{"thread":{"id":"44230","subject":"[PATCH] git-gui: Update translation template","startedAt":"2016-10-06T09:07:42Z","lastAt":"2016-10-06T09:07:42Z","messageCount":1,"participants":["Dimitriy Ryazantcev"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"303462","messageId":"20161006090654.27296-1-dimitriy.ryazantcev@gmail.com","threadId":"44230","inReplyTo":null,"subject":"[PATCH] git-gui: Update translation template","fromName":"Dimitriy Ryazantcev","fromEmail":"dimitriy.ryazantcev@gmail.com","sentAt":"2016-10-06T09:06:54Z","receivedAt":"2016-10-06T09:07:42Z","isPatch":true,"sender":{"key":"dimitriy.ryazantcev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1285934?v=4"},"body":"Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>\n---\n po/git-gui.pot | 2203 +++++++++++++++++++++++++++++++-------------------------\n 1 file changed, 1205 insertions(+), 998 deletions(-)\n\ndiff --git a/po/git-gui.pot b/po/git-gui.pot\nindex 0c94f9c..634af68 100644\n--- a/po/git-gui.pot\n+++ b/po/git-gui.pot\n@@ -8,41 +8,42 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: PACKAGE VERSION\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n-\"POT-Creation-Date: 2010-01-26 15:47-0800\\n\"\n+\"POT-Creation-Date: 2016-10-06 12:00+0300\\n\"\n \"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n \"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n \"Language-Team: LANGUAGE <LL@li.org>\\n\"\n+\"Language: \\n\"\n \"MIME-Version: 1.0\\n\"\n \"Content-Type: text/plain; charset=CHARSET\\n\"\n \"Content-Transfer-Encoding: 8bit\\n\"\n \n-#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903\n-#: git-gui.sh:922\n-msgid \"git-gui: fatal error\"\n-msgstr \"\"\n-\n-#: git-gui.sh:743\n+#: git-gui.sh:865\n #, tcl-format\n msgid \"Invalid font specified in %s:\"\n msgstr \"\"\n \n-#: git-gui.sh:779\n+#: git-gui.sh:919\n msgid \"Main Font\"\n msgstr \"\"\n \n-#: git-gui.sh:780\n+#: git-gui.sh:920\n msgid \"Diff/Console Font\"\n msgstr \"\"\n \n-#: git-gui.sh:794\n+#: git-gui.sh:935 git-gui.sh:949 git-gui.sh:962 git-gui.sh:1052 git-gui.sh:1071\n+#: git-gui.sh:3147\n+msgid \"git-gui: fatal error\"\n+msgstr \"\"\n+\n+#: git-gui.sh:936\n msgid \"Cannot find git in PATH.\"\n msgstr \"\"\n \n-#: git-gui.sh:821\n+#: git-gui.sh:963\n msgid \"Cannot parse Git version string:\"\n msgstr \"\"\n \n-#: git-gui.sh:839\n+#: git-gui.sh:988\n #, tcl-format\n msgid \"\"\n \"Git version cannot be determined.\\n\"\n@@ -54,473 +55,501 @@ msgid \"\"\n \"Assume '%s' is version 1.5.0?\\n\"\n msgstr \"\"\n \n-#: git-gui.sh:1128\n+#: git-gui.sh:1285\n msgid \"Git directory not found:\"\n msgstr \"\"\n \n-#: git-gui.sh:1146\n+#: git-gui.sh:1319\n msgid \"Cannot move to top of working directory:\"\n msgstr \"\"\n \n-#: git-gui.sh:1154\n+#: git-gui.sh:1327\n msgid \"Cannot use bare repository:\"\n msgstr \"\"\n \n-#: git-gui.sh:1162\n+#: git-gui.sh:1335\n msgid \"No working directory\"\n msgstr \"\"\n \n-#: git-gui.sh:1334 lib/checkout_op.tcl:306\n+#: git-gui.sh:1507 lib/checkout_op.tcl:306\n msgid \"Refreshing file status...\"\n msgstr \"\"\n \n-#: git-gui.sh:1390\n+#: git-gui.sh:1567\n msgid \"Scanning for modified files ...\"\n msgstr \"\"\n \n-#: git-gui.sh:1454\n+#: git-gui.sh:1645\n msgid \"Calling prepare-commit-msg hook...\"\n msgstr \"\"\n \n-#: git-gui.sh:1471\n+#: git-gui.sh:1662\n msgid \"Commit declined by prepare-commit-msg hook.\"\n msgstr \"\"\n \n-#: git-gui.sh:1629 lib/browser.tcl:246\n+#: git-gui.sh:1820 lib/browser.tcl:252\n msgid \"Ready.\"\n msgstr \"\"\n \n-#: git-gui.sh:1787\n+#: git-gui.sh:1984\n #, tcl-format\n-msgid \"Displaying only %s of %s files.\"\n+msgid \"\"\n+\"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files.\"\n msgstr \"\"\n \n-#: git-gui.sh:1913\n+#: git-gui.sh:2107\n msgid \"Unmodified\"\n msgstr \"\"\n \n-#: git-gui.sh:1915\n+#: git-gui.sh:2109\n msgid \"Modified, not staged\"\n msgstr \"\"\n \n-#: git-gui.sh:1916 git-gui.sh:1924\n+#: git-gui.sh:2110 git-gui.sh:2122\n msgid \"Staged for commit\"\n msgstr \"\"\n \n-#: git-gui.sh:1917 git-gui.sh:1925\n+#: git-gui.sh:2111 git-gui.sh:2123\n msgid \"Portions staged for commit\"\n msgstr \"\"\n \n-#: git-gui.sh:1918 git-gui.sh:1926\n+#: git-gui.sh:2112 git-gui.sh:2124\n msgid \"Staged for commit, missing\"\n msgstr \"\"\n \n-#: git-gui.sh:1920\n+#: git-gui.sh:2114\n msgid \"File type changed, not staged\"\n msgstr \"\"\n \n-#: git-gui.sh:1921\n+#: git-gui.sh:2115 git-gui.sh:2116\n+msgid \"File type changed, old type staged for commit\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2117\n msgid \"File type changed, staged\"\n msgstr \"\"\n \n-#: git-gui.sh:1923\n+#: git-gui.sh:2118\n+msgid \"File type change staged, modification not staged\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2119\n+msgid \"File type change staged, file missing\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2121\n msgid \"Untracked, not staged\"\n msgstr \"\"\n \n-#: git-gui.sh:1928\n+#: git-gui.sh:2126\n msgid \"Missing\"\n msgstr \"\"\n \n-#: git-gui.sh:1929\n+#: git-gui.sh:2127\n msgid \"Staged for removal\"\n msgstr \"\"\n \n-#: git-gui.sh:1930\n+#: git-gui.sh:2128\n msgid \"Staged for removal, still present\"\n msgstr \"\"\n \n-#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935\n-#: git-gui.sh:1936 git-gui.sh:1937\n+#: git-gui.sh:2130 git-gui.sh:2131 git-gui.sh:2132 git-gui.sh:2133\n+#: git-gui.sh:2134 git-gui.sh:2135\n msgid \"Requires merge resolution\"\n msgstr \"\"\n \n-#: git-gui.sh:1972\n+#: git-gui.sh:2170\n msgid \"Starting gitk... please wait...\"\n msgstr \"\"\n \n-#: git-gui.sh:1984\n+#: git-gui.sh:2182\n msgid \"Couldn't find gitk in PATH\"\n msgstr \"\"\n \n-#: git-gui.sh:2043\n+#: git-gui.sh:2241\n msgid \"Couldn't find git gui in PATH\"\n msgstr \"\"\n \n-#: git-gui.sh:2455 lib/choose_repository.tcl:36\n+#: git-gui.sh:2676 lib/choose_repository.tcl:41\n msgid \"Repository\"\n msgstr \"\"\n \n-#: git-gui.sh:2456\n+#: git-gui.sh:2677\n msgid \"Edit\"\n msgstr \"\"\n \n-#: git-gui.sh:2458 lib/choose_rev.tcl:561\n+#: git-gui.sh:2679 lib/choose_rev.tcl:567\n msgid \"Branch\"\n msgstr \"\"\n \n-#: git-gui.sh:2461 lib/choose_rev.tcl:548\n+#: git-gui.sh:2682 lib/choose_rev.tcl:554\n msgid \"Commit@@noun\"\n msgstr \"\"\n \n-#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n+#: git-gui.sh:2685 lib/merge.tcl:127 lib/merge.tcl:174\n msgid \"Merge\"\n msgstr \"\"\n \n-#: git-gui.sh:2465 lib/choose_rev.tcl:557\n+#: git-gui.sh:2686 lib/choose_rev.tcl:563\n msgid \"Remote\"\n msgstr \"\"\n \n-#: git-gui.sh:2468\n+#: git-gui.sh:2689\n msgid \"Tools\"\n msgstr \"\"\n \n-#: git-gui.sh:2477\n+#: git-gui.sh:2698\n msgid \"Explore Working Copy\"\n msgstr \"\"\n \n-#: git-gui.sh:2483\n+#: git-gui.sh:2704\n+msgid \"Git Bash\"\n+msgstr \"\"\n+\n+#: git-gui.sh:2714\n msgid \"Browse Current Branch's Files\"\n msgstr \"\"\n \n-#: git-gui.sh:2487\n+#: git-gui.sh:2718\n msgid \"Browse Branch Files...\"\n msgstr \"\"\n \n-#: git-gui.sh:2492\n+#: git-gui.sh:2723\n msgid \"Visualize Current Branch's History\"\n msgstr \"\"\n \n-#: git-gui.sh:2496\n+#: git-gui.sh:2727\n msgid \"Visualize All Branch History\"\n msgstr \"\"\n \n-#: git-gui.sh:2503\n+#: git-gui.sh:2734\n #, tcl-format\n msgid \"Browse %s's Files\"\n msgstr \"\"\n \n-#: git-gui.sh:2505\n+#: git-gui.sh:2736\n #, tcl-format\n msgid \"Visualize %s's History\"\n msgstr \"\"\n \n-#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67\n+#: git-gui.sh:2741 lib/database.tcl:40\n msgid \"Database Statistics\"\n msgstr \"\"\n \n-#: git-gui.sh:2513 lib/database.tcl:34\n+#: git-gui.sh:2744 lib/database.tcl:33\n msgid \"Compress Database\"\n msgstr \"\"\n \n-#: git-gui.sh:2516\n+#: git-gui.sh:2747\n msgid \"Verify Database\"\n msgstr \"\"\n \n-#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8\n-#: lib/shortcut.tcl:40 lib/shortcut.tcl:72\n+#: git-gui.sh:2754 git-gui.sh:2758 git-gui.sh:2762\n msgid \"Create Desktop Icon\"\n msgstr \"\"\n \n-#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191\n+#: git-gui.sh:2770 lib/choose_repository.tcl:193 lib/choose_repository.tcl:201\n msgid \"Quit\"\n msgstr \"\"\n \n-#: git-gui.sh:2547\n+#: git-gui.sh:2778\n msgid \"Undo\"\n msgstr \"\"\n \n-#: git-gui.sh:2550\n+#: git-gui.sh:2781\n msgid \"Redo\"\n msgstr \"\"\n \n-#: git-gui.sh:2554 git-gui.sh:3109\n+#: git-gui.sh:2785 git-gui.sh:3399\n msgid \"Cut\"\n msgstr \"\"\n \n-#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259\n+#: git-gui.sh:2788 git-gui.sh:3402 git-gui.sh:3476 git-gui.sh:3562\n #: lib/console.tcl:69\n msgid \"Copy\"\n msgstr \"\"\n \n-#: git-gui.sh:2560 git-gui.sh:3115\n+#: git-gui.sh:2791 git-gui.sh:3405\n msgid \"Paste\"\n msgstr \"\"\n \n-#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26\n-#: lib/remote_branch_delete.tcl:38\n+#: git-gui.sh:2794 git-gui.sh:3408 lib/remote_branch_delete.tcl:39\n+#: lib/branch_delete.tcl:28\n msgid \"Delete\"\n msgstr \"\"\n \n-#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71\n+#: git-gui.sh:2798 git-gui.sh:3412 git-gui.sh:3566 lib/console.tcl:71\n msgid \"Select All\"\n msgstr \"\"\n \n-#: git-gui.sh:2576\n+#: git-gui.sh:2807\n msgid \"Create...\"\n msgstr \"\"\n \n-#: git-gui.sh:2582\n+#: git-gui.sh:2813\n msgid \"Checkout...\"\n msgstr \"\"\n \n-#: git-gui.sh:2588\n+#: git-gui.sh:2819\n msgid \"Rename...\"\n msgstr \"\"\n \n-#: git-gui.sh:2593\n+#: git-gui.sh:2824\n msgid \"Delete...\"\n msgstr \"\"\n \n-#: git-gui.sh:2598\n+#: git-gui.sh:2829\n msgid \"Reset...\"\n msgstr \"\"\n \n-#: git-gui.sh:2608\n+#: git-gui.sh:2839\n msgid \"Done\"\n msgstr \"\"\n \n-#: git-gui.sh:2610\n+#: git-gui.sh:2841\n msgid \"Commit@@verb\"\n msgstr \"\"\n \n-#: git-gui.sh:2619 git-gui.sh:3050\n+#: git-gui.sh:2850 git-gui.sh:3335\n msgid \"New Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:2627 git-gui.sh:3057\n+#: git-gui.sh:2858 git-gui.sh:3342\n msgid \"Amend Last Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99\n+#: git-gui.sh:2868 git-gui.sh:3296 lib/remote_branch_delete.tcl:101\n msgid \"Rescan\"\n msgstr \"\"\n \n-#: git-gui.sh:2643\n+#: git-gui.sh:2874\n msgid \"Stage To Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:2649\n+#: git-gui.sh:2880\n msgid \"Stage Changed Files To Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:2655\n+#: git-gui.sh:2886\n msgid \"Unstage From Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:2661 lib/index.tcl:412\n+#: git-gui.sh:2892 lib/index.tcl:442\n msgid \"Revert Changes\"\n msgstr \"\"\n \n-#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341\n+#: git-gui.sh:2900 git-gui.sh:3613 git-gui.sh:3644\n msgid \"Show Less Context\"\n msgstr \"\"\n \n-#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345\n+#: git-gui.sh:2904 git-gui.sh:3617 git-gui.sh:3648\n msgid \"Show More Context\"\n msgstr \"\"\n \n-#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133\n+#: git-gui.sh:2911 git-gui.sh:3309 git-gui.sh:3423\n msgid \"Sign Off\"\n msgstr \"\"\n \n-#: git-gui.sh:2696\n+#: git-gui.sh:2927\n msgid \"Local Merge...\"\n msgstr \"\"\n \n-#: git-gui.sh:2701\n+#: git-gui.sh:2932\n msgid \"Abort Merge...\"\n msgstr \"\"\n \n-#: git-gui.sh:2713 git-gui.sh:2741\n+#: git-gui.sh:2944 git-gui.sh:2972\n msgid \"Add...\"\n msgstr \"\"\n \n-#: git-gui.sh:2717\n+#: git-gui.sh:2948\n msgid \"Push...\"\n msgstr \"\"\n \n-#: git-gui.sh:2721\n+#: git-gui.sh:2952\n msgid \"Delete Branch...\"\n msgstr \"\"\n \n-#: git-gui.sh:2731 git-gui.sh:3292\n+#: git-gui.sh:2962 git-gui.sh:3595\n msgid \"Options...\"\n msgstr \"\"\n \n-#: git-gui.sh:2742\n+#: git-gui.sh:2973\n msgid \"Remove...\"\n msgstr \"\"\n \n-#: git-gui.sh:2751 lib/choose_repository.tcl:50\n+#: git-gui.sh:2982 lib/choose_repository.tcl:55\n msgid \"Help\"\n msgstr \"\"\n \n-#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14\n-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53\n+#: git-gui.sh:2986 git-gui.sh:2990 lib/about.tcl:14\n+#: lib/choose_repository.tcl:49 lib/choose_repository.tcl:58\n #, tcl-format\n msgid \"About %s\"\n msgstr \"\"\n \n-#: git-gui.sh:2783\n+#: git-gui.sh:3014\n msgid \"Online Documentation\"\n msgstr \"\"\n \n-#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56\n+#: git-gui.sh:3017 lib/choose_repository.tcl:52 lib/choose_repository.tcl:61\n msgid \"Show SSH Key\"\n msgstr \"\"\n \n-#: git-gui.sh:2893\n+#: git-gui.sh:3032 git-gui.sh:3164\n+msgid \"usage:\"\n+msgstr \"\"\n+\n+#: git-gui.sh:3036 git-gui.sh:3168\n+msgid \"Usage\"\n+msgstr \"\"\n+\n+#: git-gui.sh:3117 lib/blame.tcl:573\n+msgid \"Error\"\n+msgstr \"\"\n+\n+#: git-gui.sh:3148\n #, tcl-format\n msgid \"fatal: cannot stat path %s: No such file or directory\"\n msgstr \"\"\n \n-#: git-gui.sh:2926\n+#: git-gui.sh:3181\n msgid \"Current Branch:\"\n msgstr \"\"\n \n-#: git-gui.sh:2947\n-msgid \"Staged Changes (Will Commit)\"\n+#: git-gui.sh:3206\n+msgid \"Unstaged Changes\"\n msgstr \"\"\n \n-#: git-gui.sh:2967\n-msgid \"Unstaged Changes\"\n+#: git-gui.sh:3228\n+msgid \"Staged Changes (Will Commit)\"\n msgstr \"\"\n \n-#: git-gui.sh:3017\n+#: git-gui.sh:3302\n msgid \"Stage Changed\"\n msgstr \"\"\n \n-#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193\n+#: git-gui.sh:3321 lib/transport.tcl:137\n msgid \"Push\"\n msgstr \"\"\n \n-#: git-gui.sh:3071\n+#: git-gui.sh:3356\n msgid \"Initial Commit Message:\"\n msgstr \"\"\n \n-#: git-gui.sh:3072\n+#: git-gui.sh:3357\n msgid \"Amended Commit Message:\"\n msgstr \"\"\n \n-#: git-gui.sh:3073\n+#: git-gui.sh:3358\n msgid \"Amended Initial Commit Message:\"\n msgstr \"\"\n \n-#: git-gui.sh:3074\n+#: git-gui.sh:3359\n msgid \"Amended Merge Commit Message:\"\n msgstr \"\"\n \n-#: git-gui.sh:3075\n+#: git-gui.sh:3360\n msgid \"Merge Commit Message:\"\n msgstr \"\"\n \n-#: git-gui.sh:3076\n+#: git-gui.sh:3361\n msgid \"Commit Message:\"\n msgstr \"\"\n \n-#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73\n+#: git-gui.sh:3415 git-gui.sh:3570 lib/console.tcl:73\n msgid \"Copy All\"\n msgstr \"\"\n \n-#: git-gui.sh:3149 lib/blame.tcl:104\n+#: git-gui.sh:3439 lib/blame.tcl:105\n msgid \"File:\"\n msgstr \"\"\n \n-#: git-gui.sh:3255\n+#: git-gui.sh:3558\n msgid \"Refresh\"\n msgstr \"\"\n \n-#: git-gui.sh:3276\n+#: git-gui.sh:3579\n msgid \"Decrease Font Size\"\n msgstr \"\"\n \n-#: git-gui.sh:3280\n+#: git-gui.sh:3583\n msgid \"Increase Font Size\"\n msgstr \"\"\n \n-#: git-gui.sh:3288 lib/blame.tcl:281\n+#: git-gui.sh:3591 lib/blame.tcl:294\n msgid \"Encoding\"\n msgstr \"\"\n \n-#: git-gui.sh:3299\n+#: git-gui.sh:3602\n msgid \"Apply/Reverse Hunk\"\n msgstr \"\"\n \n-#: git-gui.sh:3304\n+#: git-gui.sh:3607\n msgid \"Apply/Reverse Line\"\n msgstr \"\"\n \n-#: git-gui.sh:3323\n+#: git-gui.sh:3626\n msgid \"Run Merge Tool\"\n msgstr \"\"\n \n-#: git-gui.sh:3328\n+#: git-gui.sh:3631\n msgid \"Use Remote Version\"\n msgstr \"\"\n \n-#: git-gui.sh:3332\n+#: git-gui.sh:3635\n msgid \"Use Local Version\"\n msgstr \"\"\n \n-#: git-gui.sh:3336\n+#: git-gui.sh:3639\n msgid \"Revert To Base\"\n msgstr \"\"\n \n-#: git-gui.sh:3354\n+#: git-gui.sh:3657\n msgid \"Visualize These Changes In The Submodule\"\n msgstr \"\"\n \n-#: git-gui.sh:3358\n+#: git-gui.sh:3661\n msgid \"Visualize Current Branch History In The Submodule\"\n msgstr \"\"\n \n-#: git-gui.sh:3362\n+#: git-gui.sh:3665\n msgid \"Visualize All Branch History In The Submodule\"\n msgstr \"\"\n \n-#: git-gui.sh:3367\n+#: git-gui.sh:3670\n msgid \"Start git gui In The Submodule\"\n msgstr \"\"\n \n-#: git-gui.sh:3389\n+#: git-gui.sh:3705\n msgid \"Unstage Hunk From Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:3391\n+#: git-gui.sh:3707\n msgid \"Unstage Lines From Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:3393\n+#: git-gui.sh:3709\n msgid \"Unstage Line From Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:3396\n+#: git-gui.sh:3712\n msgid \"Stage Hunk For Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:3398\n+#: git-gui.sh:3714\n msgid \"Stage Lines For Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:3400\n+#: git-gui.sh:3716\n msgid \"Stage Line For Commit\"\n msgstr \"\"\n \n-#: git-gui.sh:3424\n+#: git-gui.sh:3741\n msgid \"Initializing...\"\n msgstr \"\"\n \n-#: git-gui.sh:3541\n+#: git-gui.sh:3886\n #, tcl-format\n msgid \"\"\n \"Possible environment issues exist.\\n\"\n@@ -531,14 +560,14 @@ msgid \"\"\n \"\\n\"\n msgstr \"\"\n \n-#: git-gui.sh:3570\n+#: git-gui.sh:3915\n msgid \"\"\n \"\\n\"\n \"This is due to a known issue with the\\n\"\n \"Tcl binary distributed by Cygwin.\"\n msgstr \"\"\n \n-#: git-gui.sh:3575\n+#: git-gui.sh:3920\n #, tcl-format\n msgid \"\"\n \"\\n\"\n@@ -549,244 +578,278 @@ msgid \"\"\n \"~/.gitconfig file.\\n\"\n msgstr \"\"\n \n-#: lib/about.tcl:26\n-msgid \"git-gui - a graphical user interface for Git.\"\n-msgstr \"\"\n-\n-#: lib/blame.tcl:72\n-msgid \"File Viewer\"\n-msgstr \"\"\n-\n-#: lib/blame.tcl:78\n-msgid \"Commit:\"\n-msgstr \"\"\n-\n-#: lib/blame.tcl:271\n-msgid \"Copy Commit\"\n-msgstr \"\"\n-\n-#: lib/blame.tcl:275\n-msgid \"Find Text...\"\n+#: lib/merge.tcl:13\n+msgid \"\"\n+\"Cannot merge while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit before starting any type of merge.\\n\"\n msgstr \"\"\n \n-#: lib/blame.tcl:284\n-msgid \"Do Full Copy Detection\"\n+#: lib/merge.tcl:27\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before a merge can be performed.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n msgstr \"\"\n \n-#: lib/blame.tcl:288\n-msgid \"Show History Context\"\n+#: lib/merge.tcl:45\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a conflicted merge.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.\\n\"\n+\"\\n\"\n+\"You must resolve them, stage the file, and commit to complete the current \"\n+\"merge.  Only then can you begin another merge.\\n\"\n msgstr \"\"\n \n-#: lib/blame.tcl:291\n-msgid \"Blame Parent Commit\"\n+#: lib/merge.tcl:55\n+#, tcl-format\n+msgid \"\"\n+\"You are in the middle of a change.\\n\"\n+\"\\n\"\n+\"File %s is modified.\\n\"\n+\"\\n\"\n+\"You should complete the current commit before starting a merge.  Doing so \"\n+\"will help you abort a failed merge, should the need arise.\\n\"\n msgstr \"\"\n \n-#: lib/blame.tcl:450\n+#: lib/merge.tcl:108\n #, tcl-format\n-msgid \"Reading %s...\"\n+msgid \"%s of %s\"\n msgstr \"\"\n \n-#: lib/blame.tcl:557\n-msgid \"Loading copy/move tracking annotations...\"\n+#: lib/merge.tcl:126\n+#, tcl-format\n+msgid \"Merging %s and %s...\"\n msgstr \"\"\n \n-#: lib/blame.tcl:577\n-msgid \"lines annotated\"\n+#: lib/merge.tcl:137\n+msgid \"Merge completed successfully.\"\n msgstr \"\"\n \n-#: lib/blame.tcl:769\n-msgid \"Loading original location annotations...\"\n+#: lib/merge.tcl:139\n+msgid \"Merge failed.  Conflict resolution is required.\"\n msgstr \"\"\n \n-#: lib/blame.tcl:772\n-msgid \"Annotation complete.\"\n+#: lib/merge.tcl:156\n+#, tcl-format\n+msgid \"%s (%s): Merge\"\n msgstr \"\"\n \n-#: lib/blame.tcl:802\n-msgid \"Busy\"\n+#: lib/merge.tcl:164\n+#, tcl-format\n+msgid \"Merge Into %s\"\n msgstr \"\"\n \n-#: lib/blame.tcl:803\n-msgid \"Annotation process is already running.\"\n+#: lib/merge.tcl:170 lib/checkout_op.tcl:567 lib/tools_dlg.tcl:336\n+msgid \"Visualize\"\n msgstr \"\"\n \n-#: lib/blame.tcl:842\n-msgid \"Running thorough copy detection...\"\n+#: lib/merge.tcl:178 lib/remote_branch_delete.tcl:43 lib/branch_delete.tcl:34\n+#: lib/checkout_op.tcl:579 lib/branch_rename.tcl:32 lib/tools_dlg.tcl:41\n+#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/option.tcl:127\n+#: lib/transport.tcl:141 lib/choose_font.tcl:45 lib/branch_checkout.tcl:30\n+#: lib/browser.tcl:292 lib/remote_add.tcl:34 lib/branch_create.tcl:37\n+msgid \"Cancel\"\n msgstr \"\"\n \n-#: lib/blame.tcl:910\n-msgid \"Loading annotation...\"\n+#: lib/merge.tcl:183\n+msgid \"Revision To Merge\"\n msgstr \"\"\n \n-#: lib/blame.tcl:963\n-msgid \"Author:\"\n+#: lib/merge.tcl:218\n+msgid \"\"\n+\"Cannot abort while amending.\\n\"\n+\"\\n\"\n+\"You must finish amending this commit.\\n\"\n msgstr \"\"\n \n-#: lib/blame.tcl:967\n-msgid \"Committer:\"\n+#: lib/merge.tcl:228\n+msgid \"\"\n+\"Abort merge?\\n\"\n+\"\\n\"\n+\"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with aborting the current merge?\"\n msgstr \"\"\n \n-#: lib/blame.tcl:972\n-msgid \"Original File:\"\n+#: lib/merge.tcl:234\n+msgid \"\"\n+\"Reset changes?\\n\"\n+\"\\n\"\n+\"Resetting the changes will cause *ALL* uncommitted changes to be lost.\\n\"\n+\"\\n\"\n+\"Continue with resetting the current changes?\"\n msgstr \"\"\n \n-#: lib/blame.tcl:1020\n-msgid \"Cannot find HEAD commit:\"\n+#: lib/merge.tcl:245\n+msgid \"Aborting\"\n msgstr \"\"\n \n-#: lib/blame.tcl:1075\n-msgid \"Cannot find parent commit:\"\n+#: lib/merge.tcl:245\n+msgid \"files reset\"\n msgstr \"\"\n \n-#: lib/blame.tcl:1090\n-msgid \"Unable to display parent\"\n+#: lib/merge.tcl:273\n+msgid \"Abort failed.\"\n msgstr \"\"\n \n-#: lib/blame.tcl:1091 lib/diff.tcl:320\n-msgid \"Error loading diff:\"\n+#: lib/merge.tcl:275\n+msgid \"Abort completed.  Ready.\"\n msgstr \"\"\n \n-#: lib/blame.tcl:1231\n-msgid \"Originally By:\"\n+#: lib/error.tcl:20\n+#, tcl-format\n+msgid \"%s: error\"\n msgstr \"\"\n \n-#: lib/blame.tcl:1237\n-msgid \"In File:\"\n+#: lib/error.tcl:36\n+#, tcl-format\n+msgid \"%s: warning\"\n msgstr \"\"\n \n-#: lib/blame.tcl:1242\n-msgid \"Copied Or Moved Here By:\"\n+#: lib/error.tcl:80\n+#, tcl-format\n+msgid \"%s hook failed:\"\n msgstr \"\"\n \n-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19\n-msgid \"Checkout Branch\"\n+#: lib/error.tcl:96\n+msgid \"You must correct the above errors before committing.\"\n msgstr \"\"\n \n-#: lib/branch_checkout.tcl:23\n-msgid \"Checkout\"\n+#: lib/error.tcl:116\n+#, tcl-format\n+msgid \"%s (%s): error\"\n msgstr \"\"\n \n-#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35\n-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282\n-#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172\n-#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42\n-#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352\n-#: lib/transport.tcl:108\n-msgid \"Cancel\"\n+#: lib/date.tcl:25\n+#, tcl-format\n+msgid \"Invalid date from Git: %s\"\n msgstr \"\"\n \n-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328\n-msgid \"Revision\"\n+#: lib/encoding.tcl:443\n+msgid \"Default\"\n msgstr \"\"\n \n-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280\n-msgid \"Options\"\n+#: lib/encoding.tcl:448\n+#, tcl-format\n+msgid \"System (%s)\"\n msgstr \"\"\n \n-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92\n-msgid \"Fetch Tracking Branch\"\n+#: lib/encoding.tcl:459 lib/encoding.tcl:465\n+msgid \"Other\"\n msgstr \"\"\n \n-#: lib/branch_checkout.tcl:44\n-msgid \"Detach From Local Branch\"\n+#: lib/remote_branch_delete.tcl:29\n+#, tcl-format\n+msgid \"%s (%s): Delete Branch Remotely\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:22\n-msgid \"Create Branch\"\n+#: lib/remote_branch_delete.tcl:34\n+msgid \"Delete Branch Remotely\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:27\n-msgid \"Create New Branch\"\n+#: lib/remote_branch_delete.tcl:48\n+msgid \"From Repository\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381\n-msgid \"Create\"\n+#: lib/remote_branch_delete.tcl:51 lib/transport.tcl:165\n+msgid \"Remote:\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:40\n-msgid \"Branch Name\"\n+#: lib/remote_branch_delete.tcl:72 lib/transport.tcl:187\n+msgid \"Arbitrary Location:\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50\n-msgid \"Name:\"\n+#: lib/remote_branch_delete.tcl:88\n+msgid \"Branches\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:58\n-msgid \"Match Tracking Branch Name\"\n+#: lib/remote_branch_delete.tcl:110\n+msgid \"Delete Only If\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:66\n-msgid \"Starting Revision\"\n+#: lib/remote_branch_delete.tcl:112\n+msgid \"Merged Into:\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:72\n-msgid \"Update Existing Branch:\"\n+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53\n+msgid \"Always (Do not perform merge checks)\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:75\n-msgid \"No\"\n+#: lib/remote_branch_delete.tcl:153\n+msgid \"A branch is required for 'Merged Into'.\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:80\n-msgid \"Fast Forward Only\"\n+#: lib/remote_branch_delete.tcl:185\n+#, tcl-format\n+msgid \"\"\n+\"The following branches are not completely merged into %s:\\n\"\n+\"\\n\"\n+\" - %s\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571\n-msgid \"Reset\"\n+#: lib/remote_branch_delete.tcl:190\n+#, tcl-format\n+msgid \"\"\n+\"One or more of the merge tests failed because you have not fetched the \"\n+\"necessary commits.  Try fetching from %s first.\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:97\n-msgid \"Checkout After Creation\"\n+#: lib/remote_branch_delete.tcl:208\n+msgid \"Please select one or more branches to delete.\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:131\n-msgid \"Please select a tracking branch.\"\n+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115\n+msgid \"\"\n+\"Recovering deleted branches is difficult.\\n\"\n+\"\\n\"\n+\"Delete the selected branches?\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:140\n+#: lib/remote_branch_delete.tcl:227\n #, tcl-format\n-msgid \"Tracking branch %s is not a branch in the remote repository.\"\n+msgid \"Deleting branches from %s\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86\n-msgid \"Please supply a branch name.\"\n+#: lib/remote_branch_delete.tcl:300\n+msgid \"No repository selected.\"\n msgstr \"\"\n \n-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106\n+#: lib/remote_branch_delete.tcl:305\n #, tcl-format\n-msgid \"'%s' is not an acceptable branch name.\"\n+msgid \"Scanning %s...\"\n msgstr \"\"\n \n-#: lib/branch_delete.tcl:15\n-msgid \"Delete Branch\"\n+#: lib/branch_delete.tcl:16\n+#, tcl-format\n+msgid \"%s (%s): Delete Branch\"\n msgstr \"\"\n \n-#: lib/branch_delete.tcl:20\n+#: lib/branch_delete.tcl:21\n msgid \"Delete Local Branch\"\n msgstr \"\"\n \n-#: lib/branch_delete.tcl:37\n+#: lib/branch_delete.tcl:39\n msgid \"Local Branches\"\n msgstr \"\"\n \n-#: lib/branch_delete.tcl:52\n+#: lib/branch_delete.tcl:51\n msgid \"Delete Only If Merged Into\"\n msgstr \"\"\n \n-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119\n-msgid \"Always (Do not perform merge checks)\"\n-msgstr \"\"\n-\n #: lib/branch_delete.tcl:103\n #, tcl-format\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"\"\n \n-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217\n-msgid \"\"\n-\"Recovering deleted branches is difficult.\\n\"\n-\"\\n\"\n-\"Delete the selected branches?\"\n+#: lib/branch_delete.tcl:131\n+#, tcl-format\n+msgid \" - %s:\"\n msgstr \"\"\n \n #: lib/branch_delete.tcl:141\n@@ -796,61 +859,62 @@ msgid \"\"\n \"%s\"\n msgstr \"\"\n \n-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22\n-msgid \"Rename Branch\"\n+#: lib/choose_rev.tcl:52\n+msgid \"This Detached Checkout\"\n msgstr \"\"\n \n-#: lib/branch_rename.tcl:26\n-msgid \"Rename\"\n+#: lib/choose_rev.tcl:60\n+msgid \"Revision Expression:\"\n msgstr \"\"\n \n-#: lib/branch_rename.tcl:36\n-msgid \"Branch:\"\n+#: lib/choose_rev.tcl:72\n+msgid \"Local Branch\"\n msgstr \"\"\n \n-#: lib/branch_rename.tcl:39\n-msgid \"New Name:\"\n+#: lib/choose_rev.tcl:77\n+msgid \"Tracking Branch\"\n msgstr \"\"\n \n-#: lib/branch_rename.tcl:75\n-msgid \"Please select a branch to rename.\"\n+#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544\n+msgid \"Tag\"\n msgstr \"\"\n \n-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202\n+#: lib/choose_rev.tcl:321\n #, tcl-format\n-msgid \"Branch '%s' already exists.\"\n+msgid \"Invalid revision: %s\"\n msgstr \"\"\n \n-#: lib/branch_rename.tcl:117\n-#, tcl-format\n-msgid \"Failed to rename '%s'.\"\n+#: lib/choose_rev.tcl:342\n+msgid \"No revision selected.\"\n msgstr \"\"\n \n-#: lib/browser.tcl:17\n-msgid \"Starting...\"\n+#: lib/choose_rev.tcl:350\n+msgid \"Revision expression is empty.\"\n msgstr \"\"\n \n-#: lib/browser.tcl:26\n-msgid \"File Browser\"\n+#: lib/choose_rev.tcl:537\n+msgid \"Updated\"\n msgstr \"\"\n \n-#: lib/browser.tcl:126 lib/browser.tcl:143\n-#, tcl-format\n-msgid \"Loading %s...\"\n+#: lib/choose_rev.tcl:565\n+msgid \"URL\"\n msgstr \"\"\n \n-#: lib/browser.tcl:187\n-msgid \"[Up To Parent]\"\n+#: lib/console.tcl:59\n+msgid \"Working... please wait...\"\n msgstr \"\"\n \n-#: lib/browser.tcl:267 lib/browser.tcl:273\n-msgid \"Browse Branch Files\"\n+#: lib/console.tcl:81 lib/checkout_op.tcl:146 lib/database.tcl:30\n+#: lib/sshkey.tcl:55\n+msgid \"Close\"\n msgstr \"\"\n \n-#: lib/browser.tcl:278 lib/choose_repository.tcl:398\n-#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497\n-#: lib/choose_repository.tcl:1028\n-msgid \"Browse\"\n+#: lib/console.tcl:186\n+msgid \"Success\"\n+msgstr \"\"\n+\n+#: lib/console.tcl:200\n+msgid \"Error: Command Failed\"\n msgstr \"\"\n \n #: lib/checkout_op.tcl:85\n@@ -863,11 +927,6 @@ msgstr \"\"\n msgid \"fatal: Cannot resolve %s\"\n msgstr \"\"\n \n-#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31\n-#: lib/sshkey.tcl:53\n-msgid \"Close\"\n-msgstr \"\"\n-\n #: lib/checkout_op.tcl:175\n #, tcl-format\n msgid \"Branch '%s' does not exist.\"\n@@ -878,6 +937,11 @@ msgstr \"\"\n msgid \"Failed to configure simplified git-pull for '%s'.\"\n msgstr \"\"\n \n+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102\n+#, tcl-format\n+msgid \"Branch '%s' already exists.\"\n+msgstr \"\"\n+\n #: lib/checkout_op.tcl:229\n #, tcl-format\n msgid \"\"\n@@ -961,8 +1025,8 @@ msgstr \"\"\n msgid \"Reset '%s'?\"\n msgstr \"\"\n \n-#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343\n-msgid \"Visualize\"\n+#: lib/checkout_op.tcl:571 lib/branch_create.tcl:85\n+msgid \"Reset\"\n msgstr \"\"\n \n #: lib/checkout_op.tcl:635\n@@ -976,1193 +1040,1338 @@ msgid \"\"\n \"This should not have occurred.  %s will now close and give up.\"\n msgstr \"\"\n \n-#: lib/choose_font.tcl:39\n-msgid \"Select\"\n+#: lib/blame.tcl:73\n+#, tcl-format\n+msgid \"%s (%s): File Viewer\"\n msgstr \"\"\n \n-#: lib/choose_font.tcl:53\n-msgid \"Font Family\"\n+#: lib/blame.tcl:79\n+msgid \"Commit:\"\n msgstr \"\"\n \n-#: lib/choose_font.tcl:74\n-msgid \"Font Size\"\n+#: lib/blame.tcl:280\n+msgid \"Copy Commit\"\n msgstr \"\"\n \n-#: lib/choose_font.tcl:91\n-msgid \"Font Example\"\n+#: lib/blame.tcl:284\n+msgid \"Find Text...\"\n msgstr \"\"\n \n-#: lib/choose_font.tcl:103\n-msgid \"\"\n-\"This is example text.\\n\"\n-\"If you like this text, it can be your font.\"\n+#: lib/blame.tcl:288\n+msgid \"Goto Line...\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:297\n+msgid \"Do Full Copy Detection\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:301\n+msgid \"Show History Context\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:304\n+msgid \"Blame Parent Commit\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:466\n+#, tcl-format\n+msgid \"Reading %s...\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:594\n+msgid \"Loading copy/move tracking annotations...\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:614\n+msgid \"lines annotated\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:806\n+msgid \"Loading original location annotations...\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:809\n+msgid \"Annotation complete.\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:839\n+msgid \"Busy\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:840\n+msgid \"Annotation process is already running.\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:879\n+msgid \"Running thorough copy detection...\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:947\n+msgid \"Loading annotation...\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:1000\n+msgid \"Author:\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:1004\n+msgid \"Committer:\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:1009\n+msgid \"Original File:\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:1057\n+msgid \"Cannot find HEAD commit:\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:1112\n+msgid \"Cannot find parent commit:\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:1127\n+msgid \"Unable to display parent\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:28\n+#: lib/blame.tcl:1128 lib/diff.tcl:358\n+msgid \"Error loading diff:\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:1269\n+msgid \"Originally By:\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:1275\n+msgid \"In File:\"\n+msgstr \"\"\n+\n+#: lib/blame.tcl:1280\n+msgid \"Copied Or Moved Here By:\"\n+msgstr \"\"\n+\n+#: lib/about.tcl:26\n+msgid \"git-gui - a graphical user interface for Git.\"\n+msgstr \"\"\n+\n+#: lib/choose_repository.tcl:33\n msgid \"Git Gui\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386\n+#: lib/choose_repository.tcl:92 lib/choose_repository.tcl:412\n msgid \"Create New Repository\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:93\n+#: lib/choose_repository.tcl:98\n msgid \"New...\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471\n+#: lib/choose_repository.tcl:105 lib/choose_repository.tcl:496\n msgid \"Clone Existing Repository\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:106\n+#: lib/choose_repository.tcl:116\n msgid \"Clone...\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016\n+#: lib/choose_repository.tcl:123 lib/choose_repository.tcl:1064\n msgid \"Open Existing Repository\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:119\n+#: lib/choose_repository.tcl:129\n msgid \"Open...\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:132\n+#: lib/choose_repository.tcl:142\n msgid \"Recent Repositories\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:138\n+#: lib/choose_repository.tcl:148\n msgid \"Open Recent Repository:\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313\n-#: lib/choose_repository.tcl:320\n+#: lib/choose_repository.tcl:316 lib/choose_repository.tcl:323\n+#: lib/choose_repository.tcl:330\n #, tcl-format\n msgid \"Failed to create repository %s:\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:391\n+#: lib/choose_repository.tcl:407 lib/branch_create.tcl:33\n+msgid \"Create\"\n+msgstr \"\"\n+\n+#: lib/choose_repository.tcl:417\n msgid \"Directory:\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550\n-#: lib/choose_repository.tcl:1052\n+#: lib/choose_repository.tcl:422 lib/choose_repository.tcl:509\n+#: lib/choose_repository.tcl:518 lib/choose_repository.tcl:1074\n+#: lib/browser.tcl:288\n+msgid \"Browse\"\n+msgstr \"\"\n+\n+#: lib/choose_repository.tcl:447 lib/choose_repository.tcl:573\n+#: lib/choose_repository.tcl:1098\n msgid \"Git Repository\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:448\n+#: lib/choose_repository.tcl:472\n #, tcl-format\n msgid \"Directory %s already exists.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:452\n+#: lib/choose_repository.tcl:476\n #, tcl-format\n msgid \"File %s already exists.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:466\n+#: lib/choose_repository.tcl:491\n msgid \"Clone\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:479\n+#: lib/choose_repository.tcl:504\n msgid \"Source Location:\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:490\n+#: lib/choose_repository.tcl:513\n msgid \"Target Directory:\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:502\n+#: lib/choose_repository.tcl:523\n msgid \"Clone Type:\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:508\n+#: lib/choose_repository.tcl:528\n msgid \"Standard (Fast, Semi-Redundant, Hardlinks)\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:514\n+#: lib/choose_repository.tcl:533\n msgid \"Full Copy (Slower, Redundant Backup)\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:520\n+#: lib/choose_repository.tcl:538\n msgid \"Shared (Fastest, Not Recommended, No Backup)\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603\n-#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819\n-#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066\n+#: lib/choose_repository.tcl:545\n+msgid \"Recursively clone submodules too\"\n+msgstr \"\"\n+\n+#: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626\n+#: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842\n+#: lib/choose_repository.tcl:1104 lib/choose_repository.tcl:1112\n #, tcl-format\n msgid \"Not a Git repository: %s\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:592\n+#: lib/choose_repository.tcl:615\n msgid \"Standard only available for local repository.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:596\n+#: lib/choose_repository.tcl:619\n msgid \"Shared only available for local repository.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:617\n+#: lib/choose_repository.tcl:640\n #, tcl-format\n msgid \"Location %s already exists.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:628\n+#: lib/choose_repository.tcl:651\n msgid \"Failed to configure origin\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:640\n+#: lib/choose_repository.tcl:663\n msgid \"Counting objects\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:641\n+#: lib/choose_repository.tcl:664\n msgid \"buckets\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:665\n+#: lib/choose_repository.tcl:688\n #, tcl-format\n msgid \"Unable to copy objects/info/alternates: %s\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:701\n+#: lib/choose_repository.tcl:724\n #, tcl-format\n msgid \"Nothing to clone from %s.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917\n-#: lib/choose_repository.tcl:929\n+#: lib/choose_repository.tcl:726 lib/choose_repository.tcl:940\n+#: lib/choose_repository.tcl:952\n msgid \"The 'master' branch has not been initialized.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:716\n+#: lib/choose_repository.tcl:739\n msgid \"Hardlinks are unavailable.  Falling back to copying.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:728\n+#: lib/choose_repository.tcl:751\n #, tcl-format\n msgid \"Cloning from %s\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:759\n+#: lib/choose_repository.tcl:782\n msgid \"Copying objects\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:760\n+#: lib/choose_repository.tcl:783\n msgid \"KiB\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:784\n+#: lib/choose_repository.tcl:807\n #, tcl-format\n msgid \"Unable to copy object: %s\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:794\n+#: lib/choose_repository.tcl:817\n msgid \"Linking objects\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:795\n+#: lib/choose_repository.tcl:818\n msgid \"objects\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:803\n+#: lib/choose_repository.tcl:826\n #, tcl-format\n msgid \"Unable to hardlink object: %s\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:858\n+#: lib/choose_repository.tcl:881\n msgid \"Cannot fetch branches and objects.  See console output for details.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:869\n+#: lib/choose_repository.tcl:892\n msgid \"Cannot fetch tags.  See console output for details.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:893\n+#: lib/choose_repository.tcl:916\n msgid \"Cannot determine HEAD.  See console output for details.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:902\n+#: lib/choose_repository.tcl:925\n #, tcl-format\n msgid \"Unable to cleanup %s\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:908\n+#: lib/choose_repository.tcl:931\n msgid \"Clone failed.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:915\n+#: lib/choose_repository.tcl:938\n msgid \"No default branch obtained.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:926\n+#: lib/choose_repository.tcl:949\n #, tcl-format\n msgid \"Cannot resolve %s as a commit.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:938\n+#: lib/choose_repository.tcl:961\n msgid \"Creating working directory\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130\n-#: lib/index.tcl:198\n+#: lib/choose_repository.tcl:962 lib/index.tcl:70 lib/index.tcl:136\n+#: lib/index.tcl:207\n msgid \"files\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:968\n+#: lib/choose_repository.tcl:981\n+msgid \"Cannot clone submodules.\"\n+msgstr \"\"\n+\n+#: lib/choose_repository.tcl:990\n+msgid \"Cloning submodules\"\n+msgstr \"\"\n+\n+#: lib/choose_repository.tcl:1015\n msgid \"Initial file checkout failed.\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:1011\n+#: lib/choose_repository.tcl:1059\n msgid \"Open\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:1021\n+#: lib/choose_repository.tcl:1069\n msgid \"Repository:\"\n msgstr \"\"\n \n-#: lib/choose_repository.tcl:1072\n+#: lib/choose_repository.tcl:1118\n #, tcl-format\n msgid \"Failed to open repository %s:\"\n msgstr \"\"\n \n-#: lib/choose_rev.tcl:53\n-msgid \"This Detached Checkout\"\n+#: lib/branch_rename.tcl:15\n+#, tcl-format\n+msgid \"%s (%s): Rename Branch\"\n msgstr \"\"\n \n-#: lib/choose_rev.tcl:60\n-msgid \"Revision Expression:\"\n+#: lib/branch_rename.tcl:23\n+msgid \"Rename Branch\"\n msgstr \"\"\n \n-#: lib/choose_rev.tcl:74\n-msgid \"Local Branch\"\n+#: lib/branch_rename.tcl:28\n+msgid \"Rename\"\n msgstr \"\"\n \n-#: lib/choose_rev.tcl:79\n-msgid \"Tracking Branch\"\n+#: lib/branch_rename.tcl:38\n+msgid \"Branch:\"\n msgstr \"\"\n \n-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538\n-msgid \"Tag\"\n+#: lib/branch_rename.tcl:46\n+msgid \"New Name:\"\n msgstr \"\"\n \n-#: lib/choose_rev.tcl:317\n-#, tcl-format\n-msgid \"Invalid revision: %s\"\n+#: lib/branch_rename.tcl:81\n+msgid \"Please select a branch to rename.\"\n msgstr \"\"\n \n-#: lib/choose_rev.tcl:338\n-msgid \"No revision selected.\"\n+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154\n+msgid \"Please supply a branch name.\"\n msgstr \"\"\n \n-#: lib/choose_rev.tcl:346\n-msgid \"Revision expression is empty.\"\n+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165\n+#, tcl-format\n+msgid \"'%s' is not an acceptable branch name.\"\n msgstr \"\"\n \n-#: lib/choose_rev.tcl:531\n-msgid \"Updated\"\n+#: lib/branch_rename.tcl:123\n+#, tcl-format\n+msgid \"Failed to rename '%s'.\"\n msgstr \"\"\n \n-#: lib/choose_rev.tcl:559\n-msgid \"URL\"\n+#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75\n+#, tcl-format\n+msgid \"%s (%s): Create Desktop Icon\"\n msgstr \"\"\n \n-#: lib/commit.tcl:9\n-msgid \"\"\n-\"There is nothing to amend.\\n\"\n-\"\\n\"\n-\"You are about to create the initial commit.  There is no commit before this \"\n-\"to amend.\\n\"\n+#: lib/shortcut.tcl:24 lib/shortcut.tcl:65\n+msgid \"Cannot write shortcut:\"\n msgstr \"\"\n \n-#: lib/commit.tcl:18\n-msgid \"\"\n-\"Cannot amend while merging.\\n\"\n-\"\\n\"\n-\"You are currently in the middle of a merge that has not been fully \"\n-\"completed.  You cannot amend the prior commit unless you first abort the \"\n-\"current merge activity.\\n\"\n+#: lib/shortcut.tcl:140\n+msgid \"Cannot write icon:\"\n msgstr \"\"\n \n-#: lib/commit.tcl:48\n-msgid \"Error loading commit data for amend:\"\n+#: lib/search.tcl:48\n+msgid \"Find:\"\n msgstr \"\"\n \n-#: lib/commit.tcl:75\n-msgid \"Unable to obtain your identity:\"\n+#: lib/search.tcl:50\n+msgid \"Next\"\n msgstr \"\"\n \n-#: lib/commit.tcl:80\n-msgid \"Invalid GIT_COMMITTER_IDENT:\"\n+#: lib/search.tcl:51\n+msgid \"Prev\"\n msgstr \"\"\n \n-#: lib/commit.tcl:129\n-#, tcl-format\n-msgid \"warning: Tcl does not support encoding '%s'.\"\n+#: lib/search.tcl:52\n+msgid \"RegExp\"\n msgstr \"\"\n \n-#: lib/commit.tcl:149\n-msgid \"\"\n-\"Last scanned state does not match repository state.\\n\"\n-\"\\n\"\n-\"Another Git program has modified this repository since the last scan.  A \"\n-\"rescan must be performed before another commit can be created.\\n\"\n-\"\\n\"\n-\"The rescan will be automatically started now.\\n\"\n+#: lib/search.tcl:54\n+msgid \"Case\"\n msgstr \"\"\n \n-#: lib/commit.tcl:172\n+#: lib/status_bar.tcl:87\n #, tcl-format\n-msgid \"\"\n-\"Unmerged files cannot be committed.\\n\"\n-\"\\n\"\n-\"File %s has merge conflicts.  You must resolve them and stage the file \"\n-\"before committing.\\n\"\n+msgid \"%s ... %*i of %*i %s (%3i%%)\"\n msgstr \"\"\n \n-#: lib/commit.tcl:180\n+#: lib/tools_dlg.tcl:22\n #, tcl-format\n-msgid \"\"\n-\"Unknown file state %s detected.\\n\"\n-\"\\n\"\n-\"File %s cannot be committed by this program.\\n\"\n+msgid \"%s (%s): Add Tool\"\n msgstr \"\"\n \n-#: lib/commit.tcl:188\n-msgid \"\"\n-\"No changes to commit.\\n\"\n-\"\\n\"\n-\"You must stage at least 1 file before you can commit.\\n\"\n+#: lib/tools_dlg.tcl:28\n+msgid \"Add New Tool Command\"\n msgstr \"\"\n \n-#: lib/commit.tcl:203\n-msgid \"\"\n-\"Please supply a commit message.\\n\"\n-\"\\n\"\n-\"A good commit message has the following format:\\n\"\n-\"\\n\"\n-\"- First line: Describe in one sentence what you did.\\n\"\n-\"- Second line: Blank\\n\"\n-\"- Remaining lines: Describe why this change is good.\\n\"\n+#: lib/tools_dlg.tcl:34\n+msgid \"Add globally\"\n msgstr \"\"\n \n-#: lib/commit.tcl:234\n-msgid \"Calling pre-commit hook...\"\n+#: lib/tools_dlg.tcl:37 lib/remote_add.tcl:30\n+msgid \"Add\"\n msgstr \"\"\n \n-#: lib/commit.tcl:249\n-msgid \"Commit declined by pre-commit hook.\"\n+#: lib/tools_dlg.tcl:46\n+msgid \"Tool Details\"\n msgstr \"\"\n \n-#: lib/commit.tcl:272\n-msgid \"Calling commit-msg hook...\"\n+#: lib/tools_dlg.tcl:49\n+msgid \"Use '/' separators to create a submenu tree:\"\n msgstr \"\"\n \n-#: lib/commit.tcl:287\n-msgid \"Commit declined by commit-msg hook.\"\n+#: lib/tools_dlg.tcl:51 lib/remote_add.tcl:41 lib/branch_create.tcl:44\n+msgid \"Name:\"\n msgstr \"\"\n \n-#: lib/commit.tcl:300\n-msgid \"Committing changes...\"\n+#: lib/tools_dlg.tcl:60\n+msgid \"Command:\"\n msgstr \"\"\n \n-#: lib/commit.tcl:316\n-msgid \"write-tree failed:\"\n+#: lib/tools_dlg.tcl:71\n+msgid \"Show a dialog before running\"\n msgstr \"\"\n \n-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382\n-msgid \"Commit failed.\"\n+#: lib/tools_dlg.tcl:77\n+msgid \"Ask the user to select a revision (sets $REVISION)\"\n msgstr \"\"\n \n-#: lib/commit.tcl:334\n-#, tcl-format\n-msgid \"Commit %s appears to be corrupt\"\n+#: lib/tools_dlg.tcl:82\n+msgid \"Ask the user for additional arguments (sets $ARGS)\"\n msgstr \"\"\n \n-#: lib/commit.tcl:339\n-msgid \"\"\n-\"No changes to commit.\\n\"\n-\"\\n\"\n-\"No files were modified by this commit and it was not a merge commit.\\n\"\n-\"\\n\"\n-\"A rescan will be automatically started now.\\n\"\n+#: lib/tools_dlg.tcl:89\n+msgid \"Don't show the command output window\"\n msgstr \"\"\n \n-#: lib/commit.tcl:346\n-msgid \"No changes to commit.\"\n+#: lib/tools_dlg.tcl:94\n+msgid \"Run only if a diff is selected ($FILENAME not empty)\"\n msgstr \"\"\n \n-#: lib/commit.tcl:360\n-msgid \"commit-tree failed:\"\n+#: lib/tools_dlg.tcl:118\n+msgid \"Please supply a name for the tool.\"\n msgstr \"\"\n \n-#: lib/commit.tcl:381\n-msgid \"update-ref failed:\"\n+#: lib/tools_dlg.tcl:126\n+#, tcl-format\n+msgid \"Tool '%s' already exists.\"\n msgstr \"\"\n \n-#: lib/commit.tcl:469\n+#: lib/tools_dlg.tcl:148\n #, tcl-format\n-msgid \"Created commit %s: %s\"\n+msgid \"\"\n+\"Could not add tool:\\n\"\n+\"%s\"\n msgstr \"\"\n \n-#: lib/console.tcl:59\n-msgid \"Working... please wait...\"\n+#: lib/tools_dlg.tcl:187\n+#, tcl-format\n+msgid \"%s (%s): Remove Tool\"\n msgstr \"\"\n \n-#: lib/console.tcl:186\n-msgid \"Success\"\n+#: lib/tools_dlg.tcl:193\n+msgid \"Remove Tool Commands\"\n msgstr \"\"\n \n-#: lib/console.tcl:200\n-msgid \"Error: Command Failed\"\n+#: lib/tools_dlg.tcl:198\n+msgid \"Remove\"\n msgstr \"\"\n \n-#: lib/database.tcl:43\n-msgid \"Number of loose objects\"\n+#: lib/tools_dlg.tcl:231\n+msgid \"(Blue denotes repository-local tools)\"\n msgstr \"\"\n \n-#: lib/database.tcl:44\n-msgid \"Disk space used by loose objects\"\n+#: lib/tools_dlg.tcl:283\n+#, tcl-format\n+msgid \"%s (%s):\"\n msgstr \"\"\n \n-#: lib/database.tcl:45\n-msgid \"Number of packed objects\"\n+#: lib/tools_dlg.tcl:292\n+#, tcl-format\n+msgid \"Run Command: %s\"\n msgstr \"\"\n \n-#: lib/database.tcl:46\n-msgid \"Number of packs\"\n+#: lib/tools_dlg.tcl:306\n+msgid \"Arguments\"\n msgstr \"\"\n \n-#: lib/database.tcl:47\n-msgid \"Disk space used by packed objects\"\n+#: lib/tools_dlg.tcl:321 lib/branch_checkout.tcl:35 lib/browser.tcl:297\n+msgid \"Revision\"\n msgstr \"\"\n \n-#: lib/database.tcl:48\n-msgid \"Packed objects waiting for pruning\"\n+#: lib/tools_dlg.tcl:341\n+msgid \"OK\"\n msgstr \"\"\n \n-#: lib/database.tcl:49\n-msgid \"Garbage files\"\n+#: lib/tools.tcl:76\n+#, tcl-format\n+msgid \"Running %s requires a selected file.\"\n msgstr \"\"\n \n-#: lib/database.tcl:72\n-msgid \"Compressing the object database\"\n+#: lib/tools.tcl:92\n+#, tcl-format\n+msgid \"Are you sure you want to run %1$s on file \\\"%2$s\\\"?\"\n msgstr \"\"\n \n-#: lib/database.tcl:83\n-msgid \"Verifying the object database with fsck-objects\"\n+#: lib/tools.tcl:96\n+#, tcl-format\n+msgid \"Are you sure you want to run %s?\"\n msgstr \"\"\n \n-#: lib/database.tcl:107\n+#: lib/tools.tcl:118\n #, tcl-format\n-msgid \"\"\n-\"This repository currently has approximately %i loose objects.\\n\"\n-\"\\n\"\n-\"To maintain optimal performance it is strongly recommended that you compress \"\n-\"the database.\\n\"\n-\"\\n\"\n-\"Compress the database now?\"\n+msgid \"Tool: %s\"\n msgstr \"\"\n \n-#: lib/date.tcl:25\n+#: lib/tools.tcl:119\n #, tcl-format\n-msgid \"Invalid date from Git: %s\"\n+msgid \"Running: %s\"\n msgstr \"\"\n \n-#: lib/diff.tcl:64\n+#: lib/tools.tcl:158\n #, tcl-format\n-msgid \"\"\n-\"No differences detected.\\n\"\n-\"\\n\"\n-\"%s has no changes.\\n\"\n-\"\\n\"\n-\"The modification date of this file was updated by another application, but \"\n-\"the content within the file was not changed.\\n\"\n-\"\\n\"\n-\"A rescan will be automatically started to find other files which may have \"\n-\"the same state.\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"\"\n \n-#: lib/diff.tcl:104\n+#: lib/tools.tcl:160\n #, tcl-format\n-msgid \"Loading diff of %s...\"\n+msgid \"Tool failed: %s\"\n msgstr \"\"\n \n-#: lib/diff.tcl:125\n-msgid \"\"\n-\"LOCAL: deleted\\n\"\n-\"REMOTE:\\n\"\n+#: lib/mergetool.tcl:8\n+msgid \"Force resolution to the base version?\"\n msgstr \"\"\n \n-#: lib/diff.tcl:130\n-msgid \"\"\n-\"REMOTE: deleted\\n\"\n-\"LOCAL:\\n\"\n+#: lib/mergetool.tcl:9\n+msgid \"Force resolution to this branch?\"\n msgstr \"\"\n \n-#: lib/diff.tcl:137\n-msgid \"LOCAL:\\n\"\n+#: lib/mergetool.tcl:10\n+msgid \"Force resolution to the other branch?\"\n msgstr \"\"\n \n-#: lib/diff.tcl:140\n-msgid \"REMOTE:\\n\"\n+#: lib/mergetool.tcl:14\n+#, tcl-format\n+msgid \"\"\n+\"Note that the diff shows only conflicting changes.\\n\"\n+\"\\n\"\n+\"%s will be overwritten.\\n\"\n+\"\\n\"\n+\"This operation can be undone only by restarting the merge.\"\n msgstr \"\"\n \n-#: lib/diff.tcl:202 lib/diff.tcl:319\n+#: lib/mergetool.tcl:45\n #, tcl-format\n-msgid \"Unable to display %s\"\n+msgid \"File %s seems to have unresolved conflicts, still stage?\"\n msgstr \"\"\n \n-#: lib/diff.tcl:203\n-msgid \"Error loading file:\"\n+#: lib/mergetool.tcl:60\n+#, tcl-format\n+msgid \"Adding resolution for %s\"\n msgstr \"\"\n \n-#: lib/diff.tcl:210\n-msgid \"Git Repository (subproject)\"\n+#: lib/mergetool.tcl:141\n+msgid \"Cannot resolve deletion or link conflicts using a tool\"\n msgstr \"\"\n \n-#: lib/diff.tcl:222\n-msgid \"* Binary file (not showing content).\"\n+#: lib/mergetool.tcl:146\n+msgid \"Conflict file does not exist\"\n msgstr \"\"\n \n-#: lib/diff.tcl:227\n+#: lib/mergetool.tcl:246\n+#, tcl-format\n+msgid \"Not a GUI merge tool: '%s'\"\n+msgstr \"\"\n+\n+#: lib/mergetool.tcl:275\n+#, tcl-format\n+msgid \"Unsupported merge tool '%s'\"\n+msgstr \"\"\n+\n+#: lib/mergetool.tcl:310\n+msgid \"Merge tool is already running, terminate it?\"\n+msgstr \"\"\n+\n+#: lib/mergetool.tcl:330\n #, tcl-format\n msgid \"\"\n-\"* Untracked file is %d bytes.\\n\"\n-\"* Showing only first %d bytes.\\n\"\n+\"Error retrieving versions:\\n\"\n+\"%s\"\n msgstr \"\"\n \n-#: lib/diff.tcl:233\n+#: lib/mergetool.tcl:350\n #, tcl-format\n msgid \"\"\n+\"Could not start the merge tool:\\n\"\n \"\\n\"\n-\"* Untracked file clipped here by %s.\\n\"\n-\"* To see the entire file, use an external editor.\\n\"\n+\"%s\"\n msgstr \"\"\n \n-#: lib/diff.tcl:482\n-msgid \"Failed to unstage selected hunk.\"\n+#: lib/mergetool.tcl:354\n+msgid \"Running merge tool...\"\n msgstr \"\"\n \n-#: lib/diff.tcl:489\n-msgid \"Failed to stage selected hunk.\"\n+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390\n+msgid \"Merge tool failed.\"\n msgstr \"\"\n \n-#: lib/diff.tcl:568\n-msgid \"Failed to unstage selected line.\"\n+#: lib/option.tcl:11\n+#, tcl-format\n+msgid \"Invalid global encoding '%s'\"\n msgstr \"\"\n \n-#: lib/diff.tcl:576\n-msgid \"Failed to stage selected line.\"\n+#: lib/option.tcl:19\n+#, tcl-format\n+msgid \"Invalid repo encoding '%s'\"\n msgstr \"\"\n \n-#: lib/encoding.tcl:443\n-msgid \"Default\"\n+#: lib/option.tcl:119\n+msgid \"Restore Defaults\"\n msgstr \"\"\n \n-#: lib/encoding.tcl:448\n+#: lib/option.tcl:123\n+msgid \"Save\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:133\n #, tcl-format\n-msgid \"System (%s)\"\n+msgid \"%s Repository\"\n msgstr \"\"\n \n-#: lib/encoding.tcl:459 lib/encoding.tcl:465\n-msgid \"Other\"\n+#: lib/option.tcl:134\n+msgid \"Global (All Repositories)\"\n msgstr \"\"\n \n-#: lib/error.tcl:20 lib/error.tcl:114\n-msgid \"error\"\n+#: lib/option.tcl:140\n+msgid \"User Name\"\n msgstr \"\"\n \n-#: lib/error.tcl:36\n-msgid \"warning\"\n+#: lib/option.tcl:141\n+msgid \"Email Address\"\n msgstr \"\"\n \n-#: lib/error.tcl:94\n-msgid \"You must correct the above errors before committing.\"\n+#: lib/option.tcl:143\n+msgid \"Summarize Merge Commits\"\n msgstr \"\"\n \n-#: lib/index.tcl:6\n-msgid \"Unable to unlock the index.\"\n+#: lib/option.tcl:144\n+msgid \"Merge Verbosity\"\n msgstr \"\"\n \n-#: lib/index.tcl:15\n-msgid \"Index Error\"\n+#: lib/option.tcl:145\n+msgid \"Show Diffstat After Merge\"\n msgstr \"\"\n \n-#: lib/index.tcl:17\n-msgid \"\"\n-\"Updating the Git index failed.  A rescan will be automatically started to \"\n-\"resynchronize git-gui.\"\n+#: lib/option.tcl:146\n+msgid \"Use Merge Tool\"\n msgstr \"\"\n \n-#: lib/index.tcl:28\n-msgid \"Continue\"\n+#: lib/option.tcl:148\n+msgid \"Trust File Modification Timestamps\"\n msgstr \"\"\n \n-#: lib/index.tcl:31\n-msgid \"Unlock Index\"\n+#: lib/option.tcl:149\n+msgid \"Prune Tracking Branches During Fetch\"\n msgstr \"\"\n \n-#: lib/index.tcl:289\n-#, tcl-format\n-msgid \"Unstaging %s from commit\"\n+#: lib/option.tcl:150\n+msgid \"Match Tracking Branches\"\n msgstr \"\"\n \n-#: lib/index.tcl:328\n-msgid \"Ready to commit.\"\n+#: lib/option.tcl:151\n+msgid \"Use Textconv For Diffs and Blames\"\n msgstr \"\"\n \n-#: lib/index.tcl:341\n-#, tcl-format\n-msgid \"Adding %s\"\n+#: lib/option.tcl:152\n+msgid \"Blame Copy Only On Changed Files\"\n msgstr \"\"\n \n-#: lib/index.tcl:398\n-#, tcl-format\n-msgid \"Revert changes in file %s?\"\n+#: lib/option.tcl:153\n+msgid \"Maximum Length of Recent Repositories List\"\n msgstr \"\"\n \n-#: lib/index.tcl:400\n-#, tcl-format\n-msgid \"Revert changes in these %i files?\"\n+#: lib/option.tcl:154\n+msgid \"Minimum Letters To Blame Copy On\"\n msgstr \"\"\n \n-#: lib/index.tcl:408\n-msgid \"Any unstaged changes will be permanently lost by the revert.\"\n+#: lib/option.tcl:155\n+msgid \"Blame History Context Radius (days)\"\n msgstr \"\"\n \n-#: lib/index.tcl:411\n-msgid \"Do Nothing\"\n+#: lib/option.tcl:156\n+msgid \"Number of Diff Context Lines\"\n msgstr \"\"\n \n-#: lib/index.tcl:429\n-msgid \"Reverting selected files\"\n+#: lib/option.tcl:157\n+msgid \"Additional Diff Parameters\"\n msgstr \"\"\n \n-#: lib/index.tcl:433\n-#, tcl-format\n-msgid \"Reverting %s\"\n+#: lib/option.tcl:158\n+msgid \"Commit Message Text Width\"\n msgstr \"\"\n \n-#: lib/merge.tcl:13\n-msgid \"\"\n-\"Cannot merge while amending.\\n\"\n-\"\\n\"\n-\"You must finish amending this commit before starting any type of merge.\\n\"\n+#: lib/option.tcl:159\n+msgid \"New Branch Name Template\"\n msgstr \"\"\n \n-#: lib/merge.tcl:27\n-msgid \"\"\n-\"Last scanned state does not match repository state.\\n\"\n-\"\\n\"\n-\"Another Git program has modified this repository since the last scan.  A \"\n-\"rescan must be performed before a merge can be performed.\\n\"\n-\"\\n\"\n-\"The rescan will be automatically started now.\\n\"\n+#: lib/option.tcl:160\n+msgid \"Default File Contents Encoding\"\n msgstr \"\"\n \n-#: lib/merge.tcl:45\n-#, tcl-format\n-msgid \"\"\n-\"You are in the middle of a conflicted merge.\\n\"\n-\"\\n\"\n-\"File %s has merge conflicts.\\n\"\n-\"\\n\"\n-\"You must resolve them, stage the file, and commit to complete the current \"\n-\"merge.  Only then can you begin another merge.\\n\"\n+#: lib/option.tcl:161\n+msgid \"Warn before committing to a detached head\"\n msgstr \"\"\n \n-#: lib/merge.tcl:55\n-#, tcl-format\n-msgid \"\"\n-\"You are in the middle of a change.\\n\"\n-\"\\n\"\n-\"File %s is modified.\\n\"\n-\"\\n\"\n-\"You should complete the current commit before starting a merge.  Doing so \"\n-\"will help you abort a failed merge, should the need arise.\\n\"\n+#: lib/option.tcl:162\n+msgid \"Staging of untracked files\"\n msgstr \"\"\n \n-#: lib/merge.tcl:107\n-#, tcl-format\n-msgid \"%s of %s\"\n+#: lib/option.tcl:163\n+msgid \"Show untracked files\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:164\n+msgid \"Tab spacing\"\n msgstr \"\"\n \n-#: lib/merge.tcl:120\n+#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282\n+#: lib/database.tcl:57\n #, tcl-format\n-msgid \"Merging %s and %s...\"\n+msgid \"%s:\"\n msgstr \"\"\n \n-#: lib/merge.tcl:131\n-msgid \"Merge completed successfully.\"\n+#: lib/option.tcl:210\n+msgid \"Change\"\n msgstr \"\"\n \n-#: lib/merge.tcl:133\n-msgid \"Merge failed.  Conflict resolution is required.\"\n+#: lib/option.tcl:254\n+msgid \"Spelling Dictionary:\"\n msgstr \"\"\n \n-#: lib/merge.tcl:158\n+#: lib/option.tcl:284\n+msgid \"Change Font\"\n+msgstr \"\"\n+\n+#: lib/option.tcl:288\n #, tcl-format\n-msgid \"Merge Into %s\"\n+msgid \"Choose %s\"\n msgstr \"\"\n \n-#: lib/merge.tcl:177\n-msgid \"Revision To Merge\"\n+#: lib/option.tcl:294\n+msgid \"pt.\"\n msgstr \"\"\n \n-#: lib/merge.tcl:212\n-msgid \"\"\n-\"Cannot abort while amending.\\n\"\n-\"\\n\"\n-\"You must finish amending this commit.\\n\"\n+#: lib/option.tcl:308\n+msgid \"Preferences\"\n msgstr \"\"\n \n-#: lib/merge.tcl:222\n-msgid \"\"\n-\"Abort merge?\\n\"\n-\"\\n\"\n-\"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\\n\"\n-\"\\n\"\n-\"Continue with aborting the current merge?\"\n+#: lib/option.tcl:310 lib/branch_checkout.tcl:39 lib/branch_create.tcl:69\n+msgid \"Options\"\n msgstr \"\"\n \n-#: lib/merge.tcl:228\n-msgid \"\"\n-\"Reset changes?\\n\"\n-\"\\n\"\n-\"Resetting the changes will cause *ALL* uncommitted changes to be lost.\\n\"\n-\"\\n\"\n-\"Continue with resetting the current changes?\"\n+#: lib/option.tcl:345\n+msgid \"Failed to completely save options:\"\n msgstr \"\"\n \n-#: lib/merge.tcl:239\n-msgid \"Aborting\"\n+#: lib/database.tcl:42\n+msgid \"Number of loose objects\"\n msgstr \"\"\n \n-#: lib/merge.tcl:239\n-msgid \"files reset\"\n+#: lib/database.tcl:43\n+msgid \"Disk space used by loose objects\"\n msgstr \"\"\n \n-#: lib/merge.tcl:267\n-msgid \"Abort failed.\"\n+#: lib/database.tcl:44\n+msgid \"Number of packed objects\"\n msgstr \"\"\n \n-#: lib/merge.tcl:269\n-msgid \"Abort completed.  Ready.\"\n+#: lib/database.tcl:45\n+msgid \"Number of packs\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:8\n-msgid \"Force resolution to the base version?\"\n+#: lib/database.tcl:46\n+msgid \"Disk space used by packed objects\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:9\n-msgid \"Force resolution to this branch?\"\n+#: lib/database.tcl:47\n+msgid \"Packed objects waiting for pruning\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:10\n-msgid \"Force resolution to the other branch?\"\n+#: lib/database.tcl:48\n+msgid \"Garbage files\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:14\n+#: lib/database.tcl:66\n+#, tcl-format\n+msgid \"%s (%s): Database Statistics\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:72\n+msgid \"Compressing the object database\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:83\n+msgid \"Verifying the object database with fsck-objects\"\n+msgstr \"\"\n+\n+#: lib/database.tcl:107\n #, tcl-format\n msgid \"\"\n-\"Note that the diff shows only conflicting changes.\\n\"\n+\"This repository currently has approximately %i loose objects.\\n\"\n \"\\n\"\n-\"%s will be overwritten.\\n\"\n+\"To maintain optimal performance it is strongly recommended that you compress \"\n+\"the database.\\n\"\n \"\\n\"\n-\"This operation can be undone only by restarting the merge.\"\n+\"Compress the database now?\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:45\n+#: lib/transport.tcl:6 lib/remote_add.tcl:132\n #, tcl-format\n-msgid \"File %s seems to have unresolved conflicts, still stage?\"\n+msgid \"fetch %s\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:60\n+#: lib/transport.tcl:7\n #, tcl-format\n-msgid \"Adding resolution for %s\"\n+msgid \"Fetching new changes from %s\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:141\n-msgid \"Cannot resolve deletion or link conflicts using a tool\"\n+#: lib/transport.tcl:18\n+#, tcl-format\n+msgid \"remote prune %s\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:146\n-msgid \"Conflict file does not exist\"\n+#: lib/transport.tcl:19\n+#, tcl-format\n+msgid \"Pruning tracking branches deleted from %s\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:264\n-#, tcl-format\n-msgid \"Not a GUI merge tool: '%s'\"\n+#: lib/transport.tcl:25\n+msgid \"fetch all remotes\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:26\n+msgid \"Fetching new changes from all remotes\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:40\n+msgid \"remote prune all remotes\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:41\n+msgid \"Pruning tracking branches deleted from all remotes\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:268\n+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110\n+#: lib/remote_add.tcl:162\n #, tcl-format\n-msgid \"Unsupported merge tool '%s'\"\n+msgid \"push %s\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:303\n-msgid \"Merge tool is already running, terminate it?\"\n+#: lib/transport.tcl:55\n+#, tcl-format\n+msgid \"Pushing changes to %s\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:323\n+#: lib/transport.tcl:93\n #, tcl-format\n-msgid \"\"\n-\"Error retrieving versions:\\n\"\n-\"%s\"\n+msgid \"Mirroring to %s\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:343\n+#: lib/transport.tcl:111\n #, tcl-format\n-msgid \"\"\n-\"Could not start the merge tool:\\n\"\n-\"\\n\"\n-\"%s\"\n+msgid \"Pushing %s %s to %s\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:347\n-msgid \"Running merge tool...\"\n+#: lib/transport.tcl:132\n+msgid \"Push Branches\"\n msgstr \"\"\n \n-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383\n-msgid \"Merge tool failed.\"\n+#: lib/transport.tcl:147\n+msgid \"Source Branches\"\n msgstr \"\"\n \n-#: lib/option.tcl:11\n-#, tcl-format\n-msgid \"Invalid global encoding '%s'\"\n+#: lib/transport.tcl:162\n+msgid \"Destination Repository\"\n msgstr \"\"\n \n-#: lib/option.tcl:19\n-#, tcl-format\n-msgid \"Invalid repo encoding '%s'\"\n+#: lib/transport.tcl:205\n+msgid \"Transfer Options\"\n msgstr \"\"\n \n-#: lib/option.tcl:117\n-msgid \"Restore Defaults\"\n+#: lib/transport.tcl:207\n+msgid \"Force overwrite existing branch (may discard changes)\"\n msgstr \"\"\n \n-#: lib/option.tcl:121\n-msgid \"Save\"\n+#: lib/transport.tcl:211\n+msgid \"Use thin pack (for slow network connections)\"\n msgstr \"\"\n \n-#: lib/option.tcl:131\n+#: lib/transport.tcl:215\n+msgid \"Include tags\"\n+msgstr \"\"\n+\n+#: lib/transport.tcl:229\n #, tcl-format\n-msgid \"%s Repository\"\n+msgid \"%s (%s): Push\"\n msgstr \"\"\n \n-#: lib/option.tcl:132\n-msgid \"Global (All Repositories)\"\n+#: lib/choose_font.tcl:41\n+msgid \"Select\"\n msgstr \"\"\n \n-#: lib/option.tcl:138\n-msgid \"User Name\"\n+#: lib/choose_font.tcl:55\n+msgid \"Font Family\"\n msgstr \"\"\n \n-#: lib/option.tcl:139\n-msgid \"Email Address\"\n+#: lib/choose_font.tcl:76\n+msgid \"Font Size\"\n msgstr \"\"\n \n-#: lib/option.tcl:141\n-msgid \"Summarize Merge Commits\"\n+#: lib/choose_font.tcl:93\n+msgid \"Font Example\"\n msgstr \"\"\n \n-#: lib/option.tcl:142\n-msgid \"Merge Verbosity\"\n+#: lib/choose_font.tcl:105\n+msgid \"\"\n+\"This is example text.\\n\"\n+\"If you like this text, it can be your font.\"\n msgstr \"\"\n \n-#: lib/option.tcl:143\n-msgid \"Show Diffstat After Merge\"\n+#: lib/remote.tcl:200\n+msgid \"Push to\"\n msgstr \"\"\n \n-#: lib/option.tcl:144\n-msgid \"Use Merge Tool\"\n+#: lib/remote.tcl:218\n+msgid \"Remove Remote\"\n msgstr \"\"\n \n-#: lib/option.tcl:146\n-msgid \"Trust File Modification Timestamps\"\n+#: lib/remote.tcl:223\n+msgid \"Prune from\"\n msgstr \"\"\n \n-#: lib/option.tcl:147\n-msgid \"Prune Tracking Branches During Fetch\"\n+#: lib/remote.tcl:228\n+msgid \"Fetch from\"\n msgstr \"\"\n \n-#: lib/option.tcl:148\n-msgid \"Match Tracking Branches\"\n+#: lib/diff.tcl:77\n+#, tcl-format\n+msgid \"\"\n+\"No differences detected.\\n\"\n+\"\\n\"\n+\"%s has no changes.\\n\"\n+\"\\n\"\n+\"The modification date of this file was updated by another application, but \"\n+\"the content within the file was not changed.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started to find other files which may have \"\n+\"the same state.\"\n msgstr \"\"\n \n-#: lib/option.tcl:149\n-msgid \"Blame Copy Only On Changed Files\"\n+#: lib/diff.tcl:117\n+#, tcl-format\n+msgid \"Loading diff of %s...\"\n msgstr \"\"\n \n-#: lib/option.tcl:150\n-msgid \"Minimum Letters To Blame Copy On\"\n+#: lib/diff.tcl:143\n+msgid \"\"\n+\"LOCAL: deleted\\n\"\n+\"REMOTE:\\n\"\n msgstr \"\"\n \n-#: lib/option.tcl:151\n-msgid \"Blame History Context Radius (days)\"\n+#: lib/diff.tcl:148\n+msgid \"\"\n+\"REMOTE: deleted\\n\"\n+\"LOCAL:\\n\"\n msgstr \"\"\n \n-#: lib/option.tcl:152\n-msgid \"Number of Diff Context Lines\"\n+#: lib/diff.tcl:155\n+msgid \"LOCAL:\\n\"\n msgstr \"\"\n \n-#: lib/option.tcl:153\n-msgid \"Commit Message Text Width\"\n+#: lib/diff.tcl:158\n+msgid \"REMOTE:\\n\"\n msgstr \"\"\n \n-#: lib/option.tcl:154\n-msgid \"New Branch Name Template\"\n+#: lib/diff.tcl:220 lib/diff.tcl:357\n+#, tcl-format\n+msgid \"Unable to display %s\"\n msgstr \"\"\n \n-#: lib/option.tcl:155\n-msgid \"Default File Contents Encoding\"\n+#: lib/diff.tcl:221\n+msgid \"Error loading file:\"\n msgstr \"\"\n \n-#: lib/option.tcl:203\n-msgid \"Change\"\n+#: lib/diff.tcl:227\n+msgid \"Git Repository (subproject)\"\n msgstr \"\"\n \n-#: lib/option.tcl:230\n-msgid \"Spelling Dictionary:\"\n+#: lib/diff.tcl:239\n+msgid \"* Binary file (not showing content).\"\n msgstr \"\"\n \n-#: lib/option.tcl:254\n-msgid \"Change Font\"\n+#: lib/diff.tcl:244\n+#, tcl-format\n+msgid \"\"\n+\"* Untracked file is %d bytes.\\n\"\n+\"* Showing only first %d bytes.\\n\"\n msgstr \"\"\n \n-#: lib/option.tcl:258\n+#: lib/diff.tcl:250\n #, tcl-format\n-msgid \"Choose %s\"\n+msgid \"\"\n+\"\\n\"\n+\"* Untracked file clipped here by %s.\\n\"\n+\"* To see the entire file, use an external editor.\\n\"\n msgstr \"\"\n \n-#: lib/option.tcl:264\n-msgid \"pt.\"\n+#: lib/diff.tcl:580\n+msgid \"Failed to unstage selected hunk.\"\n msgstr \"\"\n \n-#: lib/option.tcl:278\n-msgid \"Preferences\"\n+#: lib/diff.tcl:587\n+msgid \"Failed to stage selected hunk.\"\n msgstr \"\"\n \n-#: lib/option.tcl:314\n-msgid \"Failed to completely save options:\"\n+#: lib/diff.tcl:666\n+msgid \"Failed to unstage selected line.\"\n msgstr \"\"\n \n-#: lib/remote.tcl:163\n-msgid \"Remove Remote\"\n+#: lib/diff.tcl:674\n+msgid \"Failed to stage selected line.\"\n msgstr \"\"\n \n-#: lib/remote.tcl:168\n-msgid \"Prune from\"\n+#: lib/commit.tcl:9\n+msgid \"\"\n+\"There is nothing to amend.\\n\"\n+\"\\n\"\n+\"You are about to create the initial commit.  There is no commit before this \"\n+\"to amend.\\n\"\n msgstr \"\"\n \n-#: lib/remote.tcl:173\n-msgid \"Fetch from\"\n+#: lib/commit.tcl:18\n+msgid \"\"\n+\"Cannot amend while merging.\\n\"\n+\"\\n\"\n+\"You are currently in the middle of a merge that has not been fully \"\n+\"completed.  You cannot amend the prior commit unless you first abort the \"\n+\"current merge activity.\\n\"\n msgstr \"\"\n \n-#: lib/remote.tcl:215\n-msgid \"Push to\"\n+#: lib/commit.tcl:48\n+msgid \"Error loading commit data for amend:\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:19\n-msgid \"Add Remote\"\n+#: lib/commit.tcl:75\n+msgid \"Unable to obtain your identity:\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:24\n-msgid \"Add New Remote\"\n+#: lib/commit.tcl:80\n+msgid \"Invalid GIT_COMMITTER_IDENT:\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:129\n+#, tcl-format\n+msgid \"warning: Tcl does not support encoding '%s'.\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:149\n+msgid \"\"\n+\"Last scanned state does not match repository state.\\n\"\n+\"\\n\"\n+\"Another Git program has modified this repository since the last scan.  A \"\n+\"rescan must be performed before another commit can be created.\\n\"\n+\"\\n\"\n+\"The rescan will be automatically started now.\\n\"\n+msgstr \"\"\n+\n+#: lib/commit.tcl:173\n+#, tcl-format\n+msgid \"\"\n+\"Unmerged files cannot be committed.\\n\"\n+\"\\n\"\n+\"File %s has merge conflicts.  You must resolve them and stage the file \"\n+\"before committing.\\n\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36\n-msgid \"Add\"\n+#: lib/commit.tcl:181\n+#, tcl-format\n+msgid \"\"\n+\"Unknown file state %s detected.\\n\"\n+\"\\n\"\n+\"File %s cannot be committed by this program.\\n\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:37\n-msgid \"Remote Details\"\n+#: lib/commit.tcl:189\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"You must stage at least 1 file before you can commit.\\n\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:50\n-msgid \"Location:\"\n+#: lib/commit.tcl:204\n+msgid \"\"\n+\"Please supply a commit message.\\n\"\n+\"\\n\"\n+\"A good commit message has the following format:\\n\"\n+\"\\n\"\n+\"- First line: Describe in one sentence what you did.\\n\"\n+\"- Second line: Blank\\n\"\n+\"- Remaining lines: Describe why this change is good.\\n\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:62\n-msgid \"Further Action\"\n+#: lib/commit.tcl:235\n+msgid \"Calling pre-commit hook...\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:65\n-msgid \"Fetch Immediately\"\n+#: lib/commit.tcl:250\n+msgid \"Commit declined by pre-commit hook.\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:71\n-msgid \"Initialize Remote Repository and Push\"\n+#: lib/commit.tcl:269\n+msgid \"\"\n+\"You are about to commit on a detached head. This is a potentially dangerous \"\n+\"thing to do because if you switch to another branch you will lose your \"\n+\"changes and it can be difficult to retrieve them later from the reflog. You \"\n+\"should probably cancel this commit and create a new branch to continue.\\n\"\n+\" \\n\"\n+\" Do you really want to proceed with your Commit?\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:77\n-msgid \"Do Nothing Else Now\"\n+#: lib/commit.tcl:290\n+msgid \"Calling commit-msg hook...\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:101\n-msgid \"Please supply a remote name.\"\n+#: lib/commit.tcl:305\n+msgid \"Commit declined by commit-msg hook.\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:114\n-#, tcl-format\n-msgid \"'%s' is not an acceptable remote name.\"\n+#: lib/commit.tcl:318\n+msgid \"Committing changes...\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:125\n-#, tcl-format\n-msgid \"Failed to add remote '%s' of location '%s'.\"\n+#: lib/commit.tcl:334\n+msgid \"write-tree failed:\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:133 lib/transport.tcl:6\n-#, tcl-format\n-msgid \"fetch %s\"\n+#: lib/commit.tcl:335 lib/commit.tcl:382 lib/commit.tcl:403\n+msgid \"Commit failed.\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:134\n+#: lib/commit.tcl:352\n #, tcl-format\n-msgid \"Fetching the %s\"\n+msgid \"Commit %s appears to be corrupt\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:157\n-#, tcl-format\n-msgid \"Do not know how to initialize repository at location '%s'.\"\n+#: lib/commit.tcl:357\n+msgid \"\"\n+\"No changes to commit.\\n\"\n+\"\\n\"\n+\"No files were modified by this commit and it was not a merge commit.\\n\"\n+\"\\n\"\n+\"A rescan will be automatically started now.\\n\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63\n-#: lib/transport.tcl:81\n-#, tcl-format\n-msgid \"push %s\"\n+#: lib/commit.tcl:364\n+msgid \"No changes to commit.\"\n msgstr \"\"\n \n-#: lib/remote_add.tcl:164\n-#, tcl-format\n-msgid \"Setting up the %s (at %s)\"\n+#: lib/commit.tcl:381\n+msgid \"commit-tree failed:\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34\n-msgid \"Delete Branch Remotely\"\n+#: lib/commit.tcl:402\n+msgid \"update-ref failed:\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:47\n-msgid \"From Repository\"\n+#: lib/commit.tcl:495\n+#, tcl-format\n+msgid \"Created commit %s: %s\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134\n-msgid \"Remote:\"\n+#: lib/branch_checkout.tcl:16\n+#, tcl-format\n+msgid \"%s (%s): Checkout Branch\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149\n-msgid \"Arbitrary Location:\"\n+#: lib/branch_checkout.tcl:21\n+msgid \"Checkout Branch\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:84\n-msgid \"Branches\"\n+#: lib/branch_checkout.tcl:26\n+msgid \"Checkout\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:109\n-msgid \"Delete Only If\"\n+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92\n+msgid \"Fetch Tracking Branch\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:111\n-msgid \"Merged Into:\"\n+#: lib/branch_checkout.tcl:47\n+msgid \"Detach From Local Branch\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:152\n-msgid \"A branch is required for 'Merged Into'.\"\n+#: lib/index.tcl:6\n+msgid \"Unable to unlock the index.\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:184\n-#, tcl-format\n-msgid \"\"\n-\"The following branches are not completely merged into %s:\\n\"\n-\"\\n\"\n-\" - %s\"\n+#: lib/index.tcl:17\n+msgid \"Index Error\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:189\n-#, tcl-format\n+#: lib/index.tcl:19\n msgid \"\"\n-\"One or more of the merge tests failed because you have not fetched the \"\n-\"necessary commits.  Try fetching from %s first.\"\n+\"Updating the Git index failed.  A rescan will be automatically started to \"\n+\"resynchronize git-gui.\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:207\n-msgid \"Please select one or more branches to delete.\"\n+#: lib/index.tcl:30\n+msgid \"Continue\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:226\n-#, tcl-format\n-msgid \"Deleting branches from %s\"\n+#: lib/index.tcl:33\n+msgid \"Unlock Index\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:292\n-msgid \"No repository selected.\"\n+#: lib/index.tcl:294\n+msgid \"Unstaging selected files from commit\"\n msgstr \"\"\n \n-#: lib/remote_branch_delete.tcl:297\n+#: lib/index.tcl:298\n #, tcl-format\n-msgid \"Scanning %s...\"\n-msgstr \"\"\n-\n-#: lib/search.tcl:21\n-msgid \"Find:\"\n-msgstr \"\"\n-\n-#: lib/search.tcl:23\n-msgid \"Next\"\n-msgstr \"\"\n-\n-#: lib/search.tcl:24\n-msgid \"Prev\"\n-msgstr \"\"\n-\n-#: lib/search.tcl:25\n-msgid \"Case-Sensitive\"\n+msgid \"Unstaging %s from commit\"\n msgstr \"\"\n \n-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62\n-msgid \"Cannot write shortcut:\"\n+#: lib/index.tcl:337\n+msgid \"Ready to commit.\"\n msgstr \"\"\n \n-#: lib/shortcut.tcl:137\n-msgid \"Cannot write icon:\"\n+#: lib/index.tcl:346\n+msgid \"Adding selected files\"\n msgstr \"\"\n \n-#: lib/spellcheck.tcl:57\n-msgid \"Unsupported spell checker\"\n+#: lib/index.tcl:350\n+#, tcl-format\n+msgid \"Adding %s\"\n msgstr \"\"\n \n-#: lib/spellcheck.tcl:65\n-msgid \"Spell checking is unavailable\"\n+#: lib/index.tcl:380\n+#, tcl-format\n+msgid \"Stage %d untracked files?\"\n msgstr \"\"\n \n-#: lib/spellcheck.tcl:68\n-msgid \"Invalid spell checking configuration\"\n+#: lib/index.tcl:388\n+msgid \"Adding all changed files\"\n msgstr \"\"\n \n-#: lib/spellcheck.tcl:70\n+#: lib/index.tcl:428\n #, tcl-format\n-msgid \"Reverting dictionary to %s.\"\n+msgid \"Revert changes in file %s?\"\n msgstr \"\"\n \n-#: lib/spellcheck.tcl:73\n-msgid \"Spell checker silently failed on startup\"\n+#: lib/index.tcl:430\n+#, tcl-format\n+msgid \"Revert changes in these %i files?\"\n msgstr \"\"\n \n-#: lib/spellcheck.tcl:80\n-msgid \"Unrecognized spell checker\"\n+#: lib/index.tcl:438\n+msgid \"Any unstaged changes will be permanently lost by the revert.\"\n msgstr \"\"\n \n-#: lib/spellcheck.tcl:186\n-msgid \"No Suggestions\"\n+#: lib/index.tcl:441\n+msgid \"Do Nothing\"\n msgstr \"\"\n \n-#: lib/spellcheck.tcl:388\n-msgid \"Unexpected EOF from spell checker\"\n+#: lib/index.tcl:459\n+msgid \"Reverting selected files\"\n msgstr \"\"\n \n-#: lib/spellcheck.tcl:392\n-msgid \"Spell Checker Failed\"\n+#: lib/index.tcl:463\n+#, tcl-format\n+msgid \"Reverting %s\"\n msgstr \"\"\n \n #: lib/sshkey.tcl:31\n@@ -2178,19 +2387,19 @@ msgstr \"\"\n msgid \"Generate Key\"\n msgstr \"\"\n \n-#: lib/sshkey.tcl:56\n+#: lib/sshkey.tcl:58\n msgid \"Copy To Clipboard\"\n msgstr \"\"\n \n-#: lib/sshkey.tcl:70\n+#: lib/sshkey.tcl:72\n msgid \"Your OpenSSH Public Key\"\n msgstr \"\"\n \n-#: lib/sshkey.tcl:78\n+#: lib/sshkey.tcl:80\n msgid \"Generating...\"\n msgstr \"\"\n \n-#: lib/sshkey.tcl:84\n+#: lib/sshkey.tcl:86\n #, tcl-format\n msgid \"\"\n \"Could not start ssh-keygen:\\n\"\n@@ -2198,197 +2407,195 @@ msgid \"\"\n \"%s\"\n msgstr \"\"\n \n-#: lib/sshkey.tcl:111\n+#: lib/sshkey.tcl:113\n msgid \"Generation failed.\"\n msgstr \"\"\n \n-#: lib/sshkey.tcl:118\n+#: lib/sshkey.tcl:120\n msgid \"Generation succeeded, but no keys found.\"\n msgstr \"\"\n \n-#: lib/sshkey.tcl:121\n+#: lib/sshkey.tcl:123\n #, tcl-format\n msgid \"Your key is in: %s\"\n msgstr \"\"\n \n-#: lib/status_bar.tcl:83\n-#, tcl-format\n-msgid \"%s ... %*i of %*i %s (%3i%%)\"\n+#: lib/browser.tcl:17\n+msgid \"Starting...\"\n msgstr \"\"\n \n-#: lib/tools.tcl:75\n+#: lib/browser.tcl:27\n #, tcl-format\n-msgid \"Running %s requires a selected file.\"\n+msgid \"%s (%s): File Browser\"\n msgstr \"\"\n \n-#: lib/tools.tcl:90\n+#: lib/browser.tcl:132 lib/browser.tcl:149\n #, tcl-format\n-msgid \"Are you sure you want to run %s?\"\n+msgid \"Loading %s...\"\n msgstr \"\"\n \n-#: lib/tools.tcl:110\n-#, tcl-format\n-msgid \"Tool: %s\"\n+#: lib/browser.tcl:193\n+msgid \"[Up To Parent]\"\n msgstr \"\"\n \n-#: lib/tools.tcl:111\n+#: lib/browser.tcl:275\n #, tcl-format\n-msgid \"Running: %s\"\n+msgid \"%s (%s): Browse Branch Files\"\n msgstr \"\"\n \n-#: lib/tools.tcl:149\n-#, tcl-format\n-msgid \"Tool completed successfully: %s\"\n+#: lib/browser.tcl:282\n+msgid \"Browse Branch Files\"\n msgstr \"\"\n \n-#: lib/tools.tcl:151\n+#: lib/remote_add.tcl:20\n #, tcl-format\n-msgid \"Tool failed: %s\"\n+msgid \"%s (%s): Add Remote\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:22\n-msgid \"Add Tool\"\n+#: lib/remote_add.tcl:25\n+msgid \"Add New Remote\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:28\n-msgid \"Add New Tool Command\"\n+#: lib/remote_add.tcl:39\n+msgid \"Remote Details\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:33\n-msgid \"Add globally\"\n+#: lib/remote_add.tcl:50\n+msgid \"Location:\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:45\n-msgid \"Tool Details\"\n+#: lib/remote_add.tcl:60\n+msgid \"Further Action\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:48\n-msgid \"Use '/' separators to create a submenu tree:\"\n+#: lib/remote_add.tcl:63\n+msgid \"Fetch Immediately\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:61\n-msgid \"Command:\"\n+#: lib/remote_add.tcl:69\n+msgid \"Initialize Remote Repository and Push\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:74\n-msgid \"Show a dialog before running\"\n+#: lib/remote_add.tcl:75\n+msgid \"Do Nothing Else Now\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:80\n-msgid \"Ask the user to select a revision (sets $REVISION)\"\n+#: lib/remote_add.tcl:100\n+msgid \"Please supply a remote name.\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:85\n-msgid \"Ask the user for additional arguments (sets $ARGS)\"\n+#: lib/remote_add.tcl:113\n+#, tcl-format\n+msgid \"'%s' is not an acceptable remote name.\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:92\n-msgid \"Don't show the command output window\"\n+#: lib/remote_add.tcl:124\n+#, tcl-format\n+msgid \"Failed to add remote '%s' of location '%s'.\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:97\n-msgid \"Run only if a diff is selected ($FILENAME not empty)\"\n+#: lib/remote_add.tcl:133\n+#, tcl-format\n+msgid \"Fetching the %s\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:121\n-msgid \"Please supply a name for the tool.\"\n+#: lib/remote_add.tcl:156\n+#, tcl-format\n+msgid \"Do not know how to initialize repository at location '%s'.\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:129\n+#: lib/remote_add.tcl:163\n #, tcl-format\n-msgid \"Tool '%s' already exists.\"\n+msgid \"Setting up the %s (at %s)\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:151\n-#, tcl-format\n-msgid \"\"\n-\"Could not add tool:\\n\"\n-\"%s\"\n+#: lib/line.tcl:17\n+msgid \"Goto Line:\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:190\n-msgid \"Remove Tool\"\n+#: lib/line.tcl:23\n+msgid \"Go\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:196\n-msgid \"Remove Tool Commands\"\n+#: lib/branch_create.tcl:23\n+#, tcl-format\n+msgid \"%s (%s): Create Branch\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:200\n-msgid \"Remove\"\n+#: lib/branch_create.tcl:28\n+msgid \"Create New Branch\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:236\n-msgid \"(Blue denotes repository-local tools)\"\n+#: lib/branch_create.tcl:42\n+msgid \"Branch Name\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:297\n-#, tcl-format\n-msgid \"Run Command: %s\"\n+#: lib/branch_create.tcl:57\n+msgid \"Match Tracking Branch Name\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:311\n-msgid \"Arguments\"\n+#: lib/branch_create.tcl:66\n+msgid \"Starting Revision\"\n msgstr \"\"\n \n-#: lib/tools_dlg.tcl:348\n-msgid \"OK\"\n+#: lib/branch_create.tcl:72\n+msgid \"Update Existing Branch:\"\n msgstr \"\"\n \n-#: lib/transport.tcl:7\n-#, tcl-format\n-msgid \"Fetching new changes from %s\"\n+#: lib/branch_create.tcl:75\n+msgid \"No\"\n msgstr \"\"\n \n-#: lib/transport.tcl:18\n-#, tcl-format\n-msgid \"remote prune %s\"\n+#: lib/branch_create.tcl:80\n+msgid \"Fast Forward Only\"\n msgstr \"\"\n \n-#: lib/transport.tcl:19\n-#, tcl-format\n-msgid \"Pruning tracking branches deleted from %s\"\n+#: lib/branch_create.tcl:97\n+msgid \"Checkout After Creation\"\n msgstr \"\"\n \n-#: lib/transport.tcl:26\n-#, tcl-format\n-msgid \"Pushing changes to %s\"\n+#: lib/branch_create.tcl:132\n+msgid \"Please select a tracking branch.\"\n msgstr \"\"\n \n-#: lib/transport.tcl:64\n+#: lib/branch_create.tcl:141\n #, tcl-format\n-msgid \"Mirroring to %s\"\n+msgid \"Tracking branch %s is not a branch in the remote repository.\"\n msgstr \"\"\n \n-#: lib/transport.tcl:82\n-#, tcl-format\n-msgid \"Pushing %s %s to %s\"\n+#: lib/spellcheck.tcl:57\n+msgid \"Unsupported spell checker\"\n msgstr \"\"\n \n-#: lib/transport.tcl:100\n-msgid \"Push Branches\"\n+#: lib/spellcheck.tcl:65\n+msgid \"Spell checking is unavailable\"\n msgstr \"\"\n \n-#: lib/transport.tcl:114\n-msgid \"Source Branches\"\n+#: lib/spellcheck.tcl:68\n+msgid \"Invalid spell checking configuration\"\n msgstr \"\"\n \n-#: lib/transport.tcl:131\n-msgid \"Destination Repository\"\n+#: lib/spellcheck.tcl:70\n+#, tcl-format\n+msgid \"Reverting dictionary to %s.\"\n msgstr \"\"\n \n-#: lib/transport.tcl:169\n-msgid \"Transfer Options\"\n+#: lib/spellcheck.tcl:73\n+msgid \"Spell checker silently failed on startup\"\n msgstr \"\"\n \n-#: lib/transport.tcl:171\n-msgid \"Force overwrite existing branch (may discard changes)\"\n+#: lib/spellcheck.tcl:80\n+msgid \"Unrecognized spell checker\"\n msgstr \"\"\n \n-#: lib/transport.tcl:175\n-msgid \"Use thin pack (for slow network connections)\"\n+#: lib/spellcheck.tcl:186\n+msgid \"No Suggestions\"\n msgstr \"\"\n \n-#: lib/transport.tcl:179\n-msgid \"Include tags\"\n+#: lib/spellcheck.tcl:388\n+msgid \"Unexpected EOF from spell checker\"\n+msgstr \"\"\n+\n+#: lib/spellcheck.tcl:392\n+msgid \"Spell Checker Failed\"\n msgstr \"\"\n-- \n2.9.0.windows.1\n\n"}]}