{"thread":{"id":"22471","subject":"git-gui translation updates needed","startedAt":"2010-02-01T15:16:47Z","lastAt":"2010-02-03T22:24:09Z","messageCount":15,"participants":["Shawn O. Pearce","Nanako Shiraishi","Emmanuel Trillaud","Junio C Hamano","Michele Ballabio","Paul Mackerras"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"133251","messageId":"20100201151647.GB8916@spearce.org","threadId":"22471","inReplyTo":null,"subject":"git-gui translation updates needed","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2010-02-01T15:16:47Z","receivedAt":"2010-02-01T15:16:47Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"git-gui has picked up a few new strings.  Junio and I would like\nto see the new version in git 1.7.0, which means we need to get\nthe new messages translated.\n\nIf you maintain a translation file for git-gui, please grab the\nlatest sources and send a patch for your .po file:\n\n  git://git.spearce.org/git-gui.git master\n\n\nThus far I think I have German, Italian and Swedish (thanks Christian\nStimming, Christian Stimming, Christian Stimming).\n\n-- \nShawn.\n"},{"id":"133343","messageId":"20100202192021.6117@nanako3.lavabit.com","threadId":"22471","inReplyTo":"20100201151647.GB8916@spearce.org","subject":"[PATCH] git-gui: update Japanese translation","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2010-02-02T10:20:21Z","receivedAt":"2010-02-02T10:20:21Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"\nUpdate ja.po to match 2010-01-26 version of pot file.\n\nSigned-off-by: しらいし ななこ <nanako3@lavabit.com>\n---\n po/ja.po |  653 ++++++++++++++++++++++++++++--------------------------\n 1 files changed, 339 insertions(+), 314 deletions(-)\n\n\ndiff --git a/po/ja.po b/po/ja.po\nindex 63c4695..ee381a4 100644\n--- a/po/ja.po\n+++ b/po/ja.po\n@@ -3,46 +3,45 @@\n # This file is distributed under the same license as the git-gui package.\n # しらいし ななこ <nanako3@bluebottle.com>, 2007.\n #\n-#, fuzzy\n msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: git-gui\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n-\"POT-Creation-Date: 2008-12-08 08:31-0800\\n\"\n-\"PO-Revision-Date: 2008-12-09 06:27+0900\\n\"\n+\"POT-Creation-Date: 2010-01-26 15:47-0800\\n\"\n+\"PO-Revision-Date: 2010-02-02 19:03+0900\\n\"\n \"Last-Translator: しらいし ななこ <nanako3@lavabit.com>\\n\"\n \"Language-Team: Japanese\\n\"\n \"MIME-Version: 1.0\\n\"\n \"Content-Type: text/plain; charset=UTF-8\\n\"\n \"Content-Transfer-Encoding: 8bit\\n\"\n \n-#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847\n-#: git-gui.sh:866\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 \"git-gui: 致命的なエラー\"\n \n-#: git-gui.sh:689\n+#: git-gui.sh:743\n #, tcl-format\n msgid \"Invalid font specified in %s:\"\n msgstr \"%s に無効なフォントが指定されています:\"\n \n-#: git-gui.sh:723\n+#: git-gui.sh:779\n msgid \"Main Font\"\n msgstr \"主フォント\"\n \n-#: git-gui.sh:724\n+#: git-gui.sh:780\n msgid \"Diff/Console Font\"\n msgstr \"diff/コンソール・フォント\"\n \n-#: git-gui.sh:738\n+#: git-gui.sh:794\n msgid \"Cannot find git in PATH.\"\n msgstr \"PATH 中に git が見つかりません\"\n \n-#: git-gui.sh:765\n+#: git-gui.sh:821\n msgid \"Cannot parse Git version string:\"\n msgstr \"Git バージョン名が理解できません:\"\n \n-#: git-gui.sh:783\n+#: git-gui.sh:839\n #, tcl-format\n msgid \"\"\n \"Git version cannot be determined.\\n\"\n@@ -61,446 +60,475 @@ msgstr \"\"\n \"\\n\"\n \"'%s' はバージョン 1.5.0 と思って良いですか？\\n\"\n \n-#: git-gui.sh:1062\n+#: git-gui.sh:1128\n msgid \"Git directory not found:\"\n msgstr \"Git ディレクトリが見つかりません:\"\n \n-#: git-gui.sh:1069\n+#: git-gui.sh:1146\n msgid \"Cannot move to top of working directory:\"\n msgstr \"作業ディレクトリの最上位に移動できません\"\n \n-#: git-gui.sh:1076\n-msgid \"Cannot use funny .git directory:\"\n-msgstr \"変な .git ディレクトリは使えません\"\n+#: git-gui.sh:1154\n+msgid \"Cannot use bare repository:\"\n+msgstr \"裸のリポジトリは使えません:\"\n \n-#: git-gui.sh:1081\n+#: git-gui.sh:1162\n msgid \"No working directory\"\n msgstr \"作業ディレクトリがありません\"\n \n-#: git-gui.sh:1247 lib/checkout_op.tcl:305\n+#: git-gui.sh:1334 lib/checkout_op.tcl:306\n msgid \"Refreshing file status...\"\n msgstr \"ファイル状態を更新しています…\"\n \n-#: git-gui.sh:1303\n+#: git-gui.sh:1390\n msgid \"Scanning for modified files ...\"\n msgstr \"変更されたファイルをスキャンしています…\"\n \n-#: git-gui.sh:1367\n+#: git-gui.sh:1454\n msgid \"Calling prepare-commit-msg hook...\"\n msgstr \"prepare-commit-msg フックを実行中・・・\"\n \n-#: git-gui.sh:1384\n+#: git-gui.sh:1471\n msgid \"Commit declined by prepare-commit-msg hook.\"\n msgstr \"prepare-commit-msg フックがコミットを拒否しました\"\n \n-#: git-gui.sh:1542 lib/browser.tcl:246\n+#: git-gui.sh:1629 lib/browser.tcl:246\n msgid \"Ready.\"\n msgstr \"準備完了\"\n \n-#: git-gui.sh:1819\n+#: git-gui.sh:1787\n+#, tcl-format\n+msgid \"Displaying only %s of %s files.\"\n+msgstr \"全体で%s個の内の%sファイルだけ表示しています\"\n+\n+#: git-gui.sh:1913\n msgid \"Unmodified\"\n msgstr \"変更無し\"\n \n-#: git-gui.sh:1821\n+#: git-gui.sh:1915\n msgid \"Modified, not staged\"\n msgstr \"変更あり、コミット未予定\"\n \n-#: git-gui.sh:1822 git-gui.sh:1830\n+#: git-gui.sh:1916 git-gui.sh:1924\n msgid \"Staged for commit\"\n msgstr \"コミット予定済\"\n \n-#: git-gui.sh:1823 git-gui.sh:1831\n+#: git-gui.sh:1917 git-gui.sh:1925\n msgid \"Portions staged for commit\"\n msgstr \"部分的にコミット予定済\"\n \n-#: git-gui.sh:1824 git-gui.sh:1832\n+#: git-gui.sh:1918 git-gui.sh:1926\n msgid \"Staged for commit, missing\"\n msgstr \"コミット予定済、ファイル無し\"\n \n-#: git-gui.sh:1826\n+#: git-gui.sh:1920\n msgid \"File type changed, not staged\"\n msgstr \"ファイル型変更、コミット未予定\"\n \n-#: git-gui.sh:1827\n+#: git-gui.sh:1921\n msgid \"File type changed, staged\"\n msgstr \"ファイル型変更、コミット予定済\"\n \n-#: git-gui.sh:1829\n+#: git-gui.sh:1923\n msgid \"Untracked, not staged\"\n msgstr \"管理外、コミット未予定\"\n \n-#: git-gui.sh:1834\n+#: git-gui.sh:1928\n msgid \"Missing\"\n msgstr \"ファイル無し\"\n \n-#: git-gui.sh:1835\n+#: git-gui.sh:1929\n msgid \"Staged for removal\"\n msgstr \"削除予定済\"\n \n-#: git-gui.sh:1836\n+#: git-gui.sh:1930\n msgid \"Staged for removal, still present\"\n msgstr \"削除予定済、ファイル未削除\"\n \n-#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841\n-#: git-gui.sh:1842 git-gui.sh:1843\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 msgid \"Requires merge resolution\"\n msgstr \"要マージ解決\"\n \n-#: git-gui.sh:1878\n+#: git-gui.sh:1972\n msgid \"Starting gitk... please wait...\"\n msgstr \"gitk を起動中…お待ち下さい…\"\n \n-#: git-gui.sh:1887\n+#: git-gui.sh:1984\n msgid \"Couldn't find gitk in PATH\"\n msgstr \"PATH 中に gitk が見つかりません\"\n \n-#: git-gui.sh:2280 lib/choose_repository.tcl:36\n+#: git-gui.sh:2043\n+msgid \"Couldn't find git gui in PATH\"\n+msgstr \"PATH 中に git gui が見つかりません\"\n+\n+#: git-gui.sh:2455 lib/choose_repository.tcl:36\n msgid \"Repository\"\n msgstr \"リポジトリ\"\n \n-#: git-gui.sh:2281\n+#: git-gui.sh:2456\n msgid \"Edit\"\n msgstr \"編集\"\n \n-#: git-gui.sh:2283 lib/choose_rev.tcl:561\n+#: git-gui.sh:2458 lib/choose_rev.tcl:561\n msgid \"Branch\"\n msgstr \"ブランチ\"\n \n-#: git-gui.sh:2286 lib/choose_rev.tcl:548\n+#: git-gui.sh:2461 lib/choose_rev.tcl:548\n msgid \"Commit@@noun\"\n msgstr \"コミット\"\n \n-#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n+#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n msgid \"Merge\"\n msgstr \"マージ\"\n \n-#: git-gui.sh:2290 lib/choose_rev.tcl:557\n+#: git-gui.sh:2465 lib/choose_rev.tcl:557\n msgid \"Remote\"\n msgstr \"リモート\"\n \n-#: git-gui.sh:2293\n+#: git-gui.sh:2468\n msgid \"Tools\"\n msgstr \"ツール\"\n \n-#: git-gui.sh:2302\n+#: git-gui.sh:2477\n msgid \"Explore Working Copy\"\n msgstr \"ワーキングコピーをブラウズ\"\n \n-#: git-gui.sh:2307\n+#: git-gui.sh:2483\n msgid \"Browse Current Branch's Files\"\n msgstr \"現在のブランチのファイルを見る\"\n \n-#: git-gui.sh:2311\n+#: git-gui.sh:2487\n msgid \"Browse Branch Files...\"\n msgstr \"ブランチのファイルを見る…\"\n \n-#: git-gui.sh:2316\n+#: git-gui.sh:2492\n msgid \"Visualize Current Branch's History\"\n msgstr \"現在のブランチの履歴を見る\"\n \n-#: git-gui.sh:2320\n+#: git-gui.sh:2496\n msgid \"Visualize All Branch History\"\n msgstr \"全てのブランチの履歴を見る\"\n \n-#: git-gui.sh:2327\n+#: git-gui.sh:2503\n #, tcl-format\n msgid \"Browse %s's Files\"\n msgstr \"ブランチ %s のファイルを見る\"\n \n-#: git-gui.sh:2329\n+#: git-gui.sh:2505\n #, tcl-format\n msgid \"Visualize %s's History\"\n msgstr \"ブランチ %s の履歴を見る\"\n \n-#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67\n+#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67\n msgid \"Database Statistics\"\n msgstr \"データベース統計\"\n \n-#: git-gui.sh:2337 lib/database.tcl:34\n+#: git-gui.sh:2513 lib/database.tcl:34\n msgid \"Compress Database\"\n msgstr \"データベース圧縮\"\n \n-#: git-gui.sh:2340\n+#: git-gui.sh:2516\n msgid \"Verify Database\"\n msgstr \"データベース検証\"\n \n-#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7\n-#: lib/shortcut.tcl:39 lib/shortcut.tcl:71\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 msgid \"Create Desktop Icon\"\n msgstr \"デスクトップ・アイコンを作る\"\n \n-#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191\n+#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191\n msgid \"Quit\"\n msgstr \"終了\"\n \n-#: git-gui.sh:2371\n+#: git-gui.sh:2547\n msgid \"Undo\"\n msgstr \"元に戻す\"\n \n-#: git-gui.sh:2374\n+#: git-gui.sh:2550\n msgid \"Redo\"\n msgstr \"やり直し\"\n \n-#: git-gui.sh:2378 git-gui.sh:2923\n+#: git-gui.sh:2554 git-gui.sh:3109\n msgid \"Cut\"\n msgstr \"切り取り\"\n \n-#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082\n+#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259\n #: lib/console.tcl:69\n msgid \"Copy\"\n msgstr \"コピー\"\n \n-#: git-gui.sh:2384 git-gui.sh:2929\n+#: git-gui.sh:2560 git-gui.sh:3115\n msgid \"Paste\"\n msgstr \"貼り付け\"\n \n-#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26\n+#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26\n #: lib/remote_branch_delete.tcl:38\n msgid \"Delete\"\n msgstr \"削除\"\n \n-#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71\n+#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71\n msgid \"Select All\"\n msgstr \"全て選択\"\n \n-#: git-gui.sh:2400\n+#: git-gui.sh:2576\n msgid \"Create...\"\n msgstr \"作成…\"\n \n-#: git-gui.sh:2406\n+#: git-gui.sh:2582\n msgid \"Checkout...\"\n msgstr \"チェックアウト\"\n \n-#: git-gui.sh:2412\n+#: git-gui.sh:2588\n msgid \"Rename...\"\n msgstr \"名前変更…\"\n \n-#: git-gui.sh:2417\n+#: git-gui.sh:2593\n msgid \"Delete...\"\n msgstr \"削除…\"\n \n-#: git-gui.sh:2422\n+#: git-gui.sh:2598\n msgid \"Reset...\"\n msgstr \"リセット…\"\n \n-#: git-gui.sh:2432\n+#: git-gui.sh:2608\n msgid \"Done\"\n msgstr \"完了\"\n \n-#: git-gui.sh:2434\n+#: git-gui.sh:2610\n msgid \"Commit@@verb\"\n msgstr \"コミット\"\n \n-#: git-gui.sh:2443 git-gui.sh:2864\n+#: git-gui.sh:2619 git-gui.sh:3050\n msgid \"New Commit\"\n msgstr \"新規コミット\"\n \n-#: git-gui.sh:2451 git-gui.sh:2871\n+#: git-gui.sh:2627 git-gui.sh:3057\n msgid \"Amend Last Commit\"\n msgstr \"最新コミットを訂正\"\n \n-#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99\n+#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99\n msgid \"Rescan\"\n msgstr \"再スキャン\"\n \n-#: git-gui.sh:2467\n+#: git-gui.sh:2643\n msgid \"Stage To Commit\"\n msgstr \"コミット予定する\"\n \n-#: git-gui.sh:2473\n+#: git-gui.sh:2649\n msgid \"Stage Changed Files To Commit\"\n msgstr \"変更されたファイルをコミット予定\"\n \n-#: git-gui.sh:2479\n+#: git-gui.sh:2655\n msgid \"Unstage From Commit\"\n msgstr \"コミットから降ろす\"\n \n-#: git-gui.sh:2484 lib/index.tcl:410\n+#: git-gui.sh:2661 lib/index.tcl:412\n msgid \"Revert Changes\"\n msgstr \"変更を元に戻す\"\n \n-#: git-gui.sh:2491 git-gui.sh:3069\n+#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341\n msgid \"Show Less Context\"\n msgstr \"文脈を少なく\"\n \n-#: git-gui.sh:2495 git-gui.sh:3073\n+#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345\n msgid \"Show More Context\"\n msgstr \"文脈を多く\"\n \n-#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947\n+#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133\n msgid \"Sign Off\"\n msgstr \"署名\"\n \n-#: git-gui.sh:2518\n+#: git-gui.sh:2696\n msgid \"Local Merge...\"\n msgstr \"ローカル・マージ…\"\n \n-#: git-gui.sh:2523\n+#: git-gui.sh:2701\n msgid \"Abort Merge...\"\n msgstr \"マージ中止…\"\n \n-#: git-gui.sh:2535 git-gui.sh:2575\n+#: git-gui.sh:2713 git-gui.sh:2741\n msgid \"Add...\"\n msgstr \"追加\"\n \n-#: git-gui.sh:2539\n+#: git-gui.sh:2717\n msgid \"Push...\"\n msgstr \"プッシュ…\"\n \n-#: git-gui.sh:2543\n+#: git-gui.sh:2721\n msgid \"Delete Branch...\"\n msgstr \"ブランチ削除...\"\n \n-#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14\n-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53\n-#, tcl-format\n-msgid \"About %s\"\n-msgstr \"%s について\"\n-\n-#: git-gui.sh:2557\n-msgid \"Preferences...\"\n-msgstr \"設定…\"\n-\n-#: git-gui.sh:2565 git-gui.sh:3115\n+#: git-gui.sh:2731 git-gui.sh:3292\n msgid \"Options...\"\n msgstr \"オプション…\"\n \n-#: git-gui.sh:2576\n+#: git-gui.sh:2742\n msgid \"Remove...\"\n msgstr \"削除...\"\n \n-#: git-gui.sh:2585 lib/choose_repository.tcl:50\n+#: git-gui.sh:2751 lib/choose_repository.tcl:50\n msgid \"Help\"\n msgstr \"ヘルプ\"\n \n-#: git-gui.sh:2611\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+#, tcl-format\n+msgid \"About %s\"\n+msgstr \"%s について\"\n+\n+#: git-gui.sh:2783\n msgid \"Online Documentation\"\n msgstr \"オンライン・ドキュメント\"\n \n-#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56\n+#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56\n msgid \"Show SSH Key\"\n msgstr \"SSH キーを表示\"\n \n-#: git-gui.sh:2707\n+#: git-gui.sh:2893\n #, tcl-format\n msgid \"fatal: cannot stat path %s: No such file or directory\"\n msgstr \"\"\n \"致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま\"\n \"せん\"\n \n-#: git-gui.sh:2740\n+#: git-gui.sh:2926\n msgid \"Current Branch:\"\n msgstr \"現在のブランチ\"\n \n-#: git-gui.sh:2761\n+#: git-gui.sh:2947\n msgid \"Staged Changes (Will Commit)\"\n msgstr \"ステージングされた（コミット予定済の）変更\"\n \n-#: git-gui.sh:2781\n+#: git-gui.sh:2967\n msgid \"Unstaged Changes\"\n msgstr \"コミット予定に入っていない変更\"\n \n-#: git-gui.sh:2831\n+#: git-gui.sh:3017\n msgid \"Stage Changed\"\n msgstr \"変更をコミット予定に入れる\"\n \n-#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182\n+#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193\n msgid \"Push\"\n msgstr \"プッシュ\"\n \n-#: git-gui.sh:2885\n+#: git-gui.sh:3071\n msgid \"Initial Commit Message:\"\n msgstr \"最初のコミットメッセージ:\"\n \n-#: git-gui.sh:2886\n+#: git-gui.sh:3072\n msgid \"Amended Commit Message:\"\n msgstr \"訂正したコミットメッセージ:\"\n \n-#: git-gui.sh:2887\n+#: git-gui.sh:3073\n msgid \"Amended Initial Commit Message:\"\n msgstr \"訂正した最初のコミットメッセージ:\"\n \n-#: git-gui.sh:2888\n+#: git-gui.sh:3074\n msgid \"Amended Merge Commit Message:\"\n msgstr \"訂正したマージコミットメッセージ:\"\n \n-#: git-gui.sh:2889\n+#: git-gui.sh:3075\n msgid \"Merge Commit Message:\"\n msgstr \"マージコミットメッセージ:\"\n \n-#: git-gui.sh:2890\n+#: git-gui.sh:3076\n msgid \"Commit Message:\"\n msgstr \"コミットメッセージ:\"\n \n-#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73\n+#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73\n msgid \"Copy All\"\n msgstr \"全てコピー\"\n \n-#: git-gui.sh:2963 lib/blame.tcl:104\n+#: git-gui.sh:3149 lib/blame.tcl:104\n msgid \"File:\"\n msgstr \"ファイル:\"\n \n-#: git-gui.sh:3078\n+#: git-gui.sh:3255\n msgid \"Refresh\"\n msgstr \"再読み込み\"\n \n-#: git-gui.sh:3099\n+#: git-gui.sh:3276\n msgid \"Decrease Font Size\"\n msgstr \"フォントを小さく\"\n \n-#: git-gui.sh:3103\n+#: git-gui.sh:3280\n msgid \"Increase Font Size\"\n msgstr \"フォントを大きく\"\n \n-#: git-gui.sh:3111 lib/blame.tcl:281\n+#: git-gui.sh:3288 lib/blame.tcl:281\n msgid \"Encoding\"\n msgstr \"エンコーディング\"\n \n-#: git-gui.sh:3122\n+#: git-gui.sh:3299\n msgid \"Apply/Reverse Hunk\"\n msgstr \"パッチを適用/取り消す\"\n \n-#: git-gui.sh:3127\n+#: git-gui.sh:3304\n msgid \"Apply/Reverse Line\"\n msgstr \"パッチ行を適用/取り消す\"\n \n-#: git-gui.sh:3137\n+#: git-gui.sh:3323\n msgid \"Run Merge Tool\"\n msgstr \"マージツールを起動\"\n \n-#: git-gui.sh:3142\n+#: git-gui.sh:3328\n msgid \"Use Remote Version\"\n msgstr \"リモートの方を採用\"\n \n-#: git-gui.sh:3146\n+#: git-gui.sh:3332\n msgid \"Use Local Version\"\n msgstr \"ローカルの方を採用\"\n \n-#: git-gui.sh:3150\n+#: git-gui.sh:3336\n msgid \"Revert To Base\"\n msgstr \"ベース版を採用\"\n \n-#: git-gui.sh:3169\n+#: git-gui.sh:3354\n+msgid \"Visualize These Changes In The Submodule\"\n+msgstr \"サブモジュール内のこれらの変更を見る\"\n+\n+#: git-gui.sh:3358\n+msgid \"Visualize Current Branch History In The Submodule\"\n+msgstr \"サブモジュール内で現在のブランチの履歴を見る\"\n+\n+#: git-gui.sh:3362\n+msgid \"Visualize All Branch History In The Submodule\"\n+msgstr \"サブモジュール内で全てのブランチの履歴を見る\"\n+\n+#: git-gui.sh:3367\n+msgid \"Start git gui In The Submodule\"\n+msgstr \"サブモジュール内でgit guiを起動する\"\n+\n+#: git-gui.sh:3389\n msgid \"Unstage Hunk From Commit\"\n msgstr \"パッチをコミット予定から外す\"\n \n-#: git-gui.sh:3170\n+#: git-gui.sh:3391\n+msgid \"Unstage Lines From Commit\"\n+msgstr \"コミット予定から行を外す\"\n+\n+#: git-gui.sh:3393\n msgid \"Unstage Line From Commit\"\n msgstr \"コミット予定から行を外す\"\n \n-#: git-gui.sh:3172\n+#: git-gui.sh:3396\n msgid \"Stage Hunk For Commit\"\n msgstr \"パッチをコミット予定に加える\"\n \n-#: git-gui.sh:3173\n+#: git-gui.sh:3398\n+msgid \"Stage Lines For Commit\"\n+msgstr \"パッチ行をコミット予定に加える\"\n+\n+#: git-gui.sh:3400\n msgid \"Stage Line For Commit\"\n msgstr \"パッチ行をコミット予定に加える\"\n \n-#: git-gui.sh:3196\n+#: git-gui.sh:3424\n msgid \"Initializing...\"\n msgstr \"初期化しています…\"\n \n-#: git-gui.sh:3301\n+#: git-gui.sh:3541\n #, tcl-format\n msgid \"\"\n \"Possible environment issues exist.\\n\"\n@@ -515,7 +543,7 @@ msgstr \"\"\n \"以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\\n\"\n \"\\n\"\n \n-#: git-gui.sh:3331\n+#: git-gui.sh:3570\n msgid \"\"\n \"\\n\"\n \"This is due to a known issue with the\\n\"\n@@ -525,7 +553,7 @@ msgstr \"\"\n \"これは Cygwin で配布されている Tcl バイナリに\\n\"\n \"関しての既知の問題によります\"\n \n-#: git-gui.sh:3336\n+#: git-gui.sh:3575\n #, tcl-format\n msgid \"\"\n \"\\n\"\n@@ -609,43 +637,43 @@ msgstr \"コピー検知を実行中…\"\n msgid \"Loading annotation...\"\n msgstr \"注釈を読み込んでいます…\"\n \n-#: lib/blame.tcl:964\n+#: lib/blame.tcl:963\n msgid \"Author:\"\n msgstr \"作者:\"\n \n-#: lib/blame.tcl:968\n+#: lib/blame.tcl:967\n msgid \"Committer:\"\n msgstr \"コミット者:\"\n \n-#: lib/blame.tcl:973\n+#: lib/blame.tcl:972\n msgid \"Original File:\"\n msgstr \"元ファイル\"\n \n-#: lib/blame.tcl:1021\n+#: lib/blame.tcl:1020\n msgid \"Cannot find HEAD commit:\"\n msgstr \"HEAD コミットが見つかりません\"\n \n-#: lib/blame.tcl:1076\n+#: lib/blame.tcl:1075\n msgid \"Cannot find parent commit:\"\n msgstr \"親コミットが見つかりません:\"\n \n-#: lib/blame.tcl:1091\n+#: lib/blame.tcl:1090\n msgid \"Unable to display parent\"\n msgstr \"親を表示できません\"\n \n-#: lib/blame.tcl:1092 lib/diff.tcl:297\n+#: lib/blame.tcl:1091 lib/diff.tcl:320\n msgid \"Error loading diff:\"\n msgstr \"diff を読む際のエラーです:\"\n \n-#: lib/blame.tcl:1232\n+#: lib/blame.tcl:1231\n msgid \"Originally By:\"\n msgstr \"原作者:\"\n \n-#: lib/blame.tcl:1238\n+#: lib/blame.tcl:1237\n msgid \"In File:\"\n msgstr \"ファイル:\"\n \n-#: lib/blame.tcl:1243\n+#: lib/blame.tcl:1242\n msgid \"Copied Or Moved Here By:\"\n msgstr \"複写・移動者:\"\n \n@@ -659,10 +687,10 @@ 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:544 lib/choose_font.tcl:43 lib/merge.tcl:172\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:97\n+#: lib/transport.tcl:108\n msgid \"Cancel\"\n msgstr \"中止\"\n \n@@ -690,7 +718,7 @@ msgstr \"ブランチを作成\"\n msgid \"Create New Branch\"\n msgstr \"ブランチを新規作成\"\n \n-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377\n+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381\n msgid \"Create\"\n msgstr \"作成\"\n \n@@ -722,7 +750,7 @@ msgstr \"いいえ\"\n msgid \"Fast Forward Only\"\n msgstr \"早送りのみ\"\n \n-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536\n+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571\n msgid \"Reset\"\n msgstr \"リセット\"\n \n@@ -764,15 +792,25 @@ msgstr \"ローカル・ブランチ\"\n msgid \"Delete Only If Merged Into\"\n msgstr \"マージ済みの時のみ削除\"\n \n-#: lib/branch_delete.tcl:54\n-msgid \"Always (Do not perform merge test.)\"\n-msgstr \"無条件(マージテストしない)\"\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 \"以下のブランチは %s に完全にマージされていません:\"\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+msgstr \"\"\n+\"削除したブランチを回復するのは困難です。\\n\"\n+\"\\n\"\n+\"選択したブランチを削除して良いですか？\"\n+\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -802,7 +840,7 @@ msgstr \"新しい名前:\"\n msgid \"Please select a branch to rename.\"\n msgstr \"名前を変更するブランチを選んで下さい。\"\n \n-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201\n+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202\n #, tcl-format\n msgid \"Branch '%s' already exists.\"\n msgstr \"'%s'というブランチは既に存在します。\"\n@@ -833,38 +871,38 @@ msgstr \"[上位フォルダへ]\"\n msgid \"Browse Branch Files\"\n msgstr \"現在のブランチのファイルを見る\"\n \n-#: lib/browser.tcl:278 lib/choose_repository.tcl:394\n-#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491\n-#: lib/choose_repository.tcl:995\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 msgstr \"ブラウズ\"\n \n-#: lib/checkout_op.tcl:84\n+#: lib/checkout_op.tcl:85\n #, tcl-format\n msgid \"Fetching %s from %s\"\n msgstr \"%s から %s をフェッチしています\"\n \n-#: lib/checkout_op.tcl:132\n+#: lib/checkout_op.tcl:133\n #, tcl-format\n msgid \"fatal: Cannot resolve %s\"\n msgstr \"致命的エラー: %s を解決できません\"\n \n-#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31\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:174\n+#: lib/checkout_op.tcl:175\n #, tcl-format\n msgid \"Branch '%s' does not exist.\"\n msgstr \"ブランチ'%s'は存在しません。\"\n \n-#: lib/checkout_op.tcl:193\n+#: lib/checkout_op.tcl:194\n #, tcl-format\n msgid \"Failed to configure simplified git-pull for '%s'.\"\n msgstr \"'%s' に簡易 git-pull を設定できませんでした\"\n \n-#: lib/checkout_op.tcl:228\n+#: lib/checkout_op.tcl:229\n #, tcl-format\n msgid \"\"\n \"Branch '%s' already exists.\\n\"\n@@ -877,21 +915,21 @@ msgstr \"\"\n \"%s に早送りできません。\\n\"\n \"マージが必要です。\"\n \n-#: lib/checkout_op.tcl:242\n+#: lib/checkout_op.tcl:243\n #, tcl-format\n msgid \"Merge strategy '%s' not supported.\"\n msgstr \"'%s' マージ戦略はサポートされていません。\"\n \n-#: lib/checkout_op.tcl:261\n+#: lib/checkout_op.tcl:262\n #, tcl-format\n msgid \"Failed to update '%s'.\"\n msgstr \"'%s' の更新に失敗しました。\"\n \n-#: lib/checkout_op.tcl:273\n+#: lib/checkout_op.tcl:274\n msgid \"Staging area (index) is already locked.\"\n msgstr \"インデックスは既にロックされています。\"\n \n-#: lib/checkout_op.tcl:288\n+#: lib/checkout_op.tcl:289\n msgid \"\"\n \"Last scanned state does not match repository state.\\n\"\n \"\\n\"\n@@ -907,30 +945,30 @@ msgstr \"\"\n \"\\n\"\n \"自動的に再スキャンを開始します。\\n\"\n \n-#: lib/checkout_op.tcl:344\n+#: lib/checkout_op.tcl:345\n #, tcl-format\n msgid \"Updating working directory to '%s'...\"\n msgstr \"作業ディレクトリを '%s' に更新しています…\"\n \n-#: lib/checkout_op.tcl:345\n+#: lib/checkout_op.tcl:346\n msgid \"files checked out\"\n msgstr \"チェックアウトされたファイル\"\n \n-#: lib/checkout_op.tcl:375\n+#: lib/checkout_op.tcl:376\n #, tcl-format\n msgid \"Aborted checkout of '%s' (file level merging is required).\"\n msgstr \"'%s' のチェックアウトを中止しました（ファイル毎のマージが必要です）。\"\n \n-#: lib/checkout_op.tcl:376\n+#: lib/checkout_op.tcl:377\n msgid \"File level merge required.\"\n msgstr \"ファイル毎のマージが必要です。\"\n \n-#: lib/checkout_op.tcl:380\n+#: lib/checkout_op.tcl:381\n #, tcl-format\n msgid \"Staying on branch '%s'.\"\n msgstr \"ブランチ '%s' に滞まります。\"\n \n-#: lib/checkout_op.tcl:451\n+#: lib/checkout_op.tcl:452\n msgid \"\"\n \"You are no longer on a local branch.\\n\"\n \"\\n\"\n@@ -942,30 +980,30 @@ msgstr \"\"\n \"ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン\"\n \"チを開始してください。\"\n \n-#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472\n+#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507\n #, tcl-format\n msgid \"Checked out '%s'.\"\n msgstr \"'%s' をチェックアウトしました\"\n \n-#: lib/checkout_op.tcl:500\n+#: lib/checkout_op.tcl:535\n #, tcl-format\n msgid \"Resetting '%s' to '%s' will lose the following commits:\"\n msgstr \"'%s' を '%s' にリセットすると、以下のコミットが失なわれます:\"\n \n-#: lib/checkout_op.tcl:522\n+#: lib/checkout_op.tcl:557\n msgid \"Recovering lost commits may not be easy.\"\n msgstr \"失なわれたコミットを回復するのは簡単ではありません。\"\n \n-#: lib/checkout_op.tcl:527\n+#: lib/checkout_op.tcl:562\n #, tcl-format\n msgid \"Reset '%s'?\"\n msgstr \"'%s' をリセットしますか？\"\n \n-#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343\n+#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343\n msgid \"Visualize\"\n msgstr \"可視化\"\n \n-#: lib/checkout_op.tcl:600\n+#: lib/checkout_op.tcl:635\n #, tcl-format\n msgid \"\"\n \"Failed to set current branch.\\n\"\n@@ -1009,7 +1047,7 @@ msgstr \"\"\n msgid \"Git Gui\"\n msgstr \"Git GUI\"\n \n-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382\n+#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386\n msgid \"Create New Repository\"\n msgstr \"新しいリポジトリを作る\"\n \n@@ -1017,7 +1055,7 @@ msgstr \"新しいリポジトリを作る\"\n msgid \"New...\"\n msgstr \"新規…\"\n \n-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465\n+#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471\n msgid \"Clone Existing Repository\"\n msgstr \"既存リポジトリを複製する\"\n \n@@ -1025,7 +1063,7 @@ msgstr \"既存リポジトリを複製する\"\n msgid \"Clone...\"\n msgstr \"複製…\"\n \n-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983\n+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016\n msgid \"Open Existing Repository\"\n msgstr \"既存リポジトリを開く\"\n \n@@ -1041,193 +1079,193 @@ msgstr \"最近使ったリポジトリ\"\n msgid \"Open Recent Repository:\"\n msgstr \"最近使ったリポジトリを開く\"\n \n-#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309\n-#: lib/choose_repository.tcl:316\n+#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313\n+#: lib/choose_repository.tcl:320\n #, tcl-format\n msgid \"Failed to create repository %s:\"\n msgstr \"リポジトリ %s を作製できません:\"\n \n-#: lib/choose_repository.tcl:387\n+#: lib/choose_repository.tcl:391\n msgid \"Directory:\"\n msgstr \"ディレクトリ:\"\n \n-#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544\n-#: lib/choose_repository.tcl:1017\n+#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550\n+#: lib/choose_repository.tcl:1052\n msgid \"Git Repository\"\n msgstr \"GIT リポジトリ\"\n \n-#: lib/choose_repository.tcl:442\n+#: lib/choose_repository.tcl:448\n #, tcl-format\n msgid \"Directory %s already exists.\"\n msgstr \"ディレクトリ '%s' は既に存在します。\"\n \n-#: lib/choose_repository.tcl:446\n+#: lib/choose_repository.tcl:452\n #, tcl-format\n msgid \"File %s already exists.\"\n msgstr \"ファイル '%s' は既に存在します。\"\n \n-#: lib/choose_repository.tcl:460\n+#: lib/choose_repository.tcl:466\n msgid \"Clone\"\n msgstr \"複製\"\n \n-#: lib/choose_repository.tcl:473\n+#: lib/choose_repository.tcl:479\n msgid \"Source Location:\"\n msgstr \"ソースの位置\"\n \n-#: lib/choose_repository.tcl:484\n+#: lib/choose_repository.tcl:490\n msgid \"Target Directory:\"\n msgstr \"先ディレクトリ:\"\n \n-#: lib/choose_repository.tcl:496\n+#: lib/choose_repository.tcl:502\n msgid \"Clone Type:\"\n msgstr \"複製方式:\"\n \n-#: lib/choose_repository.tcl:502\n+#: lib/choose_repository.tcl:508\n msgid \"Standard (Fast, Semi-Redundant, Hardlinks)\"\n msgstr \"標準(高速・中冗長度・ハードリンク)\"\n \n-#: lib/choose_repository.tcl:508\n+#: lib/choose_repository.tcl:514\n msgid \"Full Copy (Slower, Redundant Backup)\"\n msgstr \"全複写(低速・冗長バックアップ)\"\n \n-#: lib/choose_repository.tcl:514\n+#: lib/choose_repository.tcl:520\n msgid \"Shared (Fastest, Not Recommended, No Backup)\"\n msgstr \"共有(最高速・非推奨・バックアップ無し)\"\n \n-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597\n-#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813\n-#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031\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 #, tcl-format\n msgid \"Not a Git repository: %s\"\n msgstr \"Git リポジトリではありません: %s\"\n \n-#: lib/choose_repository.tcl:586\n+#: lib/choose_repository.tcl:592\n msgid \"Standard only available for local repository.\"\n msgstr \"標準方式は同一計算機上のリポジトリにのみ使えます。\"\n \n-#: lib/choose_repository.tcl:590\n+#: lib/choose_repository.tcl:596\n msgid \"Shared only available for local repository.\"\n msgstr \"共有方式は同一計算機上のリポジトリにのみ使えます。\"\n \n-#: lib/choose_repository.tcl:611\n+#: lib/choose_repository.tcl:617\n #, tcl-format\n msgid \"Location %s already exists.\"\n msgstr \"'%s' は既に存在します。\"\n \n-#: lib/choose_repository.tcl:622\n+#: lib/choose_repository.tcl:628\n msgid \"Failed to configure origin\"\n msgstr \"origin を設定できませんでした\"\n \n-#: lib/choose_repository.tcl:634\n+#: lib/choose_repository.tcl:640\n msgid \"Counting objects\"\n msgstr \"オブジェクトを数えています\"\n \n-#: lib/choose_repository.tcl:635\n+#: lib/choose_repository.tcl:641\n msgid \"buckets\"\n msgstr \"バケツ\"\n \n-#: lib/choose_repository.tcl:659\n+#: lib/choose_repository.tcl:665\n #, tcl-format\n msgid \"Unable to copy objects/info/alternates: %s\"\n msgstr \"objects/info/alternates を複写できません: %s\"\n \n-#: lib/choose_repository.tcl:695\n+#: lib/choose_repository.tcl:701\n #, tcl-format\n msgid \"Nothing to clone from %s.\"\n msgstr \"%s から複製する内容はありません\"\n \n-#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911\n-#: lib/choose_repository.tcl:923\n+#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917\n+#: lib/choose_repository.tcl:929\n msgid \"The 'master' branch has not been initialized.\"\n msgstr \"'master' ブランチが初期化されていません\"\n \n-#: lib/choose_repository.tcl:710\n+#: lib/choose_repository.tcl:716\n msgid \"Hardlinks are unavailable.  Falling back to copying.\"\n msgstr \"ハードリンクが作れないので、コピーします\"\n \n-#: lib/choose_repository.tcl:722\n+#: lib/choose_repository.tcl:728\n #, tcl-format\n msgid \"Cloning from %s\"\n msgstr \"%s から複製しています\"\n \n-#: lib/choose_repository.tcl:753\n+#: lib/choose_repository.tcl:759\n msgid \"Copying objects\"\n msgstr \"オブジェクトを複写しています\"\n \n-#: lib/choose_repository.tcl:754\n+#: lib/choose_repository.tcl:760\n msgid \"KiB\"\n msgstr \"KiB\"\n \n-#: lib/choose_repository.tcl:778\n+#: lib/choose_repository.tcl:784\n #, tcl-format\n msgid \"Unable to copy object: %s\"\n msgstr \"オブジェクトを複写できません: %s\"\n \n-#: lib/choose_repository.tcl:788\n+#: lib/choose_repository.tcl:794\n msgid \"Linking objects\"\n msgstr \"オブジェクトを連結しています\"\n \n-#: lib/choose_repository.tcl:789\n+#: lib/choose_repository.tcl:795\n msgid \"objects\"\n msgstr \"オブジェクト\"\n \n-#: lib/choose_repository.tcl:797\n+#: lib/choose_repository.tcl:803\n #, tcl-format\n msgid \"Unable to hardlink object: %s\"\n msgstr \"オブジェクトをハードリンクできません: %s\"\n \n-#: lib/choose_repository.tcl:852\n+#: lib/choose_repository.tcl:858\n msgid \"Cannot fetch branches and objects.  See console output for details.\"\n msgstr \"ブランチやオブジェクトを取得できません。コンソール出力を見て下さい\"\n \n-#: lib/choose_repository.tcl:863\n+#: lib/choose_repository.tcl:869\n msgid \"Cannot fetch tags.  See console output for details.\"\n msgstr \"タグを取得できません。コンソール出力を見て下さい\"\n \n-#: lib/choose_repository.tcl:887\n+#: lib/choose_repository.tcl:893\n msgid \"Cannot determine HEAD.  See console output for details.\"\n msgstr \"HEAD を確定できません。コンソール出力を見て下さい\"\n \n-#: lib/choose_repository.tcl:896\n+#: lib/choose_repository.tcl:902\n #, tcl-format\n msgid \"Unable to cleanup %s\"\n msgstr \"%s を掃除できません\"\n \n-#: lib/choose_repository.tcl:902\n+#: lib/choose_repository.tcl:908\n msgid \"Clone failed.\"\n msgstr \"複写に失敗しました。\"\n \n-#: lib/choose_repository.tcl:909\n+#: lib/choose_repository.tcl:915\n msgid \"No default branch obtained.\"\n msgstr \"デフォールト・ブランチが取得されませんでした\"\n \n-#: lib/choose_repository.tcl:920\n+#: lib/choose_repository.tcl:926\n #, tcl-format\n msgid \"Cannot resolve %s as a commit.\"\n msgstr \"%s をコミットとして解釈できません\"\n \n-#: lib/choose_repository.tcl:932\n+#: lib/choose_repository.tcl:938\n msgid \"Creating working directory\"\n msgstr \"作業ディレクトリを作成しています\"\n \n-#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128\n-#: lib/index.tcl:196\n+#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130\n+#: lib/index.tcl:198\n msgid \"files\"\n msgstr \"ファイル\"\n \n-#: lib/choose_repository.tcl:962\n+#: lib/choose_repository.tcl:968\n msgid \"Initial file checkout failed.\"\n msgstr \"初期チェックアウトに失敗しました\"\n \n-#: lib/choose_repository.tcl:978\n+#: lib/choose_repository.tcl:1011\n msgid \"Open\"\n msgstr \"開く\"\n \n-#: lib/choose_repository.tcl:988\n+#: lib/choose_repository.tcl:1021\n msgid \"Repository:\"\n msgstr \"リポジトリ:\"\n \n-#: lib/choose_repository.tcl:1037\n+#: lib/choose_repository.tcl:1072\n #, tcl-format\n msgid \"Failed to open repository %s:\"\n msgstr \"リポジトリ %s を開けません:\"\n@@ -1298,19 +1336,24 @@ msgstr \"\"\n \"現在はまだマージの途中です。先にこのマージを中止しないと、前のコミットの訂正\"\n \"はできません\\n\"\n \n-#: lib/commit.tcl:49\n+#: lib/commit.tcl:48\n msgid \"Error loading commit data for amend:\"\n msgstr \"訂正するコミットのデータを読めません:\"\n \n-#: lib/commit.tcl:76\n+#: lib/commit.tcl:75\n msgid \"Unable to obtain your identity:\"\n msgstr \"ユーザの正体を確認できません:\"\n \n-#: lib/commit.tcl:81\n+#: lib/commit.tcl:80\n msgid \"Invalid GIT_COMMITTER_IDENT:\"\n msgstr \"GIT_COMMITTER_IDENT が無効です:\"\n \n-#: lib/commit.tcl:133\n+#: lib/commit.tcl:129\n+#, tcl-format\n+msgid \"warning: Tcl does not support encoding '%s'.\"\n+msgstr \"警告: Tcl はエンコーディング '%s' をサポートしていません\"\n+\n+#: lib/commit.tcl:149\n msgid \"\"\n \"Last scanned state does not match repository state.\\n\"\n \"\\n\"\n@@ -1326,7 +1369,7 @@ msgstr \"\"\n \"\\n\"\n \"自動的に再スキャンを開始します。\\n\"\n \n-#: lib/commit.tcl:156\n+#: lib/commit.tcl:172\n #, tcl-format\n msgid \"\"\n \"Unmerged files cannot be committed.\\n\"\n@@ -1339,7 +1382,7 @@ msgstr \"\"\n \"ファイル %s にはマージ衝突が残っています。まず解決してコミット予定に加える必\"\n \"要があります。\\n\"\n \n-#: lib/commit.tcl:164\n+#: lib/commit.tcl:180\n #, tcl-format\n msgid \"\"\n \"Unknown file state %s detected.\\n\"\n@@ -1350,7 +1393,7 @@ msgstr \"\"\n \"\\n\"\n \"ファイル %s は本プログラムではコミットできません。\\n\"\n \n-#: lib/commit.tcl:172\n+#: lib/commit.tcl:188\n msgid \"\"\n \"No changes to commit.\\n\"\n \"\\n\"\n@@ -1360,7 +1403,7 @@ msgstr \"\"\n \"\\n\"\n \"最低一つの変更をコミット予定に加えてからコミットして下さい。\\n\"\n \n-#: lib/commit.tcl:187\n+#: lib/commit.tcl:203\n msgid \"\"\n \"Please supply a commit message.\\n\"\n \"\\n\"\n@@ -1378,45 +1421,40 @@ msgstr \"\"\n \"- 第２行: 空白\\n\"\n \"- 残りの行: なぜ、この変更が良い変更か、の説明。\\n\"\n \n-#: lib/commit.tcl:211\n-#, tcl-format\n-msgid \"warning: Tcl does not support encoding '%s'.\"\n-msgstr \"警告: Tcl はエンコーディング '%s' をサポートしていません\"\n-\n-#: lib/commit.tcl:227\n+#: lib/commit.tcl:234\n msgid \"Calling pre-commit hook...\"\n msgstr \"コミット前フックを実行中・・・\"\n \n-#: lib/commit.tcl:242\n+#: lib/commit.tcl:249\n msgid \"Commit declined by pre-commit hook.\"\n msgstr \"コミット前フックがコミットを拒否しました\"\n \n-#: lib/commit.tcl:265\n+#: lib/commit.tcl:272\n msgid \"Calling commit-msg hook...\"\n msgstr \"コミット・メッセージ・フックを実行中・・・\"\n \n-#: lib/commit.tcl:280\n+#: lib/commit.tcl:287\n msgid \"Commit declined by commit-msg hook.\"\n msgstr \"コミット・メッセージ・フックがコミットを拒否しました\"\n \n-#: lib/commit.tcl:293\n+#: lib/commit.tcl:300\n msgid \"Committing changes...\"\n msgstr \"変更点をコミット中・・・\"\n \n-#: lib/commit.tcl:309\n+#: lib/commit.tcl:316\n msgid \"write-tree failed:\"\n msgstr \"write-tree が失敗しました:\"\n \n-#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374\n+#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382\n msgid \"Commit failed.\"\n msgstr \"コミットに失敗しました。\"\n \n-#: lib/commit.tcl:327\n+#: lib/commit.tcl:334\n #, tcl-format\n msgid \"Commit %s appears to be corrupt\"\n msgstr \"コミット %s は壊れています\"\n \n-#: lib/commit.tcl:332\n+#: lib/commit.tcl:339\n msgid \"\"\n \"No changes to commit.\\n\"\n \"\\n\"\n@@ -1430,19 +1468,19 @@ msgstr \"\"\n \"\\n\"\n \"自動的に再スキャンを開始します。\\n\"\n \n-#: lib/commit.tcl:339\n+#: lib/commit.tcl:346\n msgid \"No changes to commit.\"\n msgstr \"コミットする変更がありません。\"\n \n-#: lib/commit.tcl:353\n+#: lib/commit.tcl:360\n msgid \"commit-tree failed:\"\n msgstr \"commit-tree が失敗しました:\"\n \n-#: lib/commit.tcl:373\n+#: lib/commit.tcl:381\n msgid \"update-ref failed:\"\n msgstr \"update-ref が失敗しました:\"\n \n-#: lib/commit.tcl:461\n+#: lib/commit.tcl:469\n #, tcl-format\n msgid \"Created commit %s: %s\"\n msgstr \"コミット %s を作成しました: %s\"\n@@ -1495,20 +1533,19 @@ msgstr \"データベース圧縮\"\n msgid \"Verifying the object database with fsck-objects\"\n msgstr \"fsck-objects でオブジェクト・データベースを検証しています\"\n \n-#: lib/database.tcl:108\n+#: lib/database.tcl:107\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 when more than %i loose objects exist.\\n\"\n+\"the database.\\n\"\n \"\\n\"\n \"Compress the database now?\"\n msgstr \"\"\n \"このリポジトリにはおおよそ %i 個の個別オブジェクトがあります\\n\"\n \"\\n\"\n-\"最適な性能を保つために、%i 個以上の個別オブジェクトを作る毎にデータベースを圧\"\n-\"縮することを推奨します\\n\"\n+\"最適な性能を保つために、データベースを圧縮することを推奨します\\n\"\n \"\\n\"\n \"データベースを圧縮しますか？\"\n \n@@ -1517,7 +1554,7 @@ msgstr \"\"\n msgid \"Invalid date from Git: %s\"\n msgstr \"Git から出た無効な日付: %s\"\n \n-#: lib/diff.tcl:59\n+#: lib/diff.tcl:64\n #, tcl-format\n msgid \"\"\n \"No differences detected.\\n\"\n@@ -1539,12 +1576,12 @@ msgstr \"\"\n \"\\n\"\n \"同様な状態のファイルを探すために、自動的に再スキャンを開始します。\"\n \n-#: lib/diff.tcl:99\n+#: lib/diff.tcl:104\n #, tcl-format\n msgid \"Loading diff of %s...\"\n msgstr \"%s の変更点をロード中…\"\n \n-#: lib/diff.tcl:120\n+#: lib/diff.tcl:125\n msgid \"\"\n \"LOCAL: deleted\\n\"\n \"REMOTE:\\n\"\n@@ -1552,7 +1589,7 @@ msgstr \"\"\n \"LOCAL: 削除\\n\"\n \"Remote:\\n\"\n \n-#: lib/diff.tcl:125\n+#: lib/diff.tcl:130\n msgid \"\"\n \"REMOTE: deleted\\n\"\n \"LOCAL:\\n\"\n@@ -1560,32 +1597,32 @@ msgstr \"\"\n \"REMOTE: 削除\\n\"\n \"LOCAL:\\n\"\n \n-#: lib/diff.tcl:132\n+#: lib/diff.tcl:137\n msgid \"LOCAL:\\n\"\n msgstr \"LOCAL:\\n\"\n \n-#: lib/diff.tcl:135\n+#: lib/diff.tcl:140\n msgid \"REMOTE:\\n\"\n msgstr \"REMOTE\\n\"\n \n-#: lib/diff.tcl:197 lib/diff.tcl:296\n+#: lib/diff.tcl:202 lib/diff.tcl:319\n #, tcl-format\n msgid \"Unable to display %s\"\n msgstr \"%s を表示できません\"\n \n-#: lib/diff.tcl:198\n+#: lib/diff.tcl:203\n msgid \"Error loading file:\"\n msgstr \"ファイルを読む際のエラーです:\"\n \n-#: lib/diff.tcl:205\n+#: lib/diff.tcl:210\n msgid \"Git Repository (subproject)\"\n msgstr \"Git リポジトリ(サブプロジェクト)\"\n \n-#: lib/diff.tcl:217\n+#: lib/diff.tcl:222\n msgid \"* Binary file (not showing content).\"\n msgstr \"* バイナリファイル(内容は表示しません)\"\n \n-#: lib/diff.tcl:222\n+#: lib/diff.tcl:227\n #, tcl-format\n msgid \"\"\n \"* Untracked file is %d bytes.\\n\"\n@@ -1594,7 +1631,7 @@ msgstr \"\"\n \"* 管理外のファイルの大きさは %d バイトです。\\n\"\n \"* 最初の %d バイトだけ表示しています。\\n\"\n \n-#: lib/diff.tcl:228\n+#: lib/diff.tcl:233\n #, tcl-format\n msgid \"\"\n \"\\n\"\n@@ -1606,19 +1643,19 @@ msgstr \"\"\n \"* %s は管理外のファイルをここで切りおとしました。\\n\"\n \"* 全体を見るには外部エディタを使ってください。\\n\"\n \n-#: lib/diff.tcl:436\n+#: lib/diff.tcl:482\n msgid \"Failed to unstage selected hunk.\"\n msgstr \"選択されたパッチをコミット予定から外せません。\"\n \n-#: lib/diff.tcl:443\n+#: lib/diff.tcl:489\n msgid \"Failed to stage selected hunk.\"\n msgstr \"選択されたパッチをコミット予定に加えられません。\"\n \n-#: lib/diff.tcl:509\n+#: lib/diff.tcl:568\n msgid \"Failed to unstage selected line.\"\n msgstr \"選択されたパッチ行をコミット予定から外せません。\"\n \n-#: lib/diff.tcl:517\n+#: lib/diff.tcl:576\n msgid \"Failed to stage selected line.\"\n msgstr \"選択されたパッチ行をコミット予定に加えられません。\"\n \n@@ -1655,7 +1692,7 @@ msgstr \"インデックスをロックできません\"\n msgid \"Index Error\"\n msgstr \"索引エラー\"\n \n-#: lib/index.tcl:21\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@@ -1663,7 +1700,7 @@ msgstr \"\"\n \"GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンし\"\n \"ます。\"\n \n-#: lib/index.tcl:27\n+#: lib/index.tcl:28\n msgid \"Continue\"\n msgstr \"続行\"\n \n@@ -1671,43 +1708,43 @@ msgstr \"続行\"\n msgid \"Unlock Index\"\n msgstr \"インデックスのロック解除\"\n \n-#: lib/index.tcl:287\n+#: lib/index.tcl:289\n #, tcl-format\n msgid \"Unstaging %s from commit\"\n msgstr \"コミットから '%s' を降ろす\"\n \n-#: lib/index.tcl:326\n+#: lib/index.tcl:328\n msgid \"Ready to commit.\"\n msgstr \"コミット準備完了\"\n \n-#: lib/index.tcl:339\n+#: lib/index.tcl:341\n #, tcl-format\n msgid \"Adding %s\"\n msgstr \"コミットに %s を加えています\"\n \n-#: lib/index.tcl:396\n+#: lib/index.tcl:398\n #, tcl-format\n msgid \"Revert changes in file %s?\"\n msgstr \"ファイル %s にした変更を元に戻しますか？\"\n \n-#: lib/index.tcl:398\n+#: lib/index.tcl:400\n #, tcl-format\n msgid \"Revert changes in these %i files?\"\n msgstr \"これら %i 個のファイルにした変更を元に戻しますか？\"\n \n-#: lib/index.tcl:406\n+#: lib/index.tcl:408\n msgid \"Any unstaged changes will be permanently lost by the revert.\"\n msgstr \"変更を元に戻すとコミット予定していない変更は全て失われます。\"\n \n-#: lib/index.tcl:409\n+#: lib/index.tcl:411\n msgid \"Do Nothing\"\n msgstr \"何もしない\"\n \n-#: lib/index.tcl:427\n+#: lib/index.tcl:429\n msgid \"Reverting selected files\"\n msgstr \"選択されたファイルにした変更を元に戻します\"\n \n-#: lib/index.tcl:431\n+#: lib/index.tcl:433\n #, tcl-format\n msgid \"Reverting %s\"\n msgstr \"%s にした変更を元に戻します\"\n@@ -1883,7 +1920,8 @@ msgstr \"\"\n #: lib/mergetool.tcl:45\n #, tcl-format\n msgid \"File %s seems to have unresolved conflicts, still stage?\"\n-msgstr \"ファイル %s には解決していない競合部分がまだあるようですが、いいですか?\"\n+msgstr \"\"\n+\"ファイル %s には解決していない競合部分がまだあるようですが、いいですか?\"\n \n #: lib/mergetool.tcl:60\n #, tcl-format\n@@ -2141,7 +2179,8 @@ msgstr \"%s からフェッチしています\"\n msgid \"Do not know how to initialize repository at location '%s'.\"\n msgstr \"リポジトリ '%s' を初期化できません。\"\n \n-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71\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 msgstr \"%s をプッシュ\"\n@@ -2159,11 +2198,11 @@ msgstr \"遠隔でブランチ削除\"\n msgid \"From Repository\"\n msgstr \"元のリポジトリ\"\n \n-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123\n+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134\n msgid \"Remote:\"\n msgstr \"リモート:\"\n \n-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138\n+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149\n msgid \"Arbitrary Location:\"\n msgstr \"任意の位置:\"\n \n@@ -2179,10 +2218,6 @@ msgstr \"条件付で削除\"\n msgid \"Merged Into:\"\n msgstr \"マージ先:\"\n \n-#: lib/remote_branch_delete.tcl:119\n-msgid \"Always (Do not perform merge checks)\"\n-msgstr \"無条件（マージ検査をしない）\"\n-\n #: lib/remote_branch_delete.tcl:152\n msgid \"A branch is required for 'Merged Into'.\"\n msgstr \"'マージ先' にはブランチが必要です。\"\n@@ -2211,26 +2246,16 @@ msgstr \"\"\n msgid \"Please select one or more branches to delete.\"\n msgstr \"削除するブランチを選択して下さい。\"\n \n-#: lib/remote_branch_delete.tcl:216\n-msgid \"\"\n-\"Recovering deleted branches is difficult.\\n\"\n-\"\\n\"\n-\"Delete the selected branches?\"\n-msgstr \"\"\n-\"削除したブランチを回復するのは困難です。\\n\"\n-\"\\n\"\n-\"選択したブランチを削除して良いですか？\"\n-\n #: lib/remote_branch_delete.tcl:226\n #, tcl-format\n msgid \"Deleting branches from %s\"\n msgstr \"%s からブランチを削除しています。\"\n \n-#: lib/remote_branch_delete.tcl:286\n+#: lib/remote_branch_delete.tcl:292\n msgid \"No repository selected.\"\n msgstr \"リポジトリが選択されていません。\"\n \n-#: lib/remote_branch_delete.tcl:291\n+#: lib/remote_branch_delete.tcl:297\n #, tcl-format\n msgid \"Scanning %s...\"\n msgstr \"%s をスキャンしています…\"\n@@ -2251,11 +2276,11 @@ msgstr \"前\"\n msgid \"Case-Sensitive\"\n msgstr \"大文字小文字を区別\"\n \n-#: lib/shortcut.tcl:20 lib/shortcut.tcl:61\n+#: lib/shortcut.tcl:21 lib/shortcut.tcl:62\n msgid \"Cannot write shortcut:\"\n msgstr \"ショートカットが書けません:\"\n \n-#: lib/shortcut.tcl:136\n+#: lib/shortcut.tcl:137\n msgid \"Cannot write icon:\"\n msgstr \"アイコンが書けません:\"\n \n@@ -2501,30 +2526,30 @@ msgstr \"%s へミラーしています\"\n msgid \"Pushing %s %s to %s\"\n msgstr \"%3$s へ %1$s %2$s をプッシュしています\"\n \n-#: lib/transport.tcl:89\n+#: lib/transport.tcl:100\n msgid \"Push Branches\"\n msgstr \"ブランチをプッシュ\"\n \n-#: lib/transport.tcl:103\n+#: lib/transport.tcl:114\n msgid \"Source Branches\"\n msgstr \"元のブランチ\"\n \n-#: lib/transport.tcl:120\n+#: lib/transport.tcl:131\n msgid \"Destination Repository\"\n msgstr \"送り先リポジトリ\"\n \n-#: lib/transport.tcl:158\n+#: lib/transport.tcl:169\n msgid \"Transfer Options\"\n msgstr \"通信オプション\"\n \n-#: lib/transport.tcl:160\n+#: lib/transport.tcl:171\n msgid \"Force overwrite existing branch (may discard changes)\"\n msgstr \"既存ブランチを上書き(変更を破棄する可能性があります)\"\n \n-#: lib/transport.tcl:164\n+#: lib/transport.tcl:175\n msgid \"Use thin pack (for slow network connections)\"\n msgstr \"Thin Pack を使う（遅いネットワーク接続）\"\n \n-#: lib/transport.tcl:168\n+#: lib/transport.tcl:179\n msgid \"Include tags\"\n msgstr \"タグを含める\"\n"},{"id":"133350","messageId":"20100202131800.63200600@eleanor","threadId":"22471","inReplyTo":"20100201151647.GB8916@spearce.org","subject":"[PATCH] git-gui: update french translation","fromName":"Emmanuel Trillaud","fromEmail":"etrillaud@gmail.com","sentAt":"2010-02-02T12:18:00Z","receivedAt":"2010-02-02T12:18:00Z","isPatch":true,"sender":{"key":"etrillaud@gmail.com","avatar":null},"body":"\nSigned-off-by: Emmanuel Trillaud <etrillaud@gmail.com>\n---\n po/fr.po |  686 +++++++++++++++++++++++++++++++++-----------------------------\n 1 files changed, 366 insertions(+), 320 deletions(-)\n\ndiff --git a/po/fr.po b/po/fr.po\nindex a944ace..8170696 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -9,8 +9,8 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: fr\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n-\"POT-Creation-Date: 2008-11-16 13:56-0800\\n\"\n-\"PO-Revision-Date: 2008-11-20 10:20+0100\\n\"\n+\"POT-Creation-Date: 2010-01-26 15:47-0800\\n\"\n+\"PO-Revision-Date: 2010-02-02 12:59+0100\\n\"\n \"Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\\n\"\n \"Language-Team: French\\n\"\n \"MIME-Version: 1.0\\n\"\n@@ -19,33 +19,33 @@ msgstr \"\"\n \"X-Generator: KBabel 1.11.4\\n\"\n \"Plural-Forms:  nplurals=2; plural=(n > 1);\\n\"\n \n-#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847\n-#: git-gui.sh:866\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 \"git-gui: erreur fatale\"\n \n-#: git-gui.sh:689\n+#: git-gui.sh:743\n #, tcl-format\n msgid \"Invalid font specified in %s:\"\n msgstr \"Police invalide spécifiée dans %s :\"\n \n-#: git-gui.sh:723\n+#: git-gui.sh:779\n msgid \"Main Font\"\n msgstr \"Police principale\"\n \n-#: git-gui.sh:724\n+#: git-gui.sh:780\n msgid \"Diff/Console Font\"\n msgstr \"Police diff/console\"\n \n-#: git-gui.sh:738\n+#: git-gui.sh:794\n msgid \"Cannot find git in PATH.\"\n msgstr \"Impossible de trouver git dans PATH.\"\n \n-#: git-gui.sh:765\n+#: git-gui.sh:821\n msgid \"Cannot parse Git version string:\"\n msgstr \"Impossible de parser la version de Git :\"\n \n-#: git-gui.sh:783\n+#: git-gui.sh:839\n #, tcl-format\n msgid \"\"\n \"Git version cannot be determined.\\n\"\n@@ -64,446 +64,475 @@ msgstr \"\"\n \"\\n\"\n \"Peut-on considérer que '%s' est en version 1.5.0 ?\\n\"\n \n-#: git-gui.sh:1062\n+#: git-gui.sh:1128\n msgid \"Git directory not found:\"\n msgstr \"Impossible de trouver le répertoire git :\"\n \n-#: git-gui.sh:1069\n+#: git-gui.sh:1146\n msgid \"Cannot move to top of working directory:\"\n msgstr \"Impossible d'aller à la racine du répertoire de travail :\"\n \n-#: git-gui.sh:1076\n-msgid \"Cannot use funny .git directory:\"\n-msgstr \"Impossible d'utiliser le répertoire .git:\"\n+#: git-gui.sh:1154\n+msgid \"Cannot use bare repository:\"\n+msgstr \"Impossible d'utiliser un dépôt nu (bare) :\"\n \n-#: git-gui.sh:1081\n+#: git-gui.sh:1162\n msgid \"No working directory\"\n msgstr \"Aucun répertoire de travail\"\n \n-#: git-gui.sh:1247 lib/checkout_op.tcl:305\n+#: git-gui.sh:1334 lib/checkout_op.tcl:306\n msgid \"Refreshing file status...\"\n msgstr \"Rafraîchissement du statut des fichiers...\"\n \n-#: git-gui.sh:1303\n+#: git-gui.sh:1390\n msgid \"Scanning for modified files ...\"\n msgstr \"Recherche de fichiers modifiés...\"\n \n-#: git-gui.sh:1367\n+#: git-gui.sh:1454\n msgid \"Calling prepare-commit-msg hook...\"\n msgstr \"Lancement de l'action de préparation du message de commit...\"\n \n-#: git-gui.sh:1384\n+#: git-gui.sh:1471\n msgid \"Commit declined by prepare-commit-msg hook.\"\n msgstr \"Commit refusé par l'action de préparation du message de commit.\"\n \n-#: git-gui.sh:1542 lib/browser.tcl:246\n+#: git-gui.sh:1629 lib/browser.tcl:246\n msgid \"Ready.\"\n msgstr \"Prêt.\"\n \n-#: git-gui.sh:1819\n+#: git-gui.sh:1787\n+#, tcl-format\n+msgid \"Displaying only %s of %s files.\"\n+msgstr \"Affiche seulement %s fichiers sur %s.\"\n+\n+#: git-gui.sh:1913\n msgid \"Unmodified\"\n msgstr \"Non modifié\"\n \n-#: git-gui.sh:1821\n+#: git-gui.sh:1915\n msgid \"Modified, not staged\"\n msgstr \"Modifié, pas indexé\"\n \n-#: git-gui.sh:1822 git-gui.sh:1830\n+#: git-gui.sh:1916 git-gui.sh:1924\n msgid \"Staged for commit\"\n msgstr \"Indexé\"\n \n-#: git-gui.sh:1823 git-gui.sh:1831\n+#: git-gui.sh:1917 git-gui.sh:1925\n msgid \"Portions staged for commit\"\n msgstr \"Portions indexées\"\n \n-#: git-gui.sh:1824 git-gui.sh:1832\n+#: git-gui.sh:1918 git-gui.sh:1926\n msgid \"Staged for commit, missing\"\n msgstr \"Indexés, manquant\"\n \n-#: git-gui.sh:1826\n+#: git-gui.sh:1920\n msgid \"File type changed, not staged\"\n msgstr \"Le type de fichier a changé, non indexé\"\n \n-#: git-gui.sh:1827\n+#: git-gui.sh:1921\n msgid \"File type changed, staged\"\n msgstr \"Le type de fichier a changé, indexé\"\n \n-#: git-gui.sh:1829\n+#: git-gui.sh:1923\n msgid \"Untracked, not staged\"\n msgstr \"Non versionné, non indexé\"\n \n-#: git-gui.sh:1834\n+#: git-gui.sh:1928\n msgid \"Missing\"\n msgstr \"Manquant\"\n \n-#: git-gui.sh:1835\n+#: git-gui.sh:1929\n msgid \"Staged for removal\"\n msgstr \"Indexé pour suppression\"\n \n-#: git-gui.sh:1836\n+#: git-gui.sh:1930\n msgid \"Staged for removal, still present\"\n msgstr \"Indexé pour suppression, toujours présent\"\n \n-#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841\n-#: git-gui.sh:1842 git-gui.sh:1843\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 msgid \"Requires merge resolution\"\n msgstr \"Nécessite la résolution d'une fusion\"\n \n-#: git-gui.sh:1878\n+#: git-gui.sh:1972\n msgid \"Starting gitk... please wait...\"\n msgstr \"Lancement de gitk... un instant...\"\n \n-#: git-gui.sh:1887\n+#: git-gui.sh:1984\n msgid \"Couldn't find gitk in PATH\"\n msgstr \"Impossible de trouver gitk dans PATH.\"\n \n-#: git-gui.sh:2280 lib/choose_repository.tcl:36\n+#: git-gui.sh:2043\n+msgid \"Couldn't find git gui in PATH\"\n+msgstr \"Impossible de trouver git gui dans PATH\"\n+\n+#: git-gui.sh:2455 lib/choose_repository.tcl:36\n msgid \"Repository\"\n msgstr \"Dépôt\"\n \n-#: git-gui.sh:2281\n+#: git-gui.sh:2456\n msgid \"Edit\"\n msgstr \"Édition\"\n \n-#: git-gui.sh:2283 lib/choose_rev.tcl:561\n+#: git-gui.sh:2458 lib/choose_rev.tcl:561\n msgid \"Branch\"\n msgstr \"Branche\"\n \n-#: git-gui.sh:2286 lib/choose_rev.tcl:548\n+#: git-gui.sh:2461 lib/choose_rev.tcl:548\n msgid \"Commit@@noun\"\n msgstr \"Commit\"\n \n-#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n+#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168\n msgid \"Merge\"\n msgstr \"Fusionner\"\n \n-#: git-gui.sh:2290 lib/choose_rev.tcl:557\n+#: git-gui.sh:2465 lib/choose_rev.tcl:557\n msgid \"Remote\"\n msgstr \"Dépôt distant\"\n \n-#: git-gui.sh:2293\n+#: git-gui.sh:2468\n msgid \"Tools\"\n msgstr \"Outils\"\n \n-#: git-gui.sh:2302\n+#: git-gui.sh:2477\n msgid \"Explore Working Copy\"\n msgstr \"Explorer la copie de travail\"\n \n-#: git-gui.sh:2307\n+#: git-gui.sh:2483\n msgid \"Browse Current Branch's Files\"\n msgstr \"Naviguer dans la branche courante\"\n \n-#: git-gui.sh:2311\n+#: git-gui.sh:2487\n msgid \"Browse Branch Files...\"\n msgstr \"Naviguer dans la branche...\"\n \n-#: git-gui.sh:2316\n+#: git-gui.sh:2492\n msgid \"Visualize Current Branch's History\"\n msgstr \"Visualiser l'historique de la branche courante\"\n \n-#: git-gui.sh:2320\n+#: git-gui.sh:2496\n msgid \"Visualize All Branch History\"\n msgstr \"Voir l'historique de toutes les branches\"\n \n-#: git-gui.sh:2327\n+#: git-gui.sh:2503\n #, tcl-format\n msgid \"Browse %s's Files\"\n msgstr \"Parcourir l'arborescence de %s\"\n \n-#: git-gui.sh:2329\n+#: git-gui.sh:2505\n #, tcl-format\n msgid \"Visualize %s's History\"\n msgstr \"Voir l'historique de la branche : %s\"\n \n-#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67\n+#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67\n msgid \"Database Statistics\"\n msgstr \"Statistiques du dépôt\"\n \n-#: git-gui.sh:2337 lib/database.tcl:34\n+#: git-gui.sh:2513 lib/database.tcl:34\n msgid \"Compress Database\"\n msgstr \"Comprimer le dépôt\"\n \n-#: git-gui.sh:2340\n+#: git-gui.sh:2516\n msgid \"Verify Database\"\n msgstr \"Vérifier le dépôt\"\n \n-#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7\n-#: lib/shortcut.tcl:39 lib/shortcut.tcl:71\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 msgid \"Create Desktop Icon\"\n msgstr \"Créer une icône sur le bureau\"\n \n-#: git-gui.sh:2363 lib/choose_repository.tcl:183\nlib/choose_repository.tcl:191 +#: git-gui.sh:2539\nlib/choose_repository.tcl:183 lib/choose_repository.tcl:191 msgid \"Quit\"\n msgstr \"Quitter\"\n \n-#: git-gui.sh:2371\n+#: git-gui.sh:2547\n msgid \"Undo\"\n msgstr \"Défaire\"\n \n-#: git-gui.sh:2374\n+#: git-gui.sh:2550\n msgid \"Redo\"\n msgstr \"Refaire\"\n \n-#: git-gui.sh:2378 git-gui.sh:2923\n+#: git-gui.sh:2554 git-gui.sh:3109\n msgid \"Cut\"\n msgstr \"Couper\"\n \n-#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082\n+#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259\n #: lib/console.tcl:69\n msgid \"Copy\"\n msgstr \"Copier\"\n \n-#: git-gui.sh:2384 git-gui.sh:2929\n+#: git-gui.sh:2560 git-gui.sh:3115\n msgid \"Paste\"\n msgstr \"Coller\"\n \n-#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26\n+#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26\n #: lib/remote_branch_delete.tcl:38\n msgid \"Delete\"\n msgstr \"Supprimer\"\n \n-#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71\n+#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71\n msgid \"Select All\"\n msgstr \"Tout sélectionner\"\n \n-#: git-gui.sh:2400\n+#: git-gui.sh:2576\n msgid \"Create...\"\n msgstr \"Créer...\"\n \n-#: git-gui.sh:2406\n+#: git-gui.sh:2582\n msgid \"Checkout...\"\n msgstr \"Charger (checkout)...\"\n \n-#: git-gui.sh:2412\n+#: git-gui.sh:2588\n msgid \"Rename...\"\n msgstr \"Renommer...\"\n \n-#: git-gui.sh:2417\n+#: git-gui.sh:2593\n msgid \"Delete...\"\n msgstr \"Supprimer...\"\n \n-#: git-gui.sh:2422\n+#: git-gui.sh:2598\n msgid \"Reset...\"\n msgstr \"Réinitialiser...\"\n \n-#: git-gui.sh:2432\n+#: git-gui.sh:2608\n msgid \"Done\"\n msgstr \"Effectué\"\n \n-#: git-gui.sh:2434\n+#: git-gui.sh:2610\n msgid \"Commit@@verb\"\n msgstr \"Commiter@@verb\"\n \n-#: git-gui.sh:2443 git-gui.sh:2864\n+#: git-gui.sh:2619 git-gui.sh:3050\n msgid \"New Commit\"\n msgstr \"Nouveau commit\"\n \n-#: git-gui.sh:2451 git-gui.sh:2871\n+#: git-gui.sh:2627 git-gui.sh:3057\n msgid \"Amend Last Commit\"\n msgstr \"Corriger dernier commit\"\n \n-#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99\n+#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99\n msgid \"Rescan\"\n msgstr \"Recharger modifs.\"\n \n-#: git-gui.sh:2467\n+#: git-gui.sh:2643\n msgid \"Stage To Commit\"\n msgstr \"Indexer\"\n \n-#: git-gui.sh:2473\n+#: git-gui.sh:2649\n msgid \"Stage Changed Files To Commit\"\n msgstr \"Indexer toutes modifications\"\n \n-#: git-gui.sh:2479\n+#: git-gui.sh:2655\n msgid \"Unstage From Commit\"\n msgstr \"Désindexer\"\n \n-#: git-gui.sh:2484 lib/index.tcl:410\n+#: git-gui.sh:2661 lib/index.tcl:412\n msgid \"Revert Changes\"\n msgstr \"Annuler les modifications\"\n \n-#: git-gui.sh:2491 git-gui.sh:3069\n+#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341\n msgid \"Show Less Context\"\n msgstr \"Montrer moins de contexte\"\n \n-#: git-gui.sh:2495 git-gui.sh:3073\n+#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345\n msgid \"Show More Context\"\n msgstr \"Montrer plus de contexte\"\n \n-#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947\n+#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133\n msgid \"Sign Off\"\n msgstr \"Signer\"\n \n-#: git-gui.sh:2518\n+#: git-gui.sh:2696\n msgid \"Local Merge...\"\n msgstr \"Fusion locale...\"\n \n-#: git-gui.sh:2523\n+#: git-gui.sh:2701\n msgid \"Abort Merge...\"\n msgstr \"Abandonner fusion...\"\n \n-#: git-gui.sh:2535 git-gui.sh:2575\n+#: git-gui.sh:2713 git-gui.sh:2741\n msgid \"Add...\"\n msgstr \"Ajouter...\"\n \n-#: git-gui.sh:2539\n+#: git-gui.sh:2717\n msgid \"Push...\"\n msgstr \"Pousser...\"\n \n-#: git-gui.sh:2543\n+#: git-gui.sh:2721\n msgid \"Delete Branch...\"\n msgstr \"Supprimer branche...\"\n \n-#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14\n-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53\n-#, tcl-format\n-msgid \"About %s\"\n-msgstr \"À propos de %s\"\n-\n-#: git-gui.sh:2557\n-msgid \"Preferences...\"\n-msgstr \"Préférences...\"\n-\n-#: git-gui.sh:2565 git-gui.sh:3115\n+#: git-gui.sh:2731 git-gui.sh:3292\n msgid \"Options...\"\n msgstr \"Options...\"\n \n-#: git-gui.sh:2576\n+#: git-gui.sh:2742\n msgid \"Remove...\"\n msgstr \"Supprimer...\"\n \n-#: git-gui.sh:2585 lib/choose_repository.tcl:50\n+#: git-gui.sh:2751 lib/choose_repository.tcl:50\n msgid \"Help\"\n msgstr \"Aide\"\n \n-#: git-gui.sh:2611\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+#, tcl-format\n+msgid \"About %s\"\n+msgstr \"À propos de %s\"\n+\n+#: git-gui.sh:2783\n msgid \"Online Documentation\"\n msgstr \"Documentation en ligne\"\n \n-#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56\n+#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56\n msgid \"Show SSH Key\"\n msgstr \"Montrer la clé SSH\"\n \n-#: git-gui.sh:2707\n+#: git-gui.sh:2893\n #, tcl-format\n msgid \"fatal: cannot stat path %s: No such file or directory\"\n msgstr \"\"\n \"erreur fatale : pas d'infos sur le chemin %s : Fichier ou répertoire \"\n \"inexistant\"\n \n-#: git-gui.sh:2740\n+#: git-gui.sh:2926\n msgid \"Current Branch:\"\n msgstr \"Branche courante :\"\n \n-#: git-gui.sh:2761\n+#: git-gui.sh:2947\n msgid \"Staged Changes (Will Commit)\"\n msgstr \"Modifs. indexées (pour commit)\"\n \n-#: git-gui.sh:2781\n+#: git-gui.sh:2967\n msgid \"Unstaged Changes\"\n msgstr \"Modifs. non indexées\"\n \n-#: git-gui.sh:2831\n+#: git-gui.sh:3017\n msgid \"Stage Changed\"\n msgstr \"Indexer modifs.\"\n \n-#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182\n+#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193\n msgid \"Push\"\n msgstr \"Pousser\"\n \n-#: git-gui.sh:2885\n+#: git-gui.sh:3071\n msgid \"Initial Commit Message:\"\n msgstr \"Message de commit initial :\"\n \n-#: git-gui.sh:2886\n+#: git-gui.sh:3072\n msgid \"Amended Commit Message:\"\n msgstr \"Message de commit corrigé :\"\n \n-#: git-gui.sh:2887\n+#: git-gui.sh:3073\n msgid \"Amended Initial Commit Message:\"\n msgstr \"Message de commit initial corrigé :\"\n \n-#: git-gui.sh:2888\n+#: git-gui.sh:3074\n msgid \"Amended Merge Commit Message:\"\n msgstr \"Message de commit de fusion corrigé :\"\n \n-#: git-gui.sh:2889\n+#: git-gui.sh:3075\n msgid \"Merge Commit Message:\"\n msgstr \"Message de commit de fusion :\"\n \n-#: git-gui.sh:2890\n+#: git-gui.sh:3076\n msgid \"Commit Message:\"\n msgstr \"Message de commit :\"\n \n-#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73\n+#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73\n msgid \"Copy All\"\n msgstr \"Copier tout\"\n \n-#: git-gui.sh:2963 lib/blame.tcl:104\n+#: git-gui.sh:3149 lib/blame.tcl:104\n msgid \"File:\"\n msgstr \"Fichier :\"\n \n-#: git-gui.sh:3078\n+#: git-gui.sh:3255\n msgid \"Refresh\"\n msgstr \"Rafraîchir\"\n \n-#: git-gui.sh:3099\n+#: git-gui.sh:3276\n msgid \"Decrease Font Size\"\n msgstr \"Diminuer la police\"\n \n-#: git-gui.sh:3103\n+#: git-gui.sh:3280\n msgid \"Increase Font Size\"\n msgstr \"Agrandir la police\"\n \n-#: git-gui.sh:3111 lib/blame.tcl:281\n+#: git-gui.sh:3288 lib/blame.tcl:281\n msgid \"Encoding\"\n msgstr \"Codage des caractères\"\n \n-#: git-gui.sh:3122\n+#: git-gui.sh:3299\n msgid \"Apply/Reverse Hunk\"\n msgstr \"Appliquer/Inverser section\"\n \n-#: git-gui.sh:3127\n+#: git-gui.sh:3304\n msgid \"Apply/Reverse Line\"\n msgstr \"Appliquer/Inverser la ligne\"\n \n-#: git-gui.sh:3137\n+#: git-gui.sh:3323\n msgid \"Run Merge Tool\"\n msgstr \"Lancer l'outil de fusion\"\n \n-#: git-gui.sh:3142\n+#: git-gui.sh:3328\n msgid \"Use Remote Version\"\n msgstr \"Utiliser la version distante\"\n \n-#: git-gui.sh:3146\n+#: git-gui.sh:3332\n msgid \"Use Local Version\"\n msgstr \"Utiliser la version locale\"\n \n-#: git-gui.sh:3150\n+#: git-gui.sh:3336\n msgid \"Revert To Base\"\n msgstr \"Revenir à la version de base\"\n \n-#: git-gui.sh:3169\n+#: git-gui.sh:3354\n+msgid \"Visualize These Changes In The Submodule\"\n+msgstr \"Voir les changments dans le sous-module\"\n+\n+#: git-gui.sh:3358\n+msgid \"Visualize Current Branch History In The Submodule\"\n+msgstr \"Voir l'historique de la branche courante du sous-module\"\n+\n+#: git-gui.sh:3362\n+msgid \"Visualize All Branch History In The Submodule\"\n+msgstr \"Voir l'historique de toutes les branches du sous-module\"\n+\n+#: git-gui.sh:3367\n+msgid \"Start git gui In The Submodule\"\n+msgstr \"Démarrer git gui dans le sous-module\"\n+\n+#: git-gui.sh:3389\n msgid \"Unstage Hunk From Commit\"\n msgstr \"Désindexer la section\"\n \n-#: git-gui.sh:3170\n+#: git-gui.sh:3391\n+msgid \"Unstage Lines From Commit\"\n+msgstr \"Désindexer la ligne du commit\"\n+\n+#: git-gui.sh:3393\n msgid \"Unstage Line From Commit\"\n msgstr \"Désindexer la ligne\"\n \n-#: git-gui.sh:3172\n+#: git-gui.sh:3396\n msgid \"Stage Hunk For Commit\"\n msgstr \"Indexer la section\"\n \n-#: git-gui.sh:3173\n+#: git-gui.sh:3398\n+msgid \"Stage Lines For Commit\"\n+msgstr \"Indexer les lignes\"\n+\n+#: git-gui.sh:3400\n msgid \"Stage Line For Commit\"\n msgstr \"Indexer la ligne\"\n \n-#: git-gui.sh:3196\n+#: git-gui.sh:3424\n msgid \"Initializing...\"\n msgstr \"Initialisation...\"\n \n-#: git-gui.sh:3301\n+#: git-gui.sh:3541\n #, tcl-format\n msgid \"\"\n \"Possible environment issues exist.\\n\"\n@@ -520,7 +549,7 @@ msgstr \"\"\n \"sous-processus de Git lancés par %s\\n\"\n \"\\n\"\n \n-#: git-gui.sh:3331\n+#: git-gui.sh:3570\n msgid \"\"\n \"\\n\"\n \"This is due to a known issue with the\\n\"\n@@ -530,7 +559,7 @@ msgstr \"\"\n \"Ceci est dû à un problème connu avec\\n\"\n \"le binaire Tcl distribué par Cygwin.\"\n \n-#: git-gui.sh:3336\n+#: git-gui.sh:3575\n #, tcl-format\n msgid \"\"\n \"\\n\"\n@@ -616,43 +645,43 @@ msgstr \"Recherche de copie approfondie en cours...\"\n msgid \"Loading annotation...\"\n msgstr \"Chargement des annotations...\"\n \n-#: lib/blame.tcl:964\n+#: lib/blame.tcl:963\n msgid \"Author:\"\n msgstr \"Auteur :\"\n \n-#: lib/blame.tcl:968\n+#: lib/blame.tcl:967\n msgid \"Committer:\"\n msgstr \"Commiteur :\"\n \n-#: lib/blame.tcl:973\n+#: lib/blame.tcl:972\n msgid \"Original File:\"\n msgstr \"Fichier original :\"\n \n-#: lib/blame.tcl:1021\n+#: lib/blame.tcl:1020\n msgid \"Cannot find HEAD commit:\"\n msgstr \"Impossible de trouver le commit HEAD :\"\n \n-#: lib/blame.tcl:1076\n+#: lib/blame.tcl:1075\n msgid \"Cannot find parent commit:\"\n msgstr \"Impossible de trouver le commit parent :\"\n \n-#: lib/blame.tcl:1091\n+#: lib/blame.tcl:1090\n msgid \"Unable to display parent\"\n msgstr \"Impossible d'afficher le parent\"\n \n-#: lib/blame.tcl:1092 lib/diff.tcl:297\n+#: lib/blame.tcl:1091 lib/diff.tcl:320\n msgid \"Error loading diff:\"\n msgstr \"Erreur lors du chargement des différences :\"\n \n-#: lib/blame.tcl:1232\n+#: lib/blame.tcl:1231\n msgid \"Originally By:\"\n msgstr \"À l'origine par :\"\n \n-#: lib/blame.tcl:1238\n+#: lib/blame.tcl:1237\n msgid \"In File:\"\n msgstr \"Dans le fichier :\"\n \n-#: lib/blame.tcl:1243\n+#: lib/blame.tcl:1242\n msgid \"Copied Or Moved Here By:\"\n msgstr \"Copié ou déplacé ici par :\"\n \n@@ -666,10 +695,10 @@ msgstr \"Charger (checkout)\"\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:544 lib/choose_font.tcl:43 lib/merge.tcl:172\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:97\n+#: lib/transport.tcl:108\n msgid \"Cancel\"\n msgstr \"Annuler\"\n \n@@ -697,7 +726,7 @@ msgstr \"Créer une branche\"\n msgid \"Create New Branch\"\n msgstr \"Créer une nouvelle branche\"\n \n-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377\n+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381\n msgid \"Create\"\n msgstr \"Créer\"\n \n@@ -729,7 +758,7 @@ msgstr \"Non\"\n msgid \"Fast Forward Only\"\n msgstr \"Mise à jour rectiligne seulement (fast-forward)\"\n \n-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536\n+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571\n msgid \"Reset\"\n msgstr \"Réinitialiser\"\n \n@@ -771,15 +800,25 @@ msgstr \"Branches locales\"\n msgid \"Delete Only If Merged Into\"\n msgstr \"Supprimer seulement si fusionnée dans :\"\n \n-#: lib/branch_delete.tcl:54\n-msgid \"Always (Do not perform merge test.)\"\n-msgstr \"Toujours (Ne pas faire de test de fusion.)\"\n+#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119\n+msgid \"Always (Do not perform merge checks)\"\n+msgstr \"Toujours (ne pas vérifier les fusions)\"\n \n #: lib/branch_delete.tcl:103\n #, tcl-format\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Les branches suivantes ne sont pas complètement fusionnées dans %s :\"\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+msgstr \"\"\n+\"Il est difficile de récupérer des branches supprimées.\\n\"\n+\"\\n\"\n+\"Supprimer les branches sélectionnées ?\"\n+\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -809,7 +848,7 @@ msgstr \"Nouveau nom :\"\n msgid \"Please select a branch to rename.\"\n msgstr \"Merci de sélectionner une branche à renommer.\"\n \n-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201\n+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202\n #, tcl-format\n msgid \"Branch '%s' already exists.\"\n msgstr \"La branche '%s' existe déjà.\"\n@@ -840,38 +879,38 @@ msgstr \"[Jusqu'au parent]\"\n msgid \"Browse Branch Files\"\n msgstr \"Naviguer dans les fichiers de le branche\"\n \n-#: lib/browser.tcl:278 lib/choose_repository.tcl:394\n-#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491\n-#: lib/choose_repository.tcl:995\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 msgstr \"Naviguer\"\n \n-#: lib/checkout_op.tcl:84\n+#: lib/checkout_op.tcl:85\n #, tcl-format\n msgid \"Fetching %s from %s\"\n msgstr \"Récupération de %s à partir de %s\"\n \n-#: lib/checkout_op.tcl:132\n+#: lib/checkout_op.tcl:133\n #, tcl-format\n msgid \"fatal: Cannot resolve %s\"\n msgstr \"erreur fatale : Impossible de résoudre %s\"\n \n-#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31\n+#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31\n #: lib/sshkey.tcl:53\n msgid \"Close\"\n msgstr \"Fermer\"\n \n-#: lib/checkout_op.tcl:174\n+#: lib/checkout_op.tcl:175\n #, tcl-format\n msgid \"Branch '%s' does not exist.\"\n msgstr \"La branche '%s' n'existe pas.\"\n \n-#: lib/checkout_op.tcl:193\n+#: lib/checkout_op.tcl:194\n #, tcl-format\n msgid \"Failed to configure simplified git-pull for '%s'.\"\n msgstr \"Échec de la configuration simplifiée de git-pull pour '%s'.\"\n \n-#: lib/checkout_op.tcl:228\n+#: lib/checkout_op.tcl:229\n #, tcl-format\n msgid \"\"\n \"Branch '%s' already exists.\\n\"\n@@ -884,21 +923,21 @@ msgstr \"\"\n \"Impossible de faire une avance rapide (fast forward) vers %s.\\n\"\n \"Une fusion est nécessaire.\"\n \n-#: lib/checkout_op.tcl:242\n+#: lib/checkout_op.tcl:243\n #, tcl-format\n msgid \"Merge strategy '%s' not supported.\"\n msgstr \"La stratégie de fusion '%s' n'est pas supportée.\"\n \n-#: lib/checkout_op.tcl:261\n+#: lib/checkout_op.tcl:262\n #, tcl-format\n msgid \"Failed to update '%s'.\"\n msgstr \"La mise à jour de '%s' a échoué.\"\n \n-#: lib/checkout_op.tcl:273\n+#: lib/checkout_op.tcl:274\n msgid \"Staging area (index) is already locked.\"\n msgstr \"L'index (staging area) est déjà verrouillé.\"\n \n-#: lib/checkout_op.tcl:288\n+#: lib/checkout_op.tcl:289\n msgid \"\"\n \"Last scanned state does not match repository state.\\n\"\n \"\\n\"\n@@ -916,30 +955,31 @@ msgstr \"\"\n \"\\n\"\n \"Cela va être fait tout de suite automatiquement.\\n\"\n \n-#: lib/checkout_op.tcl:344\n+#: lib/checkout_op.tcl:345\n #, tcl-format\n msgid \"Updating working directory to '%s'...\"\n msgstr \"Mise à jour du répertoire courant avec '%s'...\"\n \n-#: lib/checkout_op.tcl:345\n+#: lib/checkout_op.tcl:346\n msgid \"files checked out\"\n msgstr \"fichiers chargés\"\n \n-#: lib/checkout_op.tcl:375\n+#: lib/checkout_op.tcl:376\n #, tcl-format\n msgid \"Aborted checkout of '%s' (file level merging is required).\"\n-msgstr \"Chargement de '%s' abandonné (il est nécessaire de fusionner des\nfichiers).\" +msgstr \"\"\n+\"Chargement de '%s' abandonné (il est nécessaire de fusionner des fichiers).\"\n \n-#: lib/checkout_op.tcl:376\n+#: lib/checkout_op.tcl:377\n msgid \"File level merge required.\"\n msgstr \"Il est nécessaire de fusionner des fichiers.\"\n \n-#: lib/checkout_op.tcl:380\n+#: lib/checkout_op.tcl:381\n #, tcl-format\n msgid \"Staying on branch '%s'.\"\n msgstr \"Le répertoire de travail reste sur la branche '%s'.\"\n \n-#: lib/checkout_op.tcl:451\n+#: lib/checkout_op.tcl:452\n msgid \"\"\n \"You are no longer on a local branch.\\n\"\n \"\\n\"\n@@ -951,30 +991,30 @@ msgstr \"\"\n \"Si vous vouliez être sur une branche, créez-en une maintenant en partant de\n\" \"'Cet emprunt détaché'.\"\n \n-#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472\n+#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507\n #, tcl-format\n msgid \"Checked out '%s'.\"\n msgstr \"'%s' chargé.\"\n \n-#: lib/checkout_op.tcl:500\n+#: lib/checkout_op.tcl:535\n #, tcl-format\n msgid \"Resetting '%s' to '%s' will lose the following commits:\"\n msgstr \"Réinitialiser '%s' à '%s' va faire perdre les commits suivants :\"\n \n-#: lib/checkout_op.tcl:522\n+#: lib/checkout_op.tcl:557\n msgid \"Recovering lost commits may not be easy.\"\n msgstr \"Récupérer les commits perdus ne sera peut être pas facile.\"\n \n-#: lib/checkout_op.tcl:527\n+#: lib/checkout_op.tcl:562\n #, tcl-format\n msgid \"Reset '%s'?\"\n msgstr \"Réinitialiser '%s' ?\"\n \n-#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343\n+#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343\n msgid \"Visualize\"\n msgstr \"Visualiser\"\n \n-#: lib/checkout_op.tcl:600\n+#: lib/checkout_op.tcl:635\n #, tcl-format\n msgid \"\"\n \"Failed to set current branch.\\n\"\n@@ -1020,7 +1060,7 @@ msgstr \"\"\n msgid \"Git Gui\"\n msgstr \"Git Gui\"\n \n-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382\n+#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386\n msgid \"Create New Repository\"\n msgstr \"Créer nouveau dépôt\"\n \n@@ -1028,7 +1068,7 @@ msgstr \"Créer nouveau dépôt\"\n msgid \"New...\"\n msgstr \"Nouveau...\"\n \n-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465\n+#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471\n msgid \"Clone Existing Repository\"\n msgstr \"Cloner un dépôt existant\"\n \n@@ -1036,7 +1076,7 @@ msgstr \"Cloner un dépôt existant\"\n msgid \"Clone...\"\n msgstr \"Cloner...\"\n \n-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983\n+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016\n msgid \"Open Existing Repository\"\n msgstr \"Ouvrir un dépôt existant\"\n \n@@ -1052,197 +1092,199 @@ msgstr \"Dépôts récemment utilisés\"\n msgid \"Open Recent Repository:\"\n msgstr \"Ouvrir un dépôt récent :\"\n \n-#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309\n-#: lib/choose_repository.tcl:316\n+#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313\n+#: lib/choose_repository.tcl:320\n #, tcl-format\n msgid \"Failed to create repository %s:\"\n msgstr \"La création du dépôt %s a échoué :\"\n \n-#: lib/choose_repository.tcl:387\n+#: lib/choose_repository.tcl:391\n msgid \"Directory:\"\n msgstr \"Répertoire :\"\n \n-#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544\n-#: lib/choose_repository.tcl:1017\n+#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550\n+#: lib/choose_repository.tcl:1052\n msgid \"Git Repository\"\n msgstr \"Dépôt Git\"\n \n-#: lib/choose_repository.tcl:442\n+#: lib/choose_repository.tcl:448\n #, tcl-format\n msgid \"Directory %s already exists.\"\n msgstr \"Le répertoire %s existe déjà.\"\n \n-#: lib/choose_repository.tcl:446\n+#: lib/choose_repository.tcl:452\n #, tcl-format\n msgid \"File %s already exists.\"\n msgstr \"Le fichier %s existe déjà.\"\n \n-#: lib/choose_repository.tcl:460\n+#: lib/choose_repository.tcl:466\n msgid \"Clone\"\n msgstr \"Cloner\"\n \n-#: lib/choose_repository.tcl:473\n+#: lib/choose_repository.tcl:479\n msgid \"Source Location:\"\n msgstr \"Emplacement source :\"\n \n-#: lib/choose_repository.tcl:484\n+#: lib/choose_repository.tcl:490\n msgid \"Target Directory:\"\n msgstr \"Répertoire cible :\"\n \n-#: lib/choose_repository.tcl:496\n+#: lib/choose_repository.tcl:502\n msgid \"Clone Type:\"\n msgstr \"Type de clonage :\"\n \n-#: lib/choose_repository.tcl:502\n+#: lib/choose_repository.tcl:508\n msgid \"Standard (Fast, Semi-Redundant, Hardlinks)\"\n msgstr \"Standard (rapide, semi-redondant, liens durs)\"\n \n-#: lib/choose_repository.tcl:508\n+#: lib/choose_repository.tcl:514\n msgid \"Full Copy (Slower, Redundant Backup)\"\n msgstr \"Copy complète (plus lent, sauvegarde redondante)\"\n \n-#: lib/choose_repository.tcl:514\n+#: lib/choose_repository.tcl:520\n msgid \"Shared (Fastest, Not Recommended, No Backup)\"\n msgstr \"Partagé (le plus rapide, non recommandé, pas de sauvegarde)\"\n \n-#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597\n-#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813\n-#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031\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 #, tcl-format\n msgid \"Not a Git repository: %s\"\n msgstr \"'%s' n'est pas un dépôt Git.\"\n \n-#: lib/choose_repository.tcl:586\n+#: lib/choose_repository.tcl:592\n msgid \"Standard only available for local repository.\"\n msgstr \"Standard n'est disponible que pour un dépôt local.\"\n \n-#: lib/choose_repository.tcl:590\n+#: lib/choose_repository.tcl:596\n msgid \"Shared only available for local repository.\"\n msgstr \"Partagé n'est disponible que pour un dépôt local.\"\n \n-#: lib/choose_repository.tcl:611\n+#: lib/choose_repository.tcl:617\n #, tcl-format\n msgid \"Location %s already exists.\"\n msgstr \"L'emplacement %s existe déjà.\"\n \n-#: lib/choose_repository.tcl:622\n+#: lib/choose_repository.tcl:628\n msgid \"Failed to configure origin\"\n msgstr \"La configuration de l'origine a échoué.\"\n \n-#: lib/choose_repository.tcl:634\n+#: lib/choose_repository.tcl:640\n msgid \"Counting objects\"\n msgstr \"Décompte des objets\"\n \n-#: lib/choose_repository.tcl:635\n+#: lib/choose_repository.tcl:641\n msgid \"buckets\"\n msgstr \"paniers\"\n \n-#: lib/choose_repository.tcl:659\n+#: lib/choose_repository.tcl:665\n #, tcl-format\n msgid \"Unable to copy objects/info/alternates: %s\"\n msgstr \"Impossible de copier 'objects/info/alternates' : %s\"\n \n-#: lib/choose_repository.tcl:695\n+#: lib/choose_repository.tcl:701\n #, tcl-format\n msgid \"Nothing to clone from %s.\"\n msgstr \"Il n'y a rien à cloner depuis %s.\"\n \n-#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911\n-#: lib/choose_repository.tcl:923\n+#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917\n+#: lib/choose_repository.tcl:929\n msgid \"The 'master' branch has not been initialized.\"\n msgstr \"La branche 'master' n'a pas été initialisée.\"\n \n-#: lib/choose_repository.tcl:710\n+#: lib/choose_repository.tcl:716\n msgid \"Hardlinks are unavailable.  Falling back to copying.\"\n-msgstr \"Les liens durs ne sont pas supportés. Une copie sera effectuée à la\nplace.\" +msgstr \"\"\n+\"Les liens durs ne sont pas supportés. Une copie sera effectuée à la place.\"\n \n-#: lib/choose_repository.tcl:722\n+#: lib/choose_repository.tcl:728\n #, tcl-format\n msgid \"Cloning from %s\"\n msgstr \"Clonage depuis %s\"\n \n-#: lib/choose_repository.tcl:753\n+#: lib/choose_repository.tcl:759\n msgid \"Copying objects\"\n msgstr \"Copie des objets\"\n \n-#: lib/choose_repository.tcl:754\n+#: lib/choose_repository.tcl:760\n msgid \"KiB\"\n msgstr \"KiB\"\n \n-#: lib/choose_repository.tcl:778\n+#: lib/choose_repository.tcl:784\n #, tcl-format\n msgid \"Unable to copy object: %s\"\n msgstr \"Impossible de copier l'objet : %s\"\n \n-#: lib/choose_repository.tcl:788\n+#: lib/choose_repository.tcl:794\n msgid \"Linking objects\"\n msgstr \"Liaison des objets\"\n \n-#: lib/choose_repository.tcl:789\n+#: lib/choose_repository.tcl:795\n msgid \"objects\"\n msgstr \"objets\"\n \n-#: lib/choose_repository.tcl:797\n+#: lib/choose_repository.tcl:803\n #, tcl-format\n msgid \"Unable to hardlink object: %s\"\n msgstr \"Impossible créer un lien dur pour l'objet : %s\"\n \n-#: lib/choose_repository.tcl:852\n+#: lib/choose_repository.tcl:858\n msgid \"Cannot fetch branches and objects.  See console output for details.\"\n msgstr \"\"\n \"Impossible de récupérer les branches et objets. Voir la sortie console pour\n\" \"plus de détails.\"\n \n-#: lib/choose_repository.tcl:863\n+#: lib/choose_repository.tcl:869\n msgid \"Cannot fetch tags.  See console output for details.\"\n msgstr \"\"\n \"Impossible de récupérer les marques (tags). Voir la sortie console pour\nplus \" \"de détails.\"\n \n-#: lib/choose_repository.tcl:887\n+#: lib/choose_repository.tcl:893\n msgid \"Cannot determine HEAD.  See console output for details.\"\n-msgstr \"Impossible de déterminer HEAD. Voir la sortie console pour plus de\ndétails.\" +msgstr \"\"\n+\"Impossible de déterminer HEAD. Voir la sortie console pour plus de détails.\"\n \n-#: lib/choose_repository.tcl:896\n+#: lib/choose_repository.tcl:902\n #, tcl-format\n msgid \"Unable to cleanup %s\"\n msgstr \"Impossible de nettoyer %s\"\n \n-#: lib/choose_repository.tcl:902\n+#: lib/choose_repository.tcl:908\n msgid \"Clone failed.\"\n msgstr \"Le clonage a échoué.\"\n \n-#: lib/choose_repository.tcl:909\n+#: lib/choose_repository.tcl:915\n msgid \"No default branch obtained.\"\n msgstr \"Aucune branche par défaut n'a été obtenue.\"\n \n-#: lib/choose_repository.tcl:920\n+#: lib/choose_repository.tcl:926\n #, tcl-format\n msgid \"Cannot resolve %s as a commit.\"\n msgstr \"Impossible de résoudre %s comme commit.\"\n \n-#: lib/choose_repository.tcl:932\n+#: lib/choose_repository.tcl:938\n msgid \"Creating working directory\"\n msgstr \"Création du répertoire de travail\"\n \n-#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128\n-#: lib/index.tcl:196\n+#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130\n+#: lib/index.tcl:198\n msgid \"files\"\n msgstr \"fichiers\"\n \n-#: lib/choose_repository.tcl:962\n+#: lib/choose_repository.tcl:968\n msgid \"Initial file checkout failed.\"\n msgstr \"Le chargement initial du fichier a échoué.\"\n \n-#: lib/choose_repository.tcl:978\n+#: lib/choose_repository.tcl:1011\n msgid \"Open\"\n msgstr \"Ouvrir\"\n \n-#: lib/choose_repository.tcl:988\n+#: lib/choose_repository.tcl:1021\n msgid \"Repository:\"\n msgstr \"Dépôt :\"\n \n-#: lib/choose_repository.tcl:1037\n+#: lib/choose_repository.tcl:1072\n #, tcl-format\n msgid \"Failed to open repository %s:\"\n msgstr \"Impossible d'ouvrir le dépôt %s :\"\n@@ -1314,19 +1356,24 @@ msgstr \"\"\n \"terminée. Vous ne pouvez pas corriger le commit précédent sauf si vous \"\n \"abandonnez la fusion courante.\\n\"\n \n-#: lib/commit.tcl:49\n+#: lib/commit.tcl:48\n msgid \"Error loading commit data for amend:\"\n msgstr \"Erreur lors du chargement des données de commit pour correction :\"\n \n-#: lib/commit.tcl:76\n+#: lib/commit.tcl:75\n msgid \"Unable to obtain your identity:\"\n msgstr \"Impossible d'obtenir votre identité :\"\n \n-#: lib/commit.tcl:81\n+#: lib/commit.tcl:80\n msgid \"Invalid GIT_COMMITTER_IDENT:\"\n msgstr \"GIT_COMMITTER_IDENT invalide :\"\n \n-#: lib/commit.tcl:133\n+#: lib/commit.tcl:129\n+#, tcl-format\n+msgid \"warning: Tcl does not support encoding '%s'.\"\n+msgstr \"attention : Tcl ne supporte pas le codage '%s'.\"\n+\n+#: lib/commit.tcl:149\n msgid \"\"\n \"Last scanned state does not match repository state.\\n\"\n \"\\n\"\n@@ -1344,7 +1391,7 @@ msgstr \"\"\n \"\\n\"\n \"Cela va être fait tout de suite automatiquement.\\n\"\n \n-#: lib/commit.tcl:156\n+#: lib/commit.tcl:172\n #, tcl-format\n msgid \"\"\n \"Unmerged files cannot be committed.\\n\"\n@@ -1357,7 +1404,7 @@ msgstr \"\"\n \"Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-\"\n \"commiter le fichier avant de pouvoir commiter.\\n\"\n \n-#: lib/commit.tcl:164\n+#: lib/commit.tcl:180\n #, tcl-format\n msgid \"\"\n \"Unknown file state %s detected.\\n\"\n@@ -1368,7 +1415,7 @@ msgstr \"\"\n \"\\n\"\n \"Le fichier %s ne peut pas être commité par ce programme.\\n\"\n \n-#: lib/commit.tcl:172\n+#: lib/commit.tcl:188\n msgid \"\"\n \"No changes to commit.\\n\"\n \"\\n\"\n@@ -1378,7 +1425,7 @@ msgstr \"\"\n \"\\n\"\n \"Vous devez indexer au moins 1 fichier avant de pouvoir commiter.\\n\"\n \n-#: lib/commit.tcl:187\n+#: lib/commit.tcl:203\n msgid \"\"\n \"Please supply a commit message.\\n\"\n \"\\n\"\n@@ -1396,45 +1443,40 @@ msgstr \"\"\n \"- Deuxième ligne : rien.\\n\"\n \"- Lignes suivantes : Décrire pourquoi ces modifications sont bonnes.\\n\"\n \n-#: lib/commit.tcl:211\n-#, tcl-format\n-msgid \"warning: Tcl does not support encoding '%s'.\"\n-msgstr \"attention : Tcl ne supporte pas le codage '%s'.\"\n-\n-#: lib/commit.tcl:227\n+#: lib/commit.tcl:234\n msgid \"Calling pre-commit hook...\"\n msgstr \"Lancement de l'action d'avant-commit...\"\n \n-#: lib/commit.tcl:242\n+#: lib/commit.tcl:249\n msgid \"Commit declined by pre-commit hook.\"\n msgstr \"Commit refusé par l'action d'avant-commit.\"\n \n-#: lib/commit.tcl:265\n+#: lib/commit.tcl:272\n msgid \"Calling commit-msg hook...\"\n msgstr \"Lancement de l'action \\\"message de commit\\\"...\"\n \n-#: lib/commit.tcl:280\n+#: lib/commit.tcl:287\n msgid \"Commit declined by commit-msg hook.\"\n msgstr \"Commit refusé par l'action \\\"message de commit\\\".\"\n \n-#: lib/commit.tcl:293\n+#: lib/commit.tcl:300\n msgid \"Committing changes...\"\n msgstr \"Commit des modifications...\"\n \n-#: lib/commit.tcl:309\n+#: lib/commit.tcl:316\n msgid \"write-tree failed:\"\n msgstr \"write-tree a échoué :\"\n \n-#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374\n+#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382\n msgid \"Commit failed.\"\n msgstr \"Le commit a échoué.\"\n \n-#: lib/commit.tcl:327\n+#: lib/commit.tcl:334\n #, tcl-format\n msgid \"Commit %s appears to be corrupt\"\n msgstr \"Le commit %s semble être corrompu\"\n \n-#: lib/commit.tcl:332\n+#: lib/commit.tcl:339\n msgid \"\"\n \"No changes to commit.\\n\"\n \"\\n\"\n@@ -1449,19 +1491,19 @@ msgstr \"\"\n \"\\n\"\n \"Une resynchronisation va être lancée tout de suite automatiquement.\\n\"\n \n-#: lib/commit.tcl:339\n+#: lib/commit.tcl:346\n msgid \"No changes to commit.\"\n msgstr \"Pas de modifications à commiter.\"\n \n-#: lib/commit.tcl:353\n+#: lib/commit.tcl:360\n msgid \"commit-tree failed:\"\n msgstr \"commit-tree a échoué :\"\n \n-#: lib/commit.tcl:373\n+#: lib/commit.tcl:381\n msgid \"update-ref failed:\"\n msgstr \"update-ref a échoué :\"\n \n-#: lib/commit.tcl:461\n+#: lib/commit.tcl:469\n #, tcl-format\n msgid \"Created commit %s: %s\"\n msgstr \"Commit %s créé : %s\"\n@@ -1514,13 +1556,13 @@ msgstr \"Compression de la base des objets\"\n msgid \"Verifying the object database with fsck-objects\"\n msgstr \"Vérification de la base des objets avec fsck-objects\"\n \n-#: lib/database.tcl:108\n+#: lib/database.tcl:107\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\ncompress \" -\"the database when more than %i loose objects exist.\\n\"\n+\"the database.\\n\"\n \"\\n\"\n \"Compress the database now?\"\n msgstr \"\"\n@@ -1528,8 +1570,7 @@ msgstr \"\"\n \"particulier.\\n\"\n \"\\n\"\n \"Pour conserver une performance optimale, il est fortement recommandé de \"\n-\"comprimer la base quand plus de %i objets ayant leur fichier particulier \"\n-\"existent.\\n\"\n+\"comprimer la base de donnée.\\n\"\n \"\\n\"\n \"Comprimer la base maintenant ?\"\n \n@@ -1538,7 +1579,7 @@ msgstr \"\"\n msgid \"Invalid date from Git: %s\"\n msgstr \"Date invalide de Git : %s\"\n \n-#: lib/diff.tcl:59\n+#: lib/diff.tcl:64\n #, tcl-format\n msgid \"\"\n \"No differences detected.\\n\"\n@@ -1561,12 +1602,12 @@ msgstr \"\"\n \"Une resynchronisation va être lancée automatiquement pour trouver d'autres \"\n \"fichiers qui pourraient se trouver dans le même état.\"\n \n-#: lib/diff.tcl:99\n+#: lib/diff.tcl:104\n #, tcl-format\n msgid \"Loading diff of %s...\"\n msgstr \"Chargement des différences de %s...\"\n \n-#: lib/diff.tcl:120\n+#: lib/diff.tcl:125\n msgid \"\"\n \"LOCAL: deleted\\n\"\n \"REMOTE:\\n\"\n@@ -1574,7 +1615,7 @@ msgstr \"\"\n \"LOCAL : supprimé\\n\"\n \"DISTANT :\\n\"\n \n-#: lib/diff.tcl:125\n+#: lib/diff.tcl:130\n msgid \"\"\n \"REMOTE: deleted\\n\"\n \"LOCAL:\\n\"\n@@ -1582,32 +1623,32 @@ msgstr \"\"\n \"DISTANT : supprimé\\n\"\n \"LOCAL :\\n\"\n \n-#: lib/diff.tcl:132\n+#: lib/diff.tcl:137\n msgid \"LOCAL:\\n\"\n msgstr \"LOCAL :\\n\"\n \n-#: lib/diff.tcl:135\n+#: lib/diff.tcl:140\n msgid \"REMOTE:\\n\"\n msgstr \"DISTANT :\\n\"\n \n-#: lib/diff.tcl:197 lib/diff.tcl:296\n+#: lib/diff.tcl:202 lib/diff.tcl:319\n #, tcl-format\n msgid \"Unable to display %s\"\n msgstr \"Impossible d'afficher %s\"\n \n-#: lib/diff.tcl:198\n+#: lib/diff.tcl:203\n msgid \"Error loading file:\"\n msgstr \"Erreur lors du chargement du fichier :\"\n \n-#: lib/diff.tcl:205\n+#: lib/diff.tcl:210\n msgid \"Git Repository (subproject)\"\n msgstr \"Dépôt Git (sous projet)\"\n \n-#: lib/diff.tcl:217\n+#: lib/diff.tcl:222\n msgid \"* Binary file (not showing content).\"\n msgstr \"* Fichier binaire (pas d'apperçu du contenu).\"\n \n-#: lib/diff.tcl:222\n+#: lib/diff.tcl:227\n #, tcl-format\n msgid \"\"\n \"* Untracked file is %d bytes.\\n\"\n@@ -1616,7 +1657,7 @@ msgstr \"\"\n \"* Le fichier non suivi fait %d octets.\\n\"\n \"* Seuls les %d premiers octets sont montrés.\\n\"\n \n-#: lib/diff.tcl:228\n+#: lib/diff.tcl:233\n #, tcl-format\n msgid \"\"\n \"\\n\"\n@@ -1627,19 +1668,19 @@ msgstr \"\"\n \"* Fichier suivi raccourcis ici de %s.\\n\"\n \"* Pour voir le fichier entier, utilisez un éditeur externe.\\n\"\n \n-#: lib/diff.tcl:436\n+#: lib/diff.tcl:482\n msgid \"Failed to unstage selected hunk.\"\n msgstr \"Échec lors de la désindexation de la section sélectionnée.\"\n \n-#: lib/diff.tcl:443\n+#: lib/diff.tcl:489\n msgid \"Failed to stage selected hunk.\"\n msgstr \"Échec lors de l'indexation de la section.\"\n \n-#: lib/diff.tcl:509\n+#: lib/diff.tcl:568\n msgid \"Failed to unstage selected line.\"\n msgstr \"Échec lors de la désindexation de la ligne sélectionnée.\"\n \n-#: lib/diff.tcl:517\n+#: lib/diff.tcl:576\n msgid \"Failed to stage selected line.\"\n msgstr \"Échec lors de l'indexation de la ligne.\"\n \n@@ -1676,7 +1717,7 @@ msgstr \"Impossible de déverrouiller l'index.\"\n msgid \"Index Error\"\n msgstr \"Erreur de l'index\"\n \n-#: lib/index.tcl:21\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@@ -1684,7 +1725,7 @@ msgstr \"\"\n \"Échec de la mise à jour de l'index. Une resynchronisation va être lancée \"\n \"automatiquement.\"\n \n-#: lib/index.tcl:27\n+#: lib/index.tcl:28\n msgid \"Continue\"\n msgstr \"Continuer\"\n \n@@ -1692,45 +1733,45 @@ msgstr \"Continuer\"\n msgid \"Unlock Index\"\n msgstr \"Déverrouiller l'index\"\n \n-#: lib/index.tcl:287\n+#: lib/index.tcl:289\n #, tcl-format\n msgid \"Unstaging %s from commit\"\n msgstr \"Désindexation de : %s\"\n \n-#: lib/index.tcl:326\n+#: lib/index.tcl:328\n msgid \"Ready to commit.\"\n msgstr \"Prêt à être commité.\"\n \n-#: lib/index.tcl:339\n+#: lib/index.tcl:341\n #, tcl-format\n msgid \"Adding %s\"\n msgstr \"Ajout de %s\"\n \n-#: lib/index.tcl:396\n+#: lib/index.tcl:398\n #, tcl-format\n msgid \"Revert changes in file %s?\"\n msgstr \"Annuler les modifications dans le fichier %s ? \"\n \n-#: lib/index.tcl:398\n+#: lib/index.tcl:400\n #, tcl-format\n msgid \"Revert changes in these %i files?\"\n msgstr \"Annuler les modifications dans ces %i fichiers ?\"\n \n-#: lib/index.tcl:406\n+#: lib/index.tcl:408\n msgid \"Any unstaged changes will be permanently lost by the revert.\"\n msgstr \"\"\n \"Toutes les modifications non-indexées seront définitivement perdues par \"\n \"l'annulation.\"\n \n-#: lib/index.tcl:409\n+#: lib/index.tcl:411\n msgid \"Do Nothing\"\n msgstr \"Ne rien faire\"\n \n-#: lib/index.tcl:427\n+#: lib/index.tcl:429\n msgid \"Reverting selected files\"\n msgstr \"Annuler modifications dans fichiers selectionnés\"\n \n-#: lib/index.tcl:431\n+#: lib/index.tcl:433\n #, tcl-format\n msgid \"Reverting %s\"\n msgstr \"Annulation des modifications dans %s\"\n@@ -1913,7 +1954,8 @@ msgstr \"\"\n #: lib/mergetool.tcl:45\n #, tcl-format\n msgid \"File %s seems to have unresolved conflicts, still stage?\"\n-msgstr \"Le fichier %s semble avoir des conflits non résolus, indexer quand\nmême ?\" +msgstr \"\"\n+\"Le fichier %s semble avoir des conflits non résolus, indexer quand même ?\"\n \n #: lib/mergetool.tcl:60\n #, tcl-format\n@@ -1922,7 +1964,9 @@ msgstr \"Ajouter une résolution pour %s\"\n \n #: lib/mergetool.tcl:141\n msgid \"Cannot resolve deletion or link conflicts using a tool\"\n-msgstr \"Impossible de résoudre la suppression ou de relier des conflits en\nutilisant un outil\" +msgstr \"\"\n+\"Impossible de résoudre la suppression ou de relier des conflits en\nutilisant \" +\"un outil\"\n \n #: lib/mergetool.tcl:146\n msgid \"Conflict file does not exist\"\n@@ -2171,7 +2215,8 @@ msgstr \"Récupération de %s\"\n msgid \"Do not know how to initialize repository at location '%s'.\"\n msgstr \"Pas de méthode connue pour initialiser le dépôt à l'emplacement\n'%s'.\" \n-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71\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 msgstr \"pousser %s\"\n@@ -2189,11 +2234,11 @@ msgstr \"Supprimer une branche à distance\"\n msgid \"From Repository\"\n msgstr \"Dépôt source\"\n \n-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123\n+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134\n msgid \"Remote:\"\n msgstr \"Branche distante :\"\n \n-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138\n+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149\n msgid \"Arbitrary Location:\"\n msgstr \"Emplacement arbitraire :\"\n \n@@ -2209,10 +2254,6 @@ msgstr \"Supprimer seulement si\"\n msgid \"Merged Into:\"\n msgstr \"Fusionné dans :\"\n \n-#: lib/remote_branch_delete.tcl:119\n-msgid \"Always (Do not perform merge checks)\"\n-msgstr \"Toujours (ne pas vérifier les fusions)\"\n-\n #: lib/remote_branch_delete.tcl:152\n msgid \"A branch is required for 'Merged Into'.\"\n msgstr \"Une branche est nécessaire pour 'Fusionné dans'.\"\n@@ -2235,32 +2276,23 @@ msgid \"\"\n \"necessary commits.  Try fetching from %s first.\"\n msgstr \"\"\n \"Un ou plusieurs des tests de fusion ont échoué parce que vous n'avez pas \"\n-\"récupéré les commits nécessaires. Essayez de récupérer à partir de %s\nd'abord.\" +\"récupéré les commits nécessaires. Essayez de récupérer à partir\nde %s \" +\"d'abord.\"\n \n #: lib/remote_branch_delete.tcl:207\n msgid \"Please select one or more branches to delete.\"\n msgstr \"Merci de sélectionner une ou plusieurs branches à supprimer.\"\n \n-#: lib/remote_branch_delete.tcl:216\n-msgid \"\"\n-\"Recovering deleted branches is difficult.\\n\"\n-\"\\n\"\n-\"Delete the selected branches?\"\n-msgstr \"\"\n-\"Il est difficile de récupérer des branches supprimées.\\n\"\n-\"\\n\"\n-\"Supprimer les branches sélectionnées ?\"\n-\n #: lib/remote_branch_delete.tcl:226\n #, tcl-format\n msgid \"Deleting branches from %s\"\n msgstr \"Suppression des branches de %s\"\n \n-#: lib/remote_branch_delete.tcl:286\n+#: lib/remote_branch_delete.tcl:292\n msgid \"No repository selected.\"\n msgstr \"Aucun dépôt n'est sélectionné.\"\n \n-#: lib/remote_branch_delete.tcl:291\n+#: lib/remote_branch_delete.tcl:297\n #, tcl-format\n msgid \"Scanning %s...\"\n msgstr \"Synchronisation de %s...\"\n@@ -2281,11 +2313,11 @@ msgstr \"Précédent\"\n msgid \"Case-Sensitive\"\n msgstr \"Sensible à la casse\"\n \n-#: lib/shortcut.tcl:20 lib/shortcut.tcl:61\n+#: lib/shortcut.tcl:21 lib/shortcut.tcl:62\n msgid \"Cannot write shortcut:\"\n msgstr \"Impossible d'écrire le raccourci :\"\n \n-#: lib/shortcut.tcl:136\n+#: lib/shortcut.tcl:137\n msgid \"Cannot write icon:\"\n msgstr \"Impossible d'écrire l'icône :\"\n \n@@ -2440,7 +2472,8 @@ msgstr \"Montrer une boîte de dialogue avant le\nlancement\" \n #: lib/tools_dlg.tcl:80\n msgid \"Ask the user to select a revision (sets $REVISION)\"\n-msgstr \"Demander à l'utilisateur de sélectionner une révision (change\n$REVISION)\" +msgstr \"\"\n+\"Demander à l'utilisateur de sélectionner une révision (change $REVISION)\"\n \n #: lib/tools_dlg.tcl:85\n msgid \"Ask the user for additional arguments (sets $ARGS)\"\n@@ -2521,38 +2554,51 @@ msgstr \"Nettoyer les branches de suivi supprimées de\n%s\" msgid \"Pushing changes to %s\"\n msgstr \"Les modifications sont poussées vers %s\"\n \n-#: lib/transport.tcl:72\n+#: lib/transport.tcl:64\n+#, tcl-format\n+msgid \"Mirroring to %s\"\n+msgstr \"Dupliquer dans %s\"\n+\n+#: lib/transport.tcl:82\n #, tcl-format\n msgid \"Pushing %s %s to %s\"\n msgstr \"Pousse %s %s vers %s\"\n \n-#: lib/transport.tcl:89\n+#: lib/transport.tcl:100\n msgid \"Push Branches\"\n msgstr \"Pousser branches\"\n \n-#: lib/transport.tcl:103\n+#: lib/transport.tcl:114\n msgid \"Source Branches\"\n msgstr \"Branches source\"\n \n-#: lib/transport.tcl:120\n+#: lib/transport.tcl:131\n msgid \"Destination Repository\"\n msgstr \"Dépôt de destination\"\n \n-#: lib/transport.tcl:158\n+#: lib/transport.tcl:169\n msgid \"Transfer Options\"\n msgstr \"Options de transfert\"\n \n-#: lib/transport.tcl:160\n+#: lib/transport.tcl:171\n msgid \"Force overwrite existing branch (may discard changes)\"\n msgstr \"\"\n \"Forcer l'écrasement d'une branche existante (peut supprimer des \"\n \"modifications)\"\n \n-#: lib/transport.tcl:164\n+#: lib/transport.tcl:175\n msgid \"Use thin pack (for slow network connections)\"\n msgstr \"Utiliser des petits paquets (pour les connexions lentes)\"\n \n-#: lib/transport.tcl:168\n+#: lib/transport.tcl:179\n msgid \"Include tags\"\n msgstr \"Inclure les marques (tags)\"\n"},{"id":"133431","messageId":"7vy6jbunu8.fsf@alter.siamese.dyndns.org","threadId":"22471","inReplyTo":"20100201151647.GB8916@spearce.org","subject":"Re: git-gui translation updates needed","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-02-03T01:09:35Z","receivedAt":"2010-02-03T01:09:35Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" <spearce@spearce.org> writes:\n\n> git-gui has picked up a few new strings.  Junio and I would like\n> to see the new version in git 1.7.0, which means we need to get\n> the new messages translated.\n>\n> If you maintain a translation file for git-gui, please grab the\n> latest sources and send a patch for your .po file:\n>\n>   git://git.spearce.org/git-gui.git master\n>\n> Thus far I think I have German, Italian and Swedish (thanks Christian\n> Stimming, Christian Stimming, Christian Stimming).\n\nI grabbed the current one and took a quick look.\n\n\"git grep POT-Creation-Date\" reveals:\n\nel.po\t\t\"POT-Creation-Date: 2008-03-14 07:18+0100\\n\"\nzh_cn.po        \"POT-Creation-Date: 2008-03-14 07:18+0100\\n\"\nnb.po\t\t\"POT-Creation-Date: 2008-11-16 13:56-0800\\n\"\nhu.po\t\t\"POT-Creation-Date: 2008-12-08 08:31-0800\\n\"\nru.po\t\t\"POT-Creation-Date: 2008-12-08 08:31-0800\\n\"\n\ngit-gui.pot\t\"POT-Creation-Date: 2010-01-26 15:47-0800\\n\"\nfr.po\t\t\"POT-Creation-Date: 2010-01-26 15:47-0800\\n\"\nit.po\t\t\"POT-Creation-Date: 2010-01-26 15:47-0800\\n\"\nja.po\t\t\"POT-Creation-Date: 2010-01-26 15:47-0800\\n\"\nsv.po\t\t\"POT-Creation-Date: 2010-01-26 15:47-0800\\n\"\nde.po\t\t\"POT-Creation-Date: 2010-01-26 22:22+0100\\n\"\n\nThe build says:\n\n    MSGFMT    po/el.msg 381 translated, 4 fuzzy, 6 untranslated.\n    MSGFMT po/zh_cn.msg 366 translated, 7 fuzzy, 17 untranslated.\n    MSGFMT    po/nb.msg 474 translated, 39 untranslated.\n    MSGFMT    po/hu.msg 514 translated.\n    MSGFMT    po/ru.msg 513 translated, 2 untranslated.\n    MSGFMT    po/it.msg 519 translated, 1 untranslated.\n\nA few observations:\n\n - It is curious that de.po is based on a version of .pot that is\n   different from the official git-gui.pot, even though it seems to be\n   up-to-date (no, I don't read German, but running \"msgmerge -U po/de.po\n   po/git-gui.pot\" doesn't seem to detect anything missing).\n\n   Build log for \"de\" also says that has 520 messages all translated.\n\n - I am seeing \"1 untranslated\", even though it.po is based on the latest\n   git-gui.pot.  It translates \"buckets\" to an empty string; somebody who\n   care about Italian may need to double check.\n\n - Greek and Chinese are way out of date and Nowegian, Hungarian, and\n   Russian are more than one year old.\n\nIf people who can read/write Greek, Chinese, Nowegian, Hungarian, or\nRussian and who do use git-gui on regular basis want to step forward to\nhelp, it is the time.\n\nThanks.\n"},{"id":"133433","messageId":"7vd40nundv.fsf_-_@alter.siamese.dyndns.org","threadId":"22471","inReplyTo":"7vy6jbunu8.fsf@alter.siamese.dyndns.org","subject":"gitk translation updates needed?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-02-03T01:19:24Z","receivedAt":"2010-02-03T01:19:24Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"By the way, out of curiosity I tried the same for gitk.\n\n $ make po/gitk.pot\n $ make\n\n Generating catalog po/es.msg\n msgfmt --statistics --tcl po/es.po -l es -d po/\n 192 translated messages, 34 fuzzy translations, 63 untranslated messages.\n\n Generating catalog po/fr.msg\n msgfmt --statistics --tcl po/fr.po -l fr -d po/\n 271 translated messages, 11 fuzzy translations, 7 untranslated messages.\n\n Generating catalog po/hu.msg\n msgfmt --statistics --tcl po/hu.po -l hu -d po/\n 287 translated messages, 1 fuzzy translation, 1 untranslated message.\n\n Generating catalog po/it.msg\n msgfmt --statistics --tcl po/it.po -l it -d po/\n 282 translated messages, 1 fuzzy translation, 6 untranslated messages.\n\n Generating catalog po/ja.msg\n msgfmt --statistics --tcl po/ja.po -l ja -d po/\n 281 translated messages, 4 fuzzy translations, 4 untranslated messages.\n\n Generating catalog po/ru.msg\n msgfmt --statistics --tcl po/ru.po -l ru -d po/\n 234 translated messages, 19 fuzzy translations, 36 untranslated messages.\n\n Generating catalog po/sv.msg\n msgfmt --statistics --tcl po/sv.po -l sv -d po/\n 289 translated messages.\n"},{"id":"133458","messageId":"201002031111.29557.barra_cuda@katamail.com","threadId":"22471","inReplyTo":"7vy6jbunu8.fsf@alter.siamese.dyndns.org","subject":"Re: git-gui translation updates needed","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2010-02-03T10:11:16Z","receivedAt":"2010-02-03T10:11:16Z","isPatch":false,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"On Wednesday 03 February 2010, Junio C Hamano wrote:\n>  - It is curious that de.po is based on a version of .pot that is\n>    different from the official git-gui.pot, even though it seems to be\n>    up-to-date (no, I don't read German, but running \"msgmerge -U po/de.po\n>    po/git-gui.pot\" doesn't seem to detect anything missing).\n> \n>    Build log for \"de\" also says that has 520 messages all translated.\n\nIIRC, the timetable was:\n\t* Christian Stimming submits a new de.po\n\t* Shawn Pearce updates git-gui.pot and asks for help\n\t* other languages are submitted\n\nSo de.po has a different date, but doesn't miss anything since\nno major change has occurred in git-gui.git in the meantime.\n\n>  - I am seeing \"1 untranslated\", even though it.po is based on the latest\n>    git-gui.pot.  It translates \"buckets\" to an empty string; somebody who\n>    care about Italian may need to double check.\n\nAn empty string means \"there's no translation, use the default\" -- in\nthis case: \"buckets\". I left it this way because I couldn't come up\nwith a decent translation, and I wanted to keep a reminder.\n\nIn this case, git-gui is counting objects during a clone;\nwould it be OK to consider \"buckets\" as synonim of\n\"objects\" or \"items\" or something else?\nThen I would translate accordingly.\n"},{"id":"133459","messageId":"201002031113.11212.barra_cuda@katamail.com","threadId":"22471","inReplyTo":"7vd40nundv.fsf_-_@alter.siamese.dyndns.org","subject":"Re: gitk translation updates needed?","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2010-02-03T10:13:10Z","receivedAt":"2010-02-03T10:13:10Z","isPatch":false,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"On Wednesday 03 February 2010, Junio C Hamano wrote:\n> Generating catalog po/it.msg\n>  msgfmt --statistics --tcl po/it.po -l it -d po/\n>  282 translated messages, 1 fuzzy translation, 6 untranslated messages.\n\nI don't get any fuzzy translation here, but I used to, so I guess it\nregards the copyright message. If that's the case, maybe msgfmt\nmishandles the (C)opyright sign (or maybe gitk uses a weird encoding,\nI don't know).\n\nThe untranslated messages are either abbreviations (IgnCase) or\nexpressions I couldn't translate effectively (Cherry-picking);\nthey are quite understandable anyway.\n"},{"id":"133506","messageId":"7vwryuhzsn.fsf@alter.siamese.dyndns.org","threadId":"22471","inReplyTo":"201002031111.29557.barra_cuda@katamail.com","subject":"Re: git-gui translation updates needed","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-02-03T19:42:00Z","receivedAt":"2010-02-03T19:42:00Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michele Ballabio <barra_cuda@katamail.com> writes:\n\n> On Wednesday 03 February 2010, Junio C Hamano wrote:\n>>  - It is curious that de.po is ...\n> IIRC, the timetable was:\n> \t* Christian Stimming submits a new de.po\n> \t* Shawn Pearce updates git-gui.pot and asks for help\n> \t* other languages are submitted\n>\n> So de.po has a different date, but doesn't miss anything since\n> no major change has occurred in git-gui.git in the meantime.\n\nThat explains it; thanks.\n\n>>  - I am seeing \"1 untranslated\", even though it.po is based on the latest\n>>    git-gui.pot.  It translates \"buckets\" to an empty string; somebody who\n>>    care about Italian may need to double check.\n>\n> An empty string means \"there's no translation, use the default\" -- in\n> this case: \"buckets\". I left it this way because I couldn't come up\n> with a decent translation, and I wanted to keep a reminder.\n\nI understand your intention, and I think I phrased it wrongly, as if I was\nsaying that you were actively telling git-gui to say nothing when it wants\nto say \"buckets\" in English.  You did the right thing by leaving it\n\"empty\", so that other people (like me) can notice the \"untranslated\"\nwarning during build.  That is why I said \"somebody ... may need to double\ncheck\".\n\n> In this case, git-gui is counting objects during a clone; would it be OK\n> to consider \"buckets\" as synonim of \"objects\" or \"items\" or something\n> else?  Then I would translate accordingly.\n\nA cursory read of the codepath with that message tells me that Shawn is\ncalling one [0-9a-f][0-9a-f] directory under .git/objects/ a \"bucket\" and\ncounting the number of them while copying them to implement \"git clone\"\ninside git-gui (why?---that is a separate issue).\n\nCalling it \"objects\" would be technically incorrect; using a countable\nnoun that does not have a particular meaning (e.g. \"items\") would be a\ngood solution for this, I think.\n"},{"id":"133508","messageId":"7vsk9ihzlp.fsf@alter.siamese.dyndns.org","threadId":"22471","inReplyTo":"201002031113.11212.barra_cuda@katamail.com","subject":"Re: gitk translation updates needed?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-02-03T19:46:10Z","receivedAt":"2010-02-03T19:46:10Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michele Ballabio <barra_cuda@katamail.com> writes:\n\n> On Wednesday 03 February 2010, Junio C Hamano wrote:\n>> Generating catalog po/it.msg\n>>  msgfmt --statistics --tcl po/it.po -l it -d po/\n>>  282 translated messages, 1 fuzzy translation, 6 untranslated messages.\n>\n> I don't get any fuzzy translation here, but I used to, so I guess it\n> regards the copyright message. If that's the case, maybe msgfmt\n> mishandles the (C)opyright sign (or maybe gitk uses a weird encoding,\n> I don't know).\n\nSorry, I omitted a step in my report:\n\n $ make po/gitk.pot\n $ msgmerge -U po/it.po po/gitk.pot ;# and for other languages...\n $ make po/it.msg\n\nWhy doesn't gitk ship with pre-generated po/gitk.pot, by the way?\n"},{"id":"133510","messageId":"20100203195215.GE14799@spearce.org","threadId":"22471","inReplyTo":"7vwryuhzsn.fsf@alter.siamese.dyndns.org","subject":"Re: git-gui clone WTFery","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2010-02-03T19:52:15Z","receivedAt":"2010-02-03T19:52:15Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano <gitster@pobox.com> wrote:\n> Michele Ballabio <barra_cuda@katamail.com> writes:\n> > In this case, git-gui is counting objects during a clone; would it be OK\n> > to consider \"buckets\" as synonim of \"objects\" or \"items\" or something\n> > else?  Then I would translate accordingly.\n> \n> A cursory read of the codepath with that message tells me that Shawn is\n> calling one [0-9a-f][0-9a-f] directory under .git/objects/ a \"bucket\" and\n> counting the number of them while copying them to implement \"git clone\"\n> inside git-gui (why?---that is a separate issue).\n\nI just had an argument with someone in a private thread about why\ncommit messages should be more than 30 characters long.  Lets see\nif the git-gui history stands up to that and sufficiently explains\nwhy I rewrote clone in Tcl:\n\n  $ git blame lib/choose_repository.tcl\n  ...\n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  633) \n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  634)           $o_cons start \\\n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  635)                   [mc \"Counting objects\"] \\\n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  636)                   [mc \"buckets\"]\n  ...\n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  673)           update\n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  674) \n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  675)           file mkdir [file join .git objects pack]\n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  676)           foreach i [glob -tails -nocomplain \\\n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  677)                   -directory [file join $objdir pack] *] {\n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  678)                   lappend tolink [file join pack $i]\n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  679)           }\n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  680)           $o_cons update [incr bcur] $bcnt\n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  681)           update\n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  682) \n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  683)           foreach i $buckets {\n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  684)                   file mkdir [file join .git objects $i]\n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  685)                   foreach j [glob -tails -nocomplain \\\n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  686)                           -directory [file join $objdir $i] *] {\n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  687)                           lappend tolink [file join $i $j]\n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  688)                   }\n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  689)                   $o_cons update [incr bcur] $bcnt\n  81d4d3dd (Shawn O. Pearce     2007-09-24 08:40:44 -0400  690)                   update\n  ab08b363 (Shawn O. Pearce     2007-09-22 03:47:43 -0400  691)           }\n\n\nHmmph. 81d4d3dd and ab08b363 are the relevant commits:\n\n  commit 81d4d3dddc5e96aea45a2623c9b1840491348b92\n  Author: Shawn O. Pearce <spearce@spearce.org>\n  Date:   Mon Sep 24 08:40:44 2007 -0400\n\n    git-gui: Keep the UI responsive while counting objects in clone\n    \n    If we are doing a \"standard\" clone by way of hardlinking the\n    objects (or copying them if hardlinks are not available) the\n    UI can freeze up for a good few seconds while Tcl scans all\n    of the object directories.  This is espeically noticed on a\n    Windows system when you are working off network shares and\n    need to wait for both the NT overheads and the network.\n    \n    We now show a progress bar as we count the objects and build\n    our list of things to copy.  This keeps the user amused and\n    also makes sure we run the Tk event loop often enough that\n    the window can still be dragged around the desktop.\n    \n    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>\n\n  commit ab08b3630414dfb867825c4a5828438e1c69199d\n  Author: Shawn O. Pearce <spearce@spearce.org>\n  Date:   Sat Sep 22 03:47:43 2007 -0400\n\n    git-gui: Allow users to choose/create/clone a repository\n  ...\n    Rather than relying on the git-clone Porcelain that ships with\n    git we build the new repository ourselves and then obtain content\n    by git-fetch.  This technique simplifies the entire clone process\n    to roughly: `git init && git fetch && git pull`.  Today we use\n    three passes with git-fetch; the first pass gets us the bulk of\n    the objects and the branches, the second pass gets us the tags,\n    and the final pass gets us the current value of HEAD to initialize\n    the default branch.\n    \n    If the source repository is on the local disk we try to use a\n    hardlink to connect the objects into the new clone as this can\n    be many times faster than copying the objects or packing them and\n    passing the data through a pipe to index-pack.  Unlike git-clone\n    we stick to pure Tcl [file link -hard] operation thus avoiding the\n    need to fork a cpio process to setup the hardlinks.  If hardlinks\n    do not appear to be supported (e.g. filesystem doesn't allow them or\n    we are crossing filesystem boundaries) we use file copying instead.\n    \n    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>\n\n\nMy guess is, around this time period (Sept. 2007) git-clone was\nactually git-clone.sh (Yup, it was built-in in 8434c2f1afed \"Build\nin clone\" Apr 2008).  Clone on Cygwin through git-clone.sh was very\nslow compared to clone in Tcl using a native Win32 wish process...\n\nToday with git-clone in C, this is a WTF.  But at the time, it was\na nice performance boost on the Windows platform.  And nobody has\ntried to clean this up yet in git-gui.\n\nYay.  My point about commit messages is still valid.  :-)\n\n-- \nShawn.\n"},{"id":"133532","messageId":"201002032156.16101.barra_cuda@katamail.com","threadId":"22471","inReplyTo":"7vsk9ihzlp.fsf@alter.siamese.dyndns.org","subject":"Re: gitk translation updates needed?","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2010-02-03T20:56:15Z","receivedAt":"2010-02-03T20:56:15Z","isPatch":false,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"On Wednesday 03 February 2010, Junio C Hamano wrote:\n> Michele Ballabio <barra_cuda@katamail.com> writes:\n> \n> > On Wednesday 03 February 2010, Junio C Hamano wrote:\n> >> Generating catalog po/it.msg\n> >>  msgfmt --statistics --tcl po/it.po -l it -d po/\n> >>  282 translated messages, 1 fuzzy translation, 6 untranslated messages.\n> >\n> > I don't get any fuzzy translation here, but I used to, so I guess it\n> > regards the copyright message. If that's the case, maybe msgfmt\n> > mishandles the (C)opyright sign (or maybe gitk uses a weird encoding,\n> > I don't know).\n> \n> Sorry, I omitted a step in my report:\n> \n>  $ make po/gitk.pot\n>  $ msgmerge -U po/it.po po/gitk.pot ;# and for other languages...\n>  $ make po/it.msg\n\nYes, with these steps it.po now contains:\n\n#: gitk:2782\n#, fuzzy\nmsgid \"\"\n\"\\n\"\n\"Gitk - a commit viewer for git\\n\"\n\"\\n\"\n\"Copyright ©9 2005-2009 Paul Mackerras\\n\"\n\"\\n\"\n\"Use and redistribute under the terms of the GNU General Public License\"\n\nThe \"fuzzy\" attribute is bogus but is understandable, because\nthe msgid changed: \"©\" became \"©9\". What I don't get is:\nwhy \"©\" became \"©9\"? Was it a needed change or just an oversight?\n"},{"id":"133543","messageId":"20100203214652.GE12487@brick.ozlabs.ibm.com","threadId":"22471","inReplyTo":"201002032156.16101.barra_cuda@katamail.com","subject":"Re: gitk translation updates needed?","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2010-02-03T21:46:52Z","receivedAt":"2010-02-03T21:46:52Z","isPatch":false,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"On Wed, Feb 03, 2010 at 09:56:15PM +0100, Michele Ballabio wrote:\n\n> The \"fuzzy\" attribute is bogus but is understandable, because\n> the msgid changed: \"©\" became \"©9\". What I don't get is:\n> why \"©\" became \"©9\"? Was it a needed change or just an oversight?\n\nIt crept in without me noticing in commit d93f1713 (\"gitk: Use themed\ntk widgets\").  I'll fix it.\n\nPaul.\n"},{"id":"133544","messageId":"7v636ec677.fsf@alter.siamese.dyndns.org","threadId":"22471","inReplyTo":"201002032156.16101.barra_cuda@katamail.com","subject":"Re: gitk translation updates needed?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-02-03T22:20:12Z","receivedAt":"2010-02-03T22:20:12Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michele Ballabio <barra_cuda@katamail.com> writes:\n\n>>  $ make po/gitk.pot\n>>  $ msgmerge -U po/it.po po/gitk.pot ;# and for other languages...\n>>  $ make po/it.msg\n>\n> Yes, with these steps it.po now contains:\n>\n> #: gitk:2782\n> #, fuzzy\n> msgid \"\"\n> \"\\n\"\n> \"Gitk - a commit viewer for git\\n\"\n> \"\\n\"\n> \"Copyright ©9 2005-2009 Paul Mackerras\\n\"\n> \"\\n\"\n> \"Use and redistribute under the terms of the GNU General Public License\"\n>\n> The \"fuzzy\" attribute is bogus but is understandable, because\n> the msgid changed: \"©\" became \"©9\". What I don't get is:\n> why \"©\" became \"©9\"? Was it a needed change or just an oversight?\n\nVery interesting.\n\nThe last commit that touched the copyright line in gitk was aa43561 (gitk:\nDon't compare fake children when comparing commits, 2009-09-10) that\nupdated the years.  But the commit did not change the circle-c symbol at\nall:\n\n    $ git show --format='%H' -U1 aa43561a | head -n 10 | tail -n 2 | od -cx\n    0000000   -   #       C   o   p   y   r   i   g   h   t     302 251    \n            232d 4320 706f 7279 6769 7468 c220 20a9\n    0000020   2   0   0   5   -   2   0   0   8       P   a   u   l       M\n    ...\n    0000100   +   #       C   o   p   y   r   i   g   h   t     302 251    \n            232b 4320 706f 7279 6769 7468 c220 20a9\n    0000120   2   0   0   5   -   2   0   0   9       P   a   u   l       M\n\n\"make po/gitk.pot\" which is \"xgettext -kmc -LTcl -o po/gitk.pot gitk\"\nhowever produces this:\n\n    $ grep Paul po/gitk.pot | od -cx\n    0000000   \"   C   o   p   y   r   i   g   h   t     302 251   9       2\n            4322 706f 7279 6769 7468 c220 39a9 3220\n    0000020   0   0   5   -   2   0   0   9       P   a   u   l       M   a\n    ...\n\nNotice that \"302 251 9\"?\n\nIs this a bug in \"gettext\", perhaps?\n"},{"id":"133545","messageId":"7vsk9iarl6.fsf@alter.siamese.dyndns.org","threadId":"22471","inReplyTo":"20100203214652.GE12487@brick.ozlabs.ibm.com","subject":"Re: gitk translation updates needed?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-02-03T22:21:09Z","receivedAt":"2010-02-03T22:21:09Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Paul Mackerras <paulus@samba.org> writes:\n\n> It crept in without me noticing in commit d93f1713 (\"gitk: Use themed\n> tk widgets\").  I'll fix it.\n\nAhh, thanks.\n"},{"id":"133546","messageId":"7vfx5iarg6.fsf@alter.siamese.dyndns.org","threadId":"22471","inReplyTo":"7v636ec677.fsf@alter.siamese.dyndns.org","subject":"Re: gitk translation updates needed?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-02-03T22:24:09Z","receivedAt":"2010-02-03T22:24:09Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Is this a bug in \"gettext\", perhaps?\n\nScratch this; I was not reading the blame output correctly.\n"}]}