Update ja.po to match 2010-01-26 version of pot file. Signed-off-by: しらいし ななこ <nanako3@xxxxxxxxxxx> --- po/ja.po | 653 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 339 insertions(+), 314 deletions(-)
diff --git a/po/ja.po b/po/ja.po index 63c4695..ee381a4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,46 +3,45 @@ # This file is distributed under the same license as the git-gui package. # ã??ã??ã??ã?? ã?ªã?ªã?? <nanako3@xxxxxxxxxxxxxx>, 2007. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-08 08:31-0800\n" -"PO-Revision-Date: 2008-12-09 06:27+0900\n" +"POT-Creation-Date: 2010-01-26 15:47-0800\n" +"PO-Revision-Date: 2010-02-02 19:03+0900\n" "Last-Translator: ã??ã??ã??ã?? ã?ªã?ªã?? <nanako3@xxxxxxxxxxx>\n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847 -#: git-gui.sh:866 +#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 +#: git-gui.sh:922 msgid "git-gui: fatal error" msgstr "git-gui: è?´å?½ç??ã?ªã?¨ã?©ã?¼" -#: git-gui.sh:689 +#: git-gui.sh:743 #, tcl-format msgid "Invalid font specified in %s:" msgstr "%s ã?«ç?¡å?¹ã?ªã??ã?©ã?³ã??ã??æ??å®?ã??ã??ã?¦ã??ã?¾ã??:" -#: git-gui.sh:723 +#: git-gui.sh:779 msgid "Main Font" msgstr "主ã??ã?©ã?³ã??" -#: git-gui.sh:724 +#: git-gui.sh:780 msgid "Diff/Console Font" msgstr "diff/ã?³ã?³ã?½ã?¼ã?«ã?»ã??ã?©ã?³ã??" -#: git-gui.sh:738 +#: git-gui.sh:794 msgid "Cannot find git in PATH." msgstr "PATH ä¸ã?« git ã??è¦?ã?¤ã??ã??ã?¾ã??ã??" -#: git-gui.sh:765 +#: git-gui.sh:821 msgid "Cannot parse Git version string:" msgstr "Git ã??ã?¼ã?¸ã?§ã?³å??ã??ç??解ã?§ã??ã?¾ã??ã??:" -#: git-gui.sh:783 +#: git-gui.sh:839 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -61,446 +60,475 @@ msgstr "" "\n" "'%s' ã?¯ã??ã?¼ã?¸ã?§ã?³ 1.5.0 ã?¨æ??ã?£ã?¦è?¯ã??ã?§ã??ã??ï¼?\n" -#: git-gui.sh:1062 +#: git-gui.sh:1128 msgid "Git directory not found:" msgstr "Git ã??ã?£ã?¬ã?¯ã??ã?ªã??è¦?ã?¤ã??ã??ã?¾ã??ã??:" -#: git-gui.sh:1069 +#: git-gui.sh:1146 msgid "Cannot move to top of working directory:" msgstr "ä½?æ¥ã??ã?£ã?¬ã?¯ã??ã?ªã?®æ??ä¸?ä½?ã?«ç§»å??ã?§ã??ã?¾ã??ã??" -#: git-gui.sh:1076 -msgid "Cannot use funny .git directory:" -msgstr "å¤?ã?ª .git ã??ã?£ã?¬ã?¯ã??ã?ªã?¯ä½¿ã??ã?¾ã??ã??" +#: git-gui.sh:1154 +msgid "Cannot use bare repository:" +msgstr "裸ã?®ã?ªã??ã?¸ã??ã?ªã?¯ä½¿ã??ã?¾ã??ã??:" -#: git-gui.sh:1081 +#: git-gui.sh:1162 msgid "No working directory" msgstr "ä½?æ¥ã??ã?£ã?¬ã?¯ã??ã?ªã??ã??ã??ã?¾ã??ã??" -#: git-gui.sh:1247 lib/checkout_op.tcl:305 +#: git-gui.sh:1334 lib/checkout_op.tcl:306 msgid "Refreshing file status..." msgstr "ã??ã?¡ã?¤ã?«ç?¶æ??ã??æ?´æ?°ã??ã?¦ã??ã?¾ã??â?¦" -#: git-gui.sh:1303 +#: git-gui.sh:1390 msgid "Scanning for modified files ..." msgstr "å¤?æ?´ã??ã??ã??ã??ã?¡ã?¤ã?«ã??ã?¹ã?ã?£ã?³ã??ã?¦ã??ã?¾ã??â?¦" -#: git-gui.sh:1367 +#: git-gui.sh:1454 msgid "Calling prepare-commit-msg hook..." msgstr "prepare-commit-msg ã??ã??ã?¯ã??å®?è¡?ä¸ã?»ã?»ã?»" -#: git-gui.sh:1384 +#: git-gui.sh:1471 msgid "Commit declined by prepare-commit-msg hook." msgstr "prepare-commit-msg ã??ã??ã?¯ã??ã?³ã??ã??ã??ã??æ??å?¦ã??ã?¾ã??ã??" -#: git-gui.sh:1542 lib/browser.tcl:246 +#: git-gui.sh:1629 lib/browser.tcl:246 msgid "Ready." msgstr "æº?å??å®?äº?" -#: git-gui.sh:1819 +#: git-gui.sh:1787 +#, tcl-format +msgid "Displaying only %s of %s files." +msgstr "å?¨ä½?ã?§%så??ã?®å??ã?®%sã??ã?¡ã?¤ã?«ã? ã??表示ã??ã?¦ã??ã?¾ã??" + +#: git-gui.sh:1913 msgid "Unmodified" msgstr "å¤?æ?´ç?¡ã??" -#: git-gui.sh:1821 +#: git-gui.sh:1915 msgid "Modified, not staged" msgstr "å¤?æ?´ã??ã??ã??ã?³ã??ã??ã??æ?ªäº?å®?" -#: git-gui.sh:1822 git-gui.sh:1830 +#: git-gui.sh:1916 git-gui.sh:1924 msgid "Staged for commit" msgstr "ã?³ã??ã??ã??äº?å®?æ¸?" -#: git-gui.sh:1823 git-gui.sh:1831 +#: git-gui.sh:1917 git-gui.sh:1925 msgid "Portions staged for commit" msgstr "é?¨å??ç??ã?«ã?³ã??ã??ã??äº?å®?æ¸?" -#: git-gui.sh:1824 git-gui.sh:1832 +#: git-gui.sh:1918 git-gui.sh:1926 msgid "Staged for commit, missing" msgstr "ã?³ã??ã??ã??äº?å®?æ¸?ã??ã??ã?¡ã?¤ã?«ç?¡ã??" -#: git-gui.sh:1826 +#: git-gui.sh:1920 msgid "File type changed, not staged" msgstr "ã??ã?¡ã?¤ã?«å??å¤?æ?´ã??ã?³ã??ã??ã??æ?ªäº?å®?" -#: git-gui.sh:1827 +#: git-gui.sh:1921 msgid "File type changed, staged" msgstr "ã??ã?¡ã?¤ã?«å??å¤?æ?´ã??ã?³ã??ã??ã??äº?å®?æ¸?" -#: git-gui.sh:1829 +#: git-gui.sh:1923 msgid "Untracked, not staged" msgstr "管ç??å¤?ã??ã?³ã??ã??ã??æ?ªäº?å®?" -#: git-gui.sh:1834 +#: git-gui.sh:1928 msgid "Missing" msgstr "ã??ã?¡ã?¤ã?«ç?¡ã??" -#: git-gui.sh:1835 +#: git-gui.sh:1929 msgid "Staged for removal" msgstr "å??é?¤äº?å®?æ¸?" -#: git-gui.sh:1836 +#: git-gui.sh:1930 msgid "Staged for removal, still present" msgstr "å??é?¤äº?å®?æ¸?ã??ã??ã?¡ã?¤ã?«æ?ªå??é?¤" -#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841 -#: git-gui.sh:1842 git-gui.sh:1843 +#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 +#: git-gui.sh:1936 git-gui.sh:1937 msgid "Requires merge resolution" msgstr "è¦?ã??ã?¼ã?¸è§£æ±º" -#: git-gui.sh:1878 +#: git-gui.sh:1972 msgid "Starting gitk... please wait..." msgstr "gitk ã??èµ·å??ä¸â?¦ã??å¾?ã?¡ä¸?ã??ã??â?¦" -#: git-gui.sh:1887 +#: git-gui.sh:1984 msgid "Couldn't find gitk in PATH" msgstr "PATH ä¸ã?« gitk ã??è¦?ã?¤ã??ã??ã?¾ã??ã??" -#: git-gui.sh:2280 lib/choose_repository.tcl:36 +#: git-gui.sh:2043 +msgid "Couldn't find git gui in PATH" +msgstr "PATH ä¸ã?« git gui ã??è¦?ã?¤ã??ã??ã?¾ã??ã??" + +#: git-gui.sh:2455 lib/choose_repository.tcl:36 msgid "Repository" msgstr "ã?ªã??ã?¸ã??ã?ª" -#: git-gui.sh:2281 +#: git-gui.sh:2456 msgid "Edit" msgstr "ç·¨é??" -#: git-gui.sh:2283 lib/choose_rev.tcl:561 +#: git-gui.sh:2458 lib/choose_rev.tcl:561 msgid "Branch" msgstr "ã??ã?©ã?³ã??" -#: git-gui.sh:2286 lib/choose_rev.tcl:548 +#: git-gui.sh:2461 lib/choose_rev.tcl:548 msgid "Commit@@noun" msgstr "ã?³ã??ã??ã??" -#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 msgid "Merge" msgstr "ã??ã?¼ã?¸" -#: git-gui.sh:2290 lib/choose_rev.tcl:557 +#: git-gui.sh:2465 lib/choose_rev.tcl:557 msgid "Remote" msgstr "ã?ªã?¢ã?¼ã??" -#: git-gui.sh:2293 +#: git-gui.sh:2468 msgid "Tools" msgstr "ã??ã?¼ã?«" -#: git-gui.sh:2302 +#: git-gui.sh:2477 msgid "Explore Working Copy" msgstr "ã?¯ã?¼ã?ã?³ã?°ã?³ã??ã?¼ã??ã??ã?©ã?¦ã?º" -#: git-gui.sh:2307 +#: git-gui.sh:2483 msgid "Browse Current Branch's Files" msgstr "ç?¾å?¨ã?®ã??ã?©ã?³ã??ã?®ã??ã?¡ã?¤ã?«ã??è¦?ã??" -#: git-gui.sh:2311 +#: git-gui.sh:2487 msgid "Browse Branch Files..." msgstr "ã??ã?©ã?³ã??ã?®ã??ã?¡ã?¤ã?«ã??è¦?ã??â?¦" -#: git-gui.sh:2316 +#: git-gui.sh:2492 msgid "Visualize Current Branch's History" msgstr "ç?¾å?¨ã?®ã??ã?©ã?³ã??ã?®å±¥æ´ã??è¦?ã??" -#: git-gui.sh:2320 +#: git-gui.sh:2496 msgid "Visualize All Branch History" msgstr "å?¨ã?¦ã?®ã??ã?©ã?³ã??ã?®å±¥æ´ã??è¦?ã??" -#: git-gui.sh:2327 +#: git-gui.sh:2503 #, tcl-format msgid "Browse %s's Files" msgstr "ã??ã?©ã?³ã?? %s ã?®ã??ã?¡ã?¤ã?«ã??è¦?ã??" -#: git-gui.sh:2329 +#: git-gui.sh:2505 #, tcl-format msgid "Visualize %s's History" msgstr "ã??ã?©ã?³ã?? %s ã?®å±¥æ´ã??è¦?ã??" -#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 msgid "Database Statistics" msgstr "ã??ã?¼ã?¿ã??ã?¼ã?¹çµ±è¨?" -#: git-gui.sh:2337 lib/database.tcl:34 +#: git-gui.sh:2513 lib/database.tcl:34 msgid "Compress Database" msgstr "ã??ã?¼ã?¿ã??ã?¼ã?¹å?§ç¸®" -#: git-gui.sh:2340 +#: git-gui.sh:2516 msgid "Verify Database" msgstr "ã??ã?¼ã?¿ã??ã?¼ã?¹æ¤?証" -#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7 -#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 +#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 +#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 msgid "Create Desktop Icon" msgstr "ã??ã?¹ã?¯ã??ã??ã??ã?»ã?¢ã?¤ã?³ã?³ã??ä½?ã??" -#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 msgid "Quit" msgstr "çµ?äº?" -#: git-gui.sh:2371 +#: git-gui.sh:2547 msgid "Undo" msgstr "å??ã?«æ?»ã??" -#: git-gui.sh:2374 +#: git-gui.sh:2550 msgid "Redo" msgstr "ã??ã??ç?´ã??" -#: git-gui.sh:2378 git-gui.sh:2923 +#: git-gui.sh:2554 git-gui.sh:3109 msgid "Cut" msgstr "å??ã??å??ã??" -#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082 +#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 #: lib/console.tcl:69 msgid "Copy" msgstr "ã?³ã??ã?¼" -#: git-gui.sh:2384 git-gui.sh:2929 +#: git-gui.sh:2560 git-gui.sh:3115 msgid "Paste" msgstr "è²¼ã??ä»?ã??" -#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26 +#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 #: lib/remote_branch_delete.tcl:38 msgid "Delete" msgstr "å??é?¤" -#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71 +#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 msgid "Select All" msgstr "å?¨ã?¦é?¸æ??" -#: git-gui.sh:2400 +#: git-gui.sh:2576 msgid "Create..." msgstr "ä½?æ??â?¦" -#: git-gui.sh:2406 +#: git-gui.sh:2582 msgid "Checkout..." msgstr "ã??ã?§ã??ã?¯ã?¢ã?¦ã??" -#: git-gui.sh:2412 +#: git-gui.sh:2588 msgid "Rename..." msgstr "å??å??å¤?æ?´â?¦" -#: git-gui.sh:2417 +#: git-gui.sh:2593 msgid "Delete..." msgstr "å??é?¤â?¦" -#: git-gui.sh:2422 +#: git-gui.sh:2598 msgid "Reset..." msgstr "ã?ªã?»ã??ã??â?¦" -#: git-gui.sh:2432 +#: git-gui.sh:2608 msgid "Done" msgstr "å®?äº?" -#: git-gui.sh:2434 +#: git-gui.sh:2610 msgid "Commit@@verb" msgstr "ã?³ã??ã??ã??" -#: git-gui.sh:2443 git-gui.sh:2864 +#: git-gui.sh:2619 git-gui.sh:3050 msgid "New Commit" msgstr "æ?°è¦?ã?³ã??ã??ã??" -#: git-gui.sh:2451 git-gui.sh:2871 +#: git-gui.sh:2627 git-gui.sh:3057 msgid "Amend Last Commit" msgstr "æ??æ?°ã?³ã??ã??ã??ã??è¨?æ£" -#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 msgid "Rescan" msgstr "å??ã?¹ã?ã?£ã?³" -#: git-gui.sh:2467 +#: git-gui.sh:2643 msgid "Stage To Commit" msgstr "ã?³ã??ã??ã??äº?å®?ã??ã??" -#: git-gui.sh:2473 +#: git-gui.sh:2649 msgid "Stage Changed Files To Commit" msgstr "å¤?æ?´ã??ã??ã??ã??ã?¡ã?¤ã?«ã??ã?³ã??ã??ã??äº?å®?" -#: git-gui.sh:2479 +#: git-gui.sh:2655 msgid "Unstage From Commit" msgstr "ã?³ã??ã??ã??ã??ã??é??ã??ã??" -#: git-gui.sh:2484 lib/index.tcl:410 +#: git-gui.sh:2661 lib/index.tcl:412 msgid "Revert Changes" msgstr "å¤?æ?´ã??å??ã?«æ?»ã??" -#: git-gui.sh:2491 git-gui.sh:3069 +#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 msgid "Show Less Context" msgstr "æ??è??ã??å°?ã?ªã??" -#: git-gui.sh:2495 git-gui.sh:3073 +#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 msgid "Show More Context" msgstr "æ??è??ã??å¤?ã??" -#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947 +#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 msgid "Sign Off" msgstr "ç½²å??" -#: git-gui.sh:2518 +#: git-gui.sh:2696 msgid "Local Merge..." msgstr "ã?ã?¼ã?«ã?«ã?»ã??ã?¼ã?¸â?¦" -#: git-gui.sh:2523 +#: git-gui.sh:2701 msgid "Abort Merge..." msgstr "ã??ã?¼ã?¸ä¸æ¢â?¦" -#: git-gui.sh:2535 git-gui.sh:2575 +#: git-gui.sh:2713 git-gui.sh:2741 msgid "Add..." msgstr "追å? " -#: git-gui.sh:2539 +#: git-gui.sh:2717 msgid "Push..." msgstr "ã??ã??ã?·ã?¥â?¦" -#: git-gui.sh:2543 +#: git-gui.sh:2721 msgid "Delete Branch..." msgstr "ã??ã?©ã?³ã??å??é?¤..." -#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 -#, tcl-format -msgid "About %s" -msgstr "%s ã?«ã?¤ã??ã?¦" - -#: git-gui.sh:2557 -msgid "Preferences..." -msgstr "è¨å®?â?¦" - -#: git-gui.sh:2565 git-gui.sh:3115 +#: git-gui.sh:2731 git-gui.sh:3292 msgid "Options..." msgstr "ã?ªã??ã?·ã?§ã?³â?¦" -#: git-gui.sh:2576 +#: git-gui.sh:2742 msgid "Remove..." msgstr "å??é?¤..." -#: git-gui.sh:2585 lib/choose_repository.tcl:50 +#: git-gui.sh:2751 lib/choose_repository.tcl:50 msgid "Help" msgstr "ã??ã?«ã??" -#: git-gui.sh:2611 +#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 +#, tcl-format +msgid "About %s" +msgstr "%s ã?«ã?¤ã??ã?¦" + +#: git-gui.sh:2783 msgid "Online Documentation" msgstr "ã?ªã?³ã?©ã?¤ã?³ã?»ã??ã?ã?¥ã?¡ã?³ã??" -#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 msgid "Show SSH Key" msgstr "SSH ã?ã?¼ã??表示" -#: git-gui.sh:2707 +#: git-gui.sh:2893 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "" "è?´å?½ç??: ã??ã?¹ %s ã?? stat ã?§ã??ã?¾ã??ã??ã??ã??ã?®ã??ã??ã?ªã??ã?¡ã?¤ã?«ã??ã??ã?£ã?¬ã?¯ã??ã?ªã?¯ã??ã??ã?¾" "ã??ã??" -#: git-gui.sh:2740 +#: git-gui.sh:2926 msgid "Current Branch:" msgstr "ç?¾å?¨ã?®ã??ã?©ã?³ã??" -#: git-gui.sh:2761 +#: git-gui.sh:2947 msgid "Staged Changes (Will Commit)" msgstr "ã?¹ã??ã?¼ã?¸ã?³ã?°ã??ã??ã??ï¼?ã?³ã??ã??ã??äº?å®?æ¸?ã?®ï¼?å¤?æ?´" -#: git-gui.sh:2781 +#: git-gui.sh:2967 msgid "Unstaged Changes" msgstr "ã?³ã??ã??ã??äº?å®?ã?«å?¥ã?£ã?¦ã??ã?ªã??å¤?æ?´" -#: git-gui.sh:2831 +#: git-gui.sh:3017 msgid "Stage Changed" msgstr "å¤?æ?´ã??ã?³ã??ã??ã??äº?å®?ã?«å?¥ã??ã??" -#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182 +#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 msgid "Push" msgstr "ã??ã??ã?·ã?¥" -#: git-gui.sh:2885 +#: git-gui.sh:3071 msgid "Initial Commit Message:" msgstr "æ??å??ã?®ã?³ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸:" -#: git-gui.sh:2886 +#: git-gui.sh:3072 msgid "Amended Commit Message:" msgstr "è¨?æ£ã??ã??ã?³ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸:" -#: git-gui.sh:2887 +#: git-gui.sh:3073 msgid "Amended Initial Commit Message:" msgstr "è¨?æ£ã??ã??æ??å??ã?®ã?³ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸:" -#: git-gui.sh:2888 +#: git-gui.sh:3074 msgid "Amended Merge Commit Message:" msgstr "è¨?æ£ã??ã??ã??ã?¼ã?¸ã?³ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸:" -#: git-gui.sh:2889 +#: git-gui.sh:3075 msgid "Merge Commit Message:" msgstr "ã??ã?¼ã?¸ã?³ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸:" -#: git-gui.sh:2890 +#: git-gui.sh:3076 msgid "Commit Message:" msgstr "ã?³ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸:" -#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73 +#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 msgid "Copy All" msgstr "å?¨ã?¦ã?³ã??ã?¼" -#: git-gui.sh:2963 lib/blame.tcl:104 +#: git-gui.sh:3149 lib/blame.tcl:104 msgid "File:" msgstr "ã??ã?¡ã?¤ã?«:" -#: git-gui.sh:3078 +#: git-gui.sh:3255 msgid "Refresh" msgstr "å??èªã?¿è¾¼ã?¿" -#: git-gui.sh:3099 +#: git-gui.sh:3276 msgid "Decrease Font Size" msgstr "ã??ã?©ã?³ã??ã??å°?ã??ã??" -#: git-gui.sh:3103 +#: git-gui.sh:3280 msgid "Increase Font Size" msgstr "ã??ã?©ã?³ã??ã??大ã??ã??" -#: git-gui.sh:3111 lib/blame.tcl:281 +#: git-gui.sh:3288 lib/blame.tcl:281 msgid "Encoding" msgstr "ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?°" -#: git-gui.sh:3122 +#: git-gui.sh:3299 msgid "Apply/Reverse Hunk" msgstr "ã??ã??ã??ã??é?©ç?¨/å??ã??æ¶?ã??" -#: git-gui.sh:3127 +#: git-gui.sh:3304 msgid "Apply/Reverse Line" msgstr "ã??ã??ã??è¡?ã??é?©ç?¨/å??ã??æ¶?ã??" -#: git-gui.sh:3137 +#: git-gui.sh:3323 msgid "Run Merge Tool" msgstr "ã??ã?¼ã?¸ã??ã?¼ã?«ã??èµ·å??" -#: git-gui.sh:3142 +#: git-gui.sh:3328 msgid "Use Remote Version" msgstr "ã?ªã?¢ã?¼ã??ã?®æ?¹ã??æ?¡ç?¨" -#: git-gui.sh:3146 +#: git-gui.sh:3332 msgid "Use Local Version" msgstr "ã?ã?¼ã?«ã?«ã?®æ?¹ã??æ?¡ç?¨" -#: git-gui.sh:3150 +#: git-gui.sh:3336 msgid "Revert To Base" msgstr "ã??ã?¼ã?¹ç??ã??æ?¡ç?¨" -#: git-gui.sh:3169 +#: git-gui.sh:3354 +msgid "Visualize These Changes In The Submodule" +msgstr "ã?µã??ã?¢ã?¸ã?¥ã?¼ã?«å??ã?®ã??ã??ã??ã?®å¤?æ?´ã??è¦?ã??" + +#: git-gui.sh:3358 +msgid "Visualize Current Branch History In The Submodule" +msgstr "ã?µã??ã?¢ã?¸ã?¥ã?¼ã?«å??ã?§ç?¾å?¨ã?®ã??ã?©ã?³ã??ã?®å±¥æ´ã??è¦?ã??" + +#: git-gui.sh:3362 +msgid "Visualize All Branch History In The Submodule" +msgstr "ã?µã??ã?¢ã?¸ã?¥ã?¼ã?«å??ã?§å?¨ã?¦ã?®ã??ã?©ã?³ã??ã?®å±¥æ´ã??è¦?ã??" + +#: git-gui.sh:3367 +msgid "Start git gui In The Submodule" +msgstr "ã?µã??ã?¢ã?¸ã?¥ã?¼ã?«å??ã?§git guiã??èµ·å??ã??ã??" + +#: git-gui.sh:3389 msgid "Unstage Hunk From Commit" msgstr "ã??ã??ã??ã??ã?³ã??ã??ã??äº?å®?ã??ã??å¤?ã??" -#: git-gui.sh:3170 +#: git-gui.sh:3391 +msgid "Unstage Lines From Commit" +msgstr "ã?³ã??ã??ã??äº?å®?ã??ã??è¡?ã??å¤?ã??" + +#: git-gui.sh:3393 msgid "Unstage Line From Commit" msgstr "ã?³ã??ã??ã??äº?å®?ã??ã??è¡?ã??å¤?ã??" -#: git-gui.sh:3172 +#: git-gui.sh:3396 msgid "Stage Hunk For Commit" msgstr "ã??ã??ã??ã??ã?³ã??ã??ã??äº?å®?ã?«å? ã??ã??" -#: git-gui.sh:3173 +#: git-gui.sh:3398 +msgid "Stage Lines For Commit" +msgstr "ã??ã??ã??è¡?ã??ã?³ã??ã??ã??äº?å®?ã?«å? ã??ã??" + +#: git-gui.sh:3400 msgid "Stage Line For Commit" msgstr "ã??ã??ã??è¡?ã??ã?³ã??ã??ã??äº?å®?ã?«å? ã??ã??" -#: git-gui.sh:3196 +#: git-gui.sh:3424 msgid "Initializing..." msgstr "å??æ??å??ã??ã?¦ã??ã?¾ã??â?¦" -#: git-gui.sh:3301 +#: git-gui.sh:3541 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -515,7 +543,7 @@ msgstr "" "以ä¸?ã?®ç?°å¢?å¤?æ?°ã?¯ %s ã??èµ·å??ã??ã?? Git ã?µã??ã??ã?ã?»ã?¹ã?«ã??ã?£ã?¦ç?¡è¦?ã??ã??ã??ã?§ã??ã??ã??:\n" "\n" -#: git-gui.sh:3331 +#: git-gui.sh:3570 msgid "" "\n" "This is due to a known issue with the\n" @@ -525,7 +553,7 @@ msgstr "" "ã??ã??ã?¯ Cygwin ã?§é??å¸?ã??ã??ã?¦ã??ã?? Tcl ã??ã?¤ã??ã?ªã?«\n" "é?¢ã??ã?¦ã?®æ?¢ç?¥ã?®å??é¡?ã?«ã??ã??ã?¾ã??" -#: git-gui.sh:3336 +#: git-gui.sh:3575 #, tcl-format msgid "" "\n" @@ -609,43 +637,43 @@ msgstr "ã?³ã??ã?¼æ¤?ç?¥ã??å®?è¡?ä¸â?¦" msgid "Loading annotation..." msgstr "注é??ã??èªã?¿è¾¼ã??ã?§ã??ã?¾ã??â?¦" -#: lib/blame.tcl:964 +#: lib/blame.tcl:963 msgid "Author:" msgstr "ä½?è??:" -#: lib/blame.tcl:968 +#: lib/blame.tcl:967 msgid "Committer:" msgstr "ã?³ã??ã??ã??è??:" -#: lib/blame.tcl:973 +#: lib/blame.tcl:972 msgid "Original File:" msgstr "å??ã??ã?¡ã?¤ã?«" -#: lib/blame.tcl:1021 +#: lib/blame.tcl:1020 msgid "Cannot find HEAD commit:" msgstr "HEAD ã?³ã??ã??ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??" -#: lib/blame.tcl:1076 +#: lib/blame.tcl:1075 msgid "Cannot find parent commit:" msgstr "親ã?³ã??ã??ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??:" -#: lib/blame.tcl:1091 +#: lib/blame.tcl:1090 msgid "Unable to display parent" msgstr "親ã??表示ã?§ã??ã?¾ã??ã??" -#: lib/blame.tcl:1092 lib/diff.tcl:297 +#: lib/blame.tcl:1091 lib/diff.tcl:320 msgid "Error loading diff:" msgstr "diff ã??èªã??é??ã?®ã?¨ã?©ã?¼ã?§ã??:" -#: lib/blame.tcl:1232 +#: lib/blame.tcl:1231 msgid "Originally By:" msgstr "å??ä½?è??:" -#: lib/blame.tcl:1238 +#: lib/blame.tcl:1237 msgid "In File:" msgstr "ã??ã?¡ã?¤ã?«:" -#: lib/blame.tcl:1243 +#: lib/blame.tcl:1242 msgid "Copied Or Moved Here By:" msgstr "è¤?å??ã?»ç§»å??è??:" @@ -659,10 +687,10 @@ msgstr "ã??ã?§ã??ã?¯ã?¢ã?¦ã??" #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 #: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 #: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:97 +#: lib/transport.tcl:108 msgid "Cancel" msgstr "ä¸æ¢" @@ -690,7 +718,7 @@ msgstr "ã??ã?©ã?³ã??ã??ä½?æ??" msgid "Create New Branch" msgstr "ã??ã?©ã?³ã??ã??æ?°è¦?ä½?æ??" -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 msgid "Create" msgstr "ä½?æ??" @@ -722,7 +750,7 @@ msgstr "ã??ã??ã??" msgid "Fast Forward Only" msgstr "æ?©é??ã??ã?®ã?¿" -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536 +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 msgid "Reset" msgstr "ã?ªã?»ã??ã??" @@ -764,15 +792,25 @@ msgstr "ã?ã?¼ã?«ã?«ã?»ã??ã?©ã?³ã??" msgid "Delete Only If Merged Into" msgstr "ã??ã?¼ã?¸æ¸?ã?¿ã?®æ??ã?®ã?¿å??é?¤" -#: lib/branch_delete.tcl:54 -msgid "Always (Do not perform merge test.)" -msgstr "ç?¡æ?¡ä»¶(ã??ã?¼ã?¸ã??ã?¹ã??ã??ã?ªã??)" +#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 +msgid "Always (Do not perform merge checks)" +msgstr "ç?¡æ?¡ä»¶ï¼?ã??ã?¼ã?¸æ¤?æ?»ã??ã??ã?ªã??ï¼?" #: lib/branch_delete.tcl:103 #, tcl-format msgid "The following branches are not completely merged into %s:" msgstr "以ä¸?ã?®ã??ã?©ã?³ã??ã?¯ %s ã?«å®?å?¨ã?«ã??ã?¼ã?¸ã??ã??ã?¦ã??ã?¾ã??ã??:" +#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" +msgstr "" +"å??é?¤ã??ã??ã??ã?©ã?³ã??ã??å??復ã??ã??ã?®ã?¯å?°é?£ã?§ã??ã??\n" +"\n" +"é?¸æ??ã??ã??ã??ã?©ã?³ã??ã??å??é?¤ã??ã?¦è?¯ã??ã?§ã??ã??ï¼?" + #: lib/branch_delete.tcl:141 #, tcl-format msgid "" @@ -802,7 +840,7 @@ msgstr "æ?°ã??ã??å??å??:" msgid "Please select a branch to rename." msgstr "å??å??ã??å¤?æ?´ã??ã??ã??ã?©ã?³ã??ã??é?¸ã??ã?§ä¸?ã??ã??ã??" -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201 +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 #, tcl-format msgid "Branch '%s' already exists." msgstr "'%s'ã?¨ã??ã??ã??ã?©ã?³ã??ã?¯æ?¢ã?«å?å?¨ã??ã?¾ã??ã??" @@ -833,38 +871,38 @@ msgstr "[ä¸?ä½?ã??ã?©ã?«ã??ã?¸]" msgid "Browse Branch Files" msgstr "ç?¾å?¨ã?®ã??ã?©ã?³ã??ã?®ã??ã?¡ã?¤ã?«ã??è¦?ã??" -#: lib/browser.tcl:278 lib/choose_repository.tcl:394 -#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491 -#: lib/choose_repository.tcl:995 +#: lib/browser.tcl:278 lib/choose_repository.tcl:398 +#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 +#: lib/choose_repository.tcl:1028 msgid "Browse" msgstr "ã??ã?©ã?¦ã?º" -#: lib/checkout_op.tcl:84 +#: lib/checkout_op.tcl:85 #, tcl-format msgid "Fetching %s from %s" msgstr "%s ã??ã?? %s ã??ã??ã?§ã??ã??ã??ã?¦ã??ã?¾ã??" -#: lib/checkout_op.tcl:132 +#: lib/checkout_op.tcl:133 #, tcl-format msgid "fatal: Cannot resolve %s" msgstr "è?´å?½ç??ã?¨ã?©ã?¼: %s ã??解決ã?§ã??ã?¾ã??ã??" -#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31 +#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 #: lib/sshkey.tcl:53 msgid "Close" msgstr "é??ã??ã??" -#: lib/checkout_op.tcl:174 +#: lib/checkout_op.tcl:175 #, tcl-format msgid "Branch '%s' does not exist." msgstr "ã??ã?©ã?³ã??'%s'ã?¯å?å?¨ã??ã?¾ã??ã??ã??" -#: lib/checkout_op.tcl:193 +#: lib/checkout_op.tcl:194 #, tcl-format msgid "Failed to configure simplified git-pull for '%s'." msgstr "'%s' ã?«ç°¡æ?? git-pull ã??è¨å®?ã?§ã??ã?¾ã??ã??ã?§ã??ã??" -#: lib/checkout_op.tcl:228 +#: lib/checkout_op.tcl:229 #, tcl-format msgid "" "Branch '%s' already exists.\n" @@ -877,21 +915,21 @@ msgstr "" "%s ã?«æ?©é??ã??ã?§ã??ã?¾ã??ã??ã??\n" "ã??ã?¼ã?¸ã??å¿?è¦?ã?§ã??ã??" -#: lib/checkout_op.tcl:242 +#: lib/checkout_op.tcl:243 #, tcl-format msgid "Merge strategy '%s' not supported." msgstr "'%s' ã??ã?¼ã?¸æ?¦ç?¥ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??ã??" -#: lib/checkout_op.tcl:261 +#: lib/checkout_op.tcl:262 #, tcl-format msgid "Failed to update '%s'." msgstr "'%s' ã?®æ?´æ?°ã?«å¤±æ??ã??ã?¾ã??ã??ã??" -#: lib/checkout_op.tcl:273 +#: lib/checkout_op.tcl:274 msgid "Staging area (index) is already locked." msgstr "ã?¤ã?³ã??ã??ã?¯ã?¹ã?¯æ?¢ã?«ã?ã??ã?¯ã??ã??ã?¦ã??ã?¾ã??ã??" -#: lib/checkout_op.tcl:288 +#: lib/checkout_op.tcl:289 msgid "" "Last scanned state does not match repository state.\n" "\n" @@ -907,30 +945,30 @@ msgstr "" "\n" "è?ªå??ç??ã?«å??ã?¹ã?ã?£ã?³ã??é??å§?ã??ã?¾ã??ã??\n" -#: lib/checkout_op.tcl:344 +#: lib/checkout_op.tcl:345 #, tcl-format msgid "Updating working directory to '%s'..." msgstr "ä½?æ¥ã??ã?£ã?¬ã?¯ã??ã?ªã?? '%s' ã?«æ?´æ?°ã??ã?¦ã??ã?¾ã??â?¦" -#: lib/checkout_op.tcl:345 +#: lib/checkout_op.tcl:346 msgid "files checked out" msgstr "ã??ã?§ã??ã?¯ã?¢ã?¦ã??ã??ã??ã??ã??ã?¡ã?¤ã?«" -#: lib/checkout_op.tcl:375 +#: lib/checkout_op.tcl:376 #, tcl-format msgid "Aborted checkout of '%s' (file level merging is required)." msgstr "'%s' ã?®ã??ã?§ã??ã?¯ã?¢ã?¦ã??ã??ä¸æ¢ã??ã?¾ã??ã??ï¼?ã??ã?¡ã?¤ã?«æ¯?ã?®ã??ã?¼ã?¸ã??å¿?è¦?ã?§ã??ï¼?ã??" -#: lib/checkout_op.tcl:376 +#: lib/checkout_op.tcl:377 msgid "File level merge required." msgstr "ã??ã?¡ã?¤ã?«æ¯?ã?®ã??ã?¼ã?¸ã??å¿?è¦?ã?§ã??ã??" -#: lib/checkout_op.tcl:380 +#: lib/checkout_op.tcl:381 #, tcl-format msgid "Staying on branch '%s'." msgstr "ã??ã?©ã?³ã?? '%s' ã?«æ»?ã?¾ã??ã?¾ã??ã??" -#: lib/checkout_op.tcl:451 +#: lib/checkout_op.tcl:452 msgid "" "You are no longer on a local branch.\n" "\n" @@ -942,30 +980,30 @@ msgstr "" "ã??ã?©ã?³ã??ä¸?ã?«æ»?ã?¾ã??ã??ã??ã?¨ã??ã?¯ã??ã??ã?®ã??å??é?¢ã??ã??ã??ã??ã?§ã??ã?¯ã?¢ã?¦ã??ã??ã??ã??æ?°è¦?ã??ã?©ã?³" "ã??ã??é??å§?ã??ã?¦ã??ã? ã??ã??ã??" -#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472 +#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 #, tcl-format msgid "Checked out '%s'." msgstr "'%s' ã??ã??ã?§ã??ã?¯ã?¢ã?¦ã??ã??ã?¾ã??ã??" -#: lib/checkout_op.tcl:500 +#: lib/checkout_op.tcl:535 #, tcl-format msgid "Resetting '%s' to '%s' will lose the following commits:" msgstr "'%s' ã?? '%s' ã?«ã?ªã?»ã??ã??ã??ã??ã?¨ã??以ä¸?ã?®ã?³ã??ã??ã??ã??失ã?ªã??ã??ã?¾ã??:" -#: lib/checkout_op.tcl:522 +#: lib/checkout_op.tcl:557 msgid "Recovering lost commits may not be easy." msgstr "失ã?ªã??ã??ã??ã?³ã??ã??ã??ã??å??復ã??ã??ã?®ã?¯ç°¡å??ã?§ã?¯ã??ã??ã?¾ã??ã??ã??" -#: lib/checkout_op.tcl:527 +#: lib/checkout_op.tcl:562 #, tcl-format msgid "Reset '%s'?" msgstr "'%s' ã??ã?ªã?»ã??ã??ã??ã?¾ã??ã??ï¼?" -#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 msgid "Visualize" msgstr "å?¯è¦?å??" -#: lib/checkout_op.tcl:600 +#: lib/checkout_op.tcl:635 #, tcl-format msgid "" "Failed to set current branch.\n" @@ -1009,7 +1047,7 @@ msgstr "" msgid "Git Gui" msgstr "Git GUI" -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382 +#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 msgid "Create New Repository" msgstr "æ?°ã??ã??ã?ªã??ã?¸ã??ã?ªã??ä½?ã??" @@ -1017,7 +1055,7 @@ msgstr "æ?°ã??ã??ã?ªã??ã?¸ã??ã?ªã??ä½?ã??" msgid "New..." msgstr "æ?°è¦?â?¦" -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465 +#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 msgid "Clone Existing Repository" msgstr "æ?¢å?ã?ªã??ã?¸ã??ã?ªã??è¤?製ã??ã??" @@ -1025,7 +1063,7 @@ msgstr "æ?¢å?ã?ªã??ã?¸ã??ã?ªã??è¤?製ã??ã??" msgid "Clone..." msgstr "è¤?製â?¦" -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983 +#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 msgid "Open Existing Repository" msgstr "æ?¢å?ã?ªã??ã?¸ã??ã?ªã??é??ã??" @@ -1041,193 +1079,193 @@ msgstr "æ??è¿?使ã?£ã??ã?ªã??ã?¸ã??ã?ª" msgid "Open Recent Repository:" msgstr "æ??è¿?使ã?£ã??ã?ªã??ã?¸ã??ã?ªã??é??ã??" -#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309 -#: lib/choose_repository.tcl:316 +#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 +#: lib/choose_repository.tcl:320 #, tcl-format msgid "Failed to create repository %s:" msgstr "ã?ªã??ã?¸ã??ã?ª %s ã??ä½?製ã?§ã??ã?¾ã??ã??:" -#: lib/choose_repository.tcl:387 +#: lib/choose_repository.tcl:391 msgid "Directory:" msgstr "ã??ã?£ã?¬ã?¯ã??ã?ª:" -#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544 -#: lib/choose_repository.tcl:1017 +#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 +#: lib/choose_repository.tcl:1052 msgid "Git Repository" msgstr "GIT ã?ªã??ã?¸ã??ã?ª" -#: lib/choose_repository.tcl:442 +#: lib/choose_repository.tcl:448 #, tcl-format msgid "Directory %s already exists." msgstr "ã??ã?£ã?¬ã?¯ã??ã?ª '%s' ã?¯æ?¢ã?«å?å?¨ã??ã?¾ã??ã??" -#: lib/choose_repository.tcl:446 +#: lib/choose_repository.tcl:452 #, tcl-format msgid "File %s already exists." msgstr "ã??ã?¡ã?¤ã?« '%s' ã?¯æ?¢ã?«å?å?¨ã??ã?¾ã??ã??" -#: lib/choose_repository.tcl:460 +#: lib/choose_repository.tcl:466 msgid "Clone" msgstr "è¤?製" -#: lib/choose_repository.tcl:473 +#: lib/choose_repository.tcl:479 msgid "Source Location:" msgstr "ã?½ã?¼ã?¹ã?®ä½?ç½®" -#: lib/choose_repository.tcl:484 +#: lib/choose_repository.tcl:490 msgid "Target Directory:" msgstr "å??ã??ã?£ã?¬ã?¯ã??ã?ª:" -#: lib/choose_repository.tcl:496 +#: lib/choose_repository.tcl:502 msgid "Clone Type:" msgstr "è¤?製æ?¹å¼?:" -#: lib/choose_repository.tcl:502 +#: lib/choose_repository.tcl:508 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "æ¨?æº?(é«?é??ã?»ä¸å??é?·åº¦ã?»ã??ã?¼ã??ã?ªã?³ã?¯)" -#: lib/choose_repository.tcl:508 +#: lib/choose_repository.tcl:514 msgid "Full Copy (Slower, Redundant Backup)" msgstr "å?¨è¤?å??(ä½?é??ã?»å??é?·ã??ã??ã?¯ã?¢ã??ã??)" -#: lib/choose_repository.tcl:514 +#: lib/choose_repository.tcl:520 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "å?±æ??(æ??é«?é??ã?»é??æ?¨å¥¨ã?»ã??ã??ã?¯ã?¢ã??ã??ç?¡ã??)" -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 -#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813 -#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031 +#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 +#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 +#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 #, tcl-format msgid "Not a Git repository: %s" msgstr "Git ã?ªã??ã?¸ã??ã?ªã?§ã?¯ã??ã??ã?¾ã??ã??: %s" -#: lib/choose_repository.tcl:586 +#: lib/choose_repository.tcl:592 msgid "Standard only available for local repository." msgstr "æ¨?æº?æ?¹å¼?ã?¯å??ä¸?è¨?ç®?æ©?ä¸?ã?®ã?ªã??ã?¸ã??ã?ªã?«ã?®ã?¿ä½¿ã??ã?¾ã??ã??" -#: lib/choose_repository.tcl:590 +#: lib/choose_repository.tcl:596 msgid "Shared only available for local repository." msgstr "å?±æ??æ?¹å¼?ã?¯å??ä¸?è¨?ç®?æ©?ä¸?ã?®ã?ªã??ã?¸ã??ã?ªã?«ã?®ã?¿ä½¿ã??ã?¾ã??ã??" -#: lib/choose_repository.tcl:611 +#: lib/choose_repository.tcl:617 #, tcl-format msgid "Location %s already exists." msgstr "'%s' ã?¯æ?¢ã?«å?å?¨ã??ã?¾ã??ã??" -#: lib/choose_repository.tcl:622 +#: lib/choose_repository.tcl:628 msgid "Failed to configure origin" msgstr "origin ã??è¨å®?ã?§ã??ã?¾ã??ã??ã?§ã??ã??" -#: lib/choose_repository.tcl:634 +#: lib/choose_repository.tcl:640 msgid "Counting objects" msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??æ?°ã??ã?¦ã??ã?¾ã??" -#: lib/choose_repository.tcl:635 +#: lib/choose_repository.tcl:641 msgid "buckets" msgstr "ã??ã?±ã??" -#: lib/choose_repository.tcl:659 +#: lib/choose_repository.tcl:665 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" msgstr "objects/info/alternates ã??è¤?å??ã?§ã??ã?¾ã??ã??: %s" -#: lib/choose_repository.tcl:695 +#: lib/choose_repository.tcl:701 #, tcl-format msgid "Nothing to clone from %s." msgstr "%s ã??ã??è¤?製ã??ã??å??容ã?¯ã??ã??ã?¾ã??ã??" -#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911 -#: lib/choose_repository.tcl:923 +#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 +#: lib/choose_repository.tcl:929 msgid "The 'master' branch has not been initialized." msgstr "'master' ã??ã?©ã?³ã??ã??å??æ??å??ã??ã??ã?¦ã??ã?¾ã??ã??" -#: lib/choose_repository.tcl:710 +#: lib/choose_repository.tcl:716 msgid "Hardlinks are unavailable. Falling back to copying." msgstr "ã??ã?¼ã??ã?ªã?³ã?¯ã??ä½?ã??ã?ªã??ã?®ã?§ã??ã?³ã??ã?¼ã??ã?¾ã??" -#: lib/choose_repository.tcl:722 +#: lib/choose_repository.tcl:728 #, tcl-format msgid "Cloning from %s" msgstr "%s ã??ã??è¤?製ã??ã?¦ã??ã?¾ã??" -#: lib/choose_repository.tcl:753 +#: lib/choose_repository.tcl:759 msgid "Copying objects" msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??è¤?å??ã??ã?¦ã??ã?¾ã??" -#: lib/choose_repository.tcl:754 +#: lib/choose_repository.tcl:760 msgid "KiB" msgstr "KiB" -#: lib/choose_repository.tcl:778 +#: lib/choose_repository.tcl:784 #, tcl-format msgid "Unable to copy object: %s" msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??è¤?å??ã?§ã??ã?¾ã??ã??: %s" -#: lib/choose_repository.tcl:788 +#: lib/choose_repository.tcl:794 msgid "Linking objects" msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??é?£çµ?ã??ã?¦ã??ã?¾ã??" -#: lib/choose_repository.tcl:789 +#: lib/choose_repository.tcl:795 msgid "objects" msgstr "ã?ªã??ã?¸ã?§ã?¯ã??" -#: lib/choose_repository.tcl:797 +#: lib/choose_repository.tcl:803 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??ã??ã?¼ã??ã?ªã?³ã?¯ã?§ã??ã?¾ã??ã??: %s" -#: lib/choose_repository.tcl:852 +#: lib/choose_repository.tcl:858 msgid "Cannot fetch branches and objects. See console output for details." msgstr "ã??ã?©ã?³ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??ã??ã?³ã?³ã?½ã?¼ã?«å?ºå??ã??è¦?ã?¦ä¸?ã??ã??" -#: lib/choose_repository.tcl:863 +#: lib/choose_repository.tcl:869 msgid "Cannot fetch tags. See console output for details." msgstr "ã?¿ã?°ã??å??å¾?ã?§ã??ã?¾ã??ã??ã??ã?³ã?³ã?½ã?¼ã?«å?ºå??ã??è¦?ã?¦ä¸?ã??ã??" -#: lib/choose_repository.tcl:887 +#: lib/choose_repository.tcl:893 msgid "Cannot determine HEAD. See console output for details." msgstr "HEAD ã??確å®?ã?§ã??ã?¾ã??ã??ã??ã?³ã?³ã?½ã?¼ã?«å?ºå??ã??è¦?ã?¦ä¸?ã??ã??" -#: lib/choose_repository.tcl:896 +#: lib/choose_repository.tcl:902 #, tcl-format msgid "Unable to cleanup %s" msgstr "%s ã??æ??é?¤ã?§ã??ã?¾ã??ã??" -#: lib/choose_repository.tcl:902 +#: lib/choose_repository.tcl:908 msgid "Clone failed." msgstr "è¤?å??ã?«å¤±æ??ã??ã?¾ã??ã??ã??" -#: lib/choose_repository.tcl:909 +#: lib/choose_repository.tcl:915 msgid "No default branch obtained." msgstr "ã??ã??ã?©ã?¼ã?«ã??ã?»ã??ã?©ã?³ã??ã??å??å¾?ã??ã??ã?¾ã??ã??ã?§ã??ã??" -#: lib/choose_repository.tcl:920 +#: lib/choose_repository.tcl:926 #, tcl-format msgid "Cannot resolve %s as a commit." msgstr "%s ã??ã?³ã??ã??ã??ã?¨ã??ã?¦è§£é??ã?§ã??ã?¾ã??ã??" -#: lib/choose_repository.tcl:932 +#: lib/choose_repository.tcl:938 msgid "Creating working directory" msgstr "ä½?æ¥ã??ã?£ã?¬ã?¯ã??ã?ªã??ä½?æ??ã??ã?¦ã??ã?¾ã??" -#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128 -#: lib/index.tcl:196 +#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 +#: lib/index.tcl:198 msgid "files" msgstr "ã??ã?¡ã?¤ã?«" -#: lib/choose_repository.tcl:962 +#: lib/choose_repository.tcl:968 msgid "Initial file checkout failed." msgstr "å??æ??ã??ã?§ã??ã?¯ã?¢ã?¦ã??ã?«å¤±æ??ã??ã?¾ã??ã??" -#: lib/choose_repository.tcl:978 +#: lib/choose_repository.tcl:1011 msgid "Open" msgstr "é??ã??" -#: lib/choose_repository.tcl:988 +#: lib/choose_repository.tcl:1021 msgid "Repository:" msgstr "ã?ªã??ã?¸ã??ã?ª:" -#: lib/choose_repository.tcl:1037 +#: lib/choose_repository.tcl:1072 #, tcl-format msgid "Failed to open repository %s:" msgstr "ã?ªã??ã?¸ã??ã?ª %s ã??é??ã??ã?¾ã??ã??:" @@ -1298,19 +1336,24 @@ msgstr "" "ç?¾å?¨ã?¯ã?¾ã? ã??ã?¼ã?¸ã?®é??ä¸ã?§ã??ã??å??ã?«ã??ã?®ã??ã?¼ã?¸ã??ä¸æ¢ã??ã?ªã??ã?¨ã??å??ã?®ã?³ã??ã??ã??ã?®è¨?æ£" "ã?¯ã?§ã??ã?¾ã??ã??\n" -#: lib/commit.tcl:49 +#: lib/commit.tcl:48 msgid "Error loading commit data for amend:" msgstr "è¨?æ£ã??ã??ã?³ã??ã??ã??ã?®ã??ã?¼ã?¿ã??èªã??ã?¾ã??ã??:" -#: lib/commit.tcl:76 +#: lib/commit.tcl:75 msgid "Unable to obtain your identity:" msgstr "ã?¦ã?¼ã?¶ã?®æ£ä½?ã??確èª?ã?§ã??ã?¾ã??ã??:" -#: lib/commit.tcl:81 +#: lib/commit.tcl:80 msgid "Invalid GIT_COMMITTER_IDENT:" msgstr "GIT_COMMITTER_IDENT ã??ç?¡å?¹ã?§ã??:" -#: lib/commit.tcl:133 +#: lib/commit.tcl:129 +#, tcl-format +msgid "warning: Tcl does not support encoding '%s'." +msgstr "è¦å??: Tcl ã?¯ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?° '%s' ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??" + +#: lib/commit.tcl:149 msgid "" "Last scanned state does not match repository state.\n" "\n" @@ -1326,7 +1369,7 @@ msgstr "" "\n" "è?ªå??ç??ã?«å??ã?¹ã?ã?£ã?³ã??é??å§?ã??ã?¾ã??ã??\n" -#: lib/commit.tcl:156 +#: lib/commit.tcl:172 #, tcl-format msgid "" "Unmerged files cannot be committed.\n" @@ -1339,7 +1382,7 @@ msgstr "" "ã??ã?¡ã?¤ã?« %s ã?«ã?¯ã??ã?¼ã?¸è¡?çª?ã??æ®?ã?£ã?¦ã??ã?¾ã??ã??ã?¾ã??解決ã??ã?¦ã?³ã??ã??ã??äº?å®?ã?«å? ã??ã??å¿?" "è¦?ã??ã??ã??ã?¾ã??ã??\n" -#: lib/commit.tcl:164 +#: lib/commit.tcl:180 #, tcl-format msgid "" "Unknown file state %s detected.\n" @@ -1350,7 +1393,7 @@ msgstr "" "\n" "ã??ã?¡ã?¤ã?« %s ã?¯æ?¬ã??ã?ã?°ã?©ã? ã?§ã?¯ã?³ã??ã??ã??ã?§ã??ã?¾ã??ã??ã??\n" -#: lib/commit.tcl:172 +#: lib/commit.tcl:188 msgid "" "No changes to commit.\n" "\n" @@ -1360,7 +1403,7 @@ msgstr "" "\n" "æ??ä½?ä¸?ã?¤ã?®å¤?æ?´ã??ã?³ã??ã??ã??äº?å®?ã?«å? ã??ã?¦ã??ã??ã?³ã??ã??ã??ã??ã?¦ä¸?ã??ã??ã??\n" -#: lib/commit.tcl:187 +#: lib/commit.tcl:203 msgid "" "Please supply a commit message.\n" "\n" @@ -1378,45 +1421,40 @@ msgstr "" "- 第ï¼?è¡?: 空ç?½\n" "- æ®?ã??ã?®è¡?: ã?ªã??ã??ã??ã?®å¤?æ?´ã??è?¯ã??å¤?æ?´ã??ã??ã?®èª¬æ??ã??\n" -#: lib/commit.tcl:211 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." -msgstr "è¦å??: Tcl ã?¯ã?¨ã?³ã?³ã?¼ã??ã?£ã?³ã?° '%s' ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??" - -#: lib/commit.tcl:227 +#: lib/commit.tcl:234 msgid "Calling pre-commit hook..." msgstr "ã?³ã??ã??ã??å??ã??ã??ã?¯ã??å®?è¡?ä¸ã?»ã?»ã?»" -#: lib/commit.tcl:242 +#: lib/commit.tcl:249 msgid "Commit declined by pre-commit hook." msgstr "ã?³ã??ã??ã??å??ã??ã??ã?¯ã??ã?³ã??ã??ã??ã??æ??å?¦ã??ã?¾ã??ã??" -#: lib/commit.tcl:265 +#: lib/commit.tcl:272 msgid "Calling commit-msg hook..." msgstr "ã?³ã??ã??ã??ã?»ã?¡ã??ã?»ã?¼ã?¸ã?»ã??ã??ã?¯ã??å®?è¡?ä¸ã?»ã?»ã?»" -#: lib/commit.tcl:280 +#: lib/commit.tcl:287 msgid "Commit declined by commit-msg hook." msgstr "ã?³ã??ã??ã??ã?»ã?¡ã??ã?»ã?¼ã?¸ã?»ã??ã??ã?¯ã??ã?³ã??ã??ã??ã??æ??å?¦ã??ã?¾ã??ã??" -#: lib/commit.tcl:293 +#: lib/commit.tcl:300 msgid "Committing changes..." msgstr "å¤?æ?´ç?¹ã??ã?³ã??ã??ã??ä¸ã?»ã?»ã?»" -#: lib/commit.tcl:309 +#: lib/commit.tcl:316 msgid "write-tree failed:" msgstr "write-tree ã??失æ??ã??ã?¾ã??ã??:" -#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374 +#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 msgid "Commit failed." msgstr "ã?³ã??ã??ã??ã?«å¤±æ??ã??ã?¾ã??ã??ã??" -#: lib/commit.tcl:327 +#: lib/commit.tcl:334 #, tcl-format msgid "Commit %s appears to be corrupt" msgstr "ã?³ã??ã??ã?? %s ã?¯å£?ã??ã?¦ã??ã?¾ã??" -#: lib/commit.tcl:332 +#: lib/commit.tcl:339 msgid "" "No changes to commit.\n" "\n" @@ -1430,19 +1468,19 @@ msgstr "" "\n" "è?ªå??ç??ã?«å??ã?¹ã?ã?£ã?³ã??é??å§?ã??ã?¾ã??ã??\n" -#: lib/commit.tcl:339 +#: lib/commit.tcl:346 msgid "No changes to commit." msgstr "ã?³ã??ã??ã??ã??ã??å¤?æ?´ã??ã??ã??ã?¾ã??ã??ã??" -#: lib/commit.tcl:353 +#: lib/commit.tcl:360 msgid "commit-tree failed:" msgstr "commit-tree ã??失æ??ã??ã?¾ã??ã??:" -#: lib/commit.tcl:373 +#: lib/commit.tcl:381 msgid "update-ref failed:" msgstr "update-ref ã??失æ??ã??ã?¾ã??ã??:" -#: lib/commit.tcl:461 +#: lib/commit.tcl:469 #, tcl-format msgid "Created commit %s: %s" msgstr "ã?³ã??ã??ã?? %s ã??ä½?æ??ã??ã?¾ã??ã??: %s" @@ -1495,20 +1533,19 @@ msgstr "ã??ã?¼ã?¿ã??ã?¼ã?¹å?§ç¸®" msgid "Verifying the object database with fsck-objects" msgstr "fsck-objects ã?§ã?ªã??ã?¸ã?§ã?¯ã??ã?»ã??ã?¼ã?¿ã??ã?¼ã?¹ã??æ¤?証ã??ã?¦ã??ã?¾ã??" -#: lib/database.tcl:108 +#: lib/database.tcl:107 #, tcl-format msgid "" "This repository currently has approximately %i loose objects.\n" "\n" "To maintain optimal performance it is strongly recommended that you compress " -"the database when more than %i loose objects exist.\n" +"the database.\n" "\n" "Compress the database now?" msgstr "" "ã??ã?®ã?ªã??ã?¸ã??ã?ªã?«ã?¯ã??ã??ã??ã?? %i å??ã?®å??å?¥ã?ªã??ã?¸ã?§ã?¯ã??ã??ã??ã??ã?¾ã??\n" "\n" -"æ??é?©ã?ªæ?§è?½ã??ä¿?ã?¤ã??ã??ã?«ã??%i å??以ä¸?ã?®å??å?¥ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?ã??æ¯?ã?«ã??ã?¼ã?¿ã??ã?¼ã?¹ã??å?§" -"縮ã??ã??ã??ã?¨ã??æ?¨å¥¨ã??ã?¾ã??\n" +"æ??é?©ã?ªæ?§è?½ã??ä¿?ã?¤ã??ã??ã?«ã??ã??ã?¼ã?¿ã??ã?¼ã?¹ã??å?§ç¸®ã??ã??ã??ã?¨ã??æ?¨å¥¨ã??ã?¾ã??\n" "\n" "ã??ã?¼ã?¿ã??ã?¼ã?¹ã??å?§ç¸®ã??ã?¾ã??ã??ï¼?" @@ -1517,7 +1554,7 @@ msgstr "" msgid "Invalid date from Git: %s" msgstr "Git ã??ã??å?ºã??ç?¡å?¹ã?ªæ?¥ä»?: %s" -#: lib/diff.tcl:59 +#: lib/diff.tcl:64 #, tcl-format msgid "" "No differences detected.\n" @@ -1539,12 +1576,12 @@ msgstr "" "\n" "å??æ§?ã?ªç?¶æ??ã?®ã??ã?¡ã?¤ã?«ã??æ?¢ã??ã??ã??ã?«ã??è?ªå??ç??ã?«å??ã?¹ã?ã?£ã?³ã??é??å§?ã??ã?¾ã??ã??" -#: lib/diff.tcl:99 +#: lib/diff.tcl:104 #, tcl-format msgid "Loading diff of %s..." msgstr "%s ã?®å¤?æ?´ç?¹ã??ã?ã?¼ã??ä¸â?¦" -#: lib/diff.tcl:120 +#: lib/diff.tcl:125 msgid "" "LOCAL: deleted\n" "REMOTE:\n" @@ -1552,7 +1589,7 @@ msgstr "" "LOCAL: å??é?¤\n" "Remote:\n" -#: lib/diff.tcl:125 +#: lib/diff.tcl:130 msgid "" "REMOTE: deleted\n" "LOCAL:\n" @@ -1560,32 +1597,32 @@ msgstr "" "REMOTE: å??é?¤\n" "LOCAL:\n" -#: lib/diff.tcl:132 +#: lib/diff.tcl:137 msgid "LOCAL:\n" msgstr "LOCAL:\n" -#: lib/diff.tcl:135 +#: lib/diff.tcl:140 msgid "REMOTE:\n" msgstr "REMOTE\n" -#: lib/diff.tcl:197 lib/diff.tcl:296 +#: lib/diff.tcl:202 lib/diff.tcl:319 #, tcl-format msgid "Unable to display %s" msgstr "%s ã??表示ã?§ã??ã?¾ã??ã??" -#: lib/diff.tcl:198 +#: lib/diff.tcl:203 msgid "Error loading file:" msgstr "ã??ã?¡ã?¤ã?«ã??èªã??é??ã?®ã?¨ã?©ã?¼ã?§ã??:" -#: lib/diff.tcl:205 +#: lib/diff.tcl:210 msgid "Git Repository (subproject)" msgstr "Git ã?ªã??ã?¸ã??ã?ª(ã?µã??ã??ã?ã?¸ã?§ã?¯ã??)" -#: lib/diff.tcl:217 +#: lib/diff.tcl:222 msgid "* Binary file (not showing content)." msgstr "* ã??ã?¤ã??ã?ªã??ã?¡ã?¤ã?«(å??容ã?¯è¡¨ç¤ºã??ã?¾ã??ã??)" -#: lib/diff.tcl:222 +#: lib/diff.tcl:227 #, tcl-format msgid "" "* Untracked file is %d bytes.\n" @@ -1594,7 +1631,7 @@ msgstr "" "* 管ç??å¤?ã?®ã??ã?¡ã?¤ã?«ã?®å¤§ã??ã??ã?¯ %d ã??ã?¤ã??ã?§ã??ã??\n" "* æ??å??ã?® %d ã??ã?¤ã??ã? ã??表示ã??ã?¦ã??ã?¾ã??ã??\n" -#: lib/diff.tcl:228 +#: lib/diff.tcl:233 #, tcl-format msgid "" "\n" @@ -1606,19 +1643,19 @@ msgstr "" "* %s ã?¯ç®¡ç??å¤?ã?®ã??ã?¡ã?¤ã?«ã??ã??ã??ã?§å??ã??ã??ã?¨ã??ã?¾ã??ã??ã??\n" "* å?¨ä½?ã??è¦?ã??ã?«ã?¯å¤?é?¨ã?¨ã??ã?£ã?¿ã??使ã?£ã?¦ã??ã? ã??ã??ã??\n" -#: lib/diff.tcl:436 +#: lib/diff.tcl:482 msgid "Failed to unstage selected hunk." msgstr "é?¸æ??ã??ã??ã??ã??ã??ã??ã??ã?³ã??ã??ã??äº?å®?ã??ã??å¤?ã??ã?¾ã??ã??ã??" -#: lib/diff.tcl:443 +#: lib/diff.tcl:489 msgid "Failed to stage selected hunk." msgstr "é?¸æ??ã??ã??ã??ã??ã??ã??ã??ã?³ã??ã??ã??äº?å®?ã?«å? ã??ã??ã??ã?¾ã??ã??ã??" -#: lib/diff.tcl:509 +#: lib/diff.tcl:568 msgid "Failed to unstage selected line." msgstr "é?¸æ??ã??ã??ã??ã??ã??ã??è¡?ã??ã?³ã??ã??ã??äº?å®?ã??ã??å¤?ã??ã?¾ã??ã??ã??" -#: lib/diff.tcl:517 +#: lib/diff.tcl:576 msgid "Failed to stage selected line." msgstr "é?¸æ??ã??ã??ã??ã??ã??ã??è¡?ã??ã?³ã??ã??ã??äº?å®?ã?«å? ã??ã??ã??ã?¾ã??ã??ã??" @@ -1655,7 +1692,7 @@ msgstr "ã?¤ã?³ã??ã??ã?¯ã?¹ã??ã?ã??ã?¯ã?§ã??ã?¾ã??ã??" msgid "Index Error" msgstr "ç´¢å¼?ã?¨ã?©ã?¼" -#: lib/index.tcl:21 +#: lib/index.tcl:17 msgid "" "Updating the Git index failed. A rescan will be automatically started to " "resynchronize git-gui." @@ -1663,7 +1700,7 @@ msgstr "" "GIT ã?¤ã?³ã??ã??ã?¯ã?¹ã?®æ?´æ?°ã??失æ??ã??ã?¾ã??ã??ã??git-gui ã?¨å??æ??ã??ã?¨ã??ã??ã??ã?«å??ã?¹ã?ã?£ã?³ã??" "ã?¾ã??ã??" -#: lib/index.tcl:27 +#: lib/index.tcl:28 msgid "Continue" msgstr "ç¶?è¡?" @@ -1671,43 +1708,43 @@ msgstr "ç¶?è¡?" msgid "Unlock Index" msgstr "ã?¤ã?³ã??ã??ã?¯ã?¹ã?®ã?ã??ã?¯è§£é?¤" -#: lib/index.tcl:287 +#: lib/index.tcl:289 #, tcl-format msgid "Unstaging %s from commit" msgstr "ã?³ã??ã??ã??ã??ã?? '%s' ã??é??ã??ã??" -#: lib/index.tcl:326 +#: lib/index.tcl:328 msgid "Ready to commit." msgstr "ã?³ã??ã??ã??æº?å??å®?äº?" -#: lib/index.tcl:339 +#: lib/index.tcl:341 #, tcl-format msgid "Adding %s" msgstr "ã?³ã??ã??ã??ã?« %s ã??å? ã??ã?¦ã??ã?¾ã??" -#: lib/index.tcl:396 +#: lib/index.tcl:398 #, tcl-format msgid "Revert changes in file %s?" msgstr "ã??ã?¡ã?¤ã?« %s ã?«ã??ã??å¤?æ?´ã??å??ã?«æ?»ã??ã?¾ã??ã??ï¼?" -#: lib/index.tcl:398 +#: lib/index.tcl:400 #, tcl-format msgid "Revert changes in these %i files?" msgstr "ã??ã??ã?? %i å??ã?®ã??ã?¡ã?¤ã?«ã?«ã??ã??å¤?æ?´ã??å??ã?«æ?»ã??ã?¾ã??ã??ï¼?" -#: lib/index.tcl:406 +#: lib/index.tcl:408 msgid "Any unstaged changes will be permanently lost by the revert." msgstr "å¤?æ?´ã??å??ã?«æ?»ã??ã?¨ã?³ã??ã??ã??äº?å®?ã??ã?¦ã??ã?ªã??å¤?æ?´ã?¯å?¨ã?¦å¤±ã??ã??ã?¾ã??ã??" -#: lib/index.tcl:409 +#: lib/index.tcl:411 msgid "Do Nothing" msgstr "ä½?ã??ã??ã?ªã??" -#: lib/index.tcl:427 +#: lib/index.tcl:429 msgid "Reverting selected files" msgstr "é?¸æ??ã??ã??ã??ã??ã?¡ã?¤ã?«ã?«ã??ã??å¤?æ?´ã??å??ã?«æ?»ã??ã?¾ã??" -#: lib/index.tcl:431 +#: lib/index.tcl:433 #, tcl-format msgid "Reverting %s" msgstr "%s ã?«ã??ã??å¤?æ?´ã??å??ã?«æ?»ã??ã?¾ã??" @@ -1883,7 +1920,8 @@ msgstr "" #: lib/mergetool.tcl:45 #, tcl-format msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "ã??ã?¡ã?¤ã?« %s ã?«ã?¯è§£æ±ºã??ã?¦ã??ã?ªã??競å??é?¨å??ã??ã?¾ã? ã??ã??ã??ã??ã?§ã??ã??ã??ã??ã??ã?§ã??ã???" +msgstr "" +"ã??ã?¡ã?¤ã?« %s ã?«ã?¯è§£æ±ºã??ã?¦ã??ã?ªã??競å??é?¨å??ã??ã?¾ã? ã??ã??ã??ã??ã?§ã??ã??ã??ã??ã??ã?§ã??ã???" #: lib/mergetool.tcl:60 #, tcl-format @@ -2141,7 +2179,8 @@ msgstr "%s ã??ã??ã??ã?§ã??ã??ã??ã?¦ã??ã?¾ã??" msgid "Do not know how to initialize repository at location '%s'." msgstr "ã?ªã??ã?¸ã??ã?ª '%s' ã??å??æ??å??ã?§ã??ã?¾ã??ã??ã??" -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71 +#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 +#: lib/transport.tcl:81 #, tcl-format msgid "push %s" msgstr "%s ã??ã??ã??ã?·ã?¥" @@ -2159,11 +2198,11 @@ msgstr "é? é??ã?§ã??ã?©ã?³ã??å??é?¤" msgid "From Repository" msgstr "å??ã?®ã?ªã??ã?¸ã??ã?ª" -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 msgid "Remote:" msgstr "ã?ªã?¢ã?¼ã??:" -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 msgid "Arbitrary Location:" msgstr "ä»»æ??ã?®ä½?ç½®:" @@ -2179,10 +2218,6 @@ msgstr "æ?¡ä»¶ä»?ã?§å??é?¤" msgid "Merged Into:" msgstr "ã??ã?¼ã?¸å??:" -#: lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "ç?¡æ?¡ä»¶ï¼?ã??ã?¼ã?¸æ¤?æ?»ã??ã??ã?ªã??ï¼?" - #: lib/remote_branch_delete.tcl:152 msgid "A branch is required for 'Merged Into'." msgstr "'ã??ã?¼ã?¸å??' ã?«ã?¯ã??ã?©ã?³ã??ã??å¿?è¦?ã?§ã??ã??" @@ -2211,26 +2246,16 @@ msgstr "" msgid "Please select one or more branches to delete." msgstr "å??é?¤ã??ã??ã??ã?©ã?³ã??ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??" -#: lib/remote_branch_delete.tcl:216 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"å??é?¤ã??ã??ã??ã?©ã?³ã??ã??å??復ã??ã??ã?®ã?¯å?°é?£ã?§ã??ã??\n" -"\n" -"é?¸æ??ã??ã??ã??ã?©ã?³ã??ã??å??é?¤ã??ã?¦è?¯ã??ã?§ã??ã??ï¼?" - #: lib/remote_branch_delete.tcl:226 #, tcl-format msgid "Deleting branches from %s" msgstr "%s ã??ã??ã??ã?©ã?³ã??ã??å??é?¤ã??ã?¦ã??ã?¾ã??ã??" -#: lib/remote_branch_delete.tcl:286 +#: lib/remote_branch_delete.tcl:292 msgid "No repository selected." msgstr "ã?ªã??ã?¸ã??ã?ªã??é?¸æ??ã??ã??ã?¦ã??ã?¾ã??ã??ã??" -#: lib/remote_branch_delete.tcl:291 +#: lib/remote_branch_delete.tcl:297 #, tcl-format msgid "Scanning %s..." msgstr "%s ã??ã?¹ã?ã?£ã?³ã??ã?¦ã??ã?¾ã??â?¦" @@ -2251,11 +2276,11 @@ msgstr "å??" msgid "Case-Sensitive" msgstr "大æ??å?å°?æ??å?ã??å?ºå?¥" -#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 +#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 msgid "Cannot write shortcut:" msgstr "ã?·ã?§ã?¼ã??ã?«ã??ã??ã??æ?¸ã??ã?¾ã??ã??:" -#: lib/shortcut.tcl:136 +#: lib/shortcut.tcl:137 msgid "Cannot write icon:" msgstr "ã?¢ã?¤ã?³ã?³ã??æ?¸ã??ã?¾ã??ã??:" @@ -2501,30 +2526,30 @@ msgstr "%s ã?¸ã??ã?©ã?¼ã??ã?¦ã??ã?¾ã??" msgid "Pushing %s %s to %s" msgstr "%3$s ã?¸ %1$s %2$s ã??ã??ã??ã?·ã?¥ã??ã?¦ã??ã?¾ã??" -#: lib/transport.tcl:89 +#: lib/transport.tcl:100 msgid "Push Branches" msgstr "ã??ã?©ã?³ã??ã??ã??ã??ã?·ã?¥" -#: lib/transport.tcl:103 +#: lib/transport.tcl:114 msgid "Source Branches" msgstr "å??ã?®ã??ã?©ã?³ã??" -#: lib/transport.tcl:120 +#: lib/transport.tcl:131 msgid "Destination Repository" msgstr "é??ã??å??ã?ªã??ã?¸ã??ã?ª" -#: lib/transport.tcl:158 +#: lib/transport.tcl:169 msgid "Transfer Options" msgstr "é??ä¿¡ã?ªã??ã?·ã?§ã?³" -#: lib/transport.tcl:160 +#: lib/transport.tcl:171 msgid "Force overwrite existing branch (may discard changes)" msgstr "æ?¢å?ã??ã?©ã?³ã??ã??ä¸?æ?¸ã??(å¤?æ?´ã??ç ´æ£?ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??)" -#: lib/transport.tcl:164 +#: lib/transport.tcl:175 msgid "Use thin pack (for slow network connections)" msgstr "Thin Pack ã??使ã??ï¼?é??ã??ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ï¼?" -#: lib/transport.tcl:168 +#: lib/transport.tcl:179 msgid "Include tags" msgstr "ã?¿ã?°ã??å?«ã??ã??"