msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-11 17:28+0200\n"
+"POT-Creation-Date: 2008-08-02 14:45-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: git-gui.sh:531
+#: git-gui.sh:41 git-gui.sh:688 git-gui.sh:702 git-gui.sh:715 git-gui.sh:798
+#: git-gui.sh:817
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:644
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr ""
+
+#: git-gui.sh:674
+msgid "Main Font"
+msgstr ""
+
+#: git-gui.sh:675
+msgid "Diff/Console Font"
+msgstr ""
+
+#: git-gui.sh:689
msgid "Cannot find git in PATH."
msgstr ""
-#: git-gui.sh:550
+#: git-gui.sh:716
msgid "Cannot parse Git version string:"
msgstr ""
-#: git-gui.sh:567
+#: git-gui.sh:734
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
"Assume '%s' is version 1.5.0?\n"
msgstr ""
-#: git-gui.sh:689
-msgid "Cannot find the git directory:"
+#: git-gui.sh:972
+msgid "Git directory not found:"
msgstr ""
-#: git-gui.sh:697
-msgid "Git directory not found:"
+#: git-gui.sh:979
+msgid "Cannot move to top of working directory:"
msgstr ""
-#: git-gui.sh:703
+#: git-gui.sh:986
msgid "Cannot use funny .git directory:"
msgstr ""
-#: git-gui.sh:708
+#: git-gui.sh:991
msgid "No working directory"
msgstr ""
-#: git-gui.sh:854
+#: git-gui.sh:1138 lib/checkout_op.tcl:305
msgid "Refreshing file status..."
msgstr ""
-#: git-gui.sh:891
+#: git-gui.sh:1194
msgid "Scanning for modified files ..."
msgstr ""
-#: git-gui.sh:1057 lib/browser.tcl:247
+#: git-gui.sh:1369 lib/browser.tcl:246
msgid "Ready."
msgstr ""
-#: git-gui.sh:1322
+#: git-gui.sh:1635
msgid "Unmodified"
msgstr ""
-#: git-gui.sh:1324
+#: git-gui.sh:1637
msgid "Modified, not staged"
msgstr ""
-#: git-gui.sh:1325 git-gui.sh:1330
+#: git-gui.sh:1638 git-gui.sh:1643
msgid "Staged for commit"
msgstr ""
-#: git-gui.sh:1326 git-gui.sh:1331
+#: git-gui.sh:1639 git-gui.sh:1644
msgid "Portions staged for commit"
msgstr ""
-#: git-gui.sh:1327 git-gui.sh:1332
+#: git-gui.sh:1640 git-gui.sh:1645
msgid "Staged for commit, missing"
msgstr ""
-#: git-gui.sh:1329
+#: git-gui.sh:1642
msgid "Untracked, not staged"
msgstr ""
-#: git-gui.sh:1334
+#: git-gui.sh:1647
msgid "Missing"
msgstr ""
-#: git-gui.sh:1335
+#: git-gui.sh:1648
msgid "Staged for removal"
msgstr ""
-#: git-gui.sh:1336
+#: git-gui.sh:1649
msgid "Staged for removal, still present"
msgstr ""
-#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341
+#: git-gui.sh:1651 git-gui.sh:1652 git-gui.sh:1653 git-gui.sh:1654
msgid "Requires merge resolution"
msgstr ""
-#: git-gui.sh:1383
+#: git-gui.sh:1689
msgid "Starting gitk... please wait..."
msgstr ""
-#: git-gui.sh:1392
-#, tcl-format
-msgid ""
-"Unable to start gitk:\n"
-"\n"
-"%s does not exist"
-msgstr ""
-
-#: git-gui.sh:1609
-#, tcl-format
-msgid "Invalid font specified in gui.%s:"
-msgstr ""
-
-#: git-gui.sh:1634
-msgid "Main Font"
-msgstr ""
-
-#: git-gui.sh:1635
-msgid "Diff/Console Font"
+#: git-gui.sh:1698
+msgid "Couldn't find gitk in PATH"
msgstr ""
-#: git-gui.sh:1649
+#: git-gui.sh:1948 lib/choose_repository.tcl:36
msgid "Repository"
msgstr ""
-#: git-gui.sh:1650
+#: git-gui.sh:1949
msgid "Edit"
msgstr ""
-#: git-gui.sh:1652
+#: git-gui.sh:1951 lib/choose_rev.tcl:561
msgid "Branch"
msgstr ""
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
-msgid "Commit"
+#: git-gui.sh:1954 lib/choose_rev.tcl:548
+msgid "Commit@@noun"
msgstr ""
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:1957 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
msgid "Merge"
msgstr ""
-#: git-gui.sh:1659
-msgid "Fetch"
-msgstr ""
-
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
-msgid "Push"
+#: git-gui.sh:1958 lib/choose_rev.tcl:557
+msgid "Remote"
msgstr ""
-#: git-gui.sh:1669
+#: git-gui.sh:1967
msgid "Browse Current Branch's Files"
msgstr ""
-#: git-gui.sh:1673
+#: git-gui.sh:1971
msgid "Browse Branch Files..."
msgstr ""
-#: git-gui.sh:1678
+#: git-gui.sh:1976
msgid "Visualize Current Branch's History"
msgstr ""
-#: git-gui.sh:1682
+#: git-gui.sh:1980
msgid "Visualize All Branch History"
msgstr ""
-#: git-gui.sh:1689
+#: git-gui.sh:1987
#, tcl-format
msgid "Browse %s's Files"
msgstr ""
-#: git-gui.sh:1691
+#: git-gui.sh:1989
#, tcl-format
msgid "Visualize %s's History"
msgstr ""
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:1994 lib/database.tcl:27 lib/database.tcl:67
msgid "Database Statistics"
msgstr ""
-#: git-gui.sh:1699 lib/database.tcl:34
+#: git-gui.sh:1997 lib/database.tcl:34
msgid "Compress Database"
msgstr ""
-#: git-gui.sh:1702
+#: git-gui.sh:2000
msgid "Verify Database"
msgstr ""
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
-#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
+#: git-gui.sh:2007 git-gui.sh:2011 git-gui.sh:2015 lib/shortcut.tcl:7
+#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
msgid "Create Desktop Icon"
msgstr ""
-#: git-gui.sh:1722
+#: git-gui.sh:2023 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
msgid "Quit"
msgstr ""
-#: git-gui.sh:1729
+#: git-gui.sh:2031
msgid "Undo"
msgstr ""
-#: git-gui.sh:1732
+#: git-gui.sh:2034
msgid "Redo"
msgstr ""
-#: git-gui.sh:1736 git-gui.sh:2222
+#: git-gui.sh:2038 git-gui.sh:2545
msgid "Cut"
msgstr ""
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
+#: git-gui.sh:2041 git-gui.sh:2548 git-gui.sh:2622 git-gui.sh:2715
#: lib/console.tcl:69
msgid "Copy"
msgstr ""
-#: git-gui.sh:1742 git-gui.sh:2228
+#: git-gui.sh:2044 git-gui.sh:2551
msgid "Paste"
msgstr ""
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
+#: git-gui.sh:2047 git-gui.sh:2554 lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr ""
-#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71
+#: git-gui.sh:2051 git-gui.sh:2558 git-gui.sh:2719 lib/console.tcl:71
msgid "Select All"
msgstr ""
-#: git-gui.sh:1758
+#: git-gui.sh:2060
msgid "Create..."
msgstr ""
-#: git-gui.sh:1764
+#: git-gui.sh:2066
msgid "Checkout..."
msgstr ""
-#: git-gui.sh:1770
+#: git-gui.sh:2072
msgid "Rename..."
msgstr ""
-#: git-gui.sh:1775 git-gui.sh:1873
+#: git-gui.sh:2077 git-gui.sh:2187
msgid "Delete..."
msgstr ""
-#: git-gui.sh:1780
+#: git-gui.sh:2082
msgid "Reset..."
msgstr ""
-#: git-gui.sh:1792 git-gui.sh:2169
+#: git-gui.sh:2094 git-gui.sh:2491
msgid "New Commit"
msgstr ""
-#: git-gui.sh:1800 git-gui.sh:2176
+#: git-gui.sh:2102 git-gui.sh:2498
msgid "Amend Last Commit"
msgstr ""
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2111 git-gui.sh:2458 lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr ""
-#: git-gui.sh:1815
+#: git-gui.sh:2117
msgid "Stage To Commit"
msgstr ""
-#: git-gui.sh:1820
+#: git-gui.sh:2123
msgid "Stage Changed Files To Commit"
msgstr ""
-#: git-gui.sh:1826
+#: git-gui.sh:2129
msgid "Unstage From Commit"
msgstr ""
-#: git-gui.sh:1831 lib/index.tcl:376
+#: git-gui.sh:2134 lib/index.tcl:395
msgid "Revert Changes"
msgstr ""
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
+#: git-gui.sh:2141 git-gui.sh:2702
+msgid "Show Less Context"
+msgstr ""
+
+#: git-gui.sh:2145 git-gui.sh:2706
+msgid "Show More Context"
+msgstr ""
+
+#: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
msgid "Sign Off"
msgstr ""
-#: git-gui.sh:1853
+#: git-gui.sh:2155 git-gui.sh:2474
+msgid "Commit@@verb"
+msgstr ""
+
+#: git-gui.sh:2166
msgid "Local Merge..."
msgstr ""
-#: git-gui.sh:1858
+#: git-gui.sh:2171
msgid "Abort Merge..."
msgstr ""
-#: git-gui.sh:1870
+#: git-gui.sh:2183
msgid "Push..."
msgstr ""
-#: git-gui.sh:1880
-msgid "Apple"
-msgstr ""
-
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
+#: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
#, tcl-format
msgid "About %s"
msgstr ""
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
+#: git-gui.sh:2201
+msgid "Preferences..."
+msgstr ""
+
+#: git-gui.sh:2209 git-gui.sh:2740
msgid "Options..."
msgstr ""
-#: git-gui.sh:1897
+#: git-gui.sh:2215 lib/choose_repository.tcl:47
msgid "Help"
msgstr ""
-#: git-gui.sh:1938
+#: git-gui.sh:2256
msgid "Online Documentation"
msgstr ""
-#: git-gui.sh:2054
+#: git-gui.sh:2340
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+
+#: git-gui.sh:2373
msgid "Current Branch:"
msgstr ""
-#: git-gui.sh:2075
-msgid "Staged Changes (Will Be Committed)"
+#: git-gui.sh:2394
+msgid "Staged Changes (Will Commit)"
msgstr ""
-#: git-gui.sh:2095
-msgid "Unstaged Changes (Will Not Be Committed)"
+#: git-gui.sh:2414
+msgid "Unstaged Changes"
msgstr ""
-#: git-gui.sh:2142
+#: git-gui.sh:2464
msgid "Stage Changed"
msgstr ""
-#: git-gui.sh:2188
+#: git-gui.sh:2480 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr ""
+
+#: git-gui.sh:2510
msgid "Initial Commit Message:"
msgstr ""
-#: git-gui.sh:2189
+#: git-gui.sh:2511
msgid "Amended Commit Message:"
msgstr ""
-#: git-gui.sh:2190
+#: git-gui.sh:2512
msgid "Amended Initial Commit Message:"
msgstr ""
-#: git-gui.sh:2191
+#: git-gui.sh:2513
msgid "Amended Merge Commit Message:"
msgstr ""
-#: git-gui.sh:2192
+#: git-gui.sh:2514
msgid "Merge Commit Message:"
msgstr ""
-#: git-gui.sh:2193
+#: git-gui.sh:2515
msgid "Commit Message:"
msgstr ""
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
+#: git-gui.sh:2561 git-gui.sh:2723 lib/console.tcl:73
msgid "Copy All"
msgstr ""
-#: git-gui.sh:2262 lib/blame.tcl:104
+#: git-gui.sh:2585 lib/blame.tcl:100
msgid "File:"
msgstr ""
-#: git-gui.sh:2364
-msgid "Refresh"
+#: git-gui.sh:2691
+msgid "Apply/Reverse Hunk"
msgstr ""
-#: git-gui.sh:2385
-msgid "Apply/Reverse Hunk"
+#: git-gui.sh:2696
+msgid "Apply/Reverse Line"
+msgstr ""
+
+#: git-gui.sh:2711
+msgid "Refresh"
msgstr ""
-#: git-gui.sh:2391
+#: git-gui.sh:2732
msgid "Decrease Font Size"
msgstr ""
-#: git-gui.sh:2395
+#: git-gui.sh:2736
msgid "Increase Font Size"
msgstr ""
-#: git-gui.sh:2400
-msgid "Show Less Context"
+#: git-gui.sh:2747
+msgid "Unstage Hunk From Commit"
msgstr ""
-#: git-gui.sh:2407
-msgid "Show More Context"
+#: git-gui.sh:2748
+msgid "Unstage Line From Commit"
msgstr ""
-#: git-gui.sh:2422
-msgid "Unstage Hunk From Commit"
+#: git-gui.sh:2750
+msgid "Stage Hunk For Commit"
msgstr ""
-#: git-gui.sh:2426 git-gui.sh:2430
-msgid "Stage Hunk For Commit"
+#: git-gui.sh:2751
+msgid "Stage Line For Commit"
msgstr ""
-#: git-gui.sh:2440
+#: git-gui.sh:2771
msgid "Initializing..."
msgstr ""
-#: lib/blame.tcl:77
+#: git-gui.sh:2876
+#, tcl-format
+msgid ""
+"Possible environment issues exist.\n"
+"\n"
+"The following environment variables are probably\n"
+"going to be ignored by any Git subprocess run\n"
+"by %s:\n"
+"\n"
+msgstr ""
+
+#: git-gui.sh:2906
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+
+#: git-gui.sh:2911
+#, tcl-format
+msgid ""
+"\n"
+"\n"
+"A good replacement for %s\n"
+"is placing values for the user.name and\n"
+"user.email settings into your personal\n"
+"~/.gitconfig file.\n"
+msgstr ""
+
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr ""
+
+#: lib/blame.tcl:70
msgid "File Viewer"
msgstr ""
-#: lib/blame.tcl:81
+#: lib/blame.tcl:74
msgid "Commit:"
msgstr ""
-#: lib/blame.tcl:249
+#: lib/blame.tcl:257
msgid "Copy Commit"
msgstr ""
-#: lib/blame.tcl:369
+#: lib/blame.tcl:260
+msgid "Do Full Copy Detection"
+msgstr ""
+
+#: lib/blame.tcl:388
#, tcl-format
msgid "Reading %s..."
msgstr ""
+#: lib/blame.tcl:492
+msgid "Loading copy/move tracking annotations..."
+msgstr ""
+
+#: lib/blame.tcl:512
+msgid "lines annotated"
+msgstr ""
+
+#: lib/blame.tcl:704
+msgid "Loading original location annotations..."
+msgstr ""
+
+#: lib/blame.tcl:707
+msgid "Annotation complete."
+msgstr ""
+
+#: lib/blame.tcl:737
+msgid "Busy"
+msgstr ""
+
+#: lib/blame.tcl:738
+msgid "Annotation process is already running."
+msgstr ""
+
+#: lib/blame.tcl:777
+msgid "Running thorough copy detection..."
+msgstr ""
+
+#: lib/blame.tcl:827
+msgid "Loading annotation..."
+msgstr ""
+
+#: lib/blame.tcl:883
+msgid "Author:"
+msgstr ""
+
+#: lib/blame.tcl:887
+msgid "Committer:"
+msgstr ""
+
+#: lib/blame.tcl:892
+msgid "Original File:"
+msgstr ""
+
+#: lib/blame.tcl:1006
+msgid "Originally By:"
+msgstr ""
+
+#: lib/blame.tcl:1012
+msgid "In File:"
+msgstr ""
+
+#: lib/blame.tcl:1017
+msgid "Copied Or Moved Here By:"
+msgstr ""
+
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
msgid "Checkout Branch"
msgstr ""
msgstr ""
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283
-#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172
-#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92
+#: 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:171
+#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
msgid "Cancel"
msgstr ""
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
msgid "Revision"
msgstr ""
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
-#: lib/option.tcl:274
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:244
msgid "Options"
msgstr ""
msgid "Create New Branch"
msgstr ""
-#: lib/branch_create.tcl:31
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
msgid "Create"
msgstr ""
msgid "Fast Forward Only"
msgstr ""
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
msgid "Reset"
msgstr ""
msgid "Please select a branch to rename."
msgstr ""
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201
#, tcl-format
msgid "Branch '%s' already exists."
msgstr ""
msgid "File Browser"
msgstr ""
-#: lib/browser.tcl:127 lib/browser.tcl:144
+#: lib/browser.tcl:126 lib/browser.tcl:143
#, tcl-format
msgid "Loading %s..."
msgstr ""
-#: lib/browser.tcl:188
+#: lib/browser.tcl:187
msgid "[Up To Parent]"
msgstr ""
-#: lib/browser.tcl:268 lib/browser.tcl:274
+#: lib/browser.tcl:267 lib/browser.tcl:273
msgid "Browse Branch Files"
msgstr ""
-#: lib/browser.tcl:279
+#: lib/browser.tcl:278 lib/choose_repository.tcl:387
+#: lib/choose_repository.tcl:472 lib/choose_repository.tcl:482
+#: lib/choose_repository.tcl:985
msgid "Browse"
msgstr ""
-#: lib/checkout_op.tcl:79
+#: lib/checkout_op.tcl:84
#, tcl-format
msgid "Fetching %s from %s"
msgstr ""
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:132
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr ""
+
+#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
msgid "Close"
msgstr ""
-#: lib/checkout_op.tcl:169
+#: lib/checkout_op.tcl:174
#, tcl-format
msgid "Branch '%s' does not exist."
msgstr ""
-#: lib/checkout_op.tcl:206
+#: lib/checkout_op.tcl:193
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
+msgstr ""
+
+#: lib/checkout_op.tcl:228
#, tcl-format
msgid ""
"Branch '%s' already exists.\n"
"A merge is required."
msgstr ""
-#: lib/checkout_op.tcl:220
+#: lib/checkout_op.tcl:242
#, tcl-format
msgid "Merge strategy '%s' not supported."
msgstr ""
-#: lib/checkout_op.tcl:239
+#: lib/checkout_op.tcl:261
#, tcl-format
msgid "Failed to update '%s'."
msgstr ""
-#: lib/checkout_op.tcl:251
+#: lib/checkout_op.tcl:273
msgid "Staging area (index) is already locked."
msgstr ""
-#: lib/checkout_op.tcl:266
+#: lib/checkout_op.tcl:288
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
"The rescan will be automatically started now.\n"
msgstr ""
-#: lib/checkout_op.tcl:353
+#: lib/checkout_op.tcl:344
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr ""
+
+#: lib/checkout_op.tcl:345
+msgid "files checked out"
+msgstr ""
+
+#: lib/checkout_op.tcl:375
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
msgstr ""
-#: lib/checkout_op.tcl:354
+#: lib/checkout_op.tcl:376
msgid "File level merge required."
msgstr ""
-#: lib/checkout_op.tcl:358
+#: lib/checkout_op.tcl:380
#, tcl-format
msgid "Staying on branch '%s'."
msgstr ""
-#: lib/checkout_op.tcl:429
+#: lib/checkout_op.tcl:451
msgid ""
"You are no longer on a local branch.\n"
"\n"
"Checkout'."
msgstr ""
-#: lib/checkout_op.tcl:478
+#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
#, tcl-format
-msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgid "Checked out '%s'."
msgstr ""
#: lib/checkout_op.tcl:500
+#, tcl-format
+msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgstr ""
+
+#: lib/checkout_op.tcl:522
msgid "Recovering lost commits may not be easy."
msgstr ""
-#: lib/checkout_op.tcl:505
+#: lib/checkout_op.tcl:527
#, tcl-format
msgid "Reset '%s'?"
msgstr ""
-#: lib/checkout_op.tcl:510 lib/merge.tcl:164
+#: lib/checkout_op.tcl:532 lib/merge.tcl:163
msgid "Visualize"
msgstr ""
-#: lib/checkout_op.tcl:578
+#: lib/checkout_op.tcl:600
#, tcl-format
msgid ""
"Failed to set current branch.\n"
"This should not have occurred. %s will now close and give up."
msgstr ""
+#: lib/choose_font.tcl:39
+msgid "Select"
+msgstr ""
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr ""
+
+#: lib/choose_font.tcl:74
+msgid "Font Size"
+msgstr ""
+
+#: lib/choose_font.tcl:91
+msgid "Font Example"
+msgstr ""
+
+#: lib/choose_font.tcl:103
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+
+#: lib/choose_repository.tcl:28
+msgid "Git Gui"
+msgstr ""
+
+#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
+msgid "Create New Repository"
+msgstr ""
+
+#: lib/choose_repository.tcl:87
+msgid "New..."
+msgstr ""
+
+#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:458
+msgid "Clone Existing Repository"
+msgstr ""
+
+#: lib/choose_repository.tcl:100
+msgid "Clone..."
+msgstr ""
+
+#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:974
+msgid "Open Existing Repository"
+msgstr ""
+
+#: lib/choose_repository.tcl:113
+msgid "Open..."
+msgstr ""
+
+#: lib/choose_repository.tcl:126
+msgid "Recent Repositories"
+msgstr ""
+
+#: lib/choose_repository.tcl:132
+msgid "Open Recent Repository:"
+msgstr ""
+
+#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
+#: lib/choose_repository.tcl:310
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr ""
+
+#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:476
+msgid "Directory:"
+msgstr ""
+
+#: lib/choose_repository.tcl:410 lib/choose_repository.tcl:535
+#: lib/choose_repository.tcl:1007
+msgid "Git Repository"
+msgstr ""
+
+#: lib/choose_repository.tcl:435
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:439
+#, tcl-format
+msgid "File %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:453
+msgid "Clone"
+msgstr ""
+
+#: lib/choose_repository.tcl:466
+msgid "URL:"
+msgstr ""
+
+#: lib/choose_repository.tcl:487
+msgid "Clone Type:"
+msgstr ""
+
+#: lib/choose_repository.tcl:493
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr ""
+
+#: lib/choose_repository.tcl:499
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:505
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:541 lib/choose_repository.tcl:588
+#: lib/choose_repository.tcl:734 lib/choose_repository.tcl:804
+#: lib/choose_repository.tcl:1013 lib/choose_repository.tcl:1021
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:577
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:581
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:602
+#, tcl-format
+msgid "Location %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:613
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:625
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:626
+msgid "buckets"
+msgstr ""
+
+#: lib/choose_repository.tcl:650
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:686
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr ""
+
+#: lib/choose_repository.tcl:688 lib/choose_repository.tcl:902
+#: lib/choose_repository.tcl:914
+msgid "The 'master' branch has not been initialized."
+msgstr ""
+
+#: lib/choose_repository.tcl:701
+msgid "Hardlinks are unavailable. Falling back to copying."
+msgstr ""
+
+#: lib/choose_repository.tcl:713
+#, tcl-format
+msgid "Cloning from %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:744
+msgid "Copying objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:745
+msgid "KiB"
+msgstr ""
+
+#: lib/choose_repository.tcl:769
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:779
+msgid "Linking objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:780
+msgid "objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:788
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:843
+msgid "Cannot fetch branches and objects. See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:854
+msgid "Cannot fetch tags. See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:878
+msgid "Cannot determine HEAD. See console output for details."
+msgstr ""
+
+#: lib/choose_repository.tcl:887
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr ""
+
+#: lib/choose_repository.tcl:893
+msgid "Clone failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:900
+msgid "No default branch obtained."
+msgstr ""
+
+#: lib/choose_repository.tcl:911
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr ""
+
+#: lib/choose_repository.tcl:923
+msgid "Creating working directory"
+msgstr ""
+
+#: lib/choose_repository.tcl:924 lib/index.tcl:65 lib/index.tcl:127
+#: lib/index.tcl:193
+msgid "files"
+msgstr ""
+
+#: lib/choose_repository.tcl:953
+msgid "Initial file checkout failed."
+msgstr ""
+
+#: lib/choose_repository.tcl:969
+msgid "Open"
+msgstr ""
+
+#: lib/choose_repository.tcl:979
+msgid "Repository:"
+msgstr ""
+
+#: lib/choose_repository.tcl:1027
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr ""
+
#: lib/choose_rev.tcl:53
msgid "This Detached Checkout"
msgstr ""
msgid "Tracking Branch"
msgstr ""
-#: lib/choose_rev.tcl:84
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
msgid "Tag"
msgstr ""
msgid "Revision expression is empty."
msgstr ""
+#: lib/choose_rev.tcl:531
+msgid "Updated"
+msgstr ""
+
+#: lib/choose_rev.tcl:559
+msgid "URL"
+msgstr ""
+
#: lib/commit.tcl:9
msgid ""
"There is nothing to amend.\n"
"\n"
"A good commit message has the following format:\n"
"\n"
-"- First line: Describe in one sentance what you did.\n"
+"- First line: Describe in one sentence what you did.\n"
"- Second line: Blank\n"
"- Remaining lines: Describe why this change is good.\n"
msgstr ""
-#: lib/commit.tcl:257
+#: lib/commit.tcl:207
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
+#: lib/commit.tcl:221
+msgid "Calling pre-commit hook..."
+msgstr ""
+
+#: lib/commit.tcl:236
+msgid "Commit declined by pre-commit hook."
+msgstr ""
+
+#: lib/commit.tcl:259
+msgid "Calling commit-msg hook..."
+msgstr ""
+
+#: lib/commit.tcl:274
+msgid "Commit declined by commit-msg hook."
+msgstr ""
+
+#: lib/commit.tcl:287
+msgid "Committing changes..."
+msgstr ""
+
+#: lib/commit.tcl:303
msgid "write-tree failed:"
msgstr ""
-#: lib/commit.tcl:279
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
+msgid "Commit failed."
+msgstr ""
+
+#: lib/commit.tcl:321
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr ""
+
+#: lib/commit.tcl:326
msgid ""
"No changes to commit.\n"
"\n"
"A rescan will be automatically started now.\n"
msgstr ""
-#: lib/commit.tcl:286
+#: lib/commit.tcl:333
msgid "No changes to commit."
msgstr ""
-#: lib/commit.tcl:317
+#: lib/commit.tcl:347
msgid "commit-tree failed:"
msgstr ""
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
msgid "update-ref failed:"
msgstr ""
-#: lib/commit.tcl:430
+#: lib/commit.tcl:454
#, tcl-format
msgid "Created commit %s: %s"
msgstr ""
-#: lib/console.tcl:55
+#: lib/console.tcl:59
msgid "Working... please wait..."
msgstr ""
-#: lib/console.tcl:184
+#: lib/console.tcl:186
msgid "Success"
msgstr ""
-#: lib/console.tcl:194
+#: lib/console.tcl:200
msgid "Error: Command Failed"
msgstr ""
msgid "Verifying the object database with fsck-objects"
msgstr ""
-#: lib/diff.tcl:42
+#: lib/database.tcl:108
+#, 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"
+"\n"
+"Compress the database now?"
+msgstr ""
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr ""
+
+#: lib/diff.tcl:44
#, tcl-format
msgid ""
"No differences detected.\n"
"the same state."
msgstr ""
-#: lib/diff.tcl:97
+#: lib/diff.tcl:83
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr ""
+
+#: lib/diff.tcl:116 lib/diff.tcl:190
+#, tcl-format
+msgid "Unable to display %s"
+msgstr ""
+
+#: lib/diff.tcl:117
msgid "Error loading file:"
msgstr ""
-#: lib/diff.tcl:162
+#: lib/diff.tcl:124
+msgid "Git Repository (subproject)"
+msgstr ""
+
+#: lib/diff.tcl:136
+msgid "* Binary file (not showing content)."
+msgstr ""
+
+#: lib/diff.tcl:191
msgid "Error loading diff:"
msgstr ""
-#: lib/diff.tcl:278
+#: lib/diff.tcl:313
msgid "Failed to unstage selected hunk."
msgstr ""
-#: lib/diff.tcl:285
+#: lib/diff.tcl:320
msgid "Failed to stage selected hunk."
msgstr ""
-#: lib/error.tcl:12 lib/error.tcl:102
+#: lib/diff.tcl:386
+msgid "Failed to unstage selected line."
+msgstr ""
+
+#: lib/diff.tcl:394
+msgid "Failed to stage selected line."
+msgstr ""
+
+#: lib/error.tcl:20 lib/error.tcl:114
msgid "error"
msgstr ""
-#: lib/error.tcl:28
+#: lib/error.tcl:36
msgid "warning"
msgstr ""
-#: lib/error.tcl:81
+#: lib/error.tcl:94
msgid "You must correct the above errors before committing."
msgstr ""
-#: lib/index.tcl:364
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
+msgstr ""
+
+#: lib/index.tcl:15
+msgid "Index Error"
+msgstr ""
+
+#: lib/index.tcl:21
+msgid ""
+"Updating the Git index failed. A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr ""
+
+#: lib/index.tcl:27
+msgid "Continue"
+msgstr ""
+
+#: lib/index.tcl:31
+msgid "Unlock Index"
+msgstr ""
+
+#: lib/index.tcl:282
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr ""
+
+#: lib/index.tcl:313
+msgid "Ready to commit."
+msgstr ""
+
+#: lib/index.tcl:326
+#, tcl-format
+msgid "Adding %s"
+msgstr ""
+
+#: lib/index.tcl:381
#, tcl-format
msgid "Revert changes in file %s?"
msgstr ""
-#: lib/index.tcl:366
+#: lib/index.tcl:383
#, tcl-format
msgid "Revert changes in these %i files?"
msgstr ""
-#: lib/index.tcl:372
+#: lib/index.tcl:391
msgid "Any unstaged changes will be permanently lost by the revert."
msgstr ""
-#: lib/index.tcl:375
+#: lib/index.tcl:394
msgid "Do Nothing"
msgstr ""
#: lib/merge.tcl:119
#, tcl-format
-msgid "Merging %s and %s"
+msgid "Merging %s and %s..."
msgstr ""
-#: lib/merge.tcl:131
+#: lib/merge.tcl:130
msgid "Merge completed successfully."
msgstr ""
-#: lib/merge.tcl:133
+#: lib/merge.tcl:132
msgid "Merge failed. Conflict resolution is required."
msgstr ""
-#: lib/merge.tcl:158
+#: lib/merge.tcl:157
#, tcl-format
msgid "Merge Into %s"
msgstr ""
-#: lib/merge.tcl:177
+#: lib/merge.tcl:176
msgid "Revision To Merge"
msgstr ""
-#: lib/merge.tcl:212
+#: lib/merge.tcl:211
msgid ""
"Cannot abort while amending.\n"
"\n"
"You must finish amending this commit.\n"
msgstr ""
-#: lib/merge.tcl:222
+#: lib/merge.tcl:221
msgid ""
"Abort merge?\n"
"\n"
"Continue with aborting the current merge?"
msgstr ""
-#: lib/merge.tcl:228
+#: lib/merge.tcl:227
msgid ""
"Reset changes?\n"
"\n"
"Continue with resetting the current changes?"
msgstr ""
-#: lib/merge.tcl:239
+#: lib/merge.tcl:238
msgid "Aborting"
msgstr ""
+#: lib/merge.tcl:238
+msgid "files reset"
+msgstr ""
+
#: lib/merge.tcl:266
msgid "Abort failed."
msgstr ""
msgid "Abort completed. Ready."
msgstr ""
-#: lib/option.tcl:77
-msgid "git-gui - a graphical user interface for Git."
-msgstr ""
-
-#: lib/option.tcl:164
+#: lib/option.tcl:95
msgid "Restore Defaults"
msgstr ""
-#: lib/option.tcl:168
+#: lib/option.tcl:99
msgid "Save"
msgstr ""
-#: lib/option.tcl:178
+#: lib/option.tcl:109
#, tcl-format
msgid "%s Repository"
msgstr ""
-#: lib/option.tcl:179
+#: lib/option.tcl:110
msgid "Global (All Repositories)"
msgstr ""
-#: lib/option.tcl:185
+#: lib/option.tcl:116
msgid "User Name"
msgstr ""
-#: lib/option.tcl:186
+#: lib/option.tcl:117
msgid "Email Address"
msgstr ""
-#: lib/option.tcl:188
+#: lib/option.tcl:119
msgid "Summarize Merge Commits"
msgstr ""
-#: lib/option.tcl:189
+#: lib/option.tcl:120
msgid "Merge Verbosity"
msgstr ""
-#: lib/option.tcl:190
+#: lib/option.tcl:121
msgid "Show Diffstat After Merge"
msgstr ""
-#: lib/option.tcl:192
+#: lib/option.tcl:123
msgid "Trust File Modification Timestamps"
msgstr ""
-#: lib/option.tcl:193
+#: lib/option.tcl:124
msgid "Prune Tracking Branches During Fetch"
msgstr ""
-#: lib/option.tcl:194
+#: lib/option.tcl:125
msgid "Match Tracking Branches"
msgstr ""
-#: lib/option.tcl:195
+#: lib/option.tcl:126
+msgid "Blame Copy Only On Changed Files"
+msgstr ""
+
+#: lib/option.tcl:127
+msgid "Minimum Letters To Blame Copy On"
+msgstr ""
+
+#: lib/option.tcl:128
msgid "Number of Diff Context Lines"
msgstr ""
-#: lib/option.tcl:196
+#: lib/option.tcl:129
+msgid "Commit Message Text Width"
+msgstr ""
+
+#: lib/option.tcl:130
msgid "New Branch Name Template"
msgstr ""
-#: lib/option.tcl:305
+#: lib/option.tcl:194
+msgid "Spelling Dictionary:"
+msgstr ""
+
+#: lib/option.tcl:218
+msgid "Change Font"
+msgstr ""
+
+#: lib/option.tcl:222
+#, tcl-format
+msgid "Choose %s"
+msgstr ""
+
+#: lib/option.tcl:228
+msgid "pt."
+msgstr ""
+
+#: lib/option.tcl:242
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:277
msgid "Failed to completely save options:"
msgstr ""
+#: lib/remote.tcl:165
+msgid "Prune from"
+msgstr ""
+
+#: lib/remote.tcl:170
+msgid "Fetch from"
+msgstr ""
+
+#: lib/remote.tcl:213
+msgid "Push to"
+msgstr ""
+
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
msgid "Delete Remote Branch"
msgstr ""
msgid "From Repository"
msgstr ""
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
msgid "Remote:"
msgstr ""
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
msgid "Arbitrary URL:"
msgstr ""
msgid "A branch is required for 'Merged Into'."
msgstr ""
+#: lib/remote_branch_delete.tcl:184
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+
#: lib/remote_branch_delete.tcl:189
#, tcl-format
msgid ""
msgid "Scanning %s..."
msgstr ""
-#: lib/remote.tcl:162
-#, tcl-format
-msgid "Fetch from %s..."
+#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
+msgid "Cannot write shortcut:"
msgstr ""
-#: lib/remote.tcl:172
-#, tcl-format
-msgid "Prune from %s..."
+#: lib/shortcut.tcl:136
+msgid "Cannot write icon:"
msgstr ""
-#: lib/remote.tcl:206
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr ""
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr ""
+
+#: lib/spellcheck.tcl:70
#, tcl-format
-msgid "Push to %s..."
+msgid "Reverting dictionary to %s."
msgstr ""
-#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
-msgid "Cannot write script:"
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
msgstr ""
-#: lib/shortcut.tcl:149
-msgid "Cannot write icon:"
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr ""
+
+#: lib/spellcheck.tcl:387
+msgid "Unexpected EOF from spell checker"
+msgstr ""
+
+#: lib/spellcheck.tcl:391
+msgid "Spell Checker Failed"
msgstr ""
-#: lib/status_bar.tcl:58
+#: lib/status_bar.tcl:83
#, tcl-format
msgid "%s ... %*i of %*i %s (%3i%%)"
msgstr ""
+#: lib/transport.tcl:6
+#, tcl-format
+msgid "fetch %s"
+msgstr ""
+
#: lib/transport.tcl:7
#, tcl-format
msgid "Fetching new changes from %s"
msgstr ""
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr ""
+
#: lib/transport.tcl:19
#, tcl-format
msgid "Pruning tracking branches deleted from %s"
msgstr ""
+#: lib/transport.tcl:25 lib/transport.tcl:71
+#, tcl-format
+msgid "push %s"
+msgstr ""
+
#: lib/transport.tcl:26
#, tcl-format
msgid "Pushing changes to %s"
msgstr ""
-#: lib/transport.tcl:68
+#: lib/transport.tcl:72
#, tcl-format
msgid "Pushing %s %s to %s"
msgstr ""
-#: lib/transport.tcl:84
+#: lib/transport.tcl:89
msgid "Push Branches"
msgstr ""
-#: lib/transport.tcl:98
+#: lib/transport.tcl:103
msgid "Source Branches"
msgstr ""
-#: lib/transport.tcl:115
+#: lib/transport.tcl:120
msgid "Destination Repository"
msgstr ""
-#: lib/transport.tcl:153
+#: lib/transport.tcl:158
msgid "Transfer Options"
msgstr ""
-#: lib/transport.tcl:155
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+
+#: lib/transport.tcl:164
msgid "Use thin pack (for slow network connections)"
msgstr ""
-#: lib/transport.tcl:159
+#: lib/transport.tcl:168
msgid "Include tags"
msgstr ""