1 # SOME DESCRIPTIVE TITLE.
2 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n"
11 "POT-Creation-Date: 2007-11-24 10:36+0100\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
16 "Content-Type: text/plain; charset=CHARSET\n"
17 "Content-Transfer-Encoding: 8bit\n"
19 #: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
21 msgid "git-gui: fatal error"
26 msgid "Invalid font specified in %s:"
34 msgid "Diff/Console Font"
38 msgid "Cannot find git in PATH."
42 msgid "Cannot parse Git version string:"
48 "Git version cannot be determined.\n"
50 "%s claims it is version '%s'.\n"
52 "%s requires at least Git 1.5.0 or later.\n"
54 "Assume '%s' is version 1.5.0?\n"
58 msgid "Git directory not found:"
62 msgid "Cannot move to top of working directory:"
66 msgid "Cannot use funny .git directory:"
70 msgid "No working directory"
74 msgid "Refreshing file status..."
78 msgid "Scanning for modified files ..."
81 #: git-gui.sh:1294 lib/browser.tcl:245
90 msgid "Modified, not staged"
93 #: git-gui.sh:1563 git-gui.sh:1568
94 msgid "Staged for commit"
97 #: git-gui.sh:1564 git-gui.sh:1569
98 msgid "Portions staged for commit"
101 #: git-gui.sh:1565 git-gui.sh:1570
102 msgid "Staged for commit, missing"
106 msgid "Untracked, not staged"
114 msgid "Staged for removal"
118 msgid "Staged for removal, still present"
121 #: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
122 msgid "Requires merge resolution"
126 msgid "Starting gitk... please wait..."
132 "Unable to start gitk:\n"
137 #: git-gui.sh:1823 lib/choose_repository.tcl:35
145 #: git-gui.sh:1826 lib/choose_rev.tcl:560
149 #: git-gui.sh:1829 lib/choose_rev.tcl:547
153 #: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
157 #: git-gui.sh:1833 lib/choose_rev.tcl:556
162 msgid "Browse Current Branch's Files"
166 msgid "Browse Branch Files..."
170 msgid "Visualize Current Branch's History"
174 msgid "Visualize All Branch History"
179 msgid "Browse %s's Files"
184 msgid "Visualize %s's History"
187 #: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
188 msgid "Database Statistics"
191 #: git-gui.sh:1872 lib/database.tcl:34
192 msgid "Compress Database"
196 msgid "Verify Database"
199 #: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
200 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
201 msgid "Create Desktop Icon"
204 #: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
216 #: git-gui.sh:1909 git-gui.sh:2403
220 #: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
221 #: lib/console.tcl:67
225 #: git-gui.sh:1915 git-gui.sh:2409
229 #: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
230 #: lib/remote_branch_delete.tcl:38
234 #: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
250 #: git-gui.sh:1948 git-gui.sh:2048
258 #: git-gui.sh:1965 git-gui.sh:2350
262 #: git-gui.sh:1973 git-gui.sh:2357
263 msgid "Amend Last Commit"
266 #: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
271 msgid "Stage To Commit"
275 msgid "Stage Changed Files To Commit"
279 msgid "Unstage From Commit"
282 #: git-gui.sh:2005 lib/index.tcl:393
283 msgid "Revert Changes"
286 #: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
290 #: git-gui.sh:2016 git-gui.sh:2333
295 msgid "Local Merge..."
299 msgid "Abort Merge..."
306 #: git-gui.sh:2055 lib/choose_repository.tcl:40
310 #: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
311 #: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
317 msgid "Preferences..."
320 #: git-gui.sh:2070 git-gui.sh:2595
324 #: git-gui.sh:2076 lib/choose_repository.tcl:46
329 msgid "Online Documentation"
334 msgid "fatal: cannot stat path %s: No such file or directory"
338 msgid "Current Branch:"
342 msgid "Staged Changes (Will Commit)"
346 msgid "Unstaged Changes"
350 msgid "Stage Changed"
353 #: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
358 msgid "Initial Commit Message:"
362 msgid "Amended Commit Message:"
366 msgid "Amended Initial Commit Message:"
370 msgid "Amended Merge Commit Message:"
374 msgid "Merge Commit Message:"
378 msgid "Commit Message:"
381 #: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
385 #: git-gui.sh:2443 lib/blame.tcl:104
394 msgid "Apply/Reverse Hunk"
398 msgid "Decrease Font Size"
402 msgid "Increase Font Size"
406 msgid "Show Less Context"
410 msgid "Show More Context"
414 msgid "Unstage Hunk From Commit"
418 msgid "Stage Hunk For Commit"
422 msgid "Initializing..."
428 "Possible environment issues exist.\n"
430 "The following environment variables are probably\n"
431 "going to be ignored by any Git subprocess run\n"
439 "This is due to a known issue with the\n"
440 "Tcl binary distributed by Cygwin."
448 "A good replacement for %s\n"
449 "is placing values for the user.name and\n"
450 "user.email settings into your personal\n"
451 "~/.gitconfig file.\n"
455 msgid "git-gui - a graphical user interface for Git."
472 msgid "Reading %s..."
476 msgid "Loading copy/move tracking annotations..."
480 msgid "lines annotated"
484 msgid "Loading original location annotations..."
488 msgid "Annotation complete."
492 msgid "Loading annotation..."
504 msgid "Original File:"
508 msgid "Originally By:"
516 msgid "Copied Or Moved Here By:"
519 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
520 msgid "Checkout Branch"
523 #: lib/branch_checkout.tcl:23
527 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
528 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
529 #: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
530 #: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
534 #: lib/branch_checkout.tcl:32 lib/browser.tcl:286
538 #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
542 #: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
543 msgid "Fetch Tracking Branch"
546 #: lib/branch_checkout.tcl:44
547 msgid "Detach From Local Branch"
550 #: lib/branch_create.tcl:22
551 msgid "Create Branch"
554 #: lib/branch_create.tcl:27
555 msgid "Create New Branch"
558 #: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
562 #: lib/branch_create.tcl:40
566 #: lib/branch_create.tcl:43
570 #: lib/branch_create.tcl:58
571 msgid "Match Tracking Branch Name"
574 #: lib/branch_create.tcl:66
575 msgid "Starting Revision"
578 #: lib/branch_create.tcl:72
579 msgid "Update Existing Branch:"
582 #: lib/branch_create.tcl:75
586 #: lib/branch_create.tcl:80
587 msgid "Fast Forward Only"
590 #: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
594 #: lib/branch_create.tcl:97
595 msgid "Checkout After Creation"
598 #: lib/branch_create.tcl:131
599 msgid "Please select a tracking branch."
602 #: lib/branch_create.tcl:140
604 msgid "Tracking branch %s is not a branch in the remote repository."
607 #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
608 msgid "Please supply a branch name."
611 #: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
613 msgid "'%s' is not an acceptable branch name."
616 #: lib/branch_delete.tcl:15
617 msgid "Delete Branch"
620 #: lib/branch_delete.tcl:20
621 msgid "Delete Local Branch"
624 #: lib/branch_delete.tcl:37
625 msgid "Local Branches"
628 #: lib/branch_delete.tcl:52
629 msgid "Delete Only If Merged Into"
632 #: lib/branch_delete.tcl:54
633 msgid "Always (Do not perform merge test.)"
636 #: lib/branch_delete.tcl:103
638 msgid "The following branches are not completely merged into %s:"
641 #: lib/branch_delete.tcl:115
643 "Recovering deleted branches is difficult. \n"
645 " Delete the selected branches?"
648 #: lib/branch_delete.tcl:141
651 "Failed to delete branches:\n"
655 #: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
656 msgid "Rename Branch"
659 #: lib/branch_rename.tcl:26
663 #: lib/branch_rename.tcl:36
667 #: lib/branch_rename.tcl:39
671 #: lib/branch_rename.tcl:75
672 msgid "Please select a branch to rename."
675 #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
677 msgid "Branch '%s' already exists."
680 #: lib/branch_rename.tcl:117
682 msgid "Failed to rename '%s'."
685 #: lib/browser.tcl:17
689 #: lib/browser.tcl:26
693 #: lib/browser.tcl:125 lib/browser.tcl:142
695 msgid "Loading %s..."
698 #: lib/browser.tcl:186
699 msgid "[Up To Parent]"
702 #: lib/browser.tcl:266 lib/browser.tcl:272
703 msgid "Browse Branch Files"
706 #: lib/browser.tcl:277 lib/choose_repository.tcl:391
707 #: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
708 #: lib/choose_repository.tcl:989
712 #: lib/checkout_op.tcl:79
714 msgid "Fetching %s from %s"
717 #: lib/checkout_op.tcl:127
719 msgid "fatal: Cannot resolve %s"
722 #: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
726 #: lib/checkout_op.tcl:169
728 msgid "Branch '%s' does not exist."
731 #: lib/checkout_op.tcl:206
734 "Branch '%s' already exists.\n"
736 "It cannot fast-forward to %s.\n"
737 "A merge is required."
740 #: lib/checkout_op.tcl:220
742 msgid "Merge strategy '%s' not supported."
745 #: lib/checkout_op.tcl:239
747 msgid "Failed to update '%s'."
750 #: lib/checkout_op.tcl:251
751 msgid "Staging area (index) is already locked."
754 #: lib/checkout_op.tcl:266
756 "Last scanned state does not match repository state.\n"
758 "Another Git program has modified this repository since the last scan. A "
759 "rescan must be performed before the current branch can be changed.\n"
761 "The rescan will be automatically started now.\n"
764 #: lib/checkout_op.tcl:322
766 msgid "Updating working directory to '%s'..."
769 #: lib/checkout_op.tcl:353
771 msgid "Aborted checkout of '%s' (file level merging is required)."
774 #: lib/checkout_op.tcl:354
775 msgid "File level merge required."
778 #: lib/checkout_op.tcl:358
780 msgid "Staying on branch '%s'."
783 #: lib/checkout_op.tcl:429
785 "You are no longer on a local branch.\n"
787 "If you wanted to be on a branch, create one now starting from 'This Detached "
791 #: lib/checkout_op.tcl:446
793 msgid "Checked out '%s'."
796 #: lib/checkout_op.tcl:478
798 msgid "Resetting '%s' to '%s' will lose the following commits:"
801 #: lib/checkout_op.tcl:500
802 msgid "Recovering lost commits may not be easy."
805 #: lib/checkout_op.tcl:505
810 #: lib/checkout_op.tcl:510 lib/merge.tcl:164
814 #: lib/checkout_op.tcl:578
817 "Failed to set current branch.\n"
819 "This working directory is only partially switched. We successfully updated "
820 "your files, but failed to update an internal Git file.\n"
822 "This should not have occurred. %s will now close and give up."
825 #: lib/choose_font.tcl:39
829 #: lib/choose_font.tcl:53
833 #: lib/choose_font.tcl:73
837 #: lib/choose_font.tcl:90
841 #: lib/choose_font.tcl:101
843 "This is example text.\n"
844 "If you like this text, it can be your font."
847 #: lib/choose_repository.tcl:27
851 #: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
852 msgid "Create New Repository"
855 #: lib/choose_repository.tcl:86
859 #: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
860 msgid "Clone Existing Repository"
863 #: lib/choose_repository.tcl:99
867 #: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
868 msgid "Open Existing Repository"
871 #: lib/choose_repository.tcl:112
875 #: lib/choose_repository.tcl:125
876 msgid "Recent Repositories"
879 #: lib/choose_repository.tcl:131
880 msgid "Open Recent Repository:"
883 #: lib/choose_repository.tcl:294
885 msgid "Location %s already exists."
888 #: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
889 #: lib/choose_repository.tcl:314
891 msgid "Failed to create repository %s:"
894 #: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
898 #: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
899 #: lib/choose_repository.tcl:1013
900 msgid "Git Repository"
903 #: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
905 msgid "Directory %s already exists."
908 #: lib/choose_repository.tcl:442
910 msgid "File %s already exists."
913 #: lib/choose_repository.tcl:463
917 #: lib/choose_repository.tcl:476
921 #: lib/choose_repository.tcl:496
925 #: lib/choose_repository.tcl:502
926 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
929 #: lib/choose_repository.tcl:508
930 msgid "Full Copy (Slower, Redundant Backup)"
933 #: lib/choose_repository.tcl:514
934 msgid "Shared (Fastest, Not Recommended, No Backup)"
937 #: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
938 #: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
939 #: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
941 msgid "Not a Git repository: %s"
944 #: lib/choose_repository.tcl:586
945 msgid "Standard only available for local repository."
948 #: lib/choose_repository.tcl:590
949 msgid "Shared only available for local repository."
952 #: lib/choose_repository.tcl:617
953 msgid "Failed to configure origin"
956 #: lib/choose_repository.tcl:629
957 msgid "Counting objects"
960 #: lib/choose_repository.tcl:630
964 #: lib/choose_repository.tcl:654
966 msgid "Unable to copy objects/info/alternates: %s"
969 #: lib/choose_repository.tcl:690
971 msgid "Nothing to clone from %s."
974 #: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
975 #: lib/choose_repository.tcl:918
976 msgid "The 'master' branch has not been initialized."
979 #: lib/choose_repository.tcl:705
980 msgid "Hardlinks are unavailable. Falling back to copying."
983 #: lib/choose_repository.tcl:717
985 msgid "Cloning from %s"
988 #: lib/choose_repository.tcl:748
989 msgid "Copying objects"
992 #: lib/choose_repository.tcl:749
996 #: lib/choose_repository.tcl:773
998 msgid "Unable to copy object: %s"
1001 #: lib/choose_repository.tcl:783
1002 msgid "Linking objects"
1005 #: lib/choose_repository.tcl:784
1009 #: lib/choose_repository.tcl:792
1011 msgid "Unable to hardlink object: %s"
1014 #: lib/choose_repository.tcl:847
1015 msgid "Cannot fetch branches and objects. See console output for details."
1018 #: lib/choose_repository.tcl:858
1019 msgid "Cannot fetch tags. See console output for details."
1022 #: lib/choose_repository.tcl:882
1023 msgid "Cannot determine HEAD. See console output for details."
1026 #: lib/choose_repository.tcl:891
1028 msgid "Unable to cleanup %s"
1031 #: lib/choose_repository.tcl:897
1032 msgid "Clone failed."
1035 #: lib/choose_repository.tcl:904
1036 msgid "No default branch obtained."
1039 #: lib/choose_repository.tcl:915
1041 msgid "Cannot resolve %s as a commit."
1044 #: lib/choose_repository.tcl:927
1045 msgid "Creating working directory"
1048 #: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
1049 #: lib/index.tcl:193
1053 #: lib/choose_repository.tcl:957
1054 msgid "Initial file checkout failed."
1057 #: lib/choose_repository.tcl:973
1061 #: lib/choose_repository.tcl:983
1065 #: lib/choose_repository.tcl:1033
1067 msgid "Failed to open repository %s:"
1070 #: lib/choose_rev.tcl:53
1071 msgid "This Detached Checkout"
1074 #: lib/choose_rev.tcl:60
1075 msgid "Revision Expression:"
1078 #: lib/choose_rev.tcl:74
1079 msgid "Local Branch"
1082 #: lib/choose_rev.tcl:79
1083 msgid "Tracking Branch"
1086 #: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1090 #: lib/choose_rev.tcl:317
1092 msgid "Invalid revision: %s"
1095 #: lib/choose_rev.tcl:338
1096 msgid "No revision selected."
1099 #: lib/choose_rev.tcl:346
1100 msgid "Revision expression is empty."
1103 #: lib/choose_rev.tcl:530
1107 #: lib/choose_rev.tcl:558
1113 "There is nothing to amend.\n"
1115 "You are about to create the initial commit. There is no commit before this "
1119 #: lib/commit.tcl:18
1121 "Cannot amend while merging.\n"
1123 "You are currently in the middle of a merge that has not been fully "
1124 "completed. You cannot amend the prior commit unless you first abort the "
1125 "current merge activity.\n"
1128 #: lib/commit.tcl:49
1129 msgid "Error loading commit data for amend:"
1132 #: lib/commit.tcl:76
1133 msgid "Unable to obtain your identity:"
1136 #: lib/commit.tcl:81
1137 msgid "Invalid GIT_COMMITTER_IDENT:"
1140 #: lib/commit.tcl:133
1142 "Last scanned state does not match repository state.\n"
1144 "Another Git program has modified this repository since the last scan. A "
1145 "rescan must be performed before another commit can be created.\n"
1147 "The rescan will be automatically started now.\n"
1150 #: lib/commit.tcl:154
1153 "Unmerged files cannot be committed.\n"
1155 "File %s has merge conflicts. You must resolve them and stage the file "
1156 "before committing.\n"
1159 #: lib/commit.tcl:162
1162 "Unknown file state %s detected.\n"
1164 "File %s cannot be committed by this program.\n"
1167 #: lib/commit.tcl:170
1169 "No changes to commit.\n"
1171 "You must stage at least 1 file before you can commit.\n"
1174 #: lib/commit.tcl:183
1176 "Please supply a commit message.\n"
1178 "A good commit message has the following format:\n"
1180 "- First line: Describe in one sentence what you did.\n"
1181 "- Second line: Blank\n"
1182 "- Remaining lines: Describe why this change is good.\n"
1185 #: lib/commit.tcl:257
1186 msgid "write-tree failed:"
1189 #: lib/commit.tcl:275
1191 msgid "Commit %s appears to be corrupt"
1194 #: lib/commit.tcl:279
1196 "No changes to commit.\n"
1198 "No files were modified by this commit and it was not a merge commit.\n"
1200 "A rescan will be automatically started now.\n"
1203 #: lib/commit.tcl:286
1204 msgid "No changes to commit."
1207 #: lib/commit.tcl:303
1209 msgid "warning: Tcl does not support encoding '%s'."
1212 #: lib/commit.tcl:317
1213 msgid "commit-tree failed:"
1216 #: lib/commit.tcl:339
1217 msgid "update-ref failed:"
1220 #: lib/commit.tcl:430
1222 msgid "Created commit %s: %s"
1225 #: lib/console.tcl:57
1226 msgid "Working... please wait..."
1229 #: lib/console.tcl:183
1233 #: lib/console.tcl:196
1234 msgid "Error: Command Failed"
1237 #: lib/database.tcl:43
1238 msgid "Number of loose objects"
1241 #: lib/database.tcl:44
1242 msgid "Disk space used by loose objects"
1245 #: lib/database.tcl:45
1246 msgid "Number of packed objects"
1249 #: lib/database.tcl:46
1250 msgid "Number of packs"
1253 #: lib/database.tcl:47
1254 msgid "Disk space used by packed objects"
1257 #: lib/database.tcl:48
1258 msgid "Packed objects waiting for pruning"
1261 #: lib/database.tcl:49
1262 msgid "Garbage files"
1265 #: lib/database.tcl:72
1266 msgid "Compressing the object database"
1269 #: lib/database.tcl:83
1270 msgid "Verifying the object database with fsck-objects"
1273 #: lib/database.tcl:108
1276 "This repository currently has approximately %i loose objects.\n"
1278 "To maintain optimal performance it is strongly recommended that you compress "
1279 "the database when more than %i loose objects exist.\n"
1281 "Compress the database now?"
1286 msgid "Invalid date from Git: %s"
1292 "No differences detected.\n"
1294 "%s has no changes.\n"
1296 "The modification date of this file was updated by another application, but "
1297 "the content within the file was not changed.\n"
1299 "A rescan will be automatically started to find other files which may have "
1305 msgid "Loading diff of %s..."
1308 #: lib/diff.tcl:114 lib/diff.tcl:184
1310 msgid "Unable to display %s"
1314 msgid "Error loading file:"
1318 msgid "Git Repository (subproject)"
1322 msgid "* Binary file (not showing content)."
1326 msgid "Error loading diff:"
1330 msgid "Failed to unstage selected hunk."
1334 msgid "Failed to stage selected hunk."
1337 #: lib/error.tcl:12 lib/error.tcl:102
1346 msgid "You must correct the above errors before committing."
1350 msgid "Unable to unlock the index."
1359 "Updating the Git index failed. A rescan will be automatically started to "
1360 "resynchronize git-gui."
1368 msgid "Unlock Index"
1371 #: lib/index.tcl:282
1373 msgid "Unstaging %s from commit"
1376 #: lib/index.tcl:326
1381 #: lib/index.tcl:381
1383 msgid "Revert changes in file %s?"
1386 #: lib/index.tcl:383
1388 msgid "Revert changes in these %i files?"
1391 #: lib/index.tcl:389
1392 msgid "Any unstaged changes will be permanently lost by the revert."
1395 #: lib/index.tcl:392
1401 "Cannot merge while amending.\n"
1403 "You must finish amending this commit before starting any type of merge.\n"
1408 "Last scanned state does not match repository state.\n"
1410 "Another Git program has modified this repository since the last scan. A "
1411 "rescan must be performed before a merge can be performed.\n"
1413 "The rescan will be automatically started now.\n"
1419 "You are in the middle of a conflicted merge.\n"
1421 "File %s has merge conflicts.\n"
1423 "You must resolve them, stage the file, and commit to complete the current "
1424 "merge. Only then can you begin another merge.\n"
1430 "You are in the middle of a change.\n"
1432 "File %s is modified.\n"
1434 "You should complete the current commit before starting a merge. Doing so "
1435 "will help you abort a failed merge, should the need arise.\n"
1438 #: lib/merge.tcl:106
1443 #: lib/merge.tcl:119
1445 msgid "Merging %s and %s"
1448 #: lib/merge.tcl:131
1449 msgid "Merge completed successfully."
1452 #: lib/merge.tcl:133
1453 msgid "Merge failed. Conflict resolution is required."
1456 #: lib/merge.tcl:158
1458 msgid "Merge Into %s"
1461 #: lib/merge.tcl:177
1462 msgid "Revision To Merge"
1465 #: lib/merge.tcl:212
1467 "Cannot abort while amending.\n"
1469 "You must finish amending this commit.\n"
1472 #: lib/merge.tcl:222
1476 "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
1478 "Continue with aborting the current merge?"
1481 #: lib/merge.tcl:228
1485 "Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
1487 "Continue with resetting the current changes?"
1490 #: lib/merge.tcl:239
1494 #: lib/merge.tcl:266
1495 msgid "Abort failed."
1498 #: lib/merge.tcl:268
1499 msgid "Abort completed. Ready."
1502 #: lib/option.tcl:82
1503 msgid "Restore Defaults"
1506 #: lib/option.tcl:86
1510 #: lib/option.tcl:96
1512 msgid "%s Repository"
1515 #: lib/option.tcl:97
1516 msgid "Global (All Repositories)"
1519 #: lib/option.tcl:103
1523 #: lib/option.tcl:104
1524 msgid "Email Address"
1527 #: lib/option.tcl:106
1528 msgid "Summarize Merge Commits"
1531 #: lib/option.tcl:107
1532 msgid "Merge Verbosity"
1535 #: lib/option.tcl:108
1536 msgid "Show Diffstat After Merge"
1539 #: lib/option.tcl:110
1540 msgid "Trust File Modification Timestamps"
1543 #: lib/option.tcl:111
1544 msgid "Prune Tracking Branches During Fetch"
1547 #: lib/option.tcl:112
1548 msgid "Match Tracking Branches"
1551 #: lib/option.tcl:113
1552 msgid "Number of Diff Context Lines"
1555 #: lib/option.tcl:114
1556 msgid "New Branch Name Template"
1559 #: lib/option.tcl:176
1563 #: lib/option.tcl:180
1568 #: lib/option.tcl:186
1572 #: lib/option.tcl:200
1576 #: lib/option.tcl:235
1577 msgid "Failed to completely save options:"
1580 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1581 msgid "Delete Remote Branch"
1584 #: lib/remote_branch_delete.tcl:47
1585 msgid "From Repository"
1588 #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1592 #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1593 msgid "Arbitrary URL:"
1596 #: lib/remote_branch_delete.tcl:84
1600 #: lib/remote_branch_delete.tcl:109
1601 msgid "Delete Only If"
1604 #: lib/remote_branch_delete.tcl:111
1605 msgid "Merged Into:"
1608 #: lib/remote_branch_delete.tcl:119
1609 msgid "Always (Do not perform merge checks)"
1612 #: lib/remote_branch_delete.tcl:152
1613 msgid "A branch is required for 'Merged Into'."
1616 #: lib/remote_branch_delete.tcl:184
1619 "The following branches are not completely merged into %s:\n"
1624 #: lib/remote_branch_delete.tcl:189
1627 "One or more of the merge tests failed because you have not fetched the "
1628 "necessary commits. Try fetching from %s first."
1631 #: lib/remote_branch_delete.tcl:207
1632 msgid "Please select one or more branches to delete."
1635 #: lib/remote_branch_delete.tcl:216
1637 "Recovering deleted branches is difficult.\n"
1639 "Delete the selected branches?"
1642 #: lib/remote_branch_delete.tcl:226
1644 msgid "Deleting branches from %s"
1647 #: lib/remote_branch_delete.tcl:286
1648 msgid "No repository selected."
1651 #: lib/remote_branch_delete.tcl:291
1653 msgid "Scanning %s..."
1656 #: lib/remote.tcl:165
1660 #: lib/remote.tcl:170
1664 #: lib/remote.tcl:213
1668 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61
1669 msgid "Cannot write shortcut:"
1672 #: lib/shortcut.tcl:136
1673 msgid "Cannot write icon:"
1676 #: lib/status_bar.tcl:83
1678 msgid "%s ... %*i of %*i %s (%3i%%)"
1681 #: lib/transport.tcl:6
1686 #: lib/transport.tcl:7
1688 msgid "Fetching new changes from %s"
1691 #: lib/transport.tcl:18
1693 msgid "remote prune %s"
1696 #: lib/transport.tcl:19
1698 msgid "Pruning tracking branches deleted from %s"
1701 #: lib/transport.tcl:25 lib/transport.tcl:71
1706 #: lib/transport.tcl:26
1708 msgid "Pushing changes to %s"
1711 #: lib/transport.tcl:72
1713 msgid "Pushing %s %s to %s"
1716 #: lib/transport.tcl:89
1717 msgid "Push Branches"
1720 #: lib/transport.tcl:103
1721 msgid "Source Branches"
1724 #: lib/transport.tcl:120
1725 msgid "Destination Repository"
1728 #: lib/transport.tcl:158
1729 msgid "Transfer Options"
1732 #: lib/transport.tcl:160
1733 msgid "Force overwrite existing branch (may discard changes)"
1736 #: lib/transport.tcl:164
1737 msgid "Use thin pack (for slow network connections)"
1740 #: lib/transport.tcl:168
1741 msgid "Include tags"