Merge branch 'master' of https://github.com/j6t/git-gui

+1 -1

git-gui/Makefile

··· 322 @echo $(GITGUI_VERSION) > $(TARDIR)/version 323 324 clean:: 325 - $(RM_RF) $(GITGUI_MAIN) lib/tclIndex po/*.msg 326 $(RM_RF) GIT-VERSION-FILE GIT-GUI-VARS 327 ifdef GITGUI_MACOSXAPP 328 $(RM_RF) 'Git Gui.app'* git-gui

··· 322 @echo $(GITGUI_VERSION) > $(TARDIR)/version 323 324 clean:: 325 + $(RM_RF) $(GITGUI_MAIN) lib/tclIndex po/*.msg $(PO_TEMPLATE) 326 $(RM_RF) GIT-VERSION-FILE GIT-GUI-VARS 327 ifdef GITGUI_MACOSXAPP 328 $(RM_RF) 'Git Gui.app'* git-gui

+8

git-gui/git-gui.sh

··· 880 color::sync_with_theme 881 } 882 } 883 } 884 885 set default_config(branch.autosetupmerge) true ··· 890 set default_config(merge.verbosity) 2 891 set default_config(user.name) {} 892 set default_config(user.email) {} 893 894 set default_config(gui.encoding) [encoding system] 895 set default_config(gui.matchtrackingbranch) false

··· 880 color::sync_with_theme 881 } 882 } 883 + 884 + global comment_string 885 + set comment_string [get_config core.commentstring] 886 + if {$comment_string eq {}} { 887 + set comment_string [get_config core.commentchar] 888 + } 889 } 890 891 set default_config(branch.autosetupmerge) true ··· 896 set default_config(merge.verbosity) 2 897 set default_config(user.name) {} 898 set default_config(user.email) {} 899 + set default_config(core.commentchar) "#" 900 + set default_config(core.commentstring) {} 901 902 set default_config(gui.encoding) [encoding system] 903 set default_config(gui.matchtrackingbranch) false

+3 -1

git-gui/lib/commit.tcl

··· 211 # Strip trailing whitespace 212 regsub -all -line {[ \t\r]+$} $msg {} msg 213 # Strip comment lines 214 - regsub -all {(^|\n)#[^\n]*} $msg {\1} msg 215 # Strip leading empty lines 216 regsub {^\n*} $msg {} msg 217 # Compress consecutive empty lines

··· 211 # Strip trailing whitespace 212 regsub -all -line {[ \t\r]+$} $msg {} msg 213 # Strip comment lines 214 + global comment_string 215 + set cmt_rx [strcat {(^|\n)} [regsub -all {\W} $comment_string {\\&}] {[^\n]*}] 216 + regsub -all $cmt_rx $msg {\1} msg 217 # Strip leading empty lines 218 regsub {^\n*} $msg {} msg 219 # Compress consecutive empty lines

+1

git-gui/po/.gitignore

··· 1 *.msg 2 *~

··· 1 *.msg 2 *~ 3 + /git-gui.pot

+10 -64

git-gui/po/README

··· 21 You would then need to clone the git-gui project repository and create 22 a feature branch to begin working: 23 24 - $ git clone git://repo.or.cz/git-gui.git 25 - $ cd git-gui.git 26 $ git checkout -b my-translation 27 28 The "git checkout" command creates a new branch to keep your work ··· 47 reading, because we are covering the basics. 48 49 If you did not find your language, you would need to start one yourself. 50 Copy po/git-gui.pot file to po/af.po (replace "af" with the code for 51 your language). Edit the first several lines to match existing *.po 52 files to make it clear this is a translation table for git-gui project, ··· 153 $ git add po/af.po 154 $ git commit -s -m 'git-gui: added Afrikaans translation.' 155 $ git send-email --to 'git@vger.kernel.org' \ 156 - --cc 'Pat Thoyts <patthoyts@users.sourceforge.net>' \ 157 --subject 'git-gui: Afrikaans translation' \ 158 master.. 159 ··· 169 170 $ git checkout master 171 $ git pull 172 - 173 - In the former case, you will edit po/af.po (again, replace "af" with 174 - your language code), and after testing and updating the Last-Translator: 175 - and PO-Revision-Date: lines, "add/commit/push" as in the previous 176 - section. 177 - 178 - By comparing "POT-Creation-Date:" line in po/git-gui.pot file and 179 - po/af.po file, you can tell if there are new messages that need to be 180 - translated. You would need the GNU gettext package to perform this 181 - step. 182 - 183 - $ msgmerge -U po/af.po po/git-gui.pot 184 185 This updates po/af.po (again, replace "af" with your language 186 code) so that it contains msgid lines (i.e. the original) that ··· 200 - New messages added to the software will have msgstr lines with empty 201 strings. You would need to translate them. 202 203 - The po/git-gui.pot file is updated by the internationalization 204 - coordinator from time to time. You _could_ update it yourself, but 205 - translators are discouraged from doing so because we would want all 206 - language teams to be working off of the same version of git-gui.pot. 207 - 208 - **************************************************************** 209 - 210 - This section is a note to the internationalization coordinator, and 211 - translators do not have to worry about it too much. 212 - 213 - The message template file po/git-gui.pot needs to be kept up to date 214 - relative to the software the translations apply to, and it is the 215 - responsibility of the internationalization coordinator. 216 - 217 - When updating po/git-gui.pot file, however, _never_ run "msgmerge -U 218 - po/xx.po" for individual language translations, unless you are absolutely 219 - sure that there is no outstanding work on translation for language xx. 220 - Doing so will create unnecessary merge conflicts and force needless 221 - re-translation on translators. The translator however may not have access 222 - to the msgmerge tool, in which case the coordinator may run it for the 223 - translator as a service. 224 - 225 - But mistakes do happen. Suppose a translation was based on an older 226 - version X, the POT file was updated at version Y and then msgmerge was run 227 - at version Z for the language, and the translator sent in a patch based on 228 - version X: 229 - 230 - ? translated 231 - / 232 - ---X---Y---Z (master) 233 - 234 - The coordinator could recover from such a mistake by first applying the 235 - patch to X, replace the translated file in Z, and then running msgmerge 236 - again based on the updated POT file and commit the result. The sequence 237 - would look like this: 238 - 239 - $ git checkout X 240 - $ git am -s xx.patch 241 - $ git checkout master 242 - $ git checkout HEAD@{1} po/xx.po 243 - $ msgmerge -U po/xx.po po/git-gui.pot 244 - $ git commit -c HEAD@{1} po/xx.po 245 - 246 - State in the message that the translated messages are based on a slightly 247 - older version, and msgmerge was run to incorporate changes to message 248 - templates from the updated POT file. The result needs to be further 249 - translated, but at least the messages that were updated by the patch that 250 - were not changed by the POT update will survive the process and do not 251 - need to be re-translated.

··· 21 You would then need to clone the git-gui project repository and create 22 a feature branch to begin working: 23 24 + $ git clone https://github.com/j6t/git-gui 25 + $ cd git-gui 26 $ git checkout -b my-translation 27 28 The "git checkout" command creates a new branch to keep your work ··· 47 reading, because we are covering the basics. 48 49 If you did not find your language, you would need to start one yourself. 50 + Generate po/git-gui.pot using 51 + 52 + $ make po/git-gui.pot 53 + 54 Copy po/git-gui.pot file to po/af.po (replace "af" with the code for 55 your language). Edit the first several lines to match existing *.po 56 files to make it clear this is a translation table for git-gui project, ··· 157 $ git add po/af.po 158 $ git commit -s -m 'git-gui: added Afrikaans translation.' 159 $ git send-email --to 'git@vger.kernel.org' \ 160 + --cc 'Johannes Sixt <j6t@kdbg.org>' \ 161 --subject 'git-gui: Afrikaans translation' \ 162 master.. 163 ··· 173 174 $ git checkout master 175 $ git pull 176 + $ make ALL_POFILES=po/af.po update-po 177 178 This updates po/af.po (again, replace "af" with your language 179 code) so that it contains msgid lines (i.e. the original) that ··· 193 - New messages added to the software will have msgstr lines with empty 194 strings. You would need to translate them. 195 196 + After testing and updating the Last-Translator: and PO-Revision-Date: 197 + lines, "add/commit/push" as in the previous section.

-2666

git-gui/po/git-gui.pot

··· 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. 5 - # 6 - #, fuzzy 7 - msgid "" 8 - msgstr "" 9 - "Project-Id-Version: PACKAGE VERSION\n" 10 - "Report-Msgid-Bugs-To: \n" 11 - "POT-Creation-Date: 2020-02-08 22:54+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" 15 - "Language: \n" 16 - "MIME-Version: 1.0\n" 17 - "Content-Type: text/plain; charset=CHARSET\n" 18 - "Content-Transfer-Encoding: 8bit\n" 19 - 20 - #: git-gui.sh:847 21 - #, tcl-format 22 - msgid "Invalid font specified in %s:" 23 - msgstr "" 24 - 25 - #: git-gui.sh:901 26 - msgid "Main Font" 27 - msgstr "" 28 - 29 - #: git-gui.sh:902 30 - msgid "Diff/Console Font" 31 - msgstr "" 32 - 33 - #: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053 34 - #: git-gui.sh:3212 35 - msgid "git-gui: fatal error" 36 - msgstr "" 37 - 38 - #: git-gui.sh:918 39 - msgid "Cannot find git in PATH." 40 - msgstr "" 41 - 42 - #: git-gui.sh:945 43 - msgid "Cannot parse Git version string:" 44 - msgstr "" 45 - 46 - #: git-gui.sh:970 47 - #, tcl-format 48 - msgid "" 49 - "Git version cannot be determined.\n" 50 - "\n" 51 - "%s claims it is version '%s'.\n" 52 - "\n" 53 - "%s requires at least Git 1.5.0 or later.\n" 54 - "\n" 55 - "Assume '%s' is version 1.5.0?\n" 56 - msgstr "" 57 - 58 - #: git-gui.sh:1267 59 - msgid "Git directory not found:" 60 - msgstr "" 61 - 62 - #: git-gui.sh:1301 63 - msgid "Cannot move to top of working directory:" 64 - msgstr "" 65 - 66 - #: git-gui.sh:1309 67 - msgid "Cannot use bare repository:" 68 - msgstr "" 69 - 70 - #: git-gui.sh:1317 71 - msgid "No working directory" 72 - msgstr "" 73 - 74 - #: git-gui.sh:1491 lib/checkout_op.tcl:306 75 - msgid "Refreshing file status..." 76 - msgstr "" 77 - 78 - #: git-gui.sh:1551 79 - msgid "Scanning for modified files ..." 80 - msgstr "" 81 - 82 - #: git-gui.sh:1629 83 - msgid "Calling prepare-commit-msg hook..." 84 - msgstr "" 85 - 86 - #: git-gui.sh:1646 87 - msgid "Commit declined by prepare-commit-msg hook." 88 - msgstr "" 89 - 90 - #: git-gui.sh:1804 lib/browser.tcl:252 91 - msgid "Ready." 92 - msgstr "" 93 - 94 - #: git-gui.sh:1968 95 - #, tcl-format 96 - msgid "" 97 - "Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." 98 - msgstr "" 99 - 100 - #: git-gui.sh:2091 101 - msgid "Unmodified" 102 - msgstr "" 103 - 104 - #: git-gui.sh:2093 105 - msgid "Modified, not staged" 106 - msgstr "" 107 - 108 - #: git-gui.sh:2094 git-gui.sh:2106 109 - msgid "Staged for commit" 110 - msgstr "" 111 - 112 - #: git-gui.sh:2095 git-gui.sh:2107 113 - msgid "Portions staged for commit" 114 - msgstr "" 115 - 116 - #: git-gui.sh:2096 git-gui.sh:2108 117 - msgid "Staged for commit, missing" 118 - msgstr "" 119 - 120 - #: git-gui.sh:2098 121 - msgid "File type changed, not staged" 122 - msgstr "" 123 - 124 - #: git-gui.sh:2099 git-gui.sh:2100 125 - msgid "File type changed, old type staged for commit" 126 - msgstr "" 127 - 128 - #: git-gui.sh:2101 129 - msgid "File type changed, staged" 130 - msgstr "" 131 - 132 - #: git-gui.sh:2102 133 - msgid "File type change staged, modification not staged" 134 - msgstr "" 135 - 136 - #: git-gui.sh:2103 137 - msgid "File type change staged, file missing" 138 - msgstr "" 139 - 140 - #: git-gui.sh:2105 141 - msgid "Untracked, not staged" 142 - msgstr "" 143 - 144 - #: git-gui.sh:2110 145 - msgid "Missing" 146 - msgstr "" 147 - 148 - #: git-gui.sh:2111 149 - msgid "Staged for removal" 150 - msgstr "" 151 - 152 - #: git-gui.sh:2112 153 - msgid "Staged for removal, still present" 154 - msgstr "" 155 - 156 - #: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 157 - #: git-gui.sh:2118 git-gui.sh:2119 158 - msgid "Requires merge resolution" 159 - msgstr "" 160 - 161 - #: git-gui.sh:2164 162 - msgid "Couldn't find gitk in PATH" 163 - msgstr "" 164 - 165 - #: git-gui.sh:2210 git-gui.sh:2245 166 - #, tcl-format 167 - msgid "Starting %s... please wait..." 168 - msgstr "" 169 - 170 - #: git-gui.sh:2224 171 - msgid "Couldn't find git gui in PATH" 172 - msgstr "" 173 - 174 - #: git-gui.sh:2726 lib/choose_repository.tcl:53 175 - msgid "Repository" 176 - msgstr "" 177 - 178 - #: git-gui.sh:2727 179 - msgid "Edit" 180 - msgstr "" 181 - 182 - #: git-gui.sh:2729 lib/choose_rev.tcl:567 183 - msgid "Branch" 184 - msgstr "" 185 - 186 - #: git-gui.sh:2732 lib/choose_rev.tcl:554 187 - msgid "Commit@@noun" 188 - msgstr "" 189 - 190 - #: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 191 - msgid "Merge" 192 - msgstr "" 193 - 194 - #: git-gui.sh:2736 lib/choose_rev.tcl:563 195 - msgid "Remote" 196 - msgstr "" 197 - 198 - #: git-gui.sh:2739 199 - msgid "Tools" 200 - msgstr "" 201 - 202 - #: git-gui.sh:2748 203 - msgid "Explore Working Copy" 204 - msgstr "" 205 - 206 - #: git-gui.sh:2763 207 - msgid "Git Bash" 208 - msgstr "" 209 - 210 - #: git-gui.sh:2772 211 - msgid "Browse Current Branch's Files" 212 - msgstr "" 213 - 214 - #: git-gui.sh:2776 215 - msgid "Browse Branch Files..." 216 - msgstr "" 217 - 218 - #: git-gui.sh:2781 219 - msgid "Visualize Current Branch's History" 220 - msgstr "" 221 - 222 - #: git-gui.sh:2785 223 - msgid "Visualize All Branch History" 224 - msgstr "" 225 - 226 - #: git-gui.sh:2792 227 - #, tcl-format 228 - msgid "Browse %s's Files" 229 - msgstr "" 230 - 231 - #: git-gui.sh:2794 232 - #, tcl-format 233 - msgid "Visualize %s's History" 234 - msgstr "" 235 - 236 - #: git-gui.sh:2799 lib/database.tcl:40 237 - msgid "Database Statistics" 238 - msgstr "" 239 - 240 - #: git-gui.sh:2802 lib/database.tcl:33 241 - msgid "Compress Database" 242 - msgstr "" 243 - 244 - #: git-gui.sh:2805 245 - msgid "Verify Database" 246 - msgstr "" 247 - 248 - #: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 249 - msgid "Create Desktop Icon" 250 - msgstr "" 251 - 252 - #: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 253 - msgid "Quit" 254 - msgstr "" 255 - 256 - #: git-gui.sh:2836 257 - msgid "Undo" 258 - msgstr "" 259 - 260 - #: git-gui.sh:2839 261 - msgid "Redo" 262 - msgstr "" 263 - 264 - #: git-gui.sh:2843 git-gui.sh:3461 265 - msgid "Cut" 266 - msgstr "" 267 - 268 - #: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 269 - #: lib/console.tcl:69 270 - msgid "Copy" 271 - msgstr "" 272 - 273 - #: git-gui.sh:2849 git-gui.sh:3467 274 - msgid "Paste" 275 - msgstr "" 276 - 277 - #: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 278 - #: lib/branch_delete.tcl:28 279 - msgid "Delete" 280 - msgstr "" 281 - 282 - #: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 283 - msgid "Select All" 284 - msgstr "" 285 - 286 - #: git-gui.sh:2865 287 - msgid "Create..." 288 - msgstr "" 289 - 290 - #: git-gui.sh:2871 291 - msgid "Checkout..." 292 - msgstr "" 293 - 294 - #: git-gui.sh:2877 295 - msgid "Rename..." 296 - msgstr "" 297 - 298 - #: git-gui.sh:2882 299 - msgid "Delete..." 300 - msgstr "" 301 - 302 - #: git-gui.sh:2887 303 - msgid "Reset..." 304 - msgstr "" 305 - 306 - #: git-gui.sh:2897 307 - msgid "Done" 308 - msgstr "" 309 - 310 - #: git-gui.sh:2899 311 - msgid "Commit@@verb" 312 - msgstr "" 313 - 314 - #: git-gui.sh:2908 git-gui.sh:3400 315 - msgid "Amend Last Commit" 316 - msgstr "" 317 - 318 - #: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 319 - msgid "Rescan" 320 - msgstr "" 321 - 322 - #: git-gui.sh:2924 323 - msgid "Stage To Commit" 324 - msgstr "" 325 - 326 - #: git-gui.sh:2930 327 - msgid "Stage Changed Files To Commit" 328 - msgstr "" 329 - 330 - #: git-gui.sh:2936 331 - msgid "Unstage From Commit" 332 - msgstr "" 333 - 334 - #: git-gui.sh:2942 lib/index.tcl:521 335 - msgid "Revert Changes" 336 - msgstr "" 337 - 338 - #: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 339 - msgid "Show Less Context" 340 - msgstr "" 341 - 342 - #: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 343 - msgid "Show More Context" 344 - msgstr "" 345 - 346 - #: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 347 - msgid "Sign Off" 348 - msgstr "" 349 - 350 - #: git-gui.sh:2977 351 - msgid "Local Merge..." 352 - msgstr "" 353 - 354 - #: git-gui.sh:2982 355 - msgid "Abort Merge..." 356 - msgstr "" 357 - 358 - #: git-gui.sh:2994 git-gui.sh:3022 359 - msgid "Add..." 360 - msgstr "" 361 - 362 - #: git-gui.sh:2998 363 - msgid "Push..." 364 - msgstr "" 365 - 366 - #: git-gui.sh:3002 367 - msgid "Delete Branch..." 368 - msgstr "" 369 - 370 - #: git-gui.sh:3012 git-gui.sh:3666 371 - msgid "Options..." 372 - msgstr "" 373 - 374 - #: git-gui.sh:3023 375 - msgid "Remove..." 376 - msgstr "" 377 - 378 - #: git-gui.sh:3032 lib/choose_repository.tcl:67 379 - msgid "Help" 380 - msgstr "" 381 - 382 - #: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 383 - #: lib/choose_repository.tcl:70 lib/about.tcl:14 384 - #, tcl-format 385 - msgid "About %s" 386 - msgstr "" 387 - 388 - #: git-gui.sh:3064 389 - msgid "Online Documentation" 390 - msgstr "" 391 - 392 - #: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 393 - msgid "Show SSH Key" 394 - msgstr "" 395 - 396 - #: git-gui.sh:3097 git-gui.sh:3229 397 - msgid "usage:" 398 - msgstr "" 399 - 400 - #: git-gui.sh:3101 git-gui.sh:3233 401 - msgid "Usage" 402 - msgstr "" 403 - 404 - #: git-gui.sh:3182 lib/blame.tcl:575 405 - msgid "Error" 406 - msgstr "" 407 - 408 - #: git-gui.sh:3213 409 - #, tcl-format 410 - msgid "fatal: cannot stat path %s: No such file or directory" 411 - msgstr "" 412 - 413 - #: git-gui.sh:3246 414 - msgid "Current Branch:" 415 - msgstr "" 416 - 417 - #: git-gui.sh:3271 418 - msgid "Unstaged Changes" 419 - msgstr "" 420 - 421 - #: git-gui.sh:3293 422 - msgid "Staged Changes (Will Commit)" 423 - msgstr "" 424 - 425 - #: git-gui.sh:3367 426 - msgid "Stage Changed" 427 - msgstr "" 428 - 429 - #: git-gui.sh:3386 lib/transport.tcl:137 430 - msgid "Push" 431 - msgstr "" 432 - 433 - #: git-gui.sh:3413 434 - msgid "Initial Commit Message:" 435 - msgstr "" 436 - 437 - #: git-gui.sh:3414 438 - msgid "Amended Commit Message:" 439 - msgstr "" 440 - 441 - #: git-gui.sh:3415 442 - msgid "Amended Initial Commit Message:" 443 - msgstr "" 444 - 445 - #: git-gui.sh:3416 446 - msgid "Amended Merge Commit Message:" 447 - msgstr "" 448 - 449 - #: git-gui.sh:3417 450 - msgid "Merge Commit Message:" 451 - msgstr "" 452 - 453 - #: git-gui.sh:3418 454 - msgid "Commit Message:" 455 - msgstr "" 456 - 457 - #: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 458 - msgid "Copy All" 459 - msgstr "" 460 - 461 - #: git-gui.sh:3501 lib/blame.tcl:106 462 - msgid "File:" 463 - msgstr "" 464 - 465 - #: git-gui.sh:3549 lib/choose_repository.tcl:1100 466 - msgid "Open" 467 - msgstr "" 468 - 469 - #: git-gui.sh:3629 470 - msgid "Refresh" 471 - msgstr "" 472 - 473 - #: git-gui.sh:3650 474 - msgid "Decrease Font Size" 475 - msgstr "" 476 - 477 - #: git-gui.sh:3654 478 - msgid "Increase Font Size" 479 - msgstr "" 480 - 481 - #: git-gui.sh:3662 lib/blame.tcl:296 482 - msgid "Encoding" 483 - msgstr "" 484 - 485 - #: git-gui.sh:3673 486 - msgid "Apply/Reverse Hunk" 487 - msgstr "" 488 - 489 - #: git-gui.sh:3678 490 - msgid "Apply/Reverse Line" 491 - msgstr "" 492 - 493 - #: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805 494 - msgid "Revert Hunk" 495 - msgstr "" 496 - 497 - #: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812 498 - msgid "Revert Line" 499 - msgstr "" 500 - 501 - #: git-gui.sh:3694 git-gui.sh:3791 502 - msgid "Undo Last Revert" 503 - msgstr "" 504 - 505 - #: git-gui.sh:3713 506 - msgid "Run Merge Tool" 507 - msgstr "" 508 - 509 - #: git-gui.sh:3718 510 - msgid "Use Remote Version" 511 - msgstr "" 512 - 513 - #: git-gui.sh:3722 514 - msgid "Use Local Version" 515 - msgstr "" 516 - 517 - #: git-gui.sh:3726 518 - msgid "Revert To Base" 519 - msgstr "" 520 - 521 - #: git-gui.sh:3744 522 - msgid "Visualize These Changes In The Submodule" 523 - msgstr "" 524 - 525 - #: git-gui.sh:3748 526 - msgid "Visualize Current Branch History In The Submodule" 527 - msgstr "" 528 - 529 - #: git-gui.sh:3752 530 - msgid "Visualize All Branch History In The Submodule" 531 - msgstr "" 532 - 533 - #: git-gui.sh:3757 534 - msgid "Start git gui In The Submodule" 535 - msgstr "" 536 - 537 - #: git-gui.sh:3793 538 - msgid "Unstage Hunk From Commit" 539 - msgstr "" 540 - 541 - #: git-gui.sh:3797 542 - msgid "Unstage Lines From Commit" 543 - msgstr "" 544 - 545 - #: git-gui.sh:3798 git-gui.sh:3809 546 - msgid "Revert Lines" 547 - msgstr "" 548 - 549 - #: git-gui.sh:3800 550 - msgid "Unstage Line From Commit" 551 - msgstr "" 552 - 553 - #: git-gui.sh:3804 554 - msgid "Stage Hunk For Commit" 555 - msgstr "" 556 - 557 - #: git-gui.sh:3808 558 - msgid "Stage Lines For Commit" 559 - msgstr "" 560 - 561 - #: git-gui.sh:3811 562 - msgid "Stage Line For Commit" 563 - msgstr "" 564 - 565 - #: git-gui.sh:3861 566 - msgid "Initializing..." 567 - msgstr "" 568 - 569 - #: git-gui.sh:4017 570 - #, tcl-format 571 - msgid "" 572 - "Possible environment issues exist.\n" 573 - "\n" 574 - "The following environment variables are probably\n" 575 - "going to be ignored by any Git subprocess run\n" 576 - "by %s:\n" 577 - "\n" 578 - msgstr "" 579 - 580 - #: git-gui.sh:4046 581 - msgid "" 582 - "\n" 583 - "This is due to a known issue with the\n" 584 - "Tcl binary distributed by Cygwin." 585 - msgstr "" 586 - 587 - #: git-gui.sh:4051 588 - #, tcl-format 589 - msgid "" 590 - "\n" 591 - "\n" 592 - "A good replacement for %s\n" 593 - "is placing values for the user.name and\n" 594 - "user.email settings into your personal\n" 595 - "~/.gitconfig file.\n" 596 - msgstr "" 597 - 598 - #: lib/spellcheck.tcl:57 599 - msgid "Unsupported spell checker" 600 - msgstr "" 601 - 602 - #: lib/spellcheck.tcl:65 603 - msgid "Spell checking is unavailable" 604 - msgstr "" 605 - 606 - #: lib/spellcheck.tcl:68 607 - msgid "Invalid spell checking configuration" 608 - msgstr "" 609 - 610 - #: lib/spellcheck.tcl:70 611 - #, tcl-format 612 - msgid "Reverting dictionary to %s." 613 - msgstr "" 614 - 615 - #: lib/spellcheck.tcl:73 616 - msgid "Spell checker silently failed on startup" 617 - msgstr "" 618 - 619 - #: lib/spellcheck.tcl:80 620 - msgid "Unrecognized spell checker" 621 - msgstr "" 622 - 623 - #: lib/spellcheck.tcl:186 624 - msgid "No Suggestions" 625 - msgstr "" 626 - 627 - #: lib/spellcheck.tcl:388 628 - msgid "Unexpected EOF from spell checker" 629 - msgstr "" 630 - 631 - #: lib/spellcheck.tcl:392 632 - msgid "Spell Checker Failed" 633 - msgstr "" 634 - 635 - #: lib/transport.tcl:6 lib/remote_add.tcl:132 636 - #, tcl-format 637 - msgid "fetch %s" 638 - msgstr "" 639 - 640 - #: lib/transport.tcl:7 641 - #, tcl-format 642 - msgid "Fetching new changes from %s" 643 - msgstr "" 644 - 645 - #: lib/transport.tcl:18 646 - #, tcl-format 647 - msgid "remote prune %s" 648 - msgstr "" 649 - 650 - #: lib/transport.tcl:19 651 - #, tcl-format 652 - msgid "Pruning tracking branches deleted from %s" 653 - msgstr "" 654 - 655 - #: lib/transport.tcl:25 656 - msgid "fetch all remotes" 657 - msgstr "" 658 - 659 - #: lib/transport.tcl:26 660 - msgid "Fetching new changes from all remotes" 661 - msgstr "" 662 - 663 - #: lib/transport.tcl:40 664 - msgid "remote prune all remotes" 665 - msgstr "" 666 - 667 - #: lib/transport.tcl:41 668 - msgid "Pruning tracking branches deleted from all remotes" 669 - msgstr "" 670 - 671 - #: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 672 - #: lib/remote_add.tcl:162 673 - #, tcl-format 674 - msgid "push %s" 675 - msgstr "" 676 - 677 - #: lib/transport.tcl:55 678 - #, tcl-format 679 - msgid "Pushing changes to %s" 680 - msgstr "" 681 - 682 - #: lib/transport.tcl:93 683 - #, tcl-format 684 - msgid "Mirroring to %s" 685 - msgstr "" 686 - 687 - #: lib/transport.tcl:111 688 - #, tcl-format 689 - msgid "Pushing %s %s to %s" 690 - msgstr "" 691 - 692 - #: lib/transport.tcl:132 693 - msgid "Push Branches" 694 - msgstr "" 695 - 696 - #: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34 697 - #: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32 698 - #: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 699 - #: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43 700 - #: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178 701 - msgid "Cancel" 702 - msgstr "" 703 - 704 - #: lib/transport.tcl:147 705 - msgid "Source Branches" 706 - msgstr "" 707 - 708 - #: lib/transport.tcl:162 709 - msgid "Destination Repository" 710 - msgstr "" 711 - 712 - #: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 713 - msgid "Remote:" 714 - msgstr "" 715 - 716 - #: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 717 - msgid "Arbitrary Location:" 718 - msgstr "" 719 - 720 - #: lib/transport.tcl:205 721 - msgid "Transfer Options" 722 - msgstr "" 723 - 724 - #: lib/transport.tcl:207 725 - msgid "Force overwrite existing branch (may discard changes)" 726 - msgstr "" 727 - 728 - #: lib/transport.tcl:211 729 - msgid "Use thin pack (for slow network connections)" 730 - msgstr "" 731 - 732 - #: lib/transport.tcl:215 733 - msgid "Include tags" 734 - msgstr "" 735 - 736 - #: lib/transport.tcl:229 737 - #, tcl-format 738 - msgid "%s (%s): Push" 739 - msgstr "" 740 - 741 - #: lib/checkout_op.tcl:85 742 - #, tcl-format 743 - msgid "Fetching %s from %s" 744 - msgstr "" 745 - 746 - #: lib/checkout_op.tcl:133 747 - #, tcl-format 748 - msgid "fatal: Cannot resolve %s" 749 - msgstr "" 750 - 751 - #: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 752 - #: lib/database.tcl:30 753 - msgid "Close" 754 - msgstr "" 755 - 756 - #: lib/checkout_op.tcl:175 757 - #, tcl-format 758 - msgid "Branch '%s' does not exist." 759 - msgstr "" 760 - 761 - #: lib/checkout_op.tcl:194 762 - #, tcl-format 763 - msgid "Failed to configure simplified git-pull for '%s'." 764 - msgstr "" 765 - 766 - #: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 767 - #, tcl-format 768 - msgid "Branch '%s' already exists." 769 - msgstr "" 770 - 771 - #: lib/checkout_op.tcl:229 772 - #, tcl-format 773 - msgid "" 774 - "Branch '%s' already exists.\n" 775 - "\n" 776 - "It cannot fast-forward to %s.\n" 777 - "A merge is required." 778 - msgstr "" 779 - 780 - #: lib/checkout_op.tcl:243 781 - #, tcl-format 782 - msgid "Merge strategy '%s' not supported." 783 - msgstr "" 784 - 785 - #: lib/checkout_op.tcl:262 786 - #, tcl-format 787 - msgid "Failed to update '%s'." 788 - msgstr "" 789 - 790 - #: lib/checkout_op.tcl:274 791 - msgid "Staging area (index) is already locked." 792 - msgstr "" 793 - 794 - #: lib/checkout_op.tcl:289 795 - msgid "" 796 - "Last scanned state does not match repository state.\n" 797 - "\n" 798 - "Another Git program has modified this repository since the last scan. A " 799 - "rescan must be performed before the current branch can be changed.\n" 800 - "\n" 801 - "The rescan will be automatically started now.\n" 802 - msgstr "" 803 - 804 - #: lib/checkout_op.tcl:345 805 - #, tcl-format 806 - msgid "Updating working directory to '%s'..." 807 - msgstr "" 808 - 809 - #: lib/checkout_op.tcl:346 810 - msgid "files checked out" 811 - msgstr "" 812 - 813 - #: lib/checkout_op.tcl:377 814 - #, tcl-format 815 - msgid "Aborted checkout of '%s' (file level merging is required)." 816 - msgstr "" 817 - 818 - #: lib/checkout_op.tcl:378 819 - msgid "File level merge required." 820 - msgstr "" 821 - 822 - #: lib/checkout_op.tcl:382 823 - #, tcl-format 824 - msgid "Staying on branch '%s'." 825 - msgstr "" 826 - 827 - #: lib/checkout_op.tcl:453 828 - msgid "" 829 - "You are no longer on a local branch.\n" 830 - "\n" 831 - "If you wanted to be on a branch, create one now starting from 'This Detached " 832 - "Checkout'." 833 - msgstr "" 834 - 835 - #: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 836 - #, tcl-format 837 - msgid "Checked out '%s'." 838 - msgstr "" 839 - 840 - #: lib/checkout_op.tcl:536 841 - #, tcl-format 842 - msgid "Resetting '%s' to '%s' will lose the following commits:" 843 - msgstr "" 844 - 845 - #: lib/checkout_op.tcl:558 846 - msgid "Recovering lost commits may not be easy." 847 - msgstr "" 848 - 849 - #: lib/checkout_op.tcl:563 850 - #, tcl-format 851 - msgid "Reset '%s'?" 852 - msgstr "" 853 - 854 - #: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 855 - msgid "Visualize" 856 - msgstr "" 857 - 858 - #: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 859 - msgid "Reset" 860 - msgstr "" 861 - 862 - #: lib/checkout_op.tcl:636 863 - #, tcl-format 864 - msgid "" 865 - "Failed to set current branch.\n" 866 - "\n" 867 - "This working directory is only partially switched. We successfully updated " 868 - "your files, but failed to update an internal Git file.\n" 869 - "\n" 870 - "This should not have occurred. %s will now close and give up." 871 - msgstr "" 872 - 873 - #: lib/remote_add.tcl:20 874 - #, tcl-format 875 - msgid "%s (%s): Add Remote" 876 - msgstr "" 877 - 878 - #: lib/remote_add.tcl:25 879 - msgid "Add New Remote" 880 - msgstr "" 881 - 882 - #: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 883 - msgid "Add" 884 - msgstr "" 885 - 886 - #: lib/remote_add.tcl:39 887 - msgid "Remote Details" 888 - msgstr "" 889 - 890 - #: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 891 - msgid "Name:" 892 - msgstr "" 893 - 894 - #: lib/remote_add.tcl:50 895 - msgid "Location:" 896 - msgstr "" 897 - 898 - #: lib/remote_add.tcl:60 899 - msgid "Further Action" 900 - msgstr "" 901 - 902 - #: lib/remote_add.tcl:63 903 - msgid "Fetch Immediately" 904 - msgstr "" 905 - 906 - #: lib/remote_add.tcl:69 907 - msgid "Initialize Remote Repository and Push" 908 - msgstr "" 909 - 910 - #: lib/remote_add.tcl:75 911 - msgid "Do Nothing Else Now" 912 - msgstr "" 913 - 914 - #: lib/remote_add.tcl:100 915 - msgid "Please supply a remote name." 916 - msgstr "" 917 - 918 - #: lib/remote_add.tcl:113 919 - #, tcl-format 920 - msgid "'%s' is not an acceptable remote name." 921 - msgstr "" 922 - 923 - #: lib/remote_add.tcl:124 924 - #, tcl-format 925 - msgid "Failed to add remote '%s' of location '%s'." 926 - msgstr "" 927 - 928 - #: lib/remote_add.tcl:133 929 - #, tcl-format 930 - msgid "Fetching the %s" 931 - msgstr "" 932 - 933 - #: lib/remote_add.tcl:156 934 - #, tcl-format 935 - msgid "Do not know how to initialize repository at location '%s'." 936 - msgstr "" 937 - 938 - #: lib/remote_add.tcl:163 939 - #, tcl-format 940 - msgid "Setting up the %s (at %s)" 941 - msgstr "" 942 - 943 - #: lib/browser.tcl:17 944 - msgid "Starting..." 945 - msgstr "" 946 - 947 - #: lib/browser.tcl:27 948 - #, tcl-format 949 - msgid "%s (%s): File Browser" 950 - msgstr "" 951 - 952 - #: lib/browser.tcl:132 lib/browser.tcl:149 953 - #, tcl-format 954 - msgid "Loading %s..." 955 - msgstr "" 956 - 957 - #: lib/browser.tcl:193 958 - msgid "[Up To Parent]" 959 - msgstr "" 960 - 961 - #: lib/browser.tcl:275 962 - #, tcl-format 963 - msgid "%s (%s): Browse Branch Files" 964 - msgstr "" 965 - 966 - #: lib/browser.tcl:282 967 - msgid "Browse Branch Files" 968 - msgstr "" 969 - 970 - #: lib/browser.tcl:288 lib/choose_repository.tcl:437 971 - #: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533 972 - #: lib/choose_repository.tcl:1115 973 - msgid "Browse" 974 - msgstr "" 975 - 976 - #: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 977 - msgid "Revision" 978 - msgstr "" 979 - 980 - #: lib/index.tcl:6 981 - msgid "Unable to unlock the index." 982 - msgstr "" 983 - 984 - #: lib/index.tcl:30 985 - msgid "Index Error" 986 - msgstr "" 987 - 988 - #: lib/index.tcl:32 989 - msgid "" 990 - "Updating the Git index failed. A rescan will be automatically started to " 991 - "resynchronize git-gui." 992 - msgstr "" 993 - 994 - #: lib/index.tcl:43 995 - msgid "Continue" 996 - msgstr "" 997 - 998 - #: lib/index.tcl:46 999 - msgid "Unlock Index" 1000 - msgstr "" 1001 - 1002 - #: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587 1003 - #: lib/choose_repository.tcl:999 1004 - msgid "files" 1005 - msgstr "" 1006 - 1007 - #: lib/index.tcl:326 1008 - msgid "Unstaging selected files from commit" 1009 - msgstr "" 1010 - 1011 - #: lib/index.tcl:330 1012 - #, tcl-format 1013 - msgid "Unstaging %s from commit" 1014 - msgstr "" 1015 - 1016 - #: lib/index.tcl:369 1017 - msgid "Ready to commit." 1018 - msgstr "" 1019 - 1020 - #: lib/index.tcl:378 1021 - msgid "Adding selected files" 1022 - msgstr "" 1023 - 1024 - #: lib/index.tcl:382 1025 - #, tcl-format 1026 - msgid "Adding %s" 1027 - msgstr "" 1028 - 1029 - #: lib/index.tcl:412 1030 - #, tcl-format 1031 - msgid "Stage %d untracked files?" 1032 - msgstr "" 1033 - 1034 - #: lib/index.tcl:420 1035 - msgid "Adding all changed files" 1036 - msgstr "" 1037 - 1038 - #: lib/index.tcl:503 1039 - #, tcl-format 1040 - msgid "Revert changes in file %s?" 1041 - msgstr "" 1042 - 1043 - #: lib/index.tcl:508 1044 - #, tcl-format 1045 - msgid "Revert changes in these %i files?" 1046 - msgstr "" 1047 - 1048 - #: lib/index.tcl:517 1049 - msgid "Any unstaged changes will be permanently lost by the revert." 1050 - msgstr "" 1051 - 1052 - #: lib/index.tcl:520 lib/index.tcl:563 1053 - msgid "Do Nothing" 1054 - msgstr "" 1055 - 1056 - #: lib/index.tcl:545 1057 - #, tcl-format 1058 - msgid "Delete untracked file %s?" 1059 - msgstr "" 1060 - 1061 - #: lib/index.tcl:550 1062 - #, tcl-format 1063 - msgid "Delete these %i untracked files?" 1064 - msgstr "" 1065 - 1066 - #: lib/index.tcl:560 1067 - msgid "Files will be permanently deleted." 1068 - msgstr "" 1069 - 1070 - #: lib/index.tcl:564 1071 - msgid "Delete Files" 1072 - msgstr "" 1073 - 1074 - #: lib/index.tcl:586 1075 - msgid "Deleting" 1076 - msgstr "" 1077 - 1078 - #: lib/index.tcl:665 1079 - msgid "Encountered errors deleting files:\n" 1080 - msgstr "" 1081 - 1082 - #: lib/index.tcl:674 1083 - #, tcl-format 1084 - msgid "None of the %d selected files could be deleted." 1085 - msgstr "" 1086 - 1087 - #: lib/index.tcl:679 1088 - #, tcl-format 1089 - msgid "%d of the %d selected files could not be deleted." 1090 - msgstr "" 1091 - 1092 - #: lib/index.tcl:726 1093 - msgid "Reverting selected files" 1094 - msgstr "" 1095 - 1096 - #: lib/index.tcl:730 1097 - #, tcl-format 1098 - msgid "Reverting %s" 1099 - msgstr "" 1100 - 1101 - #: lib/branch_checkout.tcl:16 1102 - #, tcl-format 1103 - msgid "%s (%s): Checkout Branch" 1104 - msgstr "" 1105 - 1106 - #: lib/branch_checkout.tcl:21 1107 - msgid "Checkout Branch" 1108 - msgstr "" 1109 - 1110 - #: lib/branch_checkout.tcl:26 1111 - msgid "Checkout" 1112 - msgstr "" 1113 - 1114 - #: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 1115 - msgid "Options" 1116 - msgstr "" 1117 - 1118 - #: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 1119 - msgid "Fetch Tracking Branch" 1120 - msgstr "" 1121 - 1122 - #: lib/branch_checkout.tcl:47 1123 - msgid "Detach From Local Branch" 1124 - msgstr "" 1125 - 1126 - #: lib/status_bar.tcl:263 1127 - #, tcl-format 1128 - msgid "%s ... %*i of %*i %s (%3i%%)" 1129 - msgstr "" 1130 - 1131 - #: lib/remote.tcl:200 1132 - msgid "Push to" 1133 - msgstr "" 1134 - 1135 - #: lib/remote.tcl:218 1136 - msgid "Remove Remote" 1137 - msgstr "" 1138 - 1139 - #: lib/remote.tcl:223 1140 - msgid "Prune from" 1141 - msgstr "" 1142 - 1143 - #: lib/remote.tcl:228 1144 - msgid "Fetch from" 1145 - msgstr "" 1146 - 1147 - #: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264 1148 - msgid "All" 1149 - msgstr "" 1150 - 1151 - #: lib/branch_rename.tcl:15 1152 - #, tcl-format 1153 - msgid "%s (%s): Rename Branch" 1154 - msgstr "" 1155 - 1156 - #: lib/branch_rename.tcl:23 1157 - msgid "Rename Branch" 1158 - msgstr "" 1159 - 1160 - #: lib/branch_rename.tcl:28 1161 - msgid "Rename" 1162 - msgstr "" 1163 - 1164 - #: lib/branch_rename.tcl:38 1165 - msgid "Branch:" 1166 - msgstr "" 1167 - 1168 - #: lib/branch_rename.tcl:46 1169 - msgid "New Name:" 1170 - msgstr "" 1171 - 1172 - #: lib/branch_rename.tcl:81 1173 - msgid "Please select a branch to rename." 1174 - msgstr "" 1175 - 1176 - #: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 1177 - msgid "Please supply a branch name." 1178 - msgstr "" 1179 - 1180 - #: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 1181 - #, tcl-format 1182 - msgid "'%s' is not an acceptable branch name." 1183 - msgstr "" 1184 - 1185 - #: lib/branch_rename.tcl:123 1186 - #, tcl-format 1187 - msgid "Failed to rename '%s'." 1188 - msgstr "" 1189 - 1190 - #: lib/choose_font.tcl:41 1191 - msgid "Select" 1192 - msgstr "" 1193 - 1194 - #: lib/choose_font.tcl:55 1195 - msgid "Font Family" 1196 - msgstr "" 1197 - 1198 - #: lib/choose_font.tcl:76 1199 - msgid "Font Size" 1200 - msgstr "" 1201 - 1202 - #: lib/choose_font.tcl:93 1203 - msgid "Font Example" 1204 - msgstr "" 1205 - 1206 - #: lib/choose_font.tcl:105 1207 - msgid "" 1208 - "This is example text.\n" 1209 - "If you like this text, it can be your font." 1210 - msgstr "" 1211 - 1212 - #: lib/option.tcl:11 1213 - #, tcl-format 1214 - msgid "Invalid global encoding '%s'" 1215 - msgstr "" 1216 - 1217 - #: lib/option.tcl:19 1218 - #, tcl-format 1219 - msgid "Invalid repo encoding '%s'" 1220 - msgstr "" 1221 - 1222 - #: lib/option.tcl:119 1223 - msgid "Restore Defaults" 1224 - msgstr "" 1225 - 1226 - #: lib/option.tcl:123 1227 - msgid "Save" 1228 - msgstr "" 1229 - 1230 - #: lib/option.tcl:133 1231 - #, tcl-format 1232 - msgid "%s Repository" 1233 - msgstr "" 1234 - 1235 - #: lib/option.tcl:134 1236 - msgid "Global (All Repositories)" 1237 - msgstr "" 1238 - 1239 - #: lib/option.tcl:140 1240 - msgid "User Name" 1241 - msgstr "" 1242 - 1243 - #: lib/option.tcl:141 1244 - msgid "Email Address" 1245 - msgstr "" 1246 - 1247 - #: lib/option.tcl:143 1248 - msgid "Summarize Merge Commits" 1249 - msgstr "" 1250 - 1251 - #: lib/option.tcl:144 1252 - msgid "Merge Verbosity" 1253 - msgstr "" 1254 - 1255 - #: lib/option.tcl:145 1256 - msgid "Show Diffstat After Merge" 1257 - msgstr "" 1258 - 1259 - #: lib/option.tcl:146 1260 - msgid "Use Merge Tool" 1261 - msgstr "" 1262 - 1263 - #: lib/option.tcl:148 1264 - msgid "Trust File Modification Timestamps" 1265 - msgstr "" 1266 - 1267 - #: lib/option.tcl:149 1268 - msgid "Prune Tracking Branches During Fetch" 1269 - msgstr "" 1270 - 1271 - #: lib/option.tcl:150 1272 - msgid "Match Tracking Branches" 1273 - msgstr "" 1274 - 1275 - #: lib/option.tcl:151 1276 - msgid "Use Textconv For Diffs and Blames" 1277 - msgstr "" 1278 - 1279 - #: lib/option.tcl:152 1280 - msgid "Blame Copy Only On Changed Files" 1281 - msgstr "" 1282 - 1283 - #: lib/option.tcl:153 1284 - msgid "Maximum Length of Recent Repositories List" 1285 - msgstr "" 1286 - 1287 - #: lib/option.tcl:154 1288 - msgid "Minimum Letters To Blame Copy On" 1289 - msgstr "" 1290 - 1291 - #: lib/option.tcl:155 1292 - msgid "Blame History Context Radius (days)" 1293 - msgstr "" 1294 - 1295 - #: lib/option.tcl:156 1296 - msgid "Number of Diff Context Lines" 1297 - msgstr "" 1298 - 1299 - #: lib/option.tcl:157 1300 - msgid "Additional Diff Parameters" 1301 - msgstr "" 1302 - 1303 - #: lib/option.tcl:158 1304 - msgid "Commit Message Text Width" 1305 - msgstr "" 1306 - 1307 - #: lib/option.tcl:159 1308 - msgid "New Branch Name Template" 1309 - msgstr "" 1310 - 1311 - #: lib/option.tcl:160 1312 - msgid "Default File Contents Encoding" 1313 - msgstr "" 1314 - 1315 - #: lib/option.tcl:161 1316 - msgid "Warn before committing to a detached head" 1317 - msgstr "" 1318 - 1319 - #: lib/option.tcl:162 1320 - msgid "Staging of untracked files" 1321 - msgstr "" 1322 - 1323 - #: lib/option.tcl:163 1324 - msgid "Show untracked files" 1325 - msgstr "" 1326 - 1327 - #: lib/option.tcl:164 1328 - msgid "Tab spacing" 1329 - msgstr "" 1330 - 1331 - #: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282 1332 - #: lib/database.tcl:57 1333 - #, tcl-format 1334 - msgid "%s:" 1335 - msgstr "" 1336 - 1337 - #: lib/option.tcl:210 1338 - msgid "Change" 1339 - msgstr "" 1340 - 1341 - #: lib/option.tcl:254 1342 - msgid "Spelling Dictionary:" 1343 - msgstr "" 1344 - 1345 - #: lib/option.tcl:284 1346 - msgid "Change Font" 1347 - msgstr "" 1348 - 1349 - #: lib/option.tcl:288 1350 - #, tcl-format 1351 - msgid "Choose %s" 1352 - msgstr "" 1353 - 1354 - #: lib/option.tcl:294 1355 - msgid "pt." 1356 - msgstr "" 1357 - 1358 - #: lib/option.tcl:308 1359 - msgid "Preferences" 1360 - msgstr "" 1361 - 1362 - #: lib/option.tcl:345 1363 - msgid "Failed to completely save options:" 1364 - msgstr "" 1365 - 1366 - #: lib/encoding.tcl:443 1367 - msgid "Default" 1368 - msgstr "" 1369 - 1370 - #: lib/encoding.tcl:448 1371 - #, tcl-format 1372 - msgid "System (%s)" 1373 - msgstr "" 1374 - 1375 - #: lib/encoding.tcl:459 lib/encoding.tcl:465 1376 - msgid "Other" 1377 - msgstr "" 1378 - 1379 - #: lib/tools.tcl:76 1380 - #, tcl-format 1381 - msgid "Running %s requires a selected file." 1382 - msgstr "" 1383 - 1384 - #: lib/tools.tcl:92 1385 - #, tcl-format 1386 - msgid "Are you sure you want to run %1$s on file \"%2$s\"?" 1387 - msgstr "" 1388 - 1389 - #: lib/tools.tcl:96 1390 - #, tcl-format 1391 - msgid "Are you sure you want to run %s?" 1392 - msgstr "" 1393 - 1394 - #: lib/tools.tcl:118 1395 - #, tcl-format 1396 - msgid "Tool: %s" 1397 - msgstr "" 1398 - 1399 - #: lib/tools.tcl:119 1400 - #, tcl-format 1401 - msgid "Running: %s" 1402 - msgstr "" 1403 - 1404 - #: lib/tools.tcl:158 1405 - #, tcl-format 1406 - msgid "Tool completed successfully: %s" 1407 - msgstr "" 1408 - 1409 - #: lib/tools.tcl:160 1410 - #, tcl-format 1411 - msgid "Tool failed: %s" 1412 - msgstr "" 1413 - 1414 - #: lib/mergetool.tcl:8 1415 - msgid "Force resolution to the base version?" 1416 - msgstr "" 1417 - 1418 - #: lib/mergetool.tcl:9 1419 - msgid "Force resolution to this branch?" 1420 - msgstr "" 1421 - 1422 - #: lib/mergetool.tcl:10 1423 - msgid "Force resolution to the other branch?" 1424 - msgstr "" 1425 - 1426 - #: lib/mergetool.tcl:14 1427 - #, tcl-format 1428 - msgid "" 1429 - "Note that the diff shows only conflicting changes.\n" 1430 - "\n" 1431 - "%s will be overwritten.\n" 1432 - "\n" 1433 - "This operation can be undone only by restarting the merge." 1434 - msgstr "" 1435 - 1436 - #: lib/mergetool.tcl:45 1437 - #, tcl-format 1438 - msgid "File %s seems to have unresolved conflicts, still stage?" 1439 - msgstr "" 1440 - 1441 - #: lib/mergetool.tcl:60 1442 - #, tcl-format 1443 - msgid "Adding resolution for %s" 1444 - msgstr "" 1445 - 1446 - #: lib/mergetool.tcl:141 1447 - msgid "Cannot resolve deletion or link conflicts using a tool" 1448 - msgstr "" 1449 - 1450 - #: lib/mergetool.tcl:146 1451 - msgid "Conflict file does not exist" 1452 - msgstr "" 1453 - 1454 - #: lib/mergetool.tcl:246 1455 - #, tcl-format 1456 - msgid "Not a GUI merge tool: '%s'" 1457 - msgstr "" 1458 - 1459 - #: lib/mergetool.tcl:275 1460 - #, tcl-format 1461 - msgid "Unsupported merge tool '%s'" 1462 - msgstr "" 1463 - 1464 - #: lib/mergetool.tcl:310 1465 - msgid "Merge tool is already running, terminate it?" 1466 - msgstr "" 1467 - 1468 - #: lib/mergetool.tcl:330 1469 - #, tcl-format 1470 - msgid "" 1471 - "Error retrieving versions:\n" 1472 - "%s" 1473 - msgstr "" 1474 - 1475 - #: lib/mergetool.tcl:350 1476 - #, tcl-format 1477 - msgid "" 1478 - "Could not start the merge tool:\n" 1479 - "\n" 1480 - "%s" 1481 - msgstr "" 1482 - 1483 - #: lib/mergetool.tcl:354 1484 - msgid "Running merge tool..." 1485 - msgstr "" 1486 - 1487 - #: lib/mergetool.tcl:382 lib/mergetool.tcl:390 1488 - msgid "Merge tool failed." 1489 - msgstr "" 1490 - 1491 - #: lib/tools_dlg.tcl:22 1492 - #, tcl-format 1493 - msgid "%s (%s): Add Tool" 1494 - msgstr "" 1495 - 1496 - #: lib/tools_dlg.tcl:28 1497 - msgid "Add New Tool Command" 1498 - msgstr "" 1499 - 1500 - #: lib/tools_dlg.tcl:34 1501 - msgid "Add globally" 1502 - msgstr "" 1503 - 1504 - #: lib/tools_dlg.tcl:46 1505 - msgid "Tool Details" 1506 - msgstr "" 1507 - 1508 - #: lib/tools_dlg.tcl:49 1509 - msgid "Use '/' separators to create a submenu tree:" 1510 - msgstr "" 1511 - 1512 - #: lib/tools_dlg.tcl:60 1513 - msgid "Command:" 1514 - msgstr "" 1515 - 1516 - #: lib/tools_dlg.tcl:71 1517 - msgid "Show a dialog before running" 1518 - msgstr "" 1519 - 1520 - #: lib/tools_dlg.tcl:77 1521 - msgid "Ask the user to select a revision (sets $REVISION)" 1522 - msgstr "" 1523 - 1524 - #: lib/tools_dlg.tcl:82 1525 - msgid "Ask the user for additional arguments (sets $ARGS)" 1526 - msgstr "" 1527 - 1528 - #: lib/tools_dlg.tcl:89 1529 - msgid "Don't show the command output window" 1530 - msgstr "" 1531 - 1532 - #: lib/tools_dlg.tcl:94 1533 - msgid "Run only if a diff is selected ($FILENAME not empty)" 1534 - msgstr "" 1535 - 1536 - #: lib/tools_dlg.tcl:118 1537 - msgid "Please supply a name for the tool." 1538 - msgstr "" 1539 - 1540 - #: lib/tools_dlg.tcl:126 1541 - #, tcl-format 1542 - msgid "Tool '%s' already exists." 1543 - msgstr "" 1544 - 1545 - #: lib/tools_dlg.tcl:148 1546 - #, tcl-format 1547 - msgid "" 1548 - "Could not add tool:\n" 1549 - "%s" 1550 - msgstr "" 1551 - 1552 - #: lib/tools_dlg.tcl:187 1553 - #, tcl-format 1554 - msgid "%s (%s): Remove Tool" 1555 - msgstr "" 1556 - 1557 - #: lib/tools_dlg.tcl:193 1558 - msgid "Remove Tool Commands" 1559 - msgstr "" 1560 - 1561 - #: lib/tools_dlg.tcl:198 1562 - msgid "Remove" 1563 - msgstr "" 1564 - 1565 - #: lib/tools_dlg.tcl:231 1566 - msgid "(Blue denotes repository-local tools)" 1567 - msgstr "" 1568 - 1569 - #: lib/tools_dlg.tcl:283 1570 - #, tcl-format 1571 - msgid "%s (%s):" 1572 - msgstr "" 1573 - 1574 - #: lib/tools_dlg.tcl:292 1575 - #, tcl-format 1576 - msgid "Run Command: %s" 1577 - msgstr "" 1578 - 1579 - #: lib/tools_dlg.tcl:306 1580 - msgid "Arguments" 1581 - msgstr "" 1582 - 1583 - #: lib/tools_dlg.tcl:341 1584 - msgid "OK" 1585 - msgstr "" 1586 - 1587 - #: lib/search.tcl:48 1588 - msgid "Find:" 1589 - msgstr "" 1590 - 1591 - #: lib/search.tcl:50 1592 - msgid "Next" 1593 - msgstr "" 1594 - 1595 - #: lib/search.tcl:51 1596 - msgid "Prev" 1597 - msgstr "" 1598 - 1599 - #: lib/search.tcl:52 1600 - msgid "RegExp" 1601 - msgstr "" 1602 - 1603 - #: lib/search.tcl:54 1604 - msgid "Case" 1605 - msgstr "" 1606 - 1607 - #: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75 1608 - #, tcl-format 1609 - msgid "%s (%s): Create Desktop Icon" 1610 - msgstr "" 1611 - 1612 - #: lib/shortcut.tcl:24 lib/shortcut.tcl:65 1613 - msgid "Cannot write shortcut:" 1614 - msgstr "" 1615 - 1616 - #: lib/shortcut.tcl:140 1617 - msgid "Cannot write icon:" 1618 - msgstr "" 1619 - 1620 - #: lib/remote_branch_delete.tcl:29 1621 - #, tcl-format 1622 - msgid "%s (%s): Delete Branch Remotely" 1623 - msgstr "" 1624 - 1625 - #: lib/remote_branch_delete.tcl:34 1626 - msgid "Delete Branch Remotely" 1627 - msgstr "" 1628 - 1629 - #: lib/remote_branch_delete.tcl:48 1630 - msgid "From Repository" 1631 - msgstr "" 1632 - 1633 - #: lib/remote_branch_delete.tcl:88 1634 - msgid "Branches" 1635 - msgstr "" 1636 - 1637 - #: lib/remote_branch_delete.tcl:110 1638 - msgid "Delete Only If" 1639 - msgstr "" 1640 - 1641 - #: lib/remote_branch_delete.tcl:112 1642 - msgid "Merged Into:" 1643 - msgstr "" 1644 - 1645 - #: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 1646 - msgid "Always (Do not perform merge checks)" 1647 - msgstr "" 1648 - 1649 - #: lib/remote_branch_delete.tcl:153 1650 - msgid "A branch is required for 'Merged Into'." 1651 - msgstr "" 1652 - 1653 - #: lib/remote_branch_delete.tcl:185 1654 - #, tcl-format 1655 - msgid "" 1656 - "The following branches are not completely merged into %s:\n" 1657 - "\n" 1658 - " - %s" 1659 - msgstr "" 1660 - 1661 - #: lib/remote_branch_delete.tcl:190 1662 - #, tcl-format 1663 - msgid "" 1664 - "One or more of the merge tests failed because you have not fetched the " 1665 - "necessary commits. Try fetching from %s first." 1666 - msgstr "" 1667 - 1668 - #: lib/remote_branch_delete.tcl:208 1669 - msgid "Please select one or more branches to delete." 1670 - msgstr "" 1671 - 1672 - #: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 1673 - msgid "" 1674 - "Recovering deleted branches is difficult.\n" 1675 - "\n" 1676 - "Delete the selected branches?" 1677 - msgstr "" 1678 - 1679 - #: lib/remote_branch_delete.tcl:227 1680 - #, tcl-format 1681 - msgid "Deleting branches from %s" 1682 - msgstr "" 1683 - 1684 - #: lib/remote_branch_delete.tcl:300 1685 - msgid "No repository selected." 1686 - msgstr "" 1687 - 1688 - #: lib/remote_branch_delete.tcl:305 1689 - #, tcl-format 1690 - msgid "Scanning %s..." 1691 - msgstr "" 1692 - 1693 - #: lib/choose_repository.tcl:45 1694 - msgid "Git Gui" 1695 - msgstr "" 1696 - 1697 - #: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 1698 - msgid "Create New Repository" 1699 - msgstr "" 1700 - 1701 - #: lib/choose_repository.tcl:110 1702 - msgid "New..." 1703 - msgstr "" 1704 - 1705 - #: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 1706 - msgid "Clone Existing Repository" 1707 - msgstr "" 1708 - 1709 - #: lib/choose_repository.tcl:128 1710 - msgid "Clone..." 1711 - msgstr "" 1712 - 1713 - #: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 1714 - msgid "Open Existing Repository" 1715 - msgstr "" 1716 - 1717 - #: lib/choose_repository.tcl:141 1718 - msgid "Open..." 1719 - msgstr "" 1720 - 1721 - #: lib/choose_repository.tcl:154 1722 - msgid "Recent Repositories" 1723 - msgstr "" 1724 - 1725 - #: lib/choose_repository.tcl:164 1726 - msgid "Open Recent Repository:" 1727 - msgstr "" 1728 - 1729 - #: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 1730 - #: lib/choose_repository.tcl:345 1731 - #, tcl-format 1732 - msgid "Failed to create repository %s:" 1733 - msgstr "" 1734 - 1735 - #: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 1736 - msgid "Create" 1737 - msgstr "" 1738 - 1739 - #: lib/choose_repository.tcl:432 1740 - msgid "Directory:" 1741 - msgstr "" 1742 - 1743 - #: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 1744 - #: lib/choose_repository.tcl:1139 1745 - msgid "Git Repository" 1746 - msgstr "" 1747 - 1748 - #: lib/choose_repository.tcl:487 1749 - #, tcl-format 1750 - msgid "Directory %s already exists." 1751 - msgstr "" 1752 - 1753 - #: lib/choose_repository.tcl:491 1754 - #, tcl-format 1755 - msgid "File %s already exists." 1756 - msgstr "" 1757 - 1758 - #: lib/choose_repository.tcl:506 1759 - msgid "Clone" 1760 - msgstr "" 1761 - 1762 - #: lib/choose_repository.tcl:519 1763 - msgid "Source Location:" 1764 - msgstr "" 1765 - 1766 - #: lib/choose_repository.tcl:528 1767 - msgid "Target Directory:" 1768 - msgstr "" 1769 - 1770 - #: lib/choose_repository.tcl:538 1771 - msgid "Clone Type:" 1772 - msgstr "" 1773 - 1774 - #: lib/choose_repository.tcl:543 1775 - msgid "Standard (Fast, Semi-Redundant, Hardlinks)" 1776 - msgstr "" 1777 - 1778 - #: lib/choose_repository.tcl:548 1779 - msgid "Full Copy (Slower, Redundant Backup)" 1780 - msgstr "" 1781 - 1782 - #: lib/choose_repository.tcl:553 1783 - msgid "Shared (Fastest, Not Recommended, No Backup)" 1784 - msgstr "" 1785 - 1786 - #: lib/choose_repository.tcl:560 1787 - msgid "Recursively clone submodules too" 1788 - msgstr "" 1789 - 1790 - #: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641 1791 - #: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864 1792 - #: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153 1793 - #, tcl-format 1794 - msgid "Not a Git repository: %s" 1795 - msgstr "" 1796 - 1797 - #: lib/choose_repository.tcl:630 1798 - msgid "Standard only available for local repository." 1799 - msgstr "" 1800 - 1801 - #: lib/choose_repository.tcl:634 1802 - msgid "Shared only available for local repository." 1803 - msgstr "" 1804 - 1805 - #: lib/choose_repository.tcl:655 1806 - #, tcl-format 1807 - msgid "Location %s already exists." 1808 - msgstr "" 1809 - 1810 - #: lib/choose_repository.tcl:666 1811 - msgid "Failed to configure origin" 1812 - msgstr "" 1813 - 1814 - #: lib/choose_repository.tcl:678 1815 - msgid "Counting objects" 1816 - msgstr "" 1817 - 1818 - #: lib/choose_repository.tcl:679 1819 - msgid "buckets" 1820 - msgstr "" 1821 - 1822 - #: lib/choose_repository.tcl:703 1823 - #, tcl-format 1824 - msgid "Unable to copy objects/info/alternates: %s" 1825 - msgstr "" 1826 - 1827 - #: lib/choose_repository.tcl:740 1828 - #, tcl-format 1829 - msgid "Nothing to clone from %s." 1830 - msgstr "" 1831 - 1832 - #: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 1833 - #: lib/choose_repository.tcl:974 1834 - msgid "The 'master' branch has not been initialized." 1835 - msgstr "" 1836 - 1837 - #: lib/choose_repository.tcl:755 1838 - msgid "Hardlinks are unavailable. Falling back to copying." 1839 - msgstr "" 1840 - 1841 - #: lib/choose_repository.tcl:769 1842 - #, tcl-format 1843 - msgid "Cloning from %s" 1844 - msgstr "" 1845 - 1846 - #: lib/choose_repository.tcl:800 1847 - msgid "Copying objects" 1848 - msgstr "" 1849 - 1850 - #: lib/choose_repository.tcl:801 1851 - msgid "KiB" 1852 - msgstr "" 1853 - 1854 - #: lib/choose_repository.tcl:825 1855 - #, tcl-format 1856 - msgid "Unable to copy object: %s" 1857 - msgstr "" 1858 - 1859 - #: lib/choose_repository.tcl:837 1860 - msgid "Linking objects" 1861 - msgstr "" 1862 - 1863 - #: lib/choose_repository.tcl:838 1864 - msgid "objects" 1865 - msgstr "" 1866 - 1867 - #: lib/choose_repository.tcl:846 1868 - #, tcl-format 1869 - msgid "Unable to hardlink object: %s" 1870 - msgstr "" 1871 - 1872 - #: lib/choose_repository.tcl:903 1873 - msgid "Cannot fetch branches and objects. See console output for details." 1874 - msgstr "" 1875 - 1876 - #: lib/choose_repository.tcl:914 1877 - msgid "Cannot fetch tags. See console output for details." 1878 - msgstr "" 1879 - 1880 - #: lib/choose_repository.tcl:938 1881 - msgid "Cannot determine HEAD. See console output for details." 1882 - msgstr "" 1883 - 1884 - #: lib/choose_repository.tcl:947 1885 - #, tcl-format 1886 - msgid "Unable to cleanup %s" 1887 - msgstr "" 1888 - 1889 - #: lib/choose_repository.tcl:953 1890 - msgid "Clone failed." 1891 - msgstr "" 1892 - 1893 - #: lib/choose_repository.tcl:960 1894 - msgid "No default branch obtained." 1895 - msgstr "" 1896 - 1897 - #: lib/choose_repository.tcl:971 1898 - #, tcl-format 1899 - msgid "Cannot resolve %s as a commit." 1900 - msgstr "" 1901 - 1902 - #: lib/choose_repository.tcl:998 1903 - msgid "Creating working directory" 1904 - msgstr "" 1905 - 1906 - #: lib/choose_repository.tcl:1028 1907 - msgid "Initial file checkout failed." 1908 - msgstr "" 1909 - 1910 - #: lib/choose_repository.tcl:1072 1911 - msgid "Cloning submodules" 1912 - msgstr "" 1913 - 1914 - #: lib/choose_repository.tcl:1087 1915 - msgid "Cannot clone submodules." 1916 - msgstr "" 1917 - 1918 - #: lib/choose_repository.tcl:1110 1919 - msgid "Repository:" 1920 - msgstr "" 1921 - 1922 - #: lib/choose_repository.tcl:1159 1923 - #, tcl-format 1924 - msgid "Failed to open repository %s:" 1925 - msgstr "" 1926 - 1927 - #: lib/about.tcl:26 1928 - msgid "git-gui - a graphical user interface for Git." 1929 - msgstr "" 1930 - 1931 - #: lib/blame.tcl:74 1932 - #, tcl-format 1933 - msgid "%s (%s): File Viewer" 1934 - msgstr "" 1935 - 1936 - #: lib/blame.tcl:80 1937 - msgid "Commit:" 1938 - msgstr "" 1939 - 1940 - #: lib/blame.tcl:282 1941 - msgid "Copy Commit" 1942 - msgstr "" 1943 - 1944 - #: lib/blame.tcl:286 1945 - msgid "Find Text..." 1946 - msgstr "" 1947 - 1948 - #: lib/blame.tcl:290 1949 - msgid "Goto Line..." 1950 - msgstr "" 1951 - 1952 - #: lib/blame.tcl:299 1953 - msgid "Do Full Copy Detection" 1954 - msgstr "" 1955 - 1956 - #: lib/blame.tcl:303 1957 - msgid "Show History Context" 1958 - msgstr "" 1959 - 1960 - #: lib/blame.tcl:306 1961 - msgid "Blame Parent Commit" 1962 - msgstr "" 1963 - 1964 - #: lib/blame.tcl:468 1965 - #, tcl-format 1966 - msgid "Reading %s..." 1967 - msgstr "" 1968 - 1969 - #: lib/blame.tcl:596 1970 - msgid "Loading copy/move tracking annotations..." 1971 - msgstr "" 1972 - 1973 - #: lib/blame.tcl:613 1974 - msgid "lines annotated" 1975 - msgstr "" 1976 - 1977 - #: lib/blame.tcl:815 1978 - msgid "Loading original location annotations..." 1979 - msgstr "" 1980 - 1981 - #: lib/blame.tcl:818 1982 - msgid "Annotation complete." 1983 - msgstr "" 1984 - 1985 - #: lib/blame.tcl:849 1986 - msgid "Busy" 1987 - msgstr "" 1988 - 1989 - #: lib/blame.tcl:850 1990 - msgid "Annotation process is already running." 1991 - msgstr "" 1992 - 1993 - #: lib/blame.tcl:889 1994 - msgid "Running thorough copy detection..." 1995 - msgstr "" 1996 - 1997 - #: lib/blame.tcl:957 1998 - msgid "Loading annotation..." 1999 - msgstr "" 2000 - 2001 - #: lib/blame.tcl:1010 2002 - msgid "Author:" 2003 - msgstr "" 2004 - 2005 - #: lib/blame.tcl:1014 2006 - msgid "Committer:" 2007 - msgstr "" 2008 - 2009 - #: lib/blame.tcl:1019 2010 - msgid "Original File:" 2011 - msgstr "" 2012 - 2013 - #: lib/blame.tcl:1067 2014 - msgid "Cannot find HEAD commit:" 2015 - msgstr "" 2016 - 2017 - #: lib/blame.tcl:1122 2018 - msgid "Cannot find parent commit:" 2019 - msgstr "" 2020 - 2021 - #: lib/blame.tcl:1137 2022 - msgid "Unable to display parent" 2023 - msgstr "" 2024 - 2025 - #: lib/blame.tcl:1138 lib/diff.tcl:345 2026 - msgid "Error loading diff:" 2027 - msgstr "" 2028 - 2029 - #: lib/blame.tcl:1279 2030 - msgid "Originally By:" 2031 - msgstr "" 2032 - 2033 - #: lib/blame.tcl:1285 2034 - msgid "In File:" 2035 - msgstr "" 2036 - 2037 - #: lib/blame.tcl:1290 2038 - msgid "Copied Or Moved Here By:" 2039 - msgstr "" 2040 - 2041 - #: lib/diff.tcl:77 2042 - #, tcl-format 2043 - msgid "" 2044 - "No differences detected.\n" 2045 - "\n" 2046 - "%s has no changes.\n" 2047 - "\n" 2048 - "The modification date of this file was updated by another application, but " 2049 - "the content within the file was not changed.\n" 2050 - "\n" 2051 - "A rescan will be automatically started to find other files which may have " 2052 - "the same state." 2053 - msgstr "" 2054 - 2055 - #: lib/diff.tcl:117 2056 - #, tcl-format 2057 - msgid "Loading diff of %s..." 2058 - msgstr "" 2059 - 2060 - #: lib/diff.tcl:143 2061 - msgid "" 2062 - "LOCAL: deleted\n" 2063 - "REMOTE:\n" 2064 - msgstr "" 2065 - 2066 - #: lib/diff.tcl:148 2067 - msgid "" 2068 - "REMOTE: deleted\n" 2069 - "LOCAL:\n" 2070 - msgstr "" 2071 - 2072 - #: lib/diff.tcl:155 2073 - msgid "LOCAL:\n" 2074 - msgstr "" 2075 - 2076 - #: lib/diff.tcl:158 2077 - msgid "REMOTE:\n" 2078 - msgstr "" 2079 - 2080 - #: lib/diff.tcl:220 lib/diff.tcl:344 2081 - #, tcl-format 2082 - msgid "Unable to display %s" 2083 - msgstr "" 2084 - 2085 - #: lib/diff.tcl:221 2086 - msgid "Error loading file:" 2087 - msgstr "" 2088 - 2089 - #: lib/diff.tcl:227 2090 - msgid "Git Repository (subproject)" 2091 - msgstr "" 2092 - 2093 - #: lib/diff.tcl:239 2094 - msgid "* Binary file (not showing content)." 2095 - msgstr "" 2096 - 2097 - #: lib/diff.tcl:244 2098 - #, tcl-format 2099 - msgid "" 2100 - "* Untracked file is %d bytes.\n" 2101 - "* Showing only first %d bytes.\n" 2102 - msgstr "" 2103 - 2104 - #: lib/diff.tcl:250 2105 - #, tcl-format 2106 - msgid "" 2107 - "\n" 2108 - "* Untracked file clipped here by %s.\n" 2109 - "* To see the entire file, use an external editor.\n" 2110 - msgstr "" 2111 - 2112 - #: lib/diff.tcl:583 2113 - msgid "Failed to unstage selected hunk." 2114 - msgstr "" 2115 - 2116 - #: lib/diff.tcl:591 2117 - msgid "Failed to revert selected hunk." 2118 - msgstr "" 2119 - 2120 - #: lib/diff.tcl:594 2121 - msgid "Failed to stage selected hunk." 2122 - msgstr "" 2123 - 2124 - #: lib/diff.tcl:687 2125 - msgid "Failed to unstage selected line." 2126 - msgstr "" 2127 - 2128 - #: lib/diff.tcl:696 2129 - msgid "Failed to revert selected line." 2130 - msgstr "" 2131 - 2132 - #: lib/diff.tcl:700 2133 - msgid "Failed to stage selected line." 2134 - msgstr "" 2135 - 2136 - #: lib/diff.tcl:889 2137 - msgid "Failed to undo last revert." 2138 - msgstr "" 2139 - 2140 - #: lib/sshkey.tcl:34 2141 - msgid "No keys found." 2142 - msgstr "" 2143 - 2144 - #: lib/sshkey.tcl:37 2145 - #, tcl-format 2146 - msgid "Found a public key in: %s" 2147 - msgstr "" 2148 - 2149 - #: lib/sshkey.tcl:43 2150 - msgid "Generate Key" 2151 - msgstr "" 2152 - 2153 - #: lib/sshkey.tcl:61 2154 - msgid "Copy To Clipboard" 2155 - msgstr "" 2156 - 2157 - #: lib/sshkey.tcl:75 2158 - msgid "Your OpenSSH Public Key" 2159 - msgstr "" 2160 - 2161 - #: lib/sshkey.tcl:83 2162 - msgid "Generating..." 2163 - msgstr "" 2164 - 2165 - #: lib/sshkey.tcl:89 2166 - #, tcl-format 2167 - msgid "" 2168 - "Could not start ssh-keygen:\n" 2169 - "\n" 2170 - "%s" 2171 - msgstr "" 2172 - 2173 - #: lib/sshkey.tcl:116 2174 - msgid "Generation failed." 2175 - msgstr "" 2176 - 2177 - #: lib/sshkey.tcl:123 2178 - msgid "Generation succeeded, but no keys found." 2179 - msgstr "" 2180 - 2181 - #: lib/sshkey.tcl:126 2182 - #, tcl-format 2183 - msgid "Your key is in: %s" 2184 - msgstr "" 2185 - 2186 - #: lib/branch_create.tcl:23 2187 - #, tcl-format 2188 - msgid "%s (%s): Create Branch" 2189 - msgstr "" 2190 - 2191 - #: lib/branch_create.tcl:28 2192 - msgid "Create New Branch" 2193 - msgstr "" 2194 - 2195 - #: lib/branch_create.tcl:42 2196 - msgid "Branch Name" 2197 - msgstr "" 2198 - 2199 - #: lib/branch_create.tcl:57 2200 - msgid "Match Tracking Branch Name" 2201 - msgstr "" 2202 - 2203 - #: lib/branch_create.tcl:66 2204 - msgid "Starting Revision" 2205 - msgstr "" 2206 - 2207 - #: lib/branch_create.tcl:72 2208 - msgid "Update Existing Branch:" 2209 - msgstr "" 2210 - 2211 - #: lib/branch_create.tcl:75 2212 - msgid "No" 2213 - msgstr "" 2214 - 2215 - #: lib/branch_create.tcl:80 2216 - msgid "Fast Forward Only" 2217 - msgstr "" 2218 - 2219 - #: lib/branch_create.tcl:97 2220 - msgid "Checkout After Creation" 2221 - msgstr "" 2222 - 2223 - #: lib/branch_create.tcl:132 2224 - msgid "Please select a tracking branch." 2225 - msgstr "" 2226 - 2227 - #: lib/branch_create.tcl:141 2228 - #, tcl-format 2229 - msgid "Tracking branch %s is not a branch in the remote repository." 2230 - msgstr "" 2231 - 2232 - #: lib/console.tcl:59 2233 - msgid "Working... please wait..." 2234 - msgstr "" 2235 - 2236 - #: lib/console.tcl:186 2237 - msgid "Success" 2238 - msgstr "" 2239 - 2240 - #: lib/console.tcl:200 2241 - msgid "Error: Command Failed" 2242 - msgstr "" 2243 - 2244 - #: lib/line.tcl:17 2245 - msgid "Goto Line:" 2246 - msgstr "" 2247 - 2248 - #: lib/line.tcl:23 2249 - msgid "Go" 2250 - msgstr "" 2251 - 2252 - #: lib/choose_rev.tcl:52 2253 - msgid "This Detached Checkout" 2254 - msgstr "" 2255 - 2256 - #: lib/choose_rev.tcl:60 2257 - msgid "Revision Expression:" 2258 - msgstr "" 2259 - 2260 - #: lib/choose_rev.tcl:72 2261 - msgid "Local Branch" 2262 - msgstr "" 2263 - 2264 - #: lib/choose_rev.tcl:77 2265 - msgid "Tracking Branch" 2266 - msgstr "" 2267 - 2268 - #: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 2269 - msgid "Tag" 2270 - msgstr "" 2271 - 2272 - #: lib/choose_rev.tcl:321 2273 - #, tcl-format 2274 - msgid "Invalid revision: %s" 2275 - msgstr "" 2276 - 2277 - #: lib/choose_rev.tcl:342 2278 - msgid "No revision selected." 2279 - msgstr "" 2280 - 2281 - #: lib/choose_rev.tcl:350 2282 - msgid "Revision expression is empty." 2283 - msgstr "" 2284 - 2285 - #: lib/choose_rev.tcl:537 2286 - msgid "Updated" 2287 - msgstr "" 2288 - 2289 - #: lib/choose_rev.tcl:565 2290 - msgid "URL" 2291 - msgstr "" 2292 - 2293 - #: lib/commit.tcl:9 2294 - msgid "" 2295 - "There is nothing to amend.\n" 2296 - "\n" 2297 - "You are about to create the initial commit. There is no commit before this " 2298 - "to amend.\n" 2299 - msgstr "" 2300 - 2301 - #: lib/commit.tcl:18 2302 - msgid "" 2303 - "Cannot amend while merging.\n" 2304 - "\n" 2305 - "You are currently in the middle of a merge that has not been fully " 2306 - "completed. You cannot amend the prior commit unless you first abort the " 2307 - "current merge activity.\n" 2308 - msgstr "" 2309 - 2310 - #: lib/commit.tcl:56 2311 - msgid "Error loading commit data for amend:" 2312 - msgstr "" 2313 - 2314 - #: lib/commit.tcl:83 2315 - msgid "Unable to obtain your identity:" 2316 - msgstr "" 2317 - 2318 - #: lib/commit.tcl:88 2319 - msgid "Invalid GIT_COMMITTER_IDENT:" 2320 - msgstr "" 2321 - 2322 - #: lib/commit.tcl:138 2323 - #, tcl-format 2324 - msgid "warning: Tcl does not support encoding '%s'." 2325 - msgstr "" 2326 - 2327 - #: lib/commit.tcl:158 2328 - msgid "" 2329 - "Last scanned state does not match repository state.\n" 2330 - "\n" 2331 - "Another Git program has modified this repository since the last scan. A " 2332 - "rescan must be performed before another commit can be created.\n" 2333 - "\n" 2334 - "The rescan will be automatically started now.\n" 2335 - msgstr "" 2336 - 2337 - #: lib/commit.tcl:182 2338 - #, tcl-format 2339 - msgid "" 2340 - "Unmerged files cannot be committed.\n" 2341 - "\n" 2342 - "File %s has merge conflicts. You must resolve them and stage the file " 2343 - "before committing.\n" 2344 - msgstr "" 2345 - 2346 - #: lib/commit.tcl:190 2347 - #, tcl-format 2348 - msgid "" 2349 - "Unknown file state %s detected.\n" 2350 - "\n" 2351 - "File %s cannot be committed by this program.\n" 2352 - msgstr "" 2353 - 2354 - #: lib/commit.tcl:198 2355 - msgid "" 2356 - "No changes to commit.\n" 2357 - "\n" 2358 - "You must stage at least 1 file before you can commit.\n" 2359 - msgstr "" 2360 - 2361 - #: lib/commit.tcl:213 2362 - msgid "" 2363 - "Please supply a commit message.\n" 2364 - "\n" 2365 - "A good commit message has the following format:\n" 2366 - "\n" 2367 - "- First line: Describe in one sentence what you did.\n" 2368 - "- Second line: Blank\n" 2369 - "- Remaining lines: Describe why this change is good.\n" 2370 - msgstr "" 2371 - 2372 - #: lib/commit.tcl:244 2373 - msgid "Calling pre-commit hook..." 2374 - msgstr "" 2375 - 2376 - #: lib/commit.tcl:259 2377 - msgid "Commit declined by pre-commit hook." 2378 - msgstr "" 2379 - 2380 - #: lib/commit.tcl:278 2381 - msgid "" 2382 - "You are about to commit on a detached head. This is a potentially dangerous " 2383 - "thing to do because if you switch to another branch you will lose your " 2384 - "changes and it can be difficult to retrieve them later from the reflog. You " 2385 - "should probably cancel this commit and create a new branch to continue.\n" 2386 - " \n" 2387 - " Do you really want to proceed with your Commit?" 2388 - msgstr "" 2389 - 2390 - #: lib/commit.tcl:299 2391 - msgid "Calling commit-msg hook..." 2392 - msgstr "" 2393 - 2394 - #: lib/commit.tcl:314 2395 - msgid "Commit declined by commit-msg hook." 2396 - msgstr "" 2397 - 2398 - #: lib/commit.tcl:327 2399 - msgid "Committing changes..." 2400 - msgstr "" 2401 - 2402 - #: lib/commit.tcl:344 2403 - msgid "write-tree failed:" 2404 - msgstr "" 2405 - 2406 - #: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 2407 - msgid "Commit failed." 2408 - msgstr "" 2409 - 2410 - #: lib/commit.tcl:362 2411 - #, tcl-format 2412 - msgid "Commit %s appears to be corrupt" 2413 - msgstr "" 2414 - 2415 - #: lib/commit.tcl:367 2416 - msgid "" 2417 - "No changes to commit.\n" 2418 - "\n" 2419 - "No files were modified by this commit and it was not a merge commit.\n" 2420 - "\n" 2421 - "A rescan will be automatically started now.\n" 2422 - msgstr "" 2423 - 2424 - #: lib/commit.tcl:374 2425 - msgid "No changes to commit." 2426 - msgstr "" 2427 - 2428 - #: lib/commit.tcl:394 2429 - msgid "commit-tree failed:" 2430 - msgstr "" 2431 - 2432 - #: lib/commit.tcl:421 2433 - msgid "update-ref failed:" 2434 - msgstr "" 2435 - 2436 - #: lib/commit.tcl:514 2437 - #, tcl-format 2438 - msgid "Created commit %s: %s" 2439 - msgstr "" 2440 - 2441 - #: lib/branch_delete.tcl:16 2442 - #, tcl-format 2443 - msgid "%s (%s): Delete Branch" 2444 - msgstr "" 2445 - 2446 - #: lib/branch_delete.tcl:21 2447 - msgid "Delete Local Branch" 2448 - msgstr "" 2449 - 2450 - #: lib/branch_delete.tcl:39 2451 - msgid "Local Branches" 2452 - msgstr "" 2453 - 2454 - #: lib/branch_delete.tcl:51 2455 - msgid "Delete Only If Merged Into" 2456 - msgstr "" 2457 - 2458 - #: lib/branch_delete.tcl:103 2459 - #, tcl-format 2460 - msgid "The following branches are not completely merged into %s:" 2461 - msgstr "" 2462 - 2463 - #: lib/branch_delete.tcl:131 2464 - #, tcl-format 2465 - msgid " - %s:" 2466 - msgstr "" 2467 - 2468 - #: lib/branch_delete.tcl:141 2469 - #, tcl-format 2470 - msgid "" 2471 - "Failed to delete branches:\n" 2472 - "%s" 2473 - msgstr "" 2474 - 2475 - #: lib/date.tcl:25 2476 - #, tcl-format 2477 - msgid "Invalid date from Git: %s" 2478 - msgstr "" 2479 - 2480 - #: lib/database.tcl:42 2481 - msgid "Number of loose objects" 2482 - msgstr "" 2483 - 2484 - #: lib/database.tcl:43 2485 - msgid "Disk space used by loose objects" 2486 - msgstr "" 2487 - 2488 - #: lib/database.tcl:44 2489 - msgid "Number of packed objects" 2490 - msgstr "" 2491 - 2492 - #: lib/database.tcl:45 2493 - msgid "Number of packs" 2494 - msgstr "" 2495 - 2496 - #: lib/database.tcl:46 2497 - msgid "Disk space used by packed objects" 2498 - msgstr "" 2499 - 2500 - #: lib/database.tcl:47 2501 - msgid "Packed objects waiting for pruning" 2502 - msgstr "" 2503 - 2504 - #: lib/database.tcl:48 2505 - msgid "Garbage files" 2506 - msgstr "" 2507 - 2508 - #: lib/database.tcl:66 2509 - #, tcl-format 2510 - msgid "%s (%s): Database Statistics" 2511 - msgstr "" 2512 - 2513 - #: lib/database.tcl:72 2514 - msgid "Compressing the object database" 2515 - msgstr "" 2516 - 2517 - #: lib/database.tcl:83 2518 - msgid "Verifying the object database with fsck-objects" 2519 - msgstr "" 2520 - 2521 - #: lib/database.tcl:107 2522 - #, tcl-format 2523 - msgid "" 2524 - "This repository currently has approximately %i loose objects.\n" 2525 - "\n" 2526 - "To maintain optimal performance it is strongly recommended that you compress " 2527 - "the database.\n" 2528 - "\n" 2529 - "Compress the database now?" 2530 - msgstr "" 2531 - 2532 - #: lib/error.tcl:20 2533 - #, tcl-format 2534 - msgid "%s: error" 2535 - msgstr "" 2536 - 2537 - #: lib/error.tcl:36 2538 - #, tcl-format 2539 - msgid "%s: warning" 2540 - msgstr "" 2541 - 2542 - #: lib/error.tcl:80 2543 - #, tcl-format 2544 - msgid "%s hook failed:" 2545 - msgstr "" 2546 - 2547 - #: lib/error.tcl:96 2548 - msgid "You must correct the above errors before committing." 2549 - msgstr "" 2550 - 2551 - #: lib/error.tcl:116 2552 - #, tcl-format 2553 - msgid "%s (%s): error" 2554 - msgstr "" 2555 - 2556 - #: lib/merge.tcl:13 2557 - msgid "" 2558 - "Cannot merge while amending.\n" 2559 - "\n" 2560 - "You must finish amending this commit before starting any type of merge.\n" 2561 - msgstr "" 2562 - 2563 - #: lib/merge.tcl:27 2564 - msgid "" 2565 - "Last scanned state does not match repository state.\n" 2566 - "\n" 2567 - "Another Git program has modified this repository since the last scan. A " 2568 - "rescan must be performed before a merge can be performed.\n" 2569 - "\n" 2570 - "The rescan will be automatically started now.\n" 2571 - msgstr "" 2572 - 2573 - #: lib/merge.tcl:45 2574 - #, tcl-format 2575 - msgid "" 2576 - "You are in the middle of a conflicted merge.\n" 2577 - "\n" 2578 - "File %s has merge conflicts.\n" 2579 - "\n" 2580 - "You must resolve them, stage the file, and commit to complete the current " 2581 - "merge. Only then can you begin another merge.\n" 2582 - msgstr "" 2583 - 2584 - #: lib/merge.tcl:55 2585 - #, tcl-format 2586 - msgid "" 2587 - "You are in the middle of a change.\n" 2588 - "\n" 2589 - "File %s is modified.\n" 2590 - "\n" 2591 - "You should complete the current commit before starting a merge. Doing so " 2592 - "will help you abort a failed merge, should the need arise.\n" 2593 - msgstr "" 2594 - 2595 - #: lib/merge.tcl:108 2596 - #, tcl-format 2597 - msgid "%s of %s" 2598 - msgstr "" 2599 - 2600 - #: lib/merge.tcl:126 2601 - #, tcl-format 2602 - msgid "Merging %s and %s..." 2603 - msgstr "" 2604 - 2605 - #: lib/merge.tcl:137 2606 - msgid "Merge completed successfully." 2607 - msgstr "" 2608 - 2609 - #: lib/merge.tcl:139 2610 - msgid "Merge failed. Conflict resolution is required." 2611 - msgstr "" 2612 - 2613 - #: lib/merge.tcl:156 2614 - #, tcl-format 2615 - msgid "%s (%s): Merge" 2616 - msgstr "" 2617 - 2618 - #: lib/merge.tcl:164 2619 - #, tcl-format 2620 - msgid "Merge Into %s" 2621 - msgstr "" 2622 - 2623 - #: lib/merge.tcl:183 2624 - msgid "Revision To Merge" 2625 - msgstr "" 2626 - 2627 - #: lib/merge.tcl:218 2628 - msgid "" 2629 - "Cannot abort while amending.\n" 2630 - "\n" 2631 - "You must finish amending this commit.\n" 2632 - msgstr "" 2633 - 2634 - #: lib/merge.tcl:228 2635 - msgid "" 2636 - "Abort merge?\n" 2637 - "\n" 2638 - "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" 2639 - "\n" 2640 - "Continue with aborting the current merge?" 2641 - msgstr "" 2642 - 2643 - #: lib/merge.tcl:234 2644 - msgid "" 2645 - "Reset changes?\n" 2646 - "\n" 2647 - "Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" 2648 - "\n" 2649 - "Continue with resetting the current changes?" 2650 - msgstr "" 2651 - 2652 - #: lib/merge.tcl:246 2653 - msgid "Aborting" 2654 - msgstr "" 2655 - 2656 - #: lib/merge.tcl:247 2657 - msgid "files reset" 2658 - msgstr "" 2659 - 2660 - #: lib/merge.tcl:277 2661 - msgid "Abort failed." 2662 - msgstr "" 2663 - 2664 - #: lib/merge.tcl:279 2665 - msgid "Abort completed. Ready." 2666 - msgstr ""

···