+5

git-gui/git-gui--askpass

··· 56 56 } 57 57 } 58 58 59 59 + # On Windows, force the encoding to UTF-8: it is what `git.exe` expects 60 60 + if {$::tcl_platform(platform) eq {windows}} { 61 61 + set ::answer [encoding convertto utf-8 $::answer] 62 62 + } 63 63 + 59 64 puts $::answer 60 65 set ::rc 0 61 66 }

+8 -6

git-gui/git-gui.sh

··· 30 30 ## 31 31 ## Tcl/Tk sanity check 32 32 33 33 - if {[catch {package require Tcl 8.6} err] 34 34 - || [catch {package require Tk 8.6} err] 33 33 + if {[catch {package require Tcl 8.5} err] 34 34 + || [catch {package require Tk 8.5} err] 35 35 } { 36 36 catch {wm withdraw .} 37 37 tk_messageBox \ ··· 2205 2205 set env(GIT_WORK_TREE) $_gitworktree 2206 2206 cd $pwd 2207 2207 2208 2208 - set status_operation [$::main_status \ 2209 2209 - start \ 2210 2210 - [mc "Starting %s... please wait..." "gitk"]] 2208 2208 + if {[info exists main_status]} { 2209 2209 + set status_operation [$::main_status \ 2210 2210 + start \ 2211 2211 + [mc "Starting %s... please wait..." "gitk"]] 2211 2212 2212 2212 - after 3500 [list $status_operation stop] 2213 2213 + after 3500 [list $status_operation stop] 2214 2214 + } 2213 2215 } 2214 2216 } 2215 2217

+27 -29

git-gui/lib/chord.tcl

··· 27 27 # # Turn off the UI while running a couple of async operations. 28 28 # lock_ui 29 29 # 30 30 - # set chord [SimpleChord new { 30 30 + # set chord [SimpleChord::new { 31 31 # unlock_ui 32 32 # # Note: $notice here is not referenced in the calling scope 33 33 # if {$notice} { info_popup $notice } ··· 37 37 # # all operations have been initiated. 38 38 # set common_note [$chord add_note] 39 39 # 40 40 - # # Pass notes as 'after' callbacks to other operations 41 41 - # async_operation $args [$chord add_note] 42 42 - # other_async_operation $args [$chord add_note] 40 40 + # # Activate notes in 'after' callbacks to other operations 41 41 + # set newnote [$chord add_note] 42 42 + # async_operation $args [list $newnote activate] 43 43 # 44 44 # # Communicate with the chord body 45 45 # if {$condition} { ··· 48 48 # } 49 49 # 50 50 # # Activate the common note, making the chord eligible to complete 51 51 - # $common_note 51 51 + # $common_note activate 52 52 # 53 53 # At this point, the chord will complete at some unknown point in the future. 54 54 # The common note might have been the first note activated, or the async ··· 60 60 # Represents a procedure that conceptually has multiple entrypoints that must 61 61 # all be called before the procedure executes. Each entrypoint is called a 62 62 # "note". The chord is only "completed" when all the notes are "activated". 63 63 - oo::class create SimpleChord { 64 64 - variable notes body is_completed 63 63 + class SimpleChord { 64 64 + field notes 65 65 + field body 66 66 + field is_completed 67 67 + field eval_ns 65 68 66 69 # Constructor: 67 67 - # set chord [SimpleChord new {body}] 70 70 + # set chord [SimpleChord::new {body}] 68 71 # Creates a new chord object with the specified body script. The 69 72 # body script is evaluated at most once, when a note is activated 70 73 # and the chord has no other non-activated notes. 71 71 - constructor {body} { 74 74 + constructor new {i_body} { 72 75 set notes [list] 73 73 - my eval [list set body $body] 76 76 + set body $i_body 74 77 set is_completed 0 78 78 + set eval_ns "[namespace qualifiers $this]::eval" 79 79 + return $this 75 80 } 76 81 77 82 # Method: ··· 80 85 # the chord body will be evaluated. This can be used to set variable 81 86 # values for the chord body to use. 82 87 method eval {script} { 83 83 - namespace eval [self] $script 88 88 + namespace eval $eval_ns $script 84 89 } 85 90 86 91 # Method: ··· 92 97 method add_note {} { 93 98 if {$is_completed} { error "Cannot add a note to a completed chord" } 94 99 95 95 - set note [ChordNote new [self]] 100 100 + set note [ChordNote::new $this] 96 101 97 102 lappend notes $note 98 103 ··· 108 113 109 114 set is_completed 1 110 115 111 111 - namespace eval [self] $body 112 112 - namespace delete [self] 116 116 + namespace eval $eval_ns $body 117 117 + delete_this 113 118 } 114 119 } 115 120 } ··· 119 124 # final note of the chord is activated (this can be any note in the chord, 120 125 # with all other notes already previously activated in any order), the chord's 121 126 # body is evaluated. 122 122 - oo::class create ChordNote { 123 123 - variable chord is_activated 127 127 + class ChordNote { 128 128 + field chord 129 129 + field is_activated 124 130 125 131 # Constructor: 126 132 # Instances of ChordNote are created internally by calling add_note on 127 133 # SimpleChord objects. 128 128 - constructor {chord} { 129 129 - my eval set chord $chord 134 134 + constructor new {c} { 135 135 + set chord $c 130 136 set is_activated 0 137 137 + return $this 131 138 } 132 139 133 140 # Method: ··· 138 145 } 139 146 140 147 # Method: 141 141 - # $note 148 148 + # $note activate 142 149 # Activates the note, if it has not already been activated, and 143 150 # completes the chord if there are no other notes awaiting 144 151 # activation. Subsequent calls will have no further effect. 145 145 - # 146 146 - # NB: In TclOO, if an object is invoked like a method without supplying 147 147 - # any method name, then this internal method `unknown` is what 148 148 - # actually runs (with no parameters). It is used in the ChordNote 149 149 - # class for the purpose of allowing the note object to be called as 150 150 - # a function (see example above). (The `unknown` method can also be 151 151 - # used to support dynamic dispatch, but must take parameters to 152 152 - # identify the "unknown" method to be invoked. In this form, this 153 153 - # proc serves only to make instances behave directly like methods.) 154 154 - method unknown {} { 152 152 + method activate {} { 155 153 if {!$is_activated} { 156 154 set is_activated 1 157 155 $chord notify_note_activation

+6 -4

git-gui/lib/index.tcl

··· 436 436 # 437 437 # The asynchronous operations are each indicated below by a comment 438 438 # before the code block that starts the async operation. 439 439 - set after_chord [SimpleChord new { 439 439 + set after_chord [SimpleChord::new { 440 440 if {[string trim $err] != ""} { 441 441 rescan_on_error $err 442 442 } else { ··· 522 522 ] 523 523 524 524 if {$reply == 1} { 525 525 + set note [$after_chord add_note] 525 526 checkout_index \ 526 527 $txt \ 527 528 $path_list \ 528 528 - [$after_chord add_note] \ 529 529 + [list $note activate] \ 529 530 $capture_error 530 531 } 531 532 } ··· 567 568 if {$reply == 1} { 568 569 $after_chord eval { set should_reshow_diff 1 } 569 570 570 570 - delete_files $untracked_list [$after_chord add_note] 571 571 + set note [$after_chord add_note] 572 572 + delete_files $untracked_list [list $note activate] 571 573 } 572 574 } 573 575 574 576 # Activate the common note. If no other notes were created, this 575 577 # completes the chord. If other notes were created, then this common 576 578 # note prevents a race condition where the chord might complete early. 577 577 - $after_common_note 579 579 + $after_common_note activate 578 580 } 579 581 580 582 # Delete all of the specified files, performing deletion in batches to allow the

+1 -1

git-gui/lib/merge.tcl

··· 244 244 set status_bar_operation [$::main_status \ 245 245 start \ 246 246 [mc "Aborting"] \ 247 247 - [mc "files reset"] 247 247 + [mc "files reset"]] 248 248 fileevent $fd readable [namespace code [list \ 249 249 _reset_wait $fd $status_bar_operation]] 250 250 } else {

+1835 -1553

git-gui/po/de.po

··· 7 7 msgstr "" 8 8 "Project-Id-Version: git-gui\n" 9 9 "Report-Msgid-Bugs-To: \n" 10 10 - "POT-Creation-Date: 2010-01-26 22:22+0100\n" 11 11 - "PO-Revision-Date: 2010-01-26 22:25+0100\n" 12 12 - "Last-Translator: Christian Stimming <stimming@tuhh.de>\n" 10 10 + "POT-Creation-Date: 2020-02-08 22:54+0100\n" 11 11 + "PO-Revision-Date: 2020-02-09 22:40+0100\n" 12 12 + "Last-Translator: Christian Stimming <christian@cstimming.de>\n" 13 13 "Language-Team: German\n" 14 14 + "Language: de_DE\n" 14 15 "MIME-Version: 1.0\n" 15 16 "Content-Type: text/plain; charset=UTF-8\n" 16 17 "Content-Transfer-Encoding: 8bit\n" 17 18 18 18 - #: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 19 19 - #: git-gui.sh:922 20 20 - msgid "git-gui: fatal error" 21 21 - msgstr "git-gui: Programmfehler" 22 22 - 23 23 - #: git-gui.sh:743 19 19 + #: git-gui.sh:847 24 20 #, tcl-format 25 21 msgid "Invalid font specified in %s:" 26 22 msgstr "Ungültige Zeichensatz-Angabe in %s:" 27 23 28 28 - #: git-gui.sh:779 24 24 + #: git-gui.sh:901 29 25 msgid "Main Font" 30 26 msgstr "Programmschriftart" 31 27 32 32 - #: git-gui.sh:780 28 28 + #: git-gui.sh:902 33 29 msgid "Diff/Console Font" 34 30 msgstr "Vergleich-Schriftart" 35 31 36 36 - #: git-gui.sh:794 32 32 + #: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053 33 33 + #: git-gui.sh:3212 34 34 + msgid "git-gui: fatal error" 35 35 + msgstr "git-gui: Programmfehler" 36 36 + 37 37 + #: git-gui.sh:918 37 38 msgid "Cannot find git in PATH." 38 39 msgstr "Git kann im PATH nicht gefunden werden." 39 40 40 40 - #: git-gui.sh:821 41 41 + #: git-gui.sh:945 41 42 msgid "Cannot parse Git version string:" 42 43 msgstr "Git Versionsangabe kann nicht erkannt werden:" 43 44 44 44 - #: git-gui.sh:839 45 45 + #: git-gui.sh:970 45 46 #, tcl-format 46 47 msgid "" 47 48 "Git version cannot be determined.\n" ··· 60 61 "\n" 61 62 "Soll angenommen werden, »%s« sei Version 1.5.0?\n" 62 63 63 63 - #: git-gui.sh:1128 64 64 + #: git-gui.sh:1267 64 65 msgid "Git directory not found:" 65 66 msgstr "Git-Verzeichnis nicht gefunden:" 66 67 67 67 - #: git-gui.sh:1146 68 68 + #: git-gui.sh:1301 68 69 msgid "Cannot move to top of working directory:" 69 70 msgstr "" 70 71 "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt " 71 72 "werden:" 72 73 73 73 - #: git-gui.sh:1154 74 74 + #: git-gui.sh:1309 74 75 msgid "Cannot use bare repository:" 75 75 - msgstr "Bloßes Projektarchiv kann nicht benutzt werden:" 76 76 + msgstr "Bloßes Repository kann nicht benutzt werden:" 76 77 77 77 - #: git-gui.sh:1162 78 78 + #: git-gui.sh:1317 78 79 msgid "No working directory" 79 80 msgstr "Kein Arbeitsverzeichnis" 80 81 81 81 - #: git-gui.sh:1334 lib/checkout_op.tcl:306 82 82 + #: git-gui.sh:1491 lib/checkout_op.tcl:306 82 83 msgid "Refreshing file status..." 83 84 msgstr "Dateistatus aktualisieren..." 84 85 85 85 - #: git-gui.sh:1390 86 86 + #: git-gui.sh:1551 86 87 msgid "Scanning for modified files ..." 87 88 msgstr "Nach geänderten Dateien suchen..." 88 89 89 89 - #: git-gui.sh:1454 90 90 + #: git-gui.sh:1629 90 91 msgid "Calling prepare-commit-msg hook..." 91 91 - msgstr "Aufrufen der Eintragen-Vorbereiten-Kontrolle (»prepare-commit hook«)..." 92 92 + msgstr "Aufrufen des »prepare-commit-msg hook«..." 92 93 93 93 - #: git-gui.sh:1471 94 94 + #: git-gui.sh:1646 94 95 msgid "Commit declined by prepare-commit-msg hook." 95 95 - msgstr "" 96 96 - "Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (»prepare-commit " 97 97 - "hook«)." 96 96 + msgstr "Commit abgelehnt durch »prepare-commit-msg hook«." 98 97 99 99 - #: git-gui.sh:1629 lib/browser.tcl:246 98 98 + #: git-gui.sh:1804 lib/browser.tcl:252 100 99 msgid "Ready." 101 100 msgstr "Bereit." 102 101 103 103 - #: git-gui.sh:1787 102 102 + #: git-gui.sh:1968 104 103 #, tcl-format 105 105 - msgid "Displaying only %s of %s files." 106 106 - msgstr "Nur %s von %s Dateien werden angezeigt." 104 104 + msgid "" 105 105 + "Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." 106 106 + msgstr "" 107 107 + "Anzeigelimit erreicht (gui.maxfilesdisplayed = %s) für Anzahl Einträge. Es " 108 108 + "werden nicht alle %s Dateien gezeigt." 107 109 108 108 - #: git-gui.sh:1913 110 110 + #: git-gui.sh:2091 109 111 msgid "Unmodified" 110 112 msgstr "Unverändert" 111 113 112 112 - #: git-gui.sh:1915 114 114 + #: git-gui.sh:2093 113 115 msgid "Modified, not staged" 114 116 msgstr "Verändert, nicht bereitgestellt" 115 117 116 116 - #: git-gui.sh:1916 git-gui.sh:1924 118 118 + #: git-gui.sh:2094 git-gui.sh:2106 117 119 msgid "Staged for commit" 118 118 - msgstr "Bereitgestellt zum Eintragen" 120 120 + msgstr "Bereitgestellt zum Committen" 119 121 120 120 - #: git-gui.sh:1917 git-gui.sh:1925 122 122 + #: git-gui.sh:2095 git-gui.sh:2107 121 123 msgid "Portions staged for commit" 122 122 - msgstr "Teilweise bereitgestellt zum Eintragen" 124 124 + msgstr "Teilweise bereitgestellt zum Committen" 123 125 124 124 - #: git-gui.sh:1918 git-gui.sh:1926 126 126 + #: git-gui.sh:2096 git-gui.sh:2108 125 127 msgid "Staged for commit, missing" 126 126 - msgstr "Bereitgestellt zum Eintragen, fehlend" 128 128 + msgstr "Bereitgestellt zum Committen, fehlend" 127 129 128 128 - #: git-gui.sh:1920 130 130 + #: git-gui.sh:2098 129 131 msgid "File type changed, not staged" 130 132 msgstr "Dateityp geändert, nicht bereitgestellt" 131 133 132 132 - #: git-gui.sh:1921 134 134 + #: git-gui.sh:2099 git-gui.sh:2100 135 135 + msgid "File type changed, old type staged for commit" 136 136 + msgstr "Dateityp geändert, alter Dateityp bereitgestellt" 137 137 + 138 138 + #: git-gui.sh:2101 133 139 msgid "File type changed, staged" 134 140 msgstr "Dateityp geändert, bereitgestellt" 135 141 136 136 - #: git-gui.sh:1923 142 142 + #: git-gui.sh:2102 143 143 + msgid "File type change staged, modification not staged" 144 144 + msgstr "Dateityp-Änderung bereitgestellt, Inhaltsänderung nicht bereitgestellt" 145 145 + 146 146 + #: git-gui.sh:2103 147 147 + msgid "File type change staged, file missing" 148 148 + msgstr "Dateityp-Änderung bereitgestellt, Datei gelöscht" 149 149 + 150 150 + #: git-gui.sh:2105 137 151 msgid "Untracked, not staged" 138 138 - msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt" 152 152 + msgstr "Unversioniert, nicht bereitgestellt" 139 153 140 140 - #: git-gui.sh:1928 154 154 + #: git-gui.sh:2110 141 155 msgid "Missing" 142 156 msgstr "Fehlend" 143 157 144 144 - #: git-gui.sh:1929 158 158 + #: git-gui.sh:2111 145 159 msgid "Staged for removal" 146 160 msgstr "Bereitgestellt zum Löschen" 147 161 148 148 - #: git-gui.sh:1930 162 162 + #: git-gui.sh:2112 149 163 msgid "Staged for removal, still present" 150 164 msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden" 151 165 152 152 - #: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 153 153 - #: git-gui.sh:1936 git-gui.sh:1937 166 166 + #: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 167 167 + #: git-gui.sh:2118 git-gui.sh:2119 154 168 msgid "Requires merge resolution" 155 169 msgstr "Konfliktauflösung nötig" 156 170 157 157 - #: git-gui.sh:1972 158 158 - msgid "Starting gitk... please wait..." 159 159 - msgstr "Gitk wird gestartet... bitte warten." 160 160 - 161 161 - #: git-gui.sh:1984 171 171 + #: git-gui.sh:2164 162 172 msgid "Couldn't find gitk in PATH" 163 173 msgstr "Gitk kann im PATH nicht gefunden werden." 164 174 165 165 - #: git-gui.sh:2043 175 175 + #: git-gui.sh:2210 git-gui.sh:2245 176 176 + #, tcl-format 177 177 + msgid "Starting %s... please wait..." 178 178 + msgstr "%s wird gestartet... bitte warten." 179 179 + 180 180 + #: git-gui.sh:2224 166 181 msgid "Couldn't find git gui in PATH" 167 182 msgstr "»Git gui« kann im PATH nicht gefunden werden." 168 183 169 169 - #: git-gui.sh:2455 lib/choose_repository.tcl:36 184 184 + #: git-gui.sh:2726 lib/choose_repository.tcl:53 170 185 msgid "Repository" 171 171 - msgstr "Projektarchiv" 186 186 + msgstr "Repository" 172 187 173 173 - #: git-gui.sh:2456 188 188 + #: git-gui.sh:2727 174 189 msgid "Edit" 175 190 msgstr "Bearbeiten" 176 191 177 177 - #: git-gui.sh:2458 lib/choose_rev.tcl:561 192 192 + #: git-gui.sh:2729 lib/choose_rev.tcl:567 178 193 msgid "Branch" 179 179 - msgstr "Zweig" 194 194 + msgstr "Branch" 180 195 181 181 - #: git-gui.sh:2461 lib/choose_rev.tcl:548 196 196 + #: git-gui.sh:2732 lib/choose_rev.tcl:554 182 197 msgid "Commit@@noun" 183 183 - msgstr "Version" 198 198 + msgstr "Commit" 184 199 185 185 - #: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 200 200 + #: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 186 201 msgid "Merge" 187 202 msgstr "Zusammenführen" 188 203 189 189 - #: git-gui.sh:2465 lib/choose_rev.tcl:557 204 204 + #: git-gui.sh:2736 lib/choose_rev.tcl:563 190 205 msgid "Remote" 191 191 - msgstr "Externe Archive" 206 206 + msgstr "Extern" 192 207 193 193 - #: git-gui.sh:2468 208 208 + #: git-gui.sh:2739 194 209 msgid "Tools" 195 210 msgstr "Werkzeuge" 196 211 197 197 - #: git-gui.sh:2477 212 212 + #: git-gui.sh:2748 198 213 msgid "Explore Working Copy" 199 199 - msgstr "Arbeitskopie im Dateimanager" 214 214 + msgstr "Arbeitskopie im Dateimanager öffnen" 215 215 + 216 216 + #: git-gui.sh:2763 217 217 + msgid "Git Bash" 218 218 + msgstr "Git Bash" 200 219 201 201 - #: git-gui.sh:2483 220 220 + #: git-gui.sh:2772 202 221 msgid "Browse Current Branch's Files" 203 203 - msgstr "Aktuellen Zweig durchblättern" 222 222 + msgstr "Aktuellen Branch durchblättern" 204 223 205 205 - #: git-gui.sh:2487 224 224 + #: git-gui.sh:2776 206 225 msgid "Browse Branch Files..." 207 207 - msgstr "Einen Zweig durchblättern..." 226 226 + msgstr "Branch durchblättern..." 208 227 209 209 - #: git-gui.sh:2492 228 228 + #: git-gui.sh:2781 210 229 msgid "Visualize Current Branch's History" 211 211 - msgstr "Aktuellen Zweig darstellen" 230 230 + msgstr "Aktuellen Branch darstellen" 212 231 213 213 - #: git-gui.sh:2496 232 232 + #: git-gui.sh:2785 214 233 msgid "Visualize All Branch History" 215 215 - msgstr "Alle Zweige darstellen" 234 234 + msgstr "Historie aller Branches darstellen" 216 235 217 217 - #: git-gui.sh:2503 236 236 + #: git-gui.sh:2792 218 237 #, tcl-format 219 238 msgid "Browse %s's Files" 220 220 - msgstr "Zweig »%s« durchblättern" 239 239 + msgstr "Branch »%s« durchblättern" 221 240 222 222 - #: git-gui.sh:2505 241 241 + #: git-gui.sh:2794 223 242 #, tcl-format 224 243 msgid "Visualize %s's History" 225 244 msgstr "Historie von »%s« darstellen" 226 245 227 227 - #: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 246 246 + #: git-gui.sh:2799 lib/database.tcl:40 228 247 msgid "Database Statistics" 229 248 msgstr "Datenbankstatistik" 230 249 231 231 - #: git-gui.sh:2513 lib/database.tcl:34 250 250 + #: git-gui.sh:2802 lib/database.tcl:33 232 251 msgid "Compress Database" 233 252 msgstr "Datenbank komprimieren" 234 253 235 235 - #: git-gui.sh:2516 254 254 + #: git-gui.sh:2805 236 255 msgid "Verify Database" 237 256 msgstr "Datenbank überprüfen" 238 257 239 239 - #: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 240 240 - #: lib/shortcut.tcl:40 lib/shortcut.tcl:72 258 258 + #: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 241 259 msgid "Create Desktop Icon" 242 260 msgstr "Desktop-Icon erstellen" 243 261 244 244 - #: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 262 262 + #: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 245 263 msgid "Quit" 246 264 msgstr "Beenden" 247 265 248 248 - #: git-gui.sh:2547 266 266 + #: git-gui.sh:2836 249 267 msgid "Undo" 250 268 msgstr "Rückgängig" 251 269 252 252 - #: git-gui.sh:2550 270 270 + #: git-gui.sh:2839 253 271 msgid "Redo" 254 272 msgstr "Wiederholen" 255 273 256 256 - #: git-gui.sh:2554 git-gui.sh:3109 274 274 + #: git-gui.sh:2843 git-gui.sh:3461 257 275 msgid "Cut" 258 276 msgstr "Ausschneiden" 259 277 260 260 - #: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 278 278 + #: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 261 279 #: lib/console.tcl:69 262 280 msgid "Copy" 263 281 msgstr "Kopieren" 264 282 265 265 - #: git-gui.sh:2560 git-gui.sh:3115 283 283 + #: git-gui.sh:2849 git-gui.sh:3467 266 284 msgid "Paste" 267 285 msgstr "Einfügen" 268 286 269 269 - #: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 270 270 - #: lib/remote_branch_delete.tcl:38 287 287 + #: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 288 288 + #: lib/branch_delete.tcl:28 271 289 msgid "Delete" 272 290 msgstr "Löschen" 273 291 274 274 - #: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 292 292 + #: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 275 293 msgid "Select All" 276 294 msgstr "Alle auswählen" 277 295 278 278 - #: git-gui.sh:2576 296 296 + #: git-gui.sh:2865 279 297 msgid "Create..." 280 298 msgstr "Erstellen..." 281 299 282 282 - #: git-gui.sh:2582 300 300 + #: git-gui.sh:2871 283 301 msgid "Checkout..." 284 284 - msgstr "Umstellen..." 302 302 + msgstr "Auschecken..." 285 303 286 286 - #: git-gui.sh:2588 304 304 + #: git-gui.sh:2877 287 305 msgid "Rename..." 288 306 msgstr "Umbenennen..." 289 307 290 290 - #: git-gui.sh:2593 308 308 + #: git-gui.sh:2882 291 309 msgid "Delete..." 292 310 msgstr "Löschen..." 293 311 294 294 - #: git-gui.sh:2598 312 312 + #: git-gui.sh:2887 295 313 msgid "Reset..." 296 296 - msgstr "Zurücksetzen..." 314 314 + msgstr "Änderungen verwerfen..." 297 315 298 298 - #: git-gui.sh:2608 316 316 + #: git-gui.sh:2897 299 317 msgid "Done" 300 318 msgstr "Fertig" 301 319 302 302 - #: git-gui.sh:2610 320 320 + #: git-gui.sh:2899 303 321 msgid "Commit@@verb" 304 304 - msgstr "Eintragen" 322 322 + msgstr "Committen" 305 323 306 306 - #: git-gui.sh:2619 git-gui.sh:3050 307 307 - msgid "New Commit" 308 308 - msgstr "Neue Version" 309 309 - 310 310 - #: git-gui.sh:2627 git-gui.sh:3057 324 324 + #: git-gui.sh:2908 git-gui.sh:3400 311 325 msgid "Amend Last Commit" 312 312 - msgstr "Letzte nachbessern" 326 326 + msgstr "Letzten Commit nachbessern" 313 327 314 314 - #: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 328 328 + #: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 315 329 msgid "Rescan" 316 330 msgstr "Neu laden" 317 331 318 318 - #: git-gui.sh:2643 332 332 + #: git-gui.sh:2924 319 333 msgid "Stage To Commit" 320 320 - msgstr "Zum Eintragen bereitstellen" 334 334 + msgstr "Für Commit bereitstellen" 321 335 322 322 - #: git-gui.sh:2649 336 336 + #: git-gui.sh:2930 323 337 msgid "Stage Changed Files To Commit" 324 324 - msgstr "Geänderte Dateien bereitstellen" 338 338 + msgstr "Geänderte Dateien für Commit bereitstellen" 325 339 326 326 - #: git-gui.sh:2655 340 340 + #: git-gui.sh:2936 327 341 msgid "Unstage From Commit" 328 328 - msgstr "Aus der Bereitstellung herausnehmen" 342 342 + msgstr "Aus Commit-Bereitstellung herausnehmen" 329 343 330 330 - #: git-gui.sh:2661 lib/index.tcl:412 344 344 + #: git-gui.sh:2942 lib/index.tcl:521 331 345 msgid "Revert Changes" 332 346 msgstr "Änderungen verwerfen" 333 347 334 334 - #: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 348 348 + #: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 335 349 msgid "Show Less Context" 336 350 msgstr "Weniger Zeilen anzeigen" 337 351 338 338 - #: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 352 352 + #: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 339 353 msgid "Show More Context" 340 354 msgstr "Mehr Zeilen anzeigen" 341 355 342 342 - #: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 356 356 + #: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 343 357 msgid "Sign Off" 344 358 msgstr "Abzeichnen" 345 359 346 346 - #: git-gui.sh:2696 360 360 + #: git-gui.sh:2977 347 361 msgid "Local Merge..." 348 362 msgstr "Lokales Zusammenführen..." 349 363 350 350 - #: git-gui.sh:2701 364 364 + #: git-gui.sh:2982 351 365 msgid "Abort Merge..." 352 366 msgstr "Zusammenführen abbrechen..." 353 367 354 354 - #: git-gui.sh:2713 git-gui.sh:2741 368 368 + #: git-gui.sh:2994 git-gui.sh:3022 355 369 msgid "Add..." 356 356 - msgstr "Hinzufügen..." 370 370 + msgstr "Neues hinzufügen..." 357 371 358 358 - #: git-gui.sh:2717 372 372 + #: git-gui.sh:2998 359 373 msgid "Push..." 360 374 msgstr "Versenden..." 361 375 362 362 - #: git-gui.sh:2721 376 376 + #: git-gui.sh:3002 363 377 msgid "Delete Branch..." 364 364 - msgstr "Zweig löschen..." 378 378 + msgstr "Branch löschen..." 365 379 366 366 - #: git-gui.sh:2731 git-gui.sh:3292 380 380 + #: git-gui.sh:3012 git-gui.sh:3666 367 381 msgid "Options..." 368 382 msgstr "Optionen..." 369 383 370 370 - #: git-gui.sh:2742 384 384 + #: git-gui.sh:3023 371 385 msgid "Remove..." 372 386 msgstr "Entfernen..." 373 387 374 374 - #: git-gui.sh:2751 lib/choose_repository.tcl:50 388 388 + #: git-gui.sh:3032 lib/choose_repository.tcl:67 375 389 msgid "Help" 376 390 msgstr "Hilfe" 377 391 378 378 - #: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 379 379 - #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 392 392 + #: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 393 393 + #: lib/choose_repository.tcl:70 lib/about.tcl:14 380 394 #, tcl-format 381 395 msgid "About %s" 382 396 msgstr "Über %s" 383 397 384 384 - #: git-gui.sh:2783 398 398 + #: git-gui.sh:3064 385 399 msgid "Online Documentation" 386 400 msgstr "Online-Dokumentation" 387 401 388 388 - #: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 402 402 + #: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 389 403 msgid "Show SSH Key" 390 404 msgstr "SSH-Schlüssel anzeigen" 391 405 392 392 - #: git-gui.sh:2893 406 406 + #: git-gui.sh:3097 git-gui.sh:3229 407 407 + msgid "usage:" 408 408 + msgstr "Verwendung:" 409 409 + 410 410 + #: git-gui.sh:3101 git-gui.sh:3233 411 411 + msgid "Usage" 412 412 + msgstr "Verwendung" 413 413 + 414 414 + #: git-gui.sh:3182 lib/blame.tcl:575 415 415 + msgid "Error" 416 416 + msgstr "Fehler" 417 417 + 418 418 + #: git-gui.sh:3213 393 419 #, tcl-format 394 420 msgid "fatal: cannot stat path %s: No such file or directory" 395 421 msgstr "" 396 422 "Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis " 397 423 "nicht gefunden" 398 424 399 399 - #: git-gui.sh:2926 425 425 + #: git-gui.sh:3246 400 426 msgid "Current Branch:" 401 401 - msgstr "Aktueller Zweig:" 427 427 + msgstr "Aktueller Branch:" 402 428 403 403 - #: git-gui.sh:2947 404 404 - msgid "Staged Changes (Will Commit)" 405 405 - msgstr "Bereitstellung (zum Eintragen)" 406 406 - 407 407 - #: git-gui.sh:2967 429 429 + #: git-gui.sh:3271 408 430 msgid "Unstaged Changes" 409 431 msgstr "Nicht bereitgestellte Änderungen" 410 432 411 411 - #: git-gui.sh:3017 433 433 + #: git-gui.sh:3293 434 434 + msgid "Staged Changes (Will Commit)" 435 435 + msgstr "Bereitstellung (zum Committen)" 436 436 + 437 437 + #: git-gui.sh:3367 412 438 msgid "Stage Changed" 413 439 msgstr "Alles bereitstellen" 414 440 415 415 - #: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 441 441 + #: git-gui.sh:3386 lib/transport.tcl:137 416 442 msgid "Push" 417 443 msgstr "Versenden" 418 444 419 419 - #: git-gui.sh:3071 445 445 + #: git-gui.sh:3413 420 446 msgid "Initial Commit Message:" 421 421 - msgstr "Erste Versionsbeschreibung:" 447 447 + msgstr "Erste Commit-Beschreibung:" 422 448 423 423 - #: git-gui.sh:3072 449 449 + #: git-gui.sh:3414 424 450 msgid "Amended Commit Message:" 425 451 msgstr "Nachgebesserte Beschreibung:" 426 452 427 427 - #: git-gui.sh:3073 453 453 + #: git-gui.sh:3415 428 454 msgid "Amended Initial Commit Message:" 429 455 msgstr "Nachgebesserte erste Beschreibung:" 430 456 431 431 - #: git-gui.sh:3074 457 457 + #: git-gui.sh:3416 432 458 msgid "Amended Merge Commit Message:" 433 459 msgstr "Nachgebesserte Zusammenführungs-Beschreibung:" 434 460 435 435 - #: git-gui.sh:3075 461 461 + #: git-gui.sh:3417 436 462 msgid "Merge Commit Message:" 437 463 msgstr "Zusammenführungs-Beschreibung:" 438 464 439 439 - #: git-gui.sh:3076 465 465 + #: git-gui.sh:3418 440 466 msgid "Commit Message:" 441 441 - msgstr "Versionsbeschreibung:" 467 467 + msgstr "Commit-Beschreibung:" 442 468 443 443 - #: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 469 469 + #: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 444 470 msgid "Copy All" 445 471 msgstr "Alle kopieren" 446 472 447 447 - #: git-gui.sh:3149 lib/blame.tcl:104 473 473 + #: git-gui.sh:3501 lib/blame.tcl:106 448 474 msgid "File:" 449 475 msgstr "Datei:" 450 476 451 451 - #: git-gui.sh:3255 477 477 + #: git-gui.sh:3549 lib/choose_repository.tcl:1100 478 478 + msgid "Open" 479 479 + msgstr "Öffnen" 480 480 + 481 481 + #: git-gui.sh:3629 452 482 msgid "Refresh" 453 483 msgstr "Aktualisieren" 454 484 455 455 - #: git-gui.sh:3276 485 485 + #: git-gui.sh:3650 456 486 msgid "Decrease Font Size" 457 487 msgstr "Schriftgröße verkleinern" 458 488 459 459 - #: git-gui.sh:3280 489 489 + #: git-gui.sh:3654 460 490 msgid "Increase Font Size" 461 491 msgstr "Schriftgröße vergrößern" 462 492 463 463 - #: git-gui.sh:3288 lib/blame.tcl:281 493 493 + #: git-gui.sh:3662 lib/blame.tcl:296 464 494 msgid "Encoding" 465 495 msgstr "Zeichenkodierung" 466 496 467 467 - #: git-gui.sh:3299 497 497 + #: git-gui.sh:3673 468 498 msgid "Apply/Reverse Hunk" 469 469 - msgstr "Kontext anwenden/umkehren" 499 499 + msgstr "Patch-Block anwenden/zurücknehmen" 470 500 471 471 - #: git-gui.sh:3304 501 501 + #: git-gui.sh:3678 472 502 msgid "Apply/Reverse Line" 473 473 - msgstr "Zeile anwenden/umkehren" 503 503 + msgstr "Zeile anwenden/zurücknehmen" 504 504 + 505 505 + #: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805 506 506 + msgid "Revert Hunk" 507 507 + msgstr "Patch-Block zurücknehmen" 474 508 475 475 - #: git-gui.sh:3323 509 509 + #: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812 510 510 + msgid "Revert Line" 511 511 + msgstr "Zeilenänderungen zurücknehmen" 512 512 + 513 513 + #: git-gui.sh:3694 git-gui.sh:3791 514 514 + msgid "Undo Last Revert" 515 515 + msgstr "Letztes Zurücknehmen rückgängig" 516 516 + 517 517 + #: git-gui.sh:3713 476 518 msgid "Run Merge Tool" 477 519 msgstr "Zusammenführungswerkzeug" 478 520 479 479 - #: git-gui.sh:3328 521 521 + #: git-gui.sh:3718 480 522 msgid "Use Remote Version" 481 523 msgstr "Externe Version benutzen" 482 524 483 483 - #: git-gui.sh:3332 525 525 + #: git-gui.sh:3722 484 526 msgid "Use Local Version" 485 527 msgstr "Lokale Version benutzen" 486 528 487 487 - #: git-gui.sh:3336 529 529 + #: git-gui.sh:3726 488 530 msgid "Revert To Base" 489 489 - msgstr "Ursprüngliche Version benutzen" 531 531 + msgstr "Zurücksetzen auf ursprünglichen Commit" 490 532 491 491 - #: git-gui.sh:3354 533 533 + #: git-gui.sh:3744 492 534 msgid "Visualize These Changes In The Submodule" 493 493 - msgstr "Diese Änderungen im Untermodul darstellen" 535 535 + msgstr "Diese Änderungen im Submodul darstellen" 494 536 495 495 - #: git-gui.sh:3358 537 537 + #: git-gui.sh:3748 496 538 msgid "Visualize Current Branch History In The Submodule" 497 497 - msgstr "Aktuellen Zweig im Untermodul darstellen" 539 539 + msgstr "Aktuellen Branch im Submodul darstellen" 498 540 499 499 - #: git-gui.sh:3362 541 541 + #: git-gui.sh:3752 500 542 msgid "Visualize All Branch History In The Submodule" 501 501 - msgstr "Alle Zweige im Untermodul darstellen" 543 543 + msgstr "Alle Branches im Submodul darstellen" 502 544 503 503 - #: git-gui.sh:3367 545 545 + #: git-gui.sh:3757 504 546 msgid "Start git gui In The Submodule" 505 505 - msgstr "Git gui im Untermodul starten" 547 547 + msgstr "Git gui im Submodul starten" 506 548 507 507 - #: git-gui.sh:3389 549 549 + #: git-gui.sh:3793 508 550 msgid "Unstage Hunk From Commit" 509 509 - msgstr "Kontext aus Bereitstellung herausnehmen" 551 551 + msgstr "Patch-Block aus Bereitstellung herausnehmen" 510 552 511 511 - #: git-gui.sh:3391 553 553 + #: git-gui.sh:3797 512 554 msgid "Unstage Lines From Commit" 513 555 msgstr "Zeilen aus der Bereitstellung herausnehmen" 514 556 515 515 - #: git-gui.sh:3393 557 557 + #: git-gui.sh:3798 git-gui.sh:3809 558 558 + msgid "Revert Lines" 559 559 + msgstr "Zeilenänderung zurücknehmen" 560 560 + 561 561 + #: git-gui.sh:3800 516 562 msgid "Unstage Line From Commit" 517 563 msgstr "Zeile aus der Bereitstellung herausnehmen" 518 564 519 519 - #: git-gui.sh:3396 565 565 + #: git-gui.sh:3804 520 566 msgid "Stage Hunk For Commit" 521 521 - msgstr "Kontext zur Bereitstellung hinzufügen" 567 567 + msgstr "Patch-Block zur Bereitstellung hinzufügen" 522 568 523 523 - #: git-gui.sh:3398 569 569 + #: git-gui.sh:3808 524 570 msgid "Stage Lines For Commit" 525 571 msgstr "Zeilen zur Bereitstellung hinzufügen" 526 572 527 527 - #: git-gui.sh:3400 573 573 + #: git-gui.sh:3811 528 574 msgid "Stage Line For Commit" 529 575 msgstr "Zeile zur Bereitstellung hinzufügen" 530 576 531 531 - #: git-gui.sh:3424 577 577 + #: git-gui.sh:3861 532 578 msgid "Initializing..." 533 579 msgstr "Initialisieren..." 534 580 535 535 - #: git-gui.sh:3541 581 581 + #: git-gui.sh:4017 536 582 #, tcl-format 537 583 msgid "" 538 584 "Possible environment issues exist.\n" ··· 548 594 "von %s an Git weitergegeben werden:\n" 549 595 "\n" 550 596 551 551 - #: git-gui.sh:3570 597 597 + #: git-gui.sh:4046 552 598 msgid "" 553 599 "\n" 554 600 "This is due to a known issue with the\n" ··· 558 604 "Dies ist ein bekanntes Problem der Tcl-Version, die\n" 559 605 "in Cygwin mitgeliefert wird." 560 606 561 561 - #: git-gui.sh:3575 607 607 + #: git-gui.sh:4051 562 608 #, tcl-format 563 609 msgid "" 564 610 "\n" ··· 574 620 "gewünschten Werte für die Einstellung user.name und \n" 575 621 "user.email in Ihre Datei ~/.gitconfig einfügen.\n" 576 622 577 577 - #: lib/about.tcl:26 578 578 - msgid "git-gui - a graphical user interface for Git." 579 579 - msgstr "git-gui - eine grafische Oberfläche für Git." 623 623 + #: lib/spellcheck.tcl:57 624 624 + msgid "Unsupported spell checker" 625 625 + msgstr "Rechtschreibprüfungsprogramm nicht unterstützt" 580 626 581 581 - #: lib/blame.tcl:72 582 582 - msgid "File Viewer" 583 583 - msgstr "Datei-Browser" 627 627 + #: lib/spellcheck.tcl:65 628 628 + msgid "Spell checking is unavailable" 629 629 + msgstr "Rechtschreibprüfung nicht verfügbar" 584 630 585 585 - #: lib/blame.tcl:78 586 586 - msgid "Commit:" 587 587 - msgstr "Version:" 631 631 + #: lib/spellcheck.tcl:68 632 632 + msgid "Invalid spell checking configuration" 633 633 + msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung" 588 634 589 589 - #: lib/blame.tcl:271 590 590 - msgid "Copy Commit" 591 591 - msgstr "Version kopieren" 592 592 - 593 593 - #: lib/blame.tcl:275 594 594 - msgid "Find Text..." 595 595 - msgstr "Text suchen..." 596 596 - 597 597 - #: lib/blame.tcl:284 598 598 - msgid "Do Full Copy Detection" 599 599 - msgstr "Volle Kopie-Erkennung" 600 600 - 601 601 - #: lib/blame.tcl:288 602 602 - msgid "Show History Context" 603 603 - msgstr "Historien-Kontext anzeigen" 604 604 - 605 605 - #: lib/blame.tcl:291 606 606 - msgid "Blame Parent Commit" 607 607 - msgstr "Elternversion annotieren" 608 608 - 609 609 - #: lib/blame.tcl:450 635 635 + #: lib/spellcheck.tcl:70 610 636 #, tcl-format 611 611 - msgid "Reading %s..." 612 612 - msgstr "%s lesen..." 613 613 - 614 614 - #: lib/blame.tcl:557 615 615 - msgid "Loading copy/move tracking annotations..." 616 616 - msgstr "Annotierungen für Kopieren/Verschieben werden geladen..." 637 637 + msgid "Reverting dictionary to %s." 638 638 + msgstr "Wörterbuch auf %s zurückgesetzt." 617 639 618 618 - #: lib/blame.tcl:577 619 619 - msgid "lines annotated" 620 620 - msgstr "Zeilen annotiert" 640 640 + #: lib/spellcheck.tcl:73 641 641 + msgid "Spell checker silently failed on startup" 642 642 + msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen" 621 643 622 622 - #: lib/blame.tcl:769 623 623 - msgid "Loading original location annotations..." 624 624 - msgstr "Annotierungen für ursprünglichen Ort werden geladen..." 625 625 - 626 626 - #: lib/blame.tcl:772 627 627 - msgid "Annotation complete." 628 628 - msgstr "Annotierung vollständig." 644 644 + #: lib/spellcheck.tcl:80 645 645 + msgid "Unrecognized spell checker" 646 646 + msgstr "Unbekanntes Rechtschreibprüfungsprogramm" 629 647 630 630 - #: lib/blame.tcl:802 631 631 - msgid "Busy" 632 632 - msgstr "Verarbeitung läuft" 648 648 + #: lib/spellcheck.tcl:186 649 649 + msgid "No Suggestions" 650 650 + msgstr "Keine Vorschläge" 633 651 634 634 - #: lib/blame.tcl:803 635 635 - msgid "Annotation process is already running." 636 636 - msgstr "Annotierung läuft bereits." 652 652 + #: lib/spellcheck.tcl:388 653 653 + msgid "Unexpected EOF from spell checker" 654 654 + msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm" 637 655 638 638 - #: lib/blame.tcl:842 639 639 - msgid "Running thorough copy detection..." 640 640 - msgstr "Intensive Kopie-Erkennung läuft..." 656 656 + #: lib/spellcheck.tcl:392 657 657 + msgid "Spell Checker Failed" 658 658 + msgstr "Rechtschreibprüfung fehlgeschlagen" 641 659 642 642 - #: lib/blame.tcl:910 643 643 - msgid "Loading annotation..." 644 644 - msgstr "Annotierung laden..." 660 660 + #: lib/transport.tcl:6 lib/remote_add.tcl:132 661 661 + #, tcl-format 662 662 + msgid "fetch %s" 663 663 + msgstr "»%s« anfordern" 645 664 646 646 - #: lib/blame.tcl:963 647 647 - msgid "Author:" 648 648 - msgstr "Autor:" 665 665 + #: lib/transport.tcl:7 666 666 + #, tcl-format 667 667 + msgid "Fetching new changes from %s" 668 668 + msgstr "Neue Änderungen von »%s« holen" 649 669 650 650 - #: lib/blame.tcl:967 651 651 - msgid "Committer:" 652 652 - msgstr "Eintragender:" 670 670 + #: lib/transport.tcl:18 671 671 + #, tcl-format 672 672 + msgid "remote prune %s" 673 673 + msgstr "Gelöschte externe Branches aus »%s« entfernen" 653 674 654 654 - #: lib/blame.tcl:972 655 655 - msgid "Original File:" 656 656 - msgstr "Ursprüngliche Datei:" 675 675 + #: lib/transport.tcl:19 676 676 + #, tcl-format 677 677 + msgid "Pruning tracking branches deleted from %s" 678 678 + msgstr "Gelöschte externe Trackingbranches aus »%s« werden entfernt" 657 679 658 658 - #: lib/blame.tcl:1020 659 659 - msgid "Cannot find HEAD commit:" 660 660 - msgstr "Zweigspitze (»HEAD«) kann nicht gefunden werden:" 680 680 + #: lib/transport.tcl:25 681 681 + msgid "fetch all remotes" 682 682 + msgstr "Abrufen aller externen" 661 683 662 662 - #: lib/blame.tcl:1075 663 663 - msgid "Cannot find parent commit:" 664 664 - msgstr "Elternversion kann nicht gefunden werden:" 684 684 + #: lib/transport.tcl:26 685 685 + msgid "Fetching new changes from all remotes" 686 686 + msgstr "Neue Änderungen von allen externen anfordern" 665 687 666 666 - #: lib/blame.tcl:1090 667 667 - msgid "Unable to display parent" 668 668 - msgstr "Elternversion kann nicht angezeigt werden" 688 688 + #: lib/transport.tcl:40 689 689 + msgid "remote prune all remotes" 690 690 + msgstr "Extern veraltete Branches entfernen aller Repositories" 669 691 670 670 - #: lib/blame.tcl:1091 lib/diff.tcl:320 671 671 - msgid "Error loading diff:" 672 672 - msgstr "Fehler beim Laden des Vergleichs:" 692 692 + #: lib/transport.tcl:41 693 693 + msgid "Pruning tracking branches deleted from all remotes" 694 694 + msgstr "" 695 695 + "Gelöschte externe Trackingbranches aus allen Repositories werden entfernt" 673 696 674 674 - #: lib/blame.tcl:1231 675 675 - msgid "Originally By:" 676 676 - msgstr "Ursprünglich von:" 697 697 + #: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 698 698 + #: lib/remote_add.tcl:162 699 699 + #, tcl-format 700 700 + msgid "push %s" 701 701 + msgstr "»%s« versenden..." 677 702 678 678 - #: lib/blame.tcl:1237 679 679 - msgid "In File:" 680 680 - msgstr "In Datei:" 703 703 + #: lib/transport.tcl:55 704 704 + #, tcl-format 705 705 + msgid "Pushing changes to %s" 706 706 + msgstr "Änderungen nach »%s« versenden" 681 707 682 682 - #: lib/blame.tcl:1242 683 683 - msgid "Copied Or Moved Here By:" 684 684 - msgstr "Kopiert oder verschoben durch:" 708 708 + #: lib/transport.tcl:93 709 709 + #, tcl-format 710 710 + msgid "Mirroring to %s" 711 711 + msgstr "Spiegeln nach %s" 685 712 686 686 - #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 687 687 - msgid "Checkout Branch" 688 688 - msgstr "Auf Zweig umstellen" 713 713 + #: lib/transport.tcl:111 714 714 + #, tcl-format 715 715 + msgid "Pushing %s %s to %s" 716 716 + msgstr "%s %s nach %s versenden" 689 717 690 690 - #: lib/branch_checkout.tcl:23 691 691 - msgid "Checkout" 692 692 - msgstr "Umstellen" 718 718 + #: lib/transport.tcl:132 719 719 + msgid "Push Branches" 720 720 + msgstr "Branches versenden" 693 721 694 694 - #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 695 695 - #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 696 696 - #: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 697 697 - #: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 698 698 - #: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 699 699 - #: lib/transport.tcl:108 722 722 + #: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34 723 723 + #: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32 724 724 + #: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 725 725 + #: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43 726 726 + #: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178 700 727 msgid "Cancel" 701 728 msgstr "Abbrechen" 702 729 703 703 - #: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 704 704 - msgid "Revision" 705 705 - msgstr "Version" 730 730 + #: lib/transport.tcl:147 731 731 + msgid "Source Branches" 732 732 + msgstr "Lokale Branches" 706 733 707 707 - #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 708 708 - msgid "Options" 709 709 - msgstr "Optionen" 734 734 + #: lib/transport.tcl:162 735 735 + msgid "Destination Repository" 736 736 + msgstr "Ziel-Repository" 710 737 711 711 - #: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 712 712 - msgid "Fetch Tracking Branch" 713 713 - msgstr "Übernahmezweig anfordern" 738 738 + #: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 739 739 + msgid "Remote:" 740 740 + msgstr "Externes Repository:" 714 741 715 715 - #: lib/branch_checkout.tcl:44 716 716 - msgid "Detach From Local Branch" 717 717 - msgstr "Verbindung zu lokalem Zweig lösen" 718 718 - 719 719 - #: lib/branch_create.tcl:22 720 720 - msgid "Create Branch" 721 721 - msgstr "Zweig erstellen" 742 742 + #: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 743 743 + msgid "Arbitrary Location:" 744 744 + msgstr "Beliebige Adresse:" 722 745 723 723 - #: lib/branch_create.tcl:27 724 724 - msgid "Create New Branch" 725 725 - msgstr "Neuen Zweig erstellen" 746 746 + #: lib/transport.tcl:205 747 747 + msgid "Transfer Options" 748 748 + msgstr "Netzwerk-Einstellungen" 726 749 727 727 - #: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 728 728 - msgid "Create" 729 729 - msgstr "Erstellen" 730 730 - 731 731 - #: lib/branch_create.tcl:40 732 732 - msgid "Branch Name" 733 733 - msgstr "Zweigname" 734 734 - 735 735 - #: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 736 736 - msgid "Name:" 737 737 - msgstr "Name:" 738 738 - 739 739 - #: lib/branch_create.tcl:58 740 740 - msgid "Match Tracking Branch Name" 741 741 - msgstr "Passend zu Übernahmezweig-Name" 742 742 - 743 743 - #: lib/branch_create.tcl:66 744 744 - msgid "Starting Revision" 745 745 - msgstr "Anfangsversion" 746 746 - 747 747 - #: lib/branch_create.tcl:72 748 748 - msgid "Update Existing Branch:" 749 749 - msgstr "Existierenden Zweig aktualisieren:" 750 750 - 751 751 - #: lib/branch_create.tcl:75 752 752 - msgid "No" 753 753 - msgstr "Nein" 754 754 - 755 755 - #: lib/branch_create.tcl:80 756 756 - msgid "Fast Forward Only" 757 757 - msgstr "Nur Schnellzusammenführung" 758 758 - 759 759 - #: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 760 760 - msgid "Reset" 761 761 - msgstr "Zurücksetzen" 762 762 - 763 763 - #: lib/branch_create.tcl:97 764 764 - msgid "Checkout After Creation" 765 765 - msgstr "Arbeitskopie umstellen nach Erstellen" 766 766 - 767 767 - #: lib/branch_create.tcl:131 768 768 - msgid "Please select a tracking branch." 769 769 - msgstr "Bitte wählen Sie einen Übernahmezweig." 770 770 - 771 771 - #: lib/branch_create.tcl:140 772 772 - #, tcl-format 773 773 - msgid "Tracking branch %s is not a branch in the remote repository." 774 774 - msgstr "Übernahmezweig »%s« ist kein Zweig im externen Projektarchiv." 775 775 - 776 776 - #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 777 777 - msgid "Please supply a branch name." 778 778 - msgstr "Bitte geben Sie einen Zweignamen an." 779 779 - 780 780 - #: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 781 781 - #, tcl-format 782 782 - msgid "'%s' is not an acceptable branch name." 783 783 - msgstr "»%s« ist kein zulässiger Zweigname." 784 784 - 785 785 - #: lib/branch_delete.tcl:15 786 786 - msgid "Delete Branch" 787 787 - msgstr "Zweig löschen" 788 788 - 789 789 - #: lib/branch_delete.tcl:20 790 790 - msgid "Delete Local Branch" 791 791 - msgstr "Lokalen Zweig löschen" 792 792 - 793 793 - #: lib/branch_delete.tcl:37 794 794 - msgid "Local Branches" 795 795 - msgstr "Lokale Zweige" 796 796 - 797 797 - #: lib/branch_delete.tcl:52 798 798 - msgid "Delete Only If Merged Into" 799 799 - msgstr "Nur löschen, wenn zusammengeführt nach" 800 800 - 801 801 - #: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 802 802 - msgid "Always (Do not perform merge checks)" 803 803 - msgstr "Immer (Keine Zusammenführungsprüfung)" 804 804 - 805 805 - #: lib/branch_delete.tcl:103 806 806 - #, tcl-format 807 807 - msgid "The following branches are not completely merged into %s:" 808 808 - msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:" 809 809 - 810 810 - #: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 811 811 - msgid "" 812 812 - "Recovering deleted branches is difficult.\n" 813 813 - "\n" 814 814 - "Delete the selected branches?" 750 750 + #: lib/transport.tcl:207 751 751 + msgid "Force overwrite existing branch (may discard changes)" 815 752 msgstr "" 816 816 - "Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand " 817 817 - "möglich.\n" 818 818 - "\n" 819 819 - "Sollen die ausgewählten Zweige gelöscht werden?" 753 753 + "Überschreiben von existierenden Branches erzwingen (könnte Änderungen " 754 754 + "löschen)" 820 755 821 821 - #: lib/branch_delete.tcl:141 822 822 - #, tcl-format 823 823 - msgid "" 824 824 - "Failed to delete branches:\n" 825 825 - "%s" 826 826 - msgstr "" 827 827 - "Fehler beim Löschen der Zweige:\n" 828 828 - "%s" 756 756 + #: lib/transport.tcl:211 757 757 + msgid "Use thin pack (for slow network connections)" 758 758 + msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)" 829 759 830 830 - #: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 831 831 - msgid "Rename Branch" 832 832 - msgstr "Zweig umbenennen" 833 833 - 834 834 - #: lib/branch_rename.tcl:26 835 835 - msgid "Rename" 836 836 - msgstr "Umbenennen" 760 760 + #: lib/transport.tcl:215 761 761 + msgid "Include tags" 762 762 + msgstr "Mit Tags versenden" 837 763 838 838 - #: lib/branch_rename.tcl:36 839 839 - msgid "Branch:" 840 840 - msgstr "Zweig:" 841 841 - 842 842 - #: lib/branch_rename.tcl:39 843 843 - msgid "New Name:" 844 844 - msgstr "Neuer Name:" 845 845 - 846 846 - #: lib/branch_rename.tcl:75 847 847 - msgid "Please select a branch to rename." 848 848 - msgstr "Bitte wählen Sie einen Zweig zum umbenennen." 849 849 - 850 850 - #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 764 764 + #: lib/transport.tcl:229 851 765 #, tcl-format 852 852 - msgid "Branch '%s' already exists." 853 853 - msgstr "Zweig »%s« existiert bereits." 854 854 - 855 855 - #: lib/branch_rename.tcl:117 856 856 - #, tcl-format 857 857 - msgid "Failed to rename '%s'." 858 858 - msgstr "Fehler beim Umbenennen von »%s«." 859 859 - 860 860 - #: lib/browser.tcl:17 861 861 - msgid "Starting..." 862 862 - msgstr "Starten..." 863 863 - 864 864 - #: lib/browser.tcl:26 865 865 - msgid "File Browser" 866 866 - msgstr "Datei-Browser" 867 867 - 868 868 - #: lib/browser.tcl:126 lib/browser.tcl:143 869 869 - #, tcl-format 870 870 - msgid "Loading %s..." 871 871 - msgstr "%s laden..." 872 872 - 873 873 - #: lib/browser.tcl:187 874 874 - msgid "[Up To Parent]" 875 875 - msgstr "[Nach oben]" 876 876 - 877 877 - #: lib/browser.tcl:267 lib/browser.tcl:273 878 878 - msgid "Browse Branch Files" 879 879 - msgstr "Dateien des Zweigs durchblättern" 880 880 - 881 881 - #: lib/browser.tcl:278 lib/choose_repository.tcl:398 882 882 - #: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 883 883 - #: lib/choose_repository.tcl:1028 884 884 - msgid "Browse" 885 885 - msgstr "Blättern" 766 766 + msgid "%s (%s): Push" 767 767 + msgstr "%s (%s): Versenden" 886 768 887 769 #: lib/checkout_op.tcl:85 888 770 #, tcl-format ··· 892 774 #: lib/checkout_op.tcl:133 893 775 #, tcl-format 894 776 msgid "fatal: Cannot resolve %s" 895 895 - msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden" 777 777 + msgstr "Fehler: »%s« kann nicht als Branch oder Version erkannt werden" 896 778 897 897 - #: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 898 898 - #: lib/sshkey.tcl:53 779 779 + #: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 780 780 + #: lib/database.tcl:30 899 781 msgid "Close" 900 782 msgstr "Schließen" 901 783 902 784 #: lib/checkout_op.tcl:175 903 785 #, tcl-format 904 786 msgid "Branch '%s' does not exist." 905 905 - msgstr "Zweig »%s« existiert nicht." 787 787 + msgstr "Branch »%s« existiert nicht." 906 788 907 789 #: lib/checkout_op.tcl:194 908 790 #, tcl-format 909 791 msgid "Failed to configure simplified git-pull for '%s'." 910 792 msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«." 911 793 794 794 + #: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 795 795 + #, tcl-format 796 796 + msgid "Branch '%s' already exists." 797 797 + msgstr "Branch »%s« existiert bereits." 798 798 + 912 799 #: lib/checkout_op.tcl:229 913 800 #, tcl-format 914 801 msgid "" ··· 917 804 "It cannot fast-forward to %s.\n" 918 805 "A merge is required." 919 806 msgstr "" 920 920 - "Zweig »%s« existiert bereits.\n" 807 807 + "Branch »%s« existiert bereits.\n" 921 808 "\n" 922 922 - "Zweig kann nicht mit »%s« schnellzusammengeführt werden. Reguläres " 923 923 - "Zusammenführen ist notwendig." 809 809 + "Branch kann nicht auf »%s« vorgespult werden. Reguläres Zusammenführen ist " 810 810 + "notwendig." 924 811 925 812 #: lib/checkout_op.tcl:243 926 813 #, tcl-format ··· 945 832 "\n" 946 833 "The rescan will be automatically started now.\n" 947 834 msgstr "" 948 948 - "Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" 835 835 + "Der letzte geladene Status stimmt nicht mehr mit dem Repository überein.\n" 949 836 "\n" 950 950 - "Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " 951 951 - "geändert. Vor dem Wechseln des lokalen Zweigs muss neu geladen werden.\n" 837 837 + "Ein anderes Git-Programm hat das Repository seit dem letzten Laden " 838 838 + "geändert. Vor dem Wechseln des lokalen Branches muss neu geladen werden.\n" 952 839 "\n" 953 840 "Es wird gleich neu geladen.\n" 954 841 955 842 #: lib/checkout_op.tcl:345 956 843 #, tcl-format 957 844 msgid "Updating working directory to '%s'..." 958 958 - msgstr "Arbeitskopie umstellen auf »%s«..." 845 845 + msgstr "Arbeitskopie aktualisieren auf »%s«..." 959 846 960 847 #: lib/checkout_op.tcl:346 961 848 msgid "files checked out" 962 849 msgstr "Dateien aktualisiert" 963 850 964 964 - #: lib/checkout_op.tcl:376 851 851 + #: lib/checkout_op.tcl:377 965 852 #, tcl-format 966 853 msgid "Aborted checkout of '%s' (file level merging is required)." 967 854 msgstr "" 968 968 - "Auf Zweig »%s« umstellen abgebrochen (Zusammenführen der Dateien ist " 855 855 + "Branch »%s« Auschecken abgebrochen (Zusammenführen der Dateien ist " 969 856 "notwendig)." 970 857 971 971 - #: lib/checkout_op.tcl:377 858 858 + #: lib/checkout_op.tcl:378 972 859 msgid "File level merge required." 973 860 msgstr "Zusammenführen der Dateien ist notwendig." 974 861 975 975 - #: lib/checkout_op.tcl:381 862 862 + #: lib/checkout_op.tcl:382 976 863 #, tcl-format 977 864 msgid "Staying on branch '%s'." 978 978 - msgstr "Es wird auf Zweig »%s« verblieben." 865 865 + msgstr "Es wird auf Branch »%s« verblieben." 979 866 980 980 - #: lib/checkout_op.tcl:452 867 867 + #: lib/checkout_op.tcl:453 981 868 msgid "" 982 869 "You are no longer on a local branch.\n" 983 870 "\n" 984 871 "If you wanted to be on a branch, create one now starting from 'This Detached " 985 872 "Checkout'." 986 873 msgstr "" 987 987 - "Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n" 874 874 + "Die Arbeitskopie ist nicht auf einem lokalen Branch.\n" 988 875 "\n" 989 989 - "Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen " 990 990 - "Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«." 876 876 + "Wenn Sie auf einem Branch arbeiten möchten, erstellen Sie bitte jetzt einen " 877 877 + "Branch mit der Auswahl »Losgelöste Arbeitskopie-Version«." 991 878 992 992 - #: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 879 879 + #: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 993 880 #, tcl-format 994 881 msgid "Checked out '%s'." 995 882 msgstr "Umgestellt auf »%s«." 996 883 997 997 - #: lib/checkout_op.tcl:535 884 884 + #: lib/checkout_op.tcl:536 998 885 #, tcl-format 999 886 msgid "Resetting '%s' to '%s' will lose the following commits:" 1000 1000 - msgstr "Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:" 887 887 + msgstr "Umsetzen von »%s« nach »%s« wird folgende Commits verlieren:" 1001 888 1002 1002 - #: lib/checkout_op.tcl:557 889 889 + #: lib/checkout_op.tcl:558 1003 890 msgid "Recovering lost commits may not be easy." 1004 891 msgstr "" 1005 1005 - "Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt " 1006 1006 - "werden." 892 892 + "Verlorene Commits können nur mit größerem Aufwand wiederhergestellt werden." 1007 893 1008 1008 - #: lib/checkout_op.tcl:562 894 894 + #: lib/checkout_op.tcl:563 1009 895 #, tcl-format 1010 896 msgid "Reset '%s'?" 1011 1011 - msgstr "»%s« zurücksetzen?" 897 897 + msgstr "»%s« umsetzen?" 1012 898 1013 1013 - #: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 899 899 + #: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 1014 900 msgid "Visualize" 1015 901 msgstr "Darstellen" 1016 902 1017 1017 - #: lib/checkout_op.tcl:635 903 903 + #: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 904 904 + msgid "Reset" 905 905 + msgstr "Umsetzen (Reset)" 906 906 + 907 907 + #: lib/checkout_op.tcl:636 1018 908 #, tcl-format 1019 909 msgid "" 1020 910 "Failed to set current branch.\n" ··· 1024 914 "\n" 1025 915 "This should not have occurred. %s will now close and give up." 1026 916 msgstr "" 1027 1027 - "Lokaler Zweig kann nicht gesetzt werden.\n" 917 917 + "Lokaler Branch kann nicht gesetzt werden.\n" 1028 918 "\n" 1029 919 "Diese Arbeitskopie ist nur teilweise umgestellt. Die Dateien sind korrekt " 1030 920 "aktualisiert, aber einige interne Git-Dateien konnten nicht geändert " ··· 1032 922 "\n" 1033 923 "Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen." 1034 924 1035 1035 - #: lib/choose_font.tcl:39 925 925 + #: lib/remote_add.tcl:20 926 926 + #, tcl-format 927 927 + msgid "%s (%s): Add Remote" 928 928 + msgstr "%s (%s): Externes Repository hinzufügen" 929 929 + 930 930 + #: lib/remote_add.tcl:25 931 931 + msgid "Add New Remote" 932 932 + msgstr "Neues externes Repository hinzufügen" 933 933 + 934 934 + #: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 935 935 + msgid "Add" 936 936 + msgstr "Hinzufügen" 937 937 + 938 938 + #: lib/remote_add.tcl:39 939 939 + msgid "Remote Details" 940 940 + msgstr "Einzelheiten des externen Repository" 941 941 + 942 942 + #: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 943 943 + msgid "Name:" 944 944 + msgstr "Name:" 945 945 + 946 946 + #: lib/remote_add.tcl:50 947 947 + msgid "Location:" 948 948 + msgstr "Adresse:" 949 949 + 950 950 + #: lib/remote_add.tcl:60 951 951 + msgid "Further Action" 952 952 + msgstr "Weitere Aktion" 953 953 + 954 954 + #: lib/remote_add.tcl:63 955 955 + msgid "Fetch Immediately" 956 956 + msgstr "Jetzt anfordern" 957 957 + 958 958 + #: lib/remote_add.tcl:69 959 959 + msgid "Initialize Remote Repository and Push" 960 960 + msgstr "Externes Repository initialisieren und dahin versenden" 961 961 + 962 962 + #: lib/remote_add.tcl:75 963 963 + msgid "Do Nothing Else Now" 964 964 + msgstr "Keine weitere Aktion" 965 965 + 966 966 + #: lib/remote_add.tcl:100 967 967 + msgid "Please supply a remote name." 968 968 + msgstr "Bitte geben Sie einen Namen des externen Repository an." 969 969 + 970 970 + #: lib/remote_add.tcl:113 971 971 + #, tcl-format 972 972 + msgid "'%s' is not an acceptable remote name." 973 973 + msgstr "»%s« ist kein zulässiger Name eines externen Repository." 974 974 + 975 975 + #: lib/remote_add.tcl:124 976 976 + #, tcl-format 977 977 + msgid "Failed to add remote '%s' of location '%s'." 978 978 + msgstr "Fehler beim Hinzufügen des externen Repository »%s« aus Adresse »%s«." 979 979 + 980 980 + #: lib/remote_add.tcl:133 981 981 + #, tcl-format 982 982 + msgid "Fetching the %s" 983 983 + msgstr "»%s« anfordern" 984 984 + 985 985 + #: lib/remote_add.tcl:156 986 986 + #, tcl-format 987 987 + msgid "Do not know how to initialize repository at location '%s'." 988 988 + msgstr "" 989 989 + "Initialisieren eines externen Repositories an Adresse »%s« ist nicht möglich." 990 990 + 991 991 + #: lib/remote_add.tcl:163 992 992 + #, tcl-format 993 993 + msgid "Setting up the %s (at %s)" 994 994 + msgstr "Einrichten von »%s« an »%s«" 995 995 + 996 996 + #: lib/browser.tcl:17 997 997 + msgid "Starting..." 998 998 + msgstr "Starten..." 999 999 + 1000 1000 + #: lib/browser.tcl:27 1001 1001 + #, tcl-format 1002 1002 + msgid "%s (%s): File Browser" 1003 1003 + msgstr "%s (%s): Datei-Browser" 1004 1004 + 1005 1005 + #: lib/browser.tcl:132 lib/browser.tcl:149 1006 1006 + #, tcl-format 1007 1007 + msgid "Loading %s..." 1008 1008 + msgstr "%s laden..." 1009 1009 + 1010 1010 + #: lib/browser.tcl:193 1011 1011 + msgid "[Up To Parent]" 1012 1012 + msgstr "[Nach oben]" 1013 1013 + 1014 1014 + #: lib/browser.tcl:275 1015 1015 + #, tcl-format 1016 1016 + msgid "%s (%s): Browse Branch Files" 1017 1017 + msgstr "%s (%s): Dateien des Branches durchblättern" 1018 1018 + 1019 1019 + #: lib/browser.tcl:282 1020 1020 + msgid "Browse Branch Files" 1021 1021 + msgstr "Dateien des Branches durchblättern" 1022 1022 + 1023 1023 + #: lib/browser.tcl:288 lib/choose_repository.tcl:437 1024 1024 + #: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533 1025 1025 + #: lib/choose_repository.tcl:1115 1026 1026 + msgid "Browse" 1027 1027 + msgstr "Blättern" 1028 1028 + 1029 1029 + #: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 1030 1030 + msgid "Revision" 1031 1031 + msgstr "Version" 1032 1032 + 1033 1033 + #: lib/index.tcl:6 1034 1034 + msgid "Unable to unlock the index." 1035 1035 + msgstr "Bereitstellung kann nicht wieder freigegeben werden." 1036 1036 + 1037 1037 + #: lib/index.tcl:30 1038 1038 + msgid "Index Error" 1039 1039 + msgstr "Fehler in Bereitstellung" 1040 1040 + 1041 1041 + #: lib/index.tcl:32 1042 1042 + msgid "" 1043 1043 + "Updating the Git index failed. A rescan will be automatically started to " 1044 1044 + "resynchronize git-gui." 1045 1045 + msgstr "" 1046 1046 + "Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine " 1047 1047 + "Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu " 1048 1048 + "synchronisieren." 1049 1049 + 1050 1050 + #: lib/index.tcl:43 1051 1051 + msgid "Continue" 1052 1052 + msgstr "Fortsetzen" 1053 1053 + 1054 1054 + #: lib/index.tcl:46 1055 1055 + msgid "Unlock Index" 1056 1056 + msgstr "Bereitstellung freigeben" 1057 1057 + 1058 1058 + #: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587 1059 1059 + #: lib/choose_repository.tcl:999 1060 1060 + msgid "files" 1061 1061 + msgstr "Dateien" 1062 1062 + 1063 1063 + #: lib/index.tcl:326 1064 1064 + msgid "Unstaging selected files from commit" 1065 1065 + msgstr "Gewählte Dateien aus der Bereitstellung herausnehmen" 1066 1066 + 1067 1067 + #: lib/index.tcl:330 1068 1068 + #, tcl-format 1069 1069 + msgid "Unstaging %s from commit" 1070 1070 + msgstr "Datei »%s« aus der Bereitstellung herausnehmen" 1071 1071 + 1072 1072 + #: lib/index.tcl:369 1073 1073 + msgid "Ready to commit." 1074 1074 + msgstr "Bereit zum Committen." 1075 1075 + 1076 1076 + #: lib/index.tcl:378 1077 1077 + msgid "Adding selected files" 1078 1078 + msgstr "Gewählte Dateien hinzufügen" 1079 1079 + 1080 1080 + #: lib/index.tcl:382 1081 1081 + #, tcl-format 1082 1082 + msgid "Adding %s" 1083 1083 + msgstr "»%s« hinzufügen" 1084 1084 + 1085 1085 + #: lib/index.tcl:412 1086 1086 + #, tcl-format 1087 1087 + msgid "Stage %d untracked files?" 1088 1088 + msgstr "%d unversionierte Dateien bereitstellen?" 1089 1089 + 1090 1090 + #: lib/index.tcl:420 1091 1091 + msgid "Adding all changed files" 1092 1092 + msgstr "Alle geänderten Dateien hinzufügen" 1093 1093 + 1094 1094 + #: lib/index.tcl:503 1095 1095 + #, tcl-format 1096 1096 + msgid "Revert changes in file %s?" 1097 1097 + msgstr "Änderungen in Datei »%s« verwerfen?" 1098 1098 + 1099 1099 + #: lib/index.tcl:508 1100 1100 + #, tcl-format 1101 1101 + msgid "Revert changes in these %i files?" 1102 1102 + msgstr "Änderungen in diesen %i Dateien verwerfen?" 1103 1103 + 1104 1104 + #: lib/index.tcl:517 1105 1105 + msgid "Any unstaged changes will be permanently lost by the revert." 1106 1106 + msgstr "" 1107 1107 + "Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen." 1108 1108 + 1109 1109 + #: lib/index.tcl:520 lib/index.tcl:563 1110 1110 + msgid "Do Nothing" 1111 1111 + msgstr "Nichts tun" 1112 1112 + 1113 1113 + #: lib/index.tcl:545 1114 1114 + #, tcl-format 1115 1115 + msgid "Delete untracked file %s?" 1116 1116 + msgstr "Unversionierte Datei »%s« löschen?" 1117 1117 + 1118 1118 + #: lib/index.tcl:550 1119 1119 + #, tcl-format 1120 1120 + msgid "Delete these %i untracked files?" 1121 1121 + msgstr "Diese %i unversionierten Dateien löschen?" 1122 1122 + 1123 1123 + #: lib/index.tcl:560 1124 1124 + msgid "Files will be permanently deleted." 1125 1125 + msgstr "Dateien werden endgültig gelöscht." 1126 1126 + 1127 1127 + #: lib/index.tcl:564 1128 1128 + msgid "Delete Files" 1129 1129 + msgstr "Dateien löschen" 1130 1130 + 1131 1131 + #: lib/index.tcl:586 1132 1132 + msgid "Deleting" 1133 1133 + msgstr "Löschen" 1134 1134 + 1135 1135 + #: lib/index.tcl:665 1136 1136 + msgid "Encountered errors deleting files:\n" 1137 1137 + msgstr "Fehler beim Löschen der Dateien:\n" 1138 1138 + 1139 1139 + #: lib/index.tcl:674 1140 1140 + #, tcl-format 1141 1141 + msgid "None of the %d selected files could be deleted." 1142 1142 + msgstr "Keine der %d gewählten Dateien konnten gelöscht werden." 1143 1143 + 1144 1144 + #: lib/index.tcl:679 1145 1145 + #, tcl-format 1146 1146 + msgid "%d of the %d selected files could not be deleted." 1147 1147 + msgstr "%d der %d gewählten Dateien konnten nicht gelöscht werden." 1148 1148 + 1149 1149 + #: lib/index.tcl:726 1150 1150 + msgid "Reverting selected files" 1151 1151 + msgstr "Änderungen in gewählten Dateien verwerfen" 1152 1152 + 1153 1153 + #: lib/index.tcl:730 1154 1154 + #, tcl-format 1155 1155 + msgid "Reverting %s" 1156 1156 + msgstr "Änderungen in %s verwerfen" 1157 1157 + 1158 1158 + #: lib/branch_checkout.tcl:16 1159 1159 + #, tcl-format 1160 1160 + msgid "%s (%s): Checkout Branch" 1161 1161 + msgstr "%s (%s): Branch auschecken" 1162 1162 + 1163 1163 + #: lib/branch_checkout.tcl:21 1164 1164 + msgid "Checkout Branch" 1165 1165 + msgstr "Branch auschecken" 1166 1166 + 1167 1167 + #: lib/branch_checkout.tcl:26 1168 1168 + msgid "Checkout" 1169 1169 + msgstr "Auschecken" 1170 1170 + 1171 1171 + #: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 1172 1172 + msgid "Options" 1173 1173 + msgstr "Optionen" 1174 1174 + 1175 1175 + #: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 1176 1176 + msgid "Fetch Tracking Branch" 1177 1177 + msgstr "Trackingbranch anfordern" 1178 1178 + 1179 1179 + #: lib/branch_checkout.tcl:47 1180 1180 + msgid "Detach From Local Branch" 1181 1181 + msgstr "Verbindung zu lokalem Branch lösen" 1182 1182 + 1183 1183 + #: lib/status_bar.tcl:263 1184 1184 + #, tcl-format 1185 1185 + msgid "%s ... %*i of %*i %s (%3i%%)" 1186 1186 + msgstr "%s ... %*i von %*i %s (%3i%%)" 1187 1187 + 1188 1188 + #: lib/remote.tcl:200 1189 1189 + msgid "Push to" 1190 1190 + msgstr "Versenden nach" 1191 1191 + 1192 1192 + #: lib/remote.tcl:218 1193 1193 + msgid "Remove Remote" 1194 1194 + msgstr "Externes Repository entfernen" 1195 1195 + 1196 1196 + #: lib/remote.tcl:223 1197 1197 + msgid "Prune from" 1198 1198 + msgstr "Veraltete Branches entfernen" 1199 1199 + 1200 1200 + #: lib/remote.tcl:228 1201 1201 + msgid "Fetch from" 1202 1202 + msgstr "Anfordern" 1203 1203 + 1204 1204 + #: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264 1205 1205 + msgid "All" 1206 1206 + msgstr "Alle" 1207 1207 + 1208 1208 + #: lib/branch_rename.tcl:15 1209 1209 + #, tcl-format 1210 1210 + msgid "%s (%s): Rename Branch" 1211 1211 + msgstr "%s (%s): Branch umbenennen" 1212 1212 + 1213 1213 + #: lib/branch_rename.tcl:23 1214 1214 + msgid "Rename Branch" 1215 1215 + msgstr "Branch umbenennen" 1216 1216 + 1217 1217 + #: lib/branch_rename.tcl:28 1218 1218 + msgid "Rename" 1219 1219 + msgstr "Umbenennen" 1220 1220 + 1221 1221 + #: lib/branch_rename.tcl:38 1222 1222 + msgid "Branch:" 1223 1223 + msgstr "Branch:" 1224 1224 + 1225 1225 + #: lib/branch_rename.tcl:46 1226 1226 + msgid "New Name:" 1227 1227 + msgstr "Neuer Name:" 1228 1228 + 1229 1229 + #: lib/branch_rename.tcl:81 1230 1230 + msgid "Please select a branch to rename." 1231 1231 + msgstr "Bitte wählen Sie einen Branch zum umbenennen." 1232 1232 + 1233 1233 + #: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 1234 1234 + msgid "Please supply a branch name." 1235 1235 + msgstr "Bitte geben Sie einen Branchnamen an." 1236 1236 + 1237 1237 + #: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 1238 1238 + #, tcl-format 1239 1239 + msgid "'%s' is not an acceptable branch name." 1240 1240 + msgstr "»%s« ist kein zulässiger Branchname." 1241 1241 + 1242 1242 + #: lib/branch_rename.tcl:123 1243 1243 + #, tcl-format 1244 1244 + msgid "Failed to rename '%s'." 1245 1245 + msgstr "Fehler beim Umbenennen von »%s«." 1246 1246 + 1247 1247 + #: lib/choose_font.tcl:41 1036 1248 msgid "Select" 1037 1249 msgstr "Auswählen" 1038 1250 1039 1039 - #: lib/choose_font.tcl:53 1251 1251 + #: lib/choose_font.tcl:55 1040 1252 msgid "Font Family" 1041 1253 msgstr "Schriftfamilie" 1042 1254 1043 1043 - #: lib/choose_font.tcl:74 1255 1255 + #: lib/choose_font.tcl:76 1044 1256 msgid "Font Size" 1045 1257 msgstr "Schriftgröße" 1046 1258 1047 1047 - #: lib/choose_font.tcl:91 1259 1259 + #: lib/choose_font.tcl:93 1048 1260 msgid "Font Example" 1049 1261 msgstr "Schriftbeispiel" 1050 1262 1051 1051 - #: lib/choose_font.tcl:103 1263 1263 + #: lib/choose_font.tcl:105 1052 1264 msgid "" 1053 1265 "This is example text.\n" 1054 1266 "If you like this text, it can be your font." ··· 1056 1268 "Dies ist ein Beispieltext.\n" 1057 1269 "Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen." 1058 1270 1059 1059 - #: lib/choose_repository.tcl:28 1271 1271 + #: lib/option.tcl:11 1272 1272 + #, tcl-format 1273 1273 + msgid "Invalid global encoding '%s'" 1274 1274 + msgstr "Ungültige globale Zeichenkodierung »%s«" 1275 1275 + 1276 1276 + #: lib/option.tcl:19 1277 1277 + #, tcl-format 1278 1278 + msgid "Invalid repo encoding '%s'" 1279 1279 + msgstr "Ungültige Repository-Zeichenkodierung »%s«" 1280 1280 + 1281 1281 + #: lib/option.tcl:119 1282 1282 + msgid "Restore Defaults" 1283 1283 + msgstr "Voreinstellungen wiederherstellen" 1284 1284 + 1285 1285 + #: lib/option.tcl:123 1286 1286 + msgid "Save" 1287 1287 + msgstr "Speichern" 1288 1288 + 1289 1289 + #: lib/option.tcl:133 1290 1290 + #, tcl-format 1291 1291 + msgid "%s Repository" 1292 1292 + msgstr "%s Repository" 1293 1293 + 1294 1294 + #: lib/option.tcl:134 1295 1295 + msgid "Global (All Repositories)" 1296 1296 + msgstr "Global (Alle Repositories)" 1297 1297 + 1298 1298 + #: lib/option.tcl:140 1299 1299 + msgid "User Name" 1300 1300 + msgstr "Benutzername" 1301 1301 + 1302 1302 + #: lib/option.tcl:141 1303 1303 + msgid "Email Address" 1304 1304 + msgstr "E-Mail-Adresse" 1305 1305 + 1306 1306 + #: lib/option.tcl:143 1307 1307 + msgid "Summarize Merge Commits" 1308 1308 + msgstr "Zusammenführungs-Commits zusammenfassen" 1309 1309 + 1310 1310 + #: lib/option.tcl:144 1311 1311 + msgid "Merge Verbosity" 1312 1312 + msgstr "Ausführlichkeit der Zusammenführen-Meldungen" 1313 1313 + 1314 1314 + #: lib/option.tcl:145 1315 1315 + msgid "Show Diffstat After Merge" 1316 1316 + msgstr "Vergleichsstatistik nach Zusammenführen anzeigen" 1317 1317 + 1318 1318 + #: lib/option.tcl:146 1319 1319 + msgid "Use Merge Tool" 1320 1320 + msgstr "Zusammenführungswerkzeug" 1321 1321 + 1322 1322 + #: lib/option.tcl:148 1323 1323 + msgid "Trust File Modification Timestamps" 1324 1324 + msgstr "Auf Dateiänderungsdatum verlassen" 1325 1325 + 1326 1326 + #: lib/option.tcl:149 1327 1327 + msgid "Prune Tracking Branches During Fetch" 1328 1328 + msgstr "Veraltete Trackingbranches entfernen während Anforderung" 1329 1329 + 1330 1330 + #: lib/option.tcl:150 1331 1331 + msgid "Match Tracking Branches" 1332 1332 + msgstr "Neue Branches automatisch als Trackingbranch" 1333 1333 + 1334 1334 + #: lib/option.tcl:151 1335 1335 + msgid "Use Textconv For Diffs and Blames" 1336 1336 + msgstr "Benutze »textconv« für Vergleich und Annotieren" 1337 1337 + 1338 1338 + #: lib/option.tcl:152 1339 1339 + msgid "Blame Copy Only On Changed Files" 1340 1340 + msgstr "Kopie-Annotieren nur bei geänderten Dateien" 1341 1341 + 1342 1342 + #: lib/option.tcl:153 1343 1343 + msgid "Maximum Length of Recent Repositories List" 1344 1344 + msgstr "Anzahl Einträge in »Letzte Repositories«" 1345 1345 + 1346 1346 + #: lib/option.tcl:154 1347 1347 + msgid "Minimum Letters To Blame Copy On" 1348 1348 + msgstr "Mindestzahl Zeichen für Kopie-Annotieren" 1349 1349 + 1350 1350 + #: lib/option.tcl:155 1351 1351 + msgid "Blame History Context Radius (days)" 1352 1352 + msgstr "Anzahl Tage für Annotieren-Historien-Kontext" 1353 1353 + 1354 1354 + #: lib/option.tcl:156 1355 1355 + msgid "Number of Diff Context Lines" 1356 1356 + msgstr "Anzahl der Kontextzeilen beim Vergleich" 1357 1357 + 1358 1358 + #: lib/option.tcl:157 1359 1359 + msgid "Additional Diff Parameters" 1360 1360 + msgstr "Zusätzliche Vergleich-/diff-Parameter" 1361 1361 + 1362 1362 + #: lib/option.tcl:158 1363 1363 + msgid "Commit Message Text Width" 1364 1364 + msgstr "Textbreite der Commit-Beschreibung" 1365 1365 + 1366 1366 + #: lib/option.tcl:159 1367 1367 + msgid "New Branch Name Template" 1368 1368 + msgstr "Namensvorlage für neue Branches" 1369 1369 + 1370 1370 + #: lib/option.tcl:160 1371 1371 + msgid "Default File Contents Encoding" 1372 1372 + msgstr "Voreingestellte Zeichenkodierung" 1373 1373 + 1374 1374 + #: lib/option.tcl:161 1375 1375 + msgid "Warn before committing to a detached head" 1376 1376 + msgstr "Warnen vor Committen auf losgelöste Branchspitze" 1377 1377 + 1378 1378 + #: lib/option.tcl:162 1379 1379 + msgid "Staging of untracked files" 1380 1380 + msgstr "Unversionierte Dateien bereitstellen" 1381 1381 + 1382 1382 + #: lib/option.tcl:163 1383 1383 + msgid "Show untracked files" 1384 1384 + msgstr "Unversionierte Dateien anzeigen" 1385 1385 + 1386 1386 + #: lib/option.tcl:164 1387 1387 + msgid "Tab spacing" 1388 1388 + msgstr "Tabulator-Breite" 1389 1389 + 1390 1390 + #: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282 1391 1391 + #: lib/database.tcl:57 1392 1392 + #, tcl-format 1393 1393 + msgid "%s:" 1394 1394 + msgstr "%s:" 1395 1395 + 1396 1396 + #: lib/option.tcl:210 1397 1397 + msgid "Change" 1398 1398 + msgstr "Ändern" 1399 1399 + 1400 1400 + #: lib/option.tcl:254 1401 1401 + msgid "Spelling Dictionary:" 1402 1402 + msgstr "Wörterbuch Rechtschreibprüfung:" 1403 1403 + 1404 1404 + #: lib/option.tcl:284 1405 1405 + msgid "Change Font" 1406 1406 + msgstr "Schriftart ändern" 1407 1407 + 1408 1408 + #: lib/option.tcl:288 1409 1409 + #, tcl-format 1410 1410 + msgid "Choose %s" 1411 1411 + msgstr "%s wählen" 1412 1412 + 1413 1413 + #: lib/option.tcl:294 1414 1414 + msgid "pt." 1415 1415 + msgstr "pt." 1416 1416 + 1417 1417 + #: lib/option.tcl:308 1418 1418 + msgid "Preferences" 1419 1419 + msgstr "Einstellungen" 1420 1420 + 1421 1421 + #: lib/option.tcl:345 1422 1422 + msgid "Failed to completely save options:" 1423 1423 + msgstr "Optionen konnten nicht gespeichert werden:" 1424 1424 + 1425 1425 + #: lib/encoding.tcl:443 1426 1426 + msgid "Default" 1427 1427 + msgstr "Voreinstellung" 1428 1428 + 1429 1429 + #: lib/encoding.tcl:448 1430 1430 + #, tcl-format 1431 1431 + msgid "System (%s)" 1432 1432 + msgstr "Systemweit (%s)" 1433 1433 + 1434 1434 + #: lib/encoding.tcl:459 lib/encoding.tcl:465 1435 1435 + msgid "Other" 1436 1436 + msgstr "Andere" 1437 1437 + 1438 1438 + #: lib/tools.tcl:76 1439 1439 + #, tcl-format 1440 1440 + msgid "Running %s requires a selected file." 1441 1441 + msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein." 1442 1442 + 1443 1443 + #: lib/tools.tcl:92 1444 1444 + #, tcl-format 1445 1445 + msgid "Are you sure you want to run %1$s on file \"%2$s\"?" 1446 1446 + msgstr "Wollen Sie %1$s wirklich auf Datei »%2$s« starten?" 1447 1447 + 1448 1448 + #: lib/tools.tcl:96 1449 1449 + #, tcl-format 1450 1450 + msgid "Are you sure you want to run %s?" 1451 1451 + msgstr "Wollen Sie %s wirklich starten?" 1452 1452 + 1453 1453 + #: lib/tools.tcl:118 1454 1454 + #, tcl-format 1455 1455 + msgid "Tool: %s" 1456 1456 + msgstr "Werkzeug: %s" 1457 1457 + 1458 1458 + #: lib/tools.tcl:119 1459 1459 + #, tcl-format 1460 1460 + msgid "Running: %s" 1461 1461 + msgstr "Starten: %s" 1462 1462 + 1463 1463 + #: lib/tools.tcl:158 1464 1464 + #, tcl-format 1465 1465 + msgid "Tool completed successfully: %s" 1466 1466 + msgstr "Werkzeug erfolgreich abgeschlossen: %s" 1467 1467 + 1468 1468 + #: lib/tools.tcl:160 1469 1469 + #, tcl-format 1470 1470 + msgid "Tool failed: %s" 1471 1471 + msgstr "Werkzeug fehlgeschlagen: %s" 1472 1472 + 1473 1473 + #: lib/mergetool.tcl:8 1474 1474 + msgid "Force resolution to the base version?" 1475 1475 + msgstr "Konflikt durch Basisversion ersetzen?" 1476 1476 + 1477 1477 + #: lib/mergetool.tcl:9 1478 1478 + msgid "Force resolution to this branch?" 1479 1479 + msgstr "Konflikt durch diesen Branch ersetzen?" 1480 1480 + 1481 1481 + #: lib/mergetool.tcl:10 1482 1482 + msgid "Force resolution to the other branch?" 1483 1483 + msgstr "Konflikt durch anderen Branch ersetzen?" 1484 1484 + 1485 1485 + #: lib/mergetool.tcl:14 1486 1486 + #, tcl-format 1487 1487 + msgid "" 1488 1488 + "Note that the diff shows only conflicting changes.\n" 1489 1489 + "\n" 1490 1490 + "%s will be overwritten.\n" 1491 1491 + "\n" 1492 1492 + "This operation can be undone only by restarting the merge." 1493 1493 + msgstr "" 1494 1494 + "Hinweis: Der Vergleich zeigt nur konfliktverursachende Änderungen an.\n" 1495 1495 + "\n" 1496 1496 + "»%s« wird überschrieben.\n" 1497 1497 + "\n" 1498 1498 + "Diese Operation kann nur rückgängig gemacht werden, wenn die\n" 1499 1499 + "Zusammenführung erneut gestartet wird." 1500 1500 + 1501 1501 + #: lib/mergetool.tcl:45 1502 1502 + #, tcl-format 1503 1503 + msgid "File %s seems to have unresolved conflicts, still stage?" 1504 1504 + msgstr "Datei »%s« hat nicht aufgelöste Konflikte. Trotzdem bereitstellen?" 1505 1505 + 1506 1506 + #: lib/mergetool.tcl:60 1507 1507 + #, tcl-format 1508 1508 + msgid "Adding resolution for %s" 1509 1509 + msgstr "Auflösung hinzugefügt für %s" 1510 1510 + 1511 1511 + #: lib/mergetool.tcl:141 1512 1512 + msgid "Cannot resolve deletion or link conflicts using a tool" 1513 1513 + msgstr "" 1514 1514 + "Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch " 1515 1515 + "das Zusamenführungswerkzeug gelöst werden." 1516 1516 + 1517 1517 + #: lib/mergetool.tcl:146 1518 1518 + msgid "Conflict file does not exist" 1519 1519 + msgstr "Konflikt-Datei existiert nicht" 1520 1520 + 1521 1521 + #: lib/mergetool.tcl:246 1522 1522 + #, tcl-format 1523 1523 + msgid "Not a GUI merge tool: '%s'" 1524 1524 + msgstr "Kein GUI Zusammenführungswerkzeug: »%s«" 1525 1525 + 1526 1526 + #: lib/mergetool.tcl:275 1527 1527 + #, tcl-format 1528 1528 + msgid "Unsupported merge tool '%s'" 1529 1529 + msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«" 1530 1530 + 1531 1531 + #: lib/mergetool.tcl:310 1532 1532 + msgid "Merge tool is already running, terminate it?" 1533 1533 + msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?" 1534 1534 + 1535 1535 + #: lib/mergetool.tcl:330 1536 1536 + #, tcl-format 1537 1537 + msgid "" 1538 1538 + "Error retrieving versions:\n" 1539 1539 + "%s" 1540 1540 + msgstr "" 1541 1541 + "Fehler beim Abrufen der Dateiversionen:\n" 1542 1542 + "%s" 1543 1543 + 1544 1544 + #: lib/mergetool.tcl:350 1545 1545 + #, tcl-format 1546 1546 + msgid "" 1547 1547 + "Could not start the merge tool:\n" 1548 1548 + "\n" 1549 1549 + "%s" 1550 1550 + msgstr "" 1551 1551 + "Zusammenführungswerkzeug konnte nicht gestartet werden:\n" 1552 1552 + "\n" 1553 1553 + "%s" 1554 1554 + 1555 1555 + #: lib/mergetool.tcl:354 1556 1556 + msgid "Running merge tool..." 1557 1557 + msgstr "Zusammenführungswerkzeug starten..." 1558 1558 + 1559 1559 + #: lib/mergetool.tcl:382 lib/mergetool.tcl:390 1560 1560 + msgid "Merge tool failed." 1561 1561 + msgstr "Zusammenführungswerkzeug fehlgeschlagen." 1562 1562 + 1563 1563 + #: lib/tools_dlg.tcl:22 1564 1564 + #, tcl-format 1565 1565 + msgid "%s (%s): Add Tool" 1566 1566 + msgstr "%s (%s): Werkzeug hinzufügen" 1567 1567 + 1568 1568 + #: lib/tools_dlg.tcl:28 1569 1569 + msgid "Add New Tool Command" 1570 1570 + msgstr "Neues Kommando für Werkzeug hinzufügen" 1571 1571 + 1572 1572 + #: lib/tools_dlg.tcl:34 1573 1573 + msgid "Add globally" 1574 1574 + msgstr "Global hinzufügen" 1575 1575 + 1576 1576 + #: lib/tools_dlg.tcl:46 1577 1577 + msgid "Tool Details" 1578 1578 + msgstr "Einzelheiten des Werkzeugs" 1579 1579 + 1580 1580 + #: lib/tools_dlg.tcl:49 1581 1581 + msgid "Use '/' separators to create a submenu tree:" 1582 1582 + msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:" 1583 1583 + 1584 1584 + #: lib/tools_dlg.tcl:60 1585 1585 + msgid "Command:" 1586 1586 + msgstr "Kommando:" 1587 1587 + 1588 1588 + #: lib/tools_dlg.tcl:71 1589 1589 + msgid "Show a dialog before running" 1590 1590 + msgstr "Bestätigungsfrage vor Starten anzeigen" 1591 1591 + 1592 1592 + #: lib/tools_dlg.tcl:77 1593 1593 + msgid "Ask the user to select a revision (sets $REVISION)" 1594 1594 + msgstr "Benutzer nach Version fragen (setzt $REVISION)" 1595 1595 + 1596 1596 + #: lib/tools_dlg.tcl:82 1597 1597 + msgid "Ask the user for additional arguments (sets $ARGS)" 1598 1598 + msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)" 1599 1599 + 1600 1600 + #: lib/tools_dlg.tcl:89 1601 1601 + msgid "Don't show the command output window" 1602 1602 + msgstr "Kein Ausgabefenster zeigen" 1603 1603 + 1604 1604 + #: lib/tools_dlg.tcl:94 1605 1605 + msgid "Run only if a diff is selected ($FILENAME not empty)" 1606 1606 + msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)" 1607 1607 + 1608 1608 + #: lib/tools_dlg.tcl:118 1609 1609 + msgid "Please supply a name for the tool." 1610 1610 + msgstr "Bitte geben Sie einen Werkzeugnamen an." 1611 1611 + 1612 1612 + #: lib/tools_dlg.tcl:126 1613 1613 + #, tcl-format 1614 1614 + msgid "Tool '%s' already exists." 1615 1615 + msgstr "Werkzeug »%s« existiert bereits." 1616 1616 + 1617 1617 + #: lib/tools_dlg.tcl:148 1618 1618 + #, tcl-format 1619 1619 + msgid "" 1620 1620 + "Could not add tool:\n" 1621 1621 + "%s" 1622 1622 + msgstr "" 1623 1623 + "Werkzeug konnte nicht hinzugefügt werden:\n" 1624 1624 + "\n" 1625 1625 + "%s" 1626 1626 + 1627 1627 + #: lib/tools_dlg.tcl:187 1628 1628 + #, tcl-format 1629 1629 + msgid "%s (%s): Remove Tool" 1630 1630 + msgstr "%s (%s): Werkzeug entfernen" 1631 1631 + 1632 1632 + #: lib/tools_dlg.tcl:193 1633 1633 + msgid "Remove Tool Commands" 1634 1634 + msgstr "Werkzeugkommandos entfernen" 1635 1635 + 1636 1636 + #: lib/tools_dlg.tcl:198 1637 1637 + msgid "Remove" 1638 1638 + msgstr "Entfernen" 1639 1639 + 1640 1640 + #: lib/tools_dlg.tcl:231 1641 1641 + msgid "(Blue denotes repository-local tools)" 1642 1642 + msgstr "(Werkzeuge für lokales Repository werden in Blau angezeigt)" 1643 1643 + 1644 1644 + #: lib/tools_dlg.tcl:283 1645 1645 + #, tcl-format 1646 1646 + msgid "%s (%s):" 1647 1647 + msgstr "%s (%s):" 1648 1648 + 1649 1649 + #: lib/tools_dlg.tcl:292 1650 1650 + #, tcl-format 1651 1651 + msgid "Run Command: %s" 1652 1652 + msgstr "Kommando aufrufen: %s" 1653 1653 + 1654 1654 + #: lib/tools_dlg.tcl:306 1655 1655 + msgid "Arguments" 1656 1656 + msgstr "Argumente" 1657 1657 + 1658 1658 + #: lib/tools_dlg.tcl:341 1659 1659 + msgid "OK" 1660 1660 + msgstr "Ok" 1661 1661 + 1662 1662 + #: lib/search.tcl:48 1663 1663 + msgid "Find:" 1664 1664 + msgstr "Suchen:" 1665 1665 + 1666 1666 + #: lib/search.tcl:50 1667 1667 + msgid "Next" 1668 1668 + msgstr "Nächster" 1669 1669 + 1670 1670 + #: lib/search.tcl:51 1671 1671 + msgid "Prev" 1672 1672 + msgstr "Voriger" 1673 1673 + 1674 1674 + #: lib/search.tcl:52 1675 1675 + msgid "RegExp" 1676 1676 + msgstr "RegAusdruck" 1677 1677 + 1678 1678 + #: lib/search.tcl:54 1679 1679 + msgid "Case" 1680 1680 + msgstr "Groß/klein" 1681 1681 + 1682 1682 + #: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75 1683 1683 + #, tcl-format 1684 1684 + msgid "%s (%s): Create Desktop Icon" 1685 1685 + msgstr "%s (%s): Desktop-Icon erstellen" 1686 1686 + 1687 1687 + #: lib/shortcut.tcl:24 lib/shortcut.tcl:65 1688 1688 + msgid "Cannot write shortcut:" 1689 1689 + msgstr "Fehler beim Schreiben der Verknüpfung:" 1690 1690 + 1691 1691 + #: lib/shortcut.tcl:140 1692 1692 + msgid "Cannot write icon:" 1693 1693 + msgstr "Fehler beim Erstellen des Icons:" 1694 1694 + 1695 1695 + #: lib/remote_branch_delete.tcl:29 1696 1696 + #, tcl-format 1697 1697 + msgid "%s (%s): Delete Branch Remotely" 1698 1698 + msgstr "%s (%s): Branch in externem Repository löschen" 1699 1699 + 1700 1700 + #: lib/remote_branch_delete.tcl:34 1701 1701 + msgid "Delete Branch Remotely" 1702 1702 + msgstr "Branch in externem Repository löschen" 1703 1703 + 1704 1704 + #: lib/remote_branch_delete.tcl:48 1705 1705 + msgid "From Repository" 1706 1706 + msgstr "In Repository" 1707 1707 + 1708 1708 + #: lib/remote_branch_delete.tcl:88 1709 1709 + msgid "Branches" 1710 1710 + msgstr "Branches" 1711 1711 + 1712 1712 + #: lib/remote_branch_delete.tcl:110 1713 1713 + msgid "Delete Only If" 1714 1714 + msgstr "Nur löschen, wenn" 1715 1715 + 1716 1716 + #: lib/remote_branch_delete.tcl:112 1717 1717 + msgid "Merged Into:" 1718 1718 + msgstr "Zusammengeführt mit:" 1719 1719 + 1720 1720 + #: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 1721 1721 + msgid "Always (Do not perform merge checks)" 1722 1722 + msgstr "Immer (Keine Zusammenführungsprüfung)" 1723 1723 + 1724 1724 + #: lib/remote_branch_delete.tcl:153 1725 1725 + msgid "A branch is required for 'Merged Into'." 1726 1726 + msgstr "Für »Zusammenführen mit« muss ein Branch angegeben werden." 1727 1727 + 1728 1728 + #: lib/remote_branch_delete.tcl:185 1729 1729 + #, tcl-format 1730 1730 + msgid "" 1731 1731 + "The following branches are not completely merged into %s:\n" 1732 1732 + "\n" 1733 1733 + " - %s" 1734 1734 + msgstr "" 1735 1735 + "Folgende Branches sind noch nicht mit »%s« zusammengeführt:\n" 1736 1736 + "\n" 1737 1737 + " - %s" 1738 1738 + 1739 1739 + #: lib/remote_branch_delete.tcl:190 1740 1740 + #, tcl-format 1741 1741 + msgid "" 1742 1742 + "One or more of the merge tests failed because you have not fetched the " 1743 1743 + "necessary commits. Try fetching from %s first." 1744 1744 + msgstr "" 1745 1745 + "Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die " 1746 1746 + "notwendigen Commits vorher angefordert haben. Sie sollten versuchen, zuerst " 1747 1747 + "von »%s« anzufordern." 1748 1748 + 1749 1749 + #: lib/remote_branch_delete.tcl:208 1750 1750 + msgid "Please select one or more branches to delete." 1751 1751 + msgstr "Bitte wählen Sie mindestens einen Branch, der gelöscht werden soll." 1752 1752 + 1753 1753 + #: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 1754 1754 + msgid "" 1755 1755 + "Recovering deleted branches is difficult.\n" 1756 1756 + "\n" 1757 1757 + "Delete the selected branches?" 1758 1758 + msgstr "" 1759 1759 + "Das Wiederherstellen von gelöschten Branches ist nur mit größerem Aufwand " 1760 1760 + "möglich.\n" 1761 1761 + "\n" 1762 1762 + "Sollen die ausgewählten Branches gelöscht werden?" 1763 1763 + 1764 1764 + #: lib/remote_branch_delete.tcl:227 1765 1765 + #, tcl-format 1766 1766 + msgid "Deleting branches from %s" 1767 1767 + msgstr "Branches auf »%s« werden gelöscht" 1768 1768 + 1769 1769 + #: lib/remote_branch_delete.tcl:300 1770 1770 + msgid "No repository selected." 1771 1771 + msgstr "Kein Repository ausgewählt." 1772 1772 + 1773 1773 + #: lib/remote_branch_delete.tcl:305 1774 1774 + #, tcl-format 1775 1775 + msgid "Scanning %s..." 1776 1776 + msgstr "»%s« laden..." 1777 1777 + 1778 1778 + #: lib/choose_repository.tcl:45 1060 1779 msgid "Git Gui" 1061 1780 msgstr "Git Gui" 1062 1781 1063 1063 - #: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 1782 1782 + #: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 1064 1783 msgid "Create New Repository" 1065 1065 - msgstr "Neues Projektarchiv" 1784 1784 + msgstr "Repository neu erstellen" 1066 1785 1067 1067 - #: lib/choose_repository.tcl:93 1786 1786 + #: lib/choose_repository.tcl:110 1068 1787 msgid "New..." 1069 1788 msgstr "Neu..." 1070 1789 1071 1071 - #: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 1790 1790 + #: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 1072 1791 msgid "Clone Existing Repository" 1073 1073 - msgstr "Projektarchiv klonen" 1792 1792 + msgstr "Repository klonen" 1074 1793 1075 1075 - #: lib/choose_repository.tcl:106 1794 1794 + #: lib/choose_repository.tcl:128 1076 1795 msgid "Clone..." 1077 1796 msgstr "Klonen..." 1078 1797 1079 1079 - #: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 1798 1798 + #: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 1080 1799 msgid "Open Existing Repository" 1081 1081 - msgstr "Projektarchiv öffnen" 1800 1800 + msgstr "Repository öffnen" 1082 1801 1083 1083 - #: lib/choose_repository.tcl:119 1802 1802 + #: lib/choose_repository.tcl:141 1084 1803 msgid "Open..." 1085 1804 msgstr "Öffnen..." 1086 1805 1087 1087 - #: lib/choose_repository.tcl:132 1806 1806 + #: lib/choose_repository.tcl:154 1088 1807 msgid "Recent Repositories" 1089 1089 - msgstr "Zuletzt benutzte Projektarchive" 1808 1808 + msgstr "Letzte Repositories" 1090 1809 1091 1091 - #: lib/choose_repository.tcl:138 1810 1810 + #: lib/choose_repository.tcl:164 1092 1811 msgid "Open Recent Repository:" 1093 1093 - msgstr "Zuletzt benutztes Projektarchiv öffnen:" 1812 1812 + msgstr "Zuletzt benutztes Repository öffnen:" 1094 1813 1095 1095 - #: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 1096 1096 - #: lib/choose_repository.tcl:320 1814 1814 + #: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 1815 1815 + #: lib/choose_repository.tcl:345 1097 1816 #, tcl-format 1098 1817 msgid "Failed to create repository %s:" 1099 1099 - msgstr "Projektarchiv »%s« konnte nicht erstellt werden:" 1818 1818 + msgstr "Repository »%s« konnte nicht erstellt werden:" 1100 1819 1101 1101 - #: lib/choose_repository.tcl:391 1820 1820 + #: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 1821 1821 + msgid "Create" 1822 1822 + msgstr "Erstellen" 1823 1823 + 1824 1824 + #: lib/choose_repository.tcl:432 1102 1825 msgid "Directory:" 1103 1826 msgstr "Verzeichnis:" 1104 1827 1105 1105 - #: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 1106 1106 - #: lib/choose_repository.tcl:1052 1828 1828 + #: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 1829 1829 + #: lib/choose_repository.tcl:1139 1107 1830 msgid "Git Repository" 1108 1108 - msgstr "Git Projektarchiv" 1831 1831 + msgstr "Git Repository" 1109 1832 1110 1110 - #: lib/choose_repository.tcl:448 1833 1833 + #: lib/choose_repository.tcl:487 1111 1834 #, tcl-format 1112 1835 msgid "Directory %s already exists." 1113 1836 msgstr "Verzeichnis »%s« existiert bereits." 1114 1837 1115 1115 - #: lib/choose_repository.tcl:452 1838 1838 + #: lib/choose_repository.tcl:491 1116 1839 #, tcl-format 1117 1840 msgid "File %s already exists." 1118 1841 msgstr "Datei »%s« existiert bereits." 1119 1842 1120 1120 - #: lib/choose_repository.tcl:466 1843 1843 + #: lib/choose_repository.tcl:506 1121 1844 msgid "Clone" 1122 1845 msgstr "Klonen" 1123 1846 1124 1124 - #: lib/choose_repository.tcl:479 1847 1847 + #: lib/choose_repository.tcl:519 1125 1848 msgid "Source Location:" 1126 1126 - msgstr "Herkunft:" 1849 1849 + msgstr "Herkunfts-Adresse:" 1127 1850 1128 1128 - #: lib/choose_repository.tcl:490 1851 1851 + #: lib/choose_repository.tcl:528 1129 1852 msgid "Target Directory:" 1130 1853 msgstr "Zielverzeichnis:" 1131 1854 1132 1132 - #: lib/choose_repository.tcl:502 1855 1855 + #: lib/choose_repository.tcl:538 1133 1856 msgid "Clone Type:" 1134 1857 msgstr "Art des Klonens:" 1135 1858 1136 1136 - #: lib/choose_repository.tcl:508 1859 1859 + #: lib/choose_repository.tcl:543 1137 1860 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" 1138 1861 msgstr "Standard (schnell, teilweise redundant, Hardlinks)" 1139 1862 1140 1140 - #: lib/choose_repository.tcl:514 1863 1863 + #: lib/choose_repository.tcl:548 1141 1864 msgid "Full Copy (Slower, Redundant Backup)" 1142 1865 msgstr "Alles kopieren (langsamer, volle Redundanz)" 1143 1866 1144 1144 - #: lib/choose_repository.tcl:520 1867 1867 + #: lib/choose_repository.tcl:553 1145 1868 msgid "Shared (Fastest, Not Recommended, No Backup)" 1146 1869 msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)" 1147 1870 1148 1148 - #: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 1149 1149 - #: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 1150 1150 - #: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 1871 1871 + #: lib/choose_repository.tcl:560 1872 1872 + msgid "Recursively clone submodules too" 1873 1873 + msgstr "Rekursiv weitere Submodule klonen" 1874 1874 + 1875 1875 + #: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641 1876 1876 + #: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864 1877 1877 + #: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153 1151 1878 #, tcl-format 1152 1879 msgid "Not a Git repository: %s" 1153 1153 - msgstr "Kein Git-Projektarchiv in »%s« gefunden." 1880 1880 + msgstr "Kein Git-Repository: %s" 1154 1881 1155 1155 - #: lib/choose_repository.tcl:592 1882 1882 + #: lib/choose_repository.tcl:630 1156 1883 msgid "Standard only available for local repository." 1157 1157 - msgstr "Standard ist nur für lokale Projektarchive verfügbar." 1884 1884 + msgstr "Standard ist nur für lokale Repositories verfügbar." 1158 1885 1159 1159 - #: lib/choose_repository.tcl:596 1886 1886 + #: lib/choose_repository.tcl:634 1160 1887 msgid "Shared only available for local repository." 1161 1161 - msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar." 1888 1888 + msgstr "Verknüpft ist nur für lokale Repositories verfügbar." 1162 1889 1163 1163 - #: lib/choose_repository.tcl:617 1890 1890 + #: lib/choose_repository.tcl:655 1164 1891 #, tcl-format 1165 1892 msgid "Location %s already exists." 1166 1166 - msgstr "Projektarchiv »%s« existiert bereits." 1893 1893 + msgstr "Adresse »%s« existiert bereits." 1167 1894 1168 1168 - #: lib/choose_repository.tcl:628 1895 1895 + #: lib/choose_repository.tcl:666 1169 1896 msgid "Failed to configure origin" 1170 1897 msgstr "Der Ursprungsort konnte nicht eingerichtet werden" 1171 1898 1172 1172 - #: lib/choose_repository.tcl:640 1899 1899 + #: lib/choose_repository.tcl:678 1173 1900 msgid "Counting objects" 1174 1901 msgstr "Objekte werden gezählt" 1175 1902 1176 1176 - #: lib/choose_repository.tcl:641 1903 1903 + #: lib/choose_repository.tcl:679 1177 1904 msgid "buckets" 1178 1905 msgstr "Buckets" 1179 1906 1180 1180 - #: lib/choose_repository.tcl:665 1907 1907 + #: lib/choose_repository.tcl:703 1181 1908 #, tcl-format 1182 1909 msgid "Unable to copy objects/info/alternates: %s" 1183 1910 msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s" 1184 1911 1185 1185 - #: lib/choose_repository.tcl:701 1912 1912 + #: lib/choose_repository.tcl:740 1186 1913 #, tcl-format 1187 1914 msgid "Nothing to clone from %s." 1188 1915 msgstr "Von »%s« konnte nichts geklont werden." 1189 1916 1190 1190 - #: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 1191 1191 - #: lib/choose_repository.tcl:929 1917 1917 + #: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 1918 1918 + #: lib/choose_repository.tcl:974 1192 1919 msgid "The 'master' branch has not been initialized." 1193 1193 - msgstr "Der »master«-Zweig wurde noch nicht initialisiert." 1920 1920 + msgstr "Der »master«-Branch wurde noch nicht initialisiert." 1194 1921 1195 1195 - #: lib/choose_repository.tcl:716 1922 1922 + #: lib/choose_repository.tcl:755 1196 1923 msgid "Hardlinks are unavailable. Falling back to copying." 1197 1924 msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert." 1198 1925 1199 1199 - #: lib/choose_repository.tcl:728 1926 1926 + #: lib/choose_repository.tcl:769 1200 1927 #, tcl-format 1201 1928 msgid "Cloning from %s" 1202 1929 msgstr "Kopieren von »%s«" 1203 1930 1204 1204 - #: lib/choose_repository.tcl:759 1931 1931 + #: lib/choose_repository.tcl:800 1205 1932 msgid "Copying objects" 1206 1933 msgstr "Objektdatenbank kopieren" 1207 1934 1208 1208 - #: lib/choose_repository.tcl:760 1935 1935 + #: lib/choose_repository.tcl:801 1209 1936 msgid "KiB" 1210 1937 msgstr "KB" 1211 1938 1212 1212 - #: lib/choose_repository.tcl:784 1939 1939 + #: lib/choose_repository.tcl:825 1213 1940 #, tcl-format 1214 1941 msgid "Unable to copy object: %s" 1215 1942 msgstr "Objekt kann nicht kopiert werden: %s" 1216 1943 1217 1217 - #: lib/choose_repository.tcl:794 1944 1944 + #: lib/choose_repository.tcl:837 1218 1945 msgid "Linking objects" 1219 1946 msgstr "Objekte verlinken" 1220 1947 1221 1221 - #: lib/choose_repository.tcl:795 1948 1948 + #: lib/choose_repository.tcl:838 1222 1949 msgid "objects" 1223 1950 msgstr "Objekte" 1224 1951 1225 1225 - #: lib/choose_repository.tcl:803 1952 1952 + #: lib/choose_repository.tcl:846 1226 1953 #, tcl-format 1227 1954 msgid "Unable to hardlink object: %s" 1228 1955 msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s" 1229 1956 1230 1230 - #: lib/choose_repository.tcl:858 1957 1957 + #: lib/choose_repository.tcl:903 1231 1958 msgid "Cannot fetch branches and objects. See console output for details." 1232 1959 msgstr "" 1233 1233 - "Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die " 1234 1234 - "Ausgaben auf der Konsole für weitere Angaben." 1960 1960 + "Branches und Objekte konnten nicht angefordert werden. Kontrollieren Sie " 1961 1961 + "die Ausgaben auf der Konsole für weitere Angaben." 1235 1962 1236 1236 - #: lib/choose_repository.tcl:869 1963 1963 + #: lib/choose_repository.tcl:914 1237 1964 msgid "Cannot fetch tags. See console output for details." 1238 1965 msgstr "" 1239 1239 - "Markierungen konnten nicht angefordert werden. Kontrollieren Sie die " 1240 1240 - "Ausgaben auf der Konsole für weitere Angaben." 1966 1966 + "Tags konnten nicht angefordert werden. Kontrollieren Sie die Ausgaben auf " 1967 1967 + "der Konsole für weitere Angaben." 1241 1968 1242 1242 - #: lib/choose_repository.tcl:893 1969 1969 + #: lib/choose_repository.tcl:938 1243 1970 msgid "Cannot determine HEAD. See console output for details." 1244 1971 msgstr "" 1245 1245 - "Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die " 1972 1972 + "Die Branchspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die " 1246 1973 "Ausgaben auf der Konsole für weitere Angaben." 1247 1974 1248 1248 - #: lib/choose_repository.tcl:902 1975 1975 + #: lib/choose_repository.tcl:947 1249 1976 #, tcl-format 1250 1977 msgid "Unable to cleanup %s" 1251 1978 msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden." 1252 1979 1253 1253 - #: lib/choose_repository.tcl:908 1980 1980 + #: lib/choose_repository.tcl:953 1254 1981 msgid "Clone failed." 1255 1982 msgstr "Klonen fehlgeschlagen." 1256 1983 1257 1257 - #: lib/choose_repository.tcl:915 1984 1984 + #: lib/choose_repository.tcl:960 1258 1985 msgid "No default branch obtained." 1259 1259 - msgstr "Kein voreingestellter Zweig gefunden." 1986 1986 + msgstr "Kein voreingestellter Branch gefunden." 1260 1987 1261 1261 - #: lib/choose_repository.tcl:926 1988 1988 + #: lib/choose_repository.tcl:971 1262 1989 #, tcl-format 1263 1990 msgid "Cannot resolve %s as a commit." 1264 1264 - msgstr "»%s« wurde nicht als Version gefunden." 1991 1991 + msgstr "»%s« wurde nicht als Commit gefunden." 1265 1992 1266 1266 - #: lib/choose_repository.tcl:938 1993 1993 + #: lib/choose_repository.tcl:998 1267 1994 msgid "Creating working directory" 1268 1995 msgstr "Arbeitskopie erstellen" 1269 1996 1270 1270 - #: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 1271 1271 - #: lib/index.tcl:198 1272 1272 - msgid "files" 1273 1273 - msgstr "Dateien" 1274 1274 - 1275 1275 - #: lib/choose_repository.tcl:968 1997 1997 + #: lib/choose_repository.tcl:1028 1276 1998 msgid "Initial file checkout failed." 1277 1999 msgstr "Erstellen der Arbeitskopie fehlgeschlagen." 1278 2000 1279 1279 - #: lib/choose_repository.tcl:1011 1280 1280 - msgid "Open" 1281 1281 - msgstr "Öffnen" 2001 2001 + #: lib/choose_repository.tcl:1072 2002 2002 + msgid "Cloning submodules" 2003 2003 + msgstr "Klone Submodul" 2004 2004 + 2005 2005 + #: lib/choose_repository.tcl:1087 2006 2006 + msgid "Cannot clone submodules." 2007 2007 + msgstr "Submodul konnte nicht geklont werden." 1282 2008 1283 1283 - #: lib/choose_repository.tcl:1021 2009 2009 + #: lib/choose_repository.tcl:1110 1284 2010 msgid "Repository:" 1285 1285 - msgstr "Projektarchiv:" 2011 2011 + msgstr "Repository:" 1286 2012 1287 1287 - #: lib/choose_repository.tcl:1072 2013 2013 + #: lib/choose_repository.tcl:1159 1288 2014 #, tcl-format 1289 2015 msgid "Failed to open repository %s:" 1290 1290 - msgstr "Projektarchiv »%s« konnte nicht geöffnet werden." 2016 2016 + msgstr "Repository »%s« konnte nicht geöffnet werden." 2017 2017 + 2018 2018 + #: lib/about.tcl:26 2019 2019 + msgid "git-gui - a graphical user interface for Git." 2020 2020 + msgstr "git-gui - eine grafische Oberfläche für Git." 2021 2021 + 2022 2022 + #: lib/blame.tcl:74 2023 2023 + #, tcl-format 2024 2024 + msgid "%s (%s): File Viewer" 2025 2025 + msgstr "%s (%s): Datei-Browser" 2026 2026 + 2027 2027 + #: lib/blame.tcl:80 2028 2028 + msgid "Commit:" 2029 2029 + msgstr "Commit:" 2030 2030 + 2031 2031 + #: lib/blame.tcl:282 2032 2032 + msgid "Copy Commit" 2033 2033 + msgstr "Commit kopieren" 2034 2034 + 2035 2035 + #: lib/blame.tcl:286 2036 2036 + msgid "Find Text..." 2037 2037 + msgstr "Text suchen..." 2038 2038 + 2039 2039 + #: lib/blame.tcl:290 2040 2040 + msgid "Goto Line..." 2041 2041 + msgstr "Gehe zu Zeile..." 2042 2042 + 2043 2043 + #: lib/blame.tcl:299 2044 2044 + msgid "Do Full Copy Detection" 2045 2045 + msgstr "Volle Kopie-Erkennung" 2046 2046 + 2047 2047 + #: lib/blame.tcl:303 2048 2048 + msgid "Show History Context" 2049 2049 + msgstr "Historien-Kontext anzeigen" 2050 2050 + 2051 2051 + #: lib/blame.tcl:306 2052 2052 + msgid "Blame Parent Commit" 2053 2053 + msgstr "Elterncommit annotieren" 2054 2054 + 2055 2055 + #: lib/blame.tcl:468 2056 2056 + #, tcl-format 2057 2057 + msgid "Reading %s..." 2058 2058 + msgstr "%s lesen..." 2059 2059 + 2060 2060 + #: lib/blame.tcl:596 2061 2061 + msgid "Loading copy/move tracking annotations..." 2062 2062 + msgstr "Annotierungen für Kopieren/Verschieben werden geladen..." 2063 2063 + 2064 2064 + #: lib/blame.tcl:613 2065 2065 + msgid "lines annotated" 2066 2066 + msgstr "Zeilen annotiert" 2067 2067 + 2068 2068 + #: lib/blame.tcl:815 2069 2069 + msgid "Loading original location annotations..." 2070 2070 + msgstr "Annotierungen für ursprünglichen Ort werden geladen..." 2071 2071 + 2072 2072 + #: lib/blame.tcl:818 2073 2073 + msgid "Annotation complete." 2074 2074 + msgstr "Annotierung vollständig." 2075 2075 + 2076 2076 + #: lib/blame.tcl:849 2077 2077 + msgid "Busy" 2078 2078 + msgstr "Verarbeitung läuft" 2079 2079 + 2080 2080 + #: lib/blame.tcl:850 2081 2081 + msgid "Annotation process is already running." 2082 2082 + msgstr "Annotierung läuft bereits." 2083 2083 + 2084 2084 + #: lib/blame.tcl:889 2085 2085 + msgid "Running thorough copy detection..." 2086 2086 + msgstr "Intensive Kopie-Erkennung läuft..." 2087 2087 + 2088 2088 + #: lib/blame.tcl:957 2089 2089 + msgid "Loading annotation..." 2090 2090 + msgstr "Annotierung laden..." 2091 2091 + 2092 2092 + #: lib/blame.tcl:1010 2093 2093 + msgid "Author:" 2094 2094 + msgstr "Autor:" 2095 2095 + 2096 2096 + #: lib/blame.tcl:1014 2097 2097 + msgid "Committer:" 2098 2098 + msgstr "Committer:" 2099 2099 + 2100 2100 + #: lib/blame.tcl:1019 2101 2101 + msgid "Original File:" 2102 2102 + msgstr "Ursprüngliche Datei:" 2103 2103 + 2104 2104 + #: lib/blame.tcl:1067 2105 2105 + msgid "Cannot find HEAD commit:" 2106 2106 + msgstr "Branchspitze (»HEAD commit«) kann nicht gefunden werden:" 2107 2107 + 2108 2108 + #: lib/blame.tcl:1122 2109 2109 + msgid "Cannot find parent commit:" 2110 2110 + msgstr "Elterncommit kann nicht gefunden werden:" 2111 2111 + 2112 2112 + #: lib/blame.tcl:1137 2113 2113 + msgid "Unable to display parent" 2114 2114 + msgstr "Elterncommit kann nicht angezeigt werden" 2115 2115 + 2116 2116 + #: lib/blame.tcl:1138 lib/diff.tcl:345 2117 2117 + msgid "Error loading diff:" 2118 2118 + msgstr "Fehler beim Laden des Vergleichs:" 2119 2119 + 2120 2120 + #: lib/blame.tcl:1279 2121 2121 + msgid "Originally By:" 2122 2122 + msgstr "Ursprünglich von:" 2123 2123 + 2124 2124 + #: lib/blame.tcl:1285 2125 2125 + msgid "In File:" 2126 2126 + msgstr "In Datei:" 2127 2127 + 2128 2128 + #: lib/blame.tcl:1290 2129 2129 + msgid "Copied Or Moved Here By:" 2130 2130 + msgstr "Kopiert oder verschoben durch:" 2131 2131 + 2132 2132 + #: lib/diff.tcl:77 2133 2133 + #, tcl-format 2134 2134 + msgid "" 2135 2135 + "No differences detected.\n" 2136 2136 + "\n" 2137 2137 + "%s has no changes.\n" 2138 2138 + "\n" 2139 2139 + "The modification date of this file was updated by another application, but " 2140 2140 + "the content within the file was not changed.\n" 2141 2141 + "\n" 2142 2142 + "A rescan will be automatically started to find other files which may have " 2143 2143 + "the same state." 2144 2144 + msgstr "" 2145 2145 + "Keine Änderungen feststellbar.\n" 2146 2146 + "\n" 2147 2147 + "»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei " 2148 2148 + "von einem anderen Programm modifiziert, aber der Inhalt der Datei ist " 2149 2149 + "unverändert.\n" 2150 2150 + "\n" 2151 2151 + "Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen " 2152 2152 + "Dateien zu prüfen." 2153 2153 + 2154 2154 + #: lib/diff.tcl:117 2155 2155 + #, tcl-format 2156 2156 + msgid "Loading diff of %s..." 2157 2157 + msgstr "Vergleich von »%s« laden..." 2158 2158 + 2159 2159 + #: lib/diff.tcl:143 2160 2160 + msgid "" 2161 2161 + "LOCAL: deleted\n" 2162 2162 + "REMOTE:\n" 2163 2163 + msgstr "" 2164 2164 + "LOKAL: gelöscht\n" 2165 2165 + "EXTERN:\n" 2166 2166 + 2167 2167 + #: lib/diff.tcl:148 2168 2168 + msgid "" 2169 2169 + "REMOTE: deleted\n" 2170 2170 + "LOCAL:\n" 2171 2171 + msgstr "" 2172 2172 + "EXTERN: gelöscht\n" 2173 2173 + "LOKAL:\n" 2174 2174 + 2175 2175 + #: lib/diff.tcl:155 2176 2176 + msgid "LOCAL:\n" 2177 2177 + msgstr "LOKAL:\n" 2178 2178 + 2179 2179 + #: lib/diff.tcl:158 2180 2180 + msgid "REMOTE:\n" 2181 2181 + msgstr "EXTERN:\n" 2182 2182 + 2183 2183 + #: lib/diff.tcl:220 lib/diff.tcl:344 2184 2184 + #, tcl-format 2185 2185 + msgid "Unable to display %s" 2186 2186 + msgstr "Datei »%s« kann nicht angezeigt werden" 2187 2187 + 2188 2188 + #: lib/diff.tcl:221 2189 2189 + msgid "Error loading file:" 2190 2190 + msgstr "Fehler beim Laden der Datei:" 2191 2191 + 2192 2192 + #: lib/diff.tcl:227 2193 2193 + msgid "Git Repository (subproject)" 2194 2194 + msgstr "Git-Repository (Subprojekt)" 2195 2195 + 2196 2196 + #: lib/diff.tcl:239 2197 2197 + msgid "* Binary file (not showing content)." 2198 2198 + msgstr "* Binärdatei (Inhalt wird nicht angezeigt)" 2199 2199 + 2200 2200 + #: lib/diff.tcl:244 2201 2201 + #, tcl-format 2202 2202 + msgid "" 2203 2203 + "* Untracked file is %d bytes.\n" 2204 2204 + "* Showing only first %d bytes.\n" 2205 2205 + msgstr "" 2206 2206 + "* Unversionierte Datei hat %d Bytes.\n" 2207 2207 + "* Nur erste %d Bytes werden angezeigt.\n" 2208 2208 + 2209 2209 + #: lib/diff.tcl:250 2210 2210 + #, tcl-format 2211 2211 + msgid "" 2212 2212 + "\n" 2213 2213 + "* Untracked file clipped here by %s.\n" 2214 2214 + "* To see the entire file, use an external editor.\n" 2215 2215 + msgstr "" 2216 2216 + "\n" 2217 2217 + "* Unversionierte Datei, hier abgeschnitten durch %s.\n" 2218 2218 + "* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n" 2219 2219 + 2220 2220 + #: lib/diff.tcl:583 2221 2221 + msgid "Failed to unstage selected hunk." 2222 2222 + msgstr "" 2223 2223 + "Fehler beim Herausnehmen des gewählten Patch-Blocks aus der Bereitstellung." 2224 2224 + 2225 2225 + #: lib/diff.tcl:591 2226 2226 + msgid "Failed to revert selected hunk." 2227 2227 + msgstr "Fehler beim Zurücknehmen des gewählten Patch-Blocks." 2228 2228 + 2229 2229 + #: lib/diff.tcl:594 2230 2230 + msgid "Failed to stage selected hunk." 2231 2231 + msgstr "Fehler beim Bereitstellen des gewählten Patch-Blocks." 2232 2232 + 2233 2233 + #: lib/diff.tcl:687 2234 2234 + msgid "Failed to unstage selected line." 2235 2235 + msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung." 2236 2236 + 2237 2237 + #: lib/diff.tcl:696 2238 2238 + msgid "Failed to revert selected line." 2239 2239 + msgstr "Fehler beim Zurücknehmen der gewählten Zeile." 2240 2240 + 2241 2241 + #: lib/diff.tcl:700 2242 2242 + msgid "Failed to stage selected line." 2243 2243 + msgstr "Fehler beim Bereitstellen der gewählten Zeile." 2244 2244 + 2245 2245 + #: lib/diff.tcl:889 2246 2246 + msgid "Failed to undo last revert." 2247 2247 + msgstr "Fehler beim Rückgängigmachen des letzten Zurücknehmen-Commits" 2248 2248 + 2249 2249 + #: lib/sshkey.tcl:34 2250 2250 + msgid "No keys found." 2251 2251 + msgstr "Keine Schlüssel gefunden." 2252 2252 + 2253 2253 + #: lib/sshkey.tcl:37 2254 2254 + #, tcl-format 2255 2255 + msgid "Found a public key in: %s" 2256 2256 + msgstr "Öffentlicher Schlüssel gefunden in: %s" 2257 2257 + 2258 2258 + #: lib/sshkey.tcl:43 2259 2259 + msgid "Generate Key" 2260 2260 + msgstr "Schlüssel erzeugen" 2261 2261 + 2262 2262 + #: lib/sshkey.tcl:61 2263 2263 + msgid "Copy To Clipboard" 2264 2264 + msgstr "In Zwischenablage kopieren" 2265 2265 + 2266 2266 + #: lib/sshkey.tcl:75 2267 2267 + msgid "Your OpenSSH Public Key" 2268 2268 + msgstr "Ihr OpenSSH öffenlicher Schlüssel" 2269 2269 + 2270 2270 + #: lib/sshkey.tcl:83 2271 2271 + msgid "Generating..." 2272 2272 + msgstr "Erzeugen..." 2273 2273 + 2274 2274 + #: lib/sshkey.tcl:89 2275 2275 + #, tcl-format 2276 2276 + msgid "" 2277 2277 + "Could not start ssh-keygen:\n" 2278 2278 + "\n" 2279 2279 + "%s" 2280 2280 + msgstr "" 2281 2281 + "Konnte »ssh-keygen« nicht starten:\n" 2282 2282 + "\n" 2283 2283 + "%s" 1291 2284 1292 1292 - #: lib/choose_rev.tcl:53 2285 2285 + #: lib/sshkey.tcl:116 2286 2286 + msgid "Generation failed." 2287 2287 + msgstr "Schlüsselerzeugung fehlgeschlagen." 2288 2288 + 2289 2289 + #: lib/sshkey.tcl:123 2290 2290 + msgid "Generation succeeded, but no keys found." 2291 2291 + msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden." 2292 2292 + 2293 2293 + #: lib/sshkey.tcl:126 2294 2294 + #, tcl-format 2295 2295 + msgid "Your key is in: %s" 2296 2296 + msgstr "Ihr Schlüssel ist abgelegt in: %s" 2297 2297 + 2298 2298 + #: lib/branch_create.tcl:23 2299 2299 + #, tcl-format 2300 2300 + msgid "%s (%s): Create Branch" 2301 2301 + msgstr "%s (%s): Branch erstellen" 2302 2302 + 2303 2303 + #: lib/branch_create.tcl:28 2304 2304 + msgid "Create New Branch" 2305 2305 + msgstr "Neuen Branch erstellen" 2306 2306 + 2307 2307 + #: lib/branch_create.tcl:42 2308 2308 + msgid "Branch Name" 2309 2309 + msgstr "Branchname" 2310 2310 + 2311 2311 + #: lib/branch_create.tcl:57 2312 2312 + msgid "Match Tracking Branch Name" 2313 2313 + msgstr "Passend zu Trackingbranch-Name" 2314 2314 + 2315 2315 + #: lib/branch_create.tcl:66 2316 2316 + msgid "Starting Revision" 2317 2317 + msgstr "Anfangsversion" 2318 2318 + 2319 2319 + #: lib/branch_create.tcl:72 2320 2320 + msgid "Update Existing Branch:" 2321 2321 + msgstr "Existierenden Branch aktualisieren:" 2322 2322 + 2323 2323 + #: lib/branch_create.tcl:75 2324 2324 + msgid "No" 2325 2325 + msgstr "Nein" 2326 2326 + 2327 2327 + #: lib/branch_create.tcl:80 2328 2328 + msgid "Fast Forward Only" 2329 2329 + msgstr "Nur Vorspulen" 2330 2330 + 2331 2331 + #: lib/branch_create.tcl:97 2332 2332 + msgid "Checkout After Creation" 2333 2333 + msgstr "Branch auschecken nach Erstellen" 2334 2334 + 2335 2335 + #: lib/branch_create.tcl:132 2336 2336 + msgid "Please select a tracking branch." 2337 2337 + msgstr "Bitte wählen Sie einen Trackingbranch." 2338 2338 + 2339 2339 + #: lib/branch_create.tcl:141 2340 2340 + #, tcl-format 2341 2341 + msgid "Tracking branch %s is not a branch in the remote repository." 2342 2342 + msgstr "Trackingbranch »%s« ist kein Branch im externen Repository." 2343 2343 + 2344 2344 + #: lib/console.tcl:59 2345 2345 + msgid "Working... please wait..." 2346 2346 + msgstr "Verarbeitung. Bitte warten..." 2347 2347 + 2348 2348 + #: lib/console.tcl:186 2349 2349 + msgid "Success" 2350 2350 + msgstr "Erfolgreich" 2351 2351 + 2352 2352 + #: lib/console.tcl:200 2353 2353 + msgid "Error: Command Failed" 2354 2354 + msgstr "Fehler: Kommando fehlgeschlagen" 2355 2355 + 2356 2356 + #: lib/line.tcl:17 2357 2357 + msgid "Goto Line:" 2358 2358 + msgstr "Gehe zu Zeile:" 2359 2359 + 2360 2360 + #: lib/line.tcl:23 2361 2361 + msgid "Go" 2362 2362 + msgstr "Gehe" 2363 2363 + 2364 2364 + #: lib/choose_rev.tcl:52 1293 2365 msgid "This Detached Checkout" 1294 1294 - msgstr "Abgetrennte Arbeitskopie-Version" 2366 2366 + msgstr "Losgelöste Arbeitskopie-Version" 1295 2367 1296 2368 #: lib/choose_rev.tcl:60 1297 2369 msgid "Revision Expression:" 1298 1298 - msgstr "Version Regexp-Ausdruck:" 2370 2370 + msgstr "Version Regex-Ausdruck:" 1299 2371 1300 1300 - #: lib/choose_rev.tcl:74 2372 2372 + #: lib/choose_rev.tcl:72 1301 2373 msgid "Local Branch" 1302 1302 - msgstr "Lokaler Zweig" 2374 2374 + msgstr "Lokaler Branch" 1303 2375 1304 1304 - #: lib/choose_rev.tcl:79 2376 2376 + #: lib/choose_rev.tcl:77 1305 2377 msgid "Tracking Branch" 1306 1306 - msgstr "Übernahmezweig" 2378 2378 + msgstr "Trackingbranch" 1307 2379 1308 1308 - #: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 2380 2380 + #: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 1309 2381 msgid "Tag" 1310 1310 - msgstr "Markierung" 2382 2382 + msgstr "Tag" 1311 2383 1312 1312 - #: lib/choose_rev.tcl:317 2384 2384 + #: lib/choose_rev.tcl:321 1313 2385 #, tcl-format 1314 2386 msgid "Invalid revision: %s" 1315 2387 msgstr "Ungültige Version: %s" 1316 2388 1317 1317 - #: lib/choose_rev.tcl:338 2389 2389 + #: lib/choose_rev.tcl:342 1318 2390 msgid "No revision selected." 1319 2391 msgstr "Keine Version ausgewählt." 1320 2392 1321 1321 - #: lib/choose_rev.tcl:346 2393 2393 + #: lib/choose_rev.tcl:350 1322 2394 msgid "Revision expression is empty." 1323 2395 msgstr "Versions-Ausdruck ist leer." 1324 2396 1325 1325 - #: lib/choose_rev.tcl:531 2397 2397 + #: lib/choose_rev.tcl:537 1326 2398 msgid "Updated" 1327 2399 msgstr "Aktualisiert" 1328 2400 1329 1329 - #: lib/choose_rev.tcl:559 2401 2401 + #: lib/choose_rev.tcl:565 1330 2402 msgid "URL" 1331 2403 msgstr "URL" 1332 2404 ··· 1337 2409 "You are about to create the initial commit. There is no commit before this " 1338 2410 "to amend.\n" 1339 2411 msgstr "" 1340 1340 - "Keine Version zur Nachbesserung vorhanden.\n" 2412 2412 + "Kein Commit zur Nachbesserung vorhanden.\n" 1341 2413 "\n" 1342 1342 - "Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende " 1343 1343 - "Version, die Sie nachbessern könnten.\n" 2414 2414 + "Sie sind dabei, den ersten Commit zu erstellen. Es gibt keinen existierenden " 2415 2415 + "Commit, den Sie nachbessern könnten.\n" 1344 2416 1345 2417 #: lib/commit.tcl:18 1346 2418 msgid "" ··· 1350 2422 "completed. You cannot amend the prior commit unless you first abort the " 1351 2423 "current merge activity.\n" 1352 2424 msgstr "" 1353 1353 - "Nachbesserung währen Zusammenführung nicht möglich.\n" 2425 2425 + "Nachbesserung bei Zusammenführung nicht möglich.\n" 1354 2426 "\n" 1355 1355 - "Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht " 1356 1356 - "beendet. Sie können keine vorige Übertragung nachbessern, solange eine " 2427 2427 + "Sie haben das Zusammenführen von Commits angefangen, aber noch nicht " 2428 2428 + "beendet. Sie können keinen vorigen Commit nachbessern, solange eine " 1357 2429 "unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung " 1358 2430 "beenden oder abbrechen.\n" 1359 2431 1360 1360 - #: lib/commit.tcl:48 2432 2432 + #: lib/commit.tcl:56 1361 2433 msgid "Error loading commit data for amend:" 1362 1362 - msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:" 2434 2434 + msgstr "Fehler beim Laden der Commitdaten für Nachbessern:" 1363 2435 1364 1364 - #: lib/commit.tcl:75 2436 2436 + #: lib/commit.tcl:83 1365 2437 msgid "Unable to obtain your identity:" 1366 2438 msgstr "Benutzername konnte nicht bestimmt werden:" 1367 2439 1368 1368 - #: lib/commit.tcl:80 2440 2440 + #: lib/commit.tcl:88 1369 2441 msgid "Invalid GIT_COMMITTER_IDENT:" 1370 2442 msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:" 1371 2443 1372 1372 - #: lib/commit.tcl:129 2444 2444 + #: lib/commit.tcl:138 1373 2445 #, tcl-format 1374 2446 msgid "warning: Tcl does not support encoding '%s'." 1375 2447 msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht." 1376 2448 1377 1377 - #: lib/commit.tcl:149 2449 2449 + #: lib/commit.tcl:158 1378 2450 msgid "" 1379 2451 "Last scanned state does not match repository state.\n" 1380 2452 "\n" ··· 1383 2455 "\n" 1384 2456 "The rescan will be automatically started now.\n" 1385 2457 msgstr "" 1386 1386 - "Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" 2458 2458 + "Der letzte geladene Status stimmt nicht mehr mit dem Repository überein.\n" 1387 2459 "\n" 1388 1388 - "Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " 1389 1389 - "geändert. Vor dem Eintragen einer neuen Version muss neu geladen werden.\n" 2460 2460 + "Ein anderes Git-Programm hat das Repository seit dem letzten Laden " 2461 2461 + "geändert. Vor dem nächsten Commit muss neu geladen werden.\n" 1390 2462 "\n" 1391 2463 "Es wird gleich neu geladen.\n" 1392 2464 1393 1393 - #: lib/commit.tcl:172 2465 2465 + #: lib/commit.tcl:182 1394 2466 #, tcl-format 1395 2467 msgid "" 1396 2468 "Unmerged files cannot be committed.\n" ··· 1398 2470 "File %s has merge conflicts. You must resolve them and stage the file " 1399 2471 "before committing.\n" 1400 2472 msgstr "" 1401 1401 - "Nicht zusammengeführte Dateien können nicht eingetragen werden.\n" 2473 2473 + "Nicht zusammengeführte Dateien können nicht committet werden.\n" 1402 2474 "\n" 1403 2475 "Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie " 1404 1404 - "müssen diese Konflikte auflösen, bevor Sie eintragen können.\n" 2476 2476 + "müssen diese Konflikte auflösen und die Dateien in die Bereitstellung " 2477 2477 + "hinzufügen, bevor Sie committen können.\n" 1405 2478 1406 1406 - #: lib/commit.tcl:180 2479 2479 + #: lib/commit.tcl:190 1407 2480 #, tcl-format 1408 2481 msgid "" 1409 2482 "Unknown file state %s detected.\n" ··· 1412 2485 msgstr "" 1413 2486 "Unbekannter Dateizustand »%s«.\n" 1414 2487 "\n" 1415 1415 - "Datei »%s« kann nicht eingetragen werden.\n" 2488 2488 + "Datei »%s« kann nicht committet werden.\n" 1416 2489 1417 1417 - #: lib/commit.tcl:188 2490 2490 + #: lib/commit.tcl:198 1418 2491 msgid "" 1419 2492 "No changes to commit.\n" 1420 2493 "\n" 1421 2494 "You must stage at least 1 file before you can commit.\n" 1422 2495 msgstr "" 1423 1423 - "Keine Änderungen vorhanden, die eingetragen werden könnten.\n" 2496 2496 + "Keine Änderungen vorhanden, die committet werden könnten.\n" 1424 2497 "\n" 1425 1425 - "Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n" 2498 2498 + "Sie müssen mindestens eine Datei bereitstellen, bevor Sie committen können.\n" 1426 2499 1427 1427 - #: lib/commit.tcl:203 2500 2500 + #: lib/commit.tcl:213 1428 2501 msgid "" 1429 2502 "Please supply a commit message.\n" 1430 2503 "\n" ··· 1444 2517 "\n" 1445 2518 "- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n" 1446 2519 1447 1447 - #: lib/commit.tcl:234 2520 2520 + #: lib/commit.tcl:244 1448 2521 msgid "Calling pre-commit hook..." 1449 1449 - msgstr "Aufrufen der Vor-Eintragen-Kontrolle (»pre-commit hook«)..." 2522 2522 + msgstr "Aufrufen des »pre-commit hook«..." 1450 2523 1451 1451 - #: lib/commit.tcl:249 2524 2524 + #: lib/commit.tcl:259 1452 2525 msgid "Commit declined by pre-commit hook." 1453 1453 - msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)." 2526 2526 + msgstr "Committen abgelehnt durch »pre-commit hook«." 2527 2527 + 2528 2528 + #: lib/commit.tcl:278 2529 2529 + msgid "" 2530 2530 + "You are about to commit on a detached head. This is a potentially dangerous " 2531 2531 + "thing to do because if you switch to another branch you will lose your " 2532 2532 + "changes and it can be difficult to retrieve them later from the reflog. You " 2533 2533 + "should probably cancel this commit and create a new branch to continue.\n" 2534 2534 + " \n" 2535 2535 + " Do you really want to proceed with your Commit?" 2536 2536 + msgstr "" 2537 2537 + "Sie sind dabei, einen Commit auf losgelöste Branchspitze (»commit to " 2538 2538 + "detached head«) zu erstellen. Das ist riskant, denn wenn Sie zu einem " 2539 2539 + "anderen Branch wechseln, würden Sie diese Änderungen verlieren und es ist " 2540 2540 + "nachträglich schwierig, diese aus dem Commit-Log (»reflog«) wiederzufinden. " 2541 2541 + "Es wird empfohlen, diesen Commit abzubrechen und zunächst einen neuen Branch " 2542 2542 + "zu erstellen.\n" 2543 2543 + "\n" 2544 2544 + " Wollen Sie den Commit trotzdem in dieser Form erstellen?" 1454 2545 1455 1455 - #: lib/commit.tcl:272 2546 2546 + #: lib/commit.tcl:299 1456 2547 msgid "Calling commit-msg hook..." 1457 1457 - msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle (»commit-message hook«)..." 2548 2548 + msgstr "Aufrufen des »commit-msg hook«..." 1458 2549 1459 1459 - #: lib/commit.tcl:287 2550 2550 + #: lib/commit.tcl:314 1460 2551 msgid "Commit declined by commit-msg hook." 1461 1461 - msgstr "" 1462 1462 - "Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message " 1463 1463 - "hook«)." 2552 2552 + msgstr "Committen abgelehnt durch »commit-msg hook«." 1464 2553 1465 1465 - #: lib/commit.tcl:300 2554 2554 + #: lib/commit.tcl:327 1466 2555 msgid "Committing changes..." 1467 1467 - msgstr "Änderungen eintragen..." 2556 2556 + msgstr "Änderungen committen..." 1468 2557 1469 1469 - #: lib/commit.tcl:316 2558 2558 + #: lib/commit.tcl:344 1470 2559 msgid "write-tree failed:" 1471 2560 msgstr "write-tree fehlgeschlagen:" 1472 2561 1473 1473 - #: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 2562 2562 + #: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 1474 2563 msgid "Commit failed." 1475 1475 - msgstr "Eintragen fehlgeschlagen." 2564 2564 + msgstr "Committen fehlgeschlagen." 1476 2565 1477 1477 - #: lib/commit.tcl:334 2566 2566 + #: lib/commit.tcl:362 1478 2567 #, tcl-format 1479 2568 msgid "Commit %s appears to be corrupt" 1480 2569 msgstr "Version »%s« scheint beschädigt zu sein" 1481 2570 1482 1482 - #: lib/commit.tcl:339 2571 2571 + #: lib/commit.tcl:367 1483 2572 msgid "" 1484 2573 "No changes to commit.\n" 1485 2574 "\n" ··· 1487 2576 "\n" 1488 2577 "A rescan will be automatically started now.\n" 1489 2578 msgstr "" 1490 1490 - "Keine Änderungen einzutragen.\n" 2579 2579 + "Keine Änderungen zum committen.\n" 1491 2580 "\n" 1492 1492 - "Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts " 2581 2581 + "Es gibt keine geänderte Datei in diesem Commit und es wurde auch nichts " 1493 2582 "zusammengeführt.\n" 1494 2583 "\n" 1495 2584 "Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n" 1496 2585 1497 1497 - #: lib/commit.tcl:346 2586 2586 + #: lib/commit.tcl:374 1498 2587 msgid "No changes to commit." 1499 1499 - msgstr "Keine Änderungen, die eingetragen werden können." 2588 2588 + msgstr "Keine Änderungen, die committet werden können." 1500 2589 1501 1501 - #: lib/commit.tcl:360 2590 2590 + #: lib/commit.tcl:394 1502 2591 msgid "commit-tree failed:" 1503 2592 msgstr "commit-tree fehlgeschlagen:" 1504 2593 1505 1505 - #: lib/commit.tcl:381 2594 2594 + #: lib/commit.tcl:421 1506 2595 msgid "update-ref failed:" 1507 2596 msgstr "update-ref fehlgeschlagen:" 1508 2597 1509 1509 - #: lib/commit.tcl:469 2598 2598 + #: lib/commit.tcl:514 1510 2599 #, tcl-format 1511 2600 msgid "Created commit %s: %s" 1512 1512 - msgstr "Version %s übertragen: %s" 2601 2601 + msgstr "Commit %s erstellt: %s" 1513 2602 1514 1514 - #: lib/console.tcl:59 1515 1515 - msgid "Working... please wait..." 1516 1516 - msgstr "Verarbeitung. Bitte warten..." 2603 2603 + #: lib/branch_delete.tcl:16 2604 2604 + #, tcl-format 2605 2605 + msgid "%s (%s): Delete Branch" 2606 2606 + msgstr "%s (%s): Branch löschen" 1517 2607 1518 1518 - #: lib/console.tcl:186 1519 1519 - msgid "Success" 1520 1520 - msgstr "Erfolgreich" 2608 2608 + #: lib/branch_delete.tcl:21 2609 2609 + msgid "Delete Local Branch" 2610 2610 + msgstr "Lokalen Branch löschen" 2611 2611 + 2612 2612 + #: lib/branch_delete.tcl:39 2613 2613 + msgid "Local Branches" 2614 2614 + msgstr "Lokale Branches" 2615 2615 + 2616 2616 + #: lib/branch_delete.tcl:51 2617 2617 + msgid "Delete Only If Merged Into" 2618 2618 + msgstr "Nur löschen, wenn zusammengeführt nach" 2619 2619 + 2620 2620 + #: lib/branch_delete.tcl:103 2621 2621 + #, tcl-format 2622 2622 + msgid "The following branches are not completely merged into %s:" 2623 2623 + msgstr "Folgende Branches sind noch nicht mit »%s« zusammengeführt:" 2624 2624 + 2625 2625 + #: lib/branch_delete.tcl:131 2626 2626 + #, tcl-format 2627 2627 + msgid " - %s:" 2628 2628 + msgstr " - %s:" 2629 2629 + 2630 2630 + #: lib/branch_delete.tcl:141 2631 2631 + #, tcl-format 2632 2632 + msgid "" 2633 2633 + "Failed to delete branches:\n" 2634 2634 + "%s" 2635 2635 + msgstr "" 2636 2636 + "Fehler beim Löschen der Branches:\n" 2637 2637 + "%s" 1521 2638 1522 1522 - #: lib/console.tcl:200 1523 1523 - msgid "Error: Command Failed" 1524 1524 - msgstr "Fehler: Kommando fehlgeschlagen" 2639 2639 + #: lib/date.tcl:25 2640 2640 + #, tcl-format 2641 2641 + msgid "Invalid date from Git: %s" 2642 2642 + msgstr "Ungültiges Datum von Git: %s" 1525 2643 1526 1526 - #: lib/database.tcl:43 2644 2644 + #: lib/database.tcl:42 1527 2645 msgid "Number of loose objects" 1528 2646 msgstr "Anzahl unverknüpfter Objekte" 1529 2647 1530 1530 - #: lib/database.tcl:44 2648 2648 + #: lib/database.tcl:43 1531 2649 msgid "Disk space used by loose objects" 1532 2650 msgstr "Festplattenplatz von unverknüpften Objekten" 1533 2651 1534 1534 - #: lib/database.tcl:45 2652 2652 + #: lib/database.tcl:44 1535 2653 msgid "Number of packed objects" 1536 2654 msgstr "Anzahl komprimierter Objekte" 1537 2655 1538 1538 - #: lib/database.tcl:46 2656 2656 + #: lib/database.tcl:45 1539 2657 msgid "Number of packs" 1540 2658 msgstr "Anzahl Komprimierungseinheiten" 1541 2659 1542 1542 - #: lib/database.tcl:47 2660 2660 + #: lib/database.tcl:46 1543 2661 msgid "Disk space used by packed objects" 1544 2662 msgstr "Festplattenplatz von komprimierten Objekten" 1545 2663 1546 1546 - #: lib/database.tcl:48 2664 2664 + #: lib/database.tcl:47 1547 2665 msgid "Packed objects waiting for pruning" 1548 2666 msgstr "Komprimierte Objekte, die zum Aufräumen vorgesehen sind" 1549 2667 1550 1550 - #: lib/database.tcl:49 2668 2668 + #: lib/database.tcl:48 1551 2669 msgid "Garbage files" 1552 2670 msgstr "Dateien im Mülleimer" 1553 2671 2672 2672 + #: lib/database.tcl:66 2673 2673 + #, tcl-format 2674 2674 + msgid "%s (%s): Database Statistics" 2675 2675 + msgstr "%s (%s): Datenbankstatistik" 2676 2676 + 1554 2677 #: lib/database.tcl:72 1555 2678 msgid "Compressing the object database" 1556 2679 msgstr "Objektdatenbank komprimieren" ··· 1569 2692 "\n" 1570 2693 "Compress the database now?" 1571 2694 msgstr "" 1572 1572 - "Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n" 2695 2695 + "Dieses Repository enthält ungefähr %i nicht verknüpfte Objekte.\n" 1573 2696 "\n" 1574 1574 - "Für eine optimale Performance wird empfohlen, die Datenbank des Projektarchivs zu komprimieren.\n" 2697 2697 + "Für eine optimale Performance wird empfohlen, die Datenbank des Repository " 2698 2698 + "zu komprimieren.\n" 1575 2699 "\n" 1576 2700 "Soll die Datenbank jetzt komprimiert werden?" 1577 2701 1578 1578 - #: lib/date.tcl:25 1579 1579 - #, tcl-format 1580 1580 - msgid "Invalid date from Git: %s" 1581 1581 - msgstr "Ungültiges Datum von Git: %s" 1582 1582 - 1583 1583 - #: lib/diff.tcl:64 1584 1584 - #, tcl-format 1585 1585 - msgid "" 1586 1586 - "No differences detected.\n" 1587 1587 - "\n" 1588 1588 - "%s has no changes.\n" 1589 1589 - "\n" 1590 1590 - "The modification date of this file was updated by another application, but " 1591 1591 - "the content within the file was not changed.\n" 1592 1592 - "\n" 1593 1593 - "A rescan will be automatically started to find other files which may have " 1594 1594 - "the same state." 1595 1595 - msgstr "" 1596 1596 - "Keine Änderungen feststellbar.\n" 1597 1597 - "\n" 1598 1598 - "»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei von " 1599 1599 - "einem anderen Programm modifiziert, aber der Inhalt der Datei ist " 1600 1600 - "unverändert.\n" 1601 1601 - "\n" 1602 1602 - "Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen " 1603 1603 - "Dateien zu prüfen." 1604 1604 - 1605 1605 - #: lib/diff.tcl:104 1606 1606 - #, tcl-format 1607 1607 - msgid "Loading diff of %s..." 1608 1608 - msgstr "Vergleich von »%s« laden..." 1609 1609 - 1610 1610 - #: lib/diff.tcl:125 1611 1611 - msgid "" 1612 1612 - "LOCAL: deleted\n" 1613 1613 - "REMOTE:\n" 1614 1614 - msgstr "" 1615 1615 - "LOKAL: gelöscht\n" 1616 1616 - "ANDERES:\n" 1617 1617 - 1618 1618 - #: lib/diff.tcl:130 1619 1619 - msgid "" 1620 1620 - "REMOTE: deleted\n" 1621 1621 - "LOCAL:\n" 1622 1622 - msgstr "" 1623 1623 - "ANDERES: gelöscht\n" 1624 1624 - "LOKAL:\n" 1625 1625 - 1626 1626 - #: lib/diff.tcl:137 1627 1627 - msgid "LOCAL:\n" 1628 1628 - msgstr "LOKAL:\n" 1629 1629 - 1630 1630 - #: lib/diff.tcl:140 1631 1631 - msgid "REMOTE:\n" 1632 1632 - msgstr "ANDERES:\n" 1633 1633 - 1634 1634 - #: lib/diff.tcl:202 lib/diff.tcl:319 1635 1635 - #, tcl-format 1636 1636 - msgid "Unable to display %s" 1637 1637 - msgstr "Datei »%s« kann nicht angezeigt werden" 1638 1638 - 1639 1639 - #: lib/diff.tcl:203 1640 1640 - msgid "Error loading file:" 1641 1641 - msgstr "Fehler beim Laden der Datei:" 1642 1642 - 1643 1643 - #: lib/diff.tcl:210 1644 1644 - msgid "Git Repository (subproject)" 1645 1645 - msgstr "Git-Projektarchiv (Unterprojekt)" 1646 1646 - 1647 1647 - #: lib/diff.tcl:222 1648 1648 - msgid "* Binary file (not showing content)." 1649 1649 - msgstr "* Binärdatei (Inhalt wird nicht angezeigt)" 1650 1650 - 1651 1651 - #: lib/diff.tcl:227 1652 1652 - #, tcl-format 1653 1653 - msgid "" 1654 1654 - "* Untracked file is %d bytes.\n" 1655 1655 - "* Showing only first %d bytes.\n" 1656 1656 - msgstr "" 1657 1657 - "* Datei nicht unter Versionskontrolle, Dateigröße %d Bytes.\n" 1658 1658 - "* Nur erste %d Bytes werden angezeigt.\n" 1659 1659 - 1660 1660 - #: lib/diff.tcl:233 1661 1661 - #, tcl-format 1662 1662 - msgid "" 1663 1663 - "\n" 1664 1664 - "* Untracked file clipped here by %s.\n" 1665 1665 - "* To see the entire file, use an external editor.\n" 1666 1666 - msgstr "" 1667 1667 - "\n" 1668 1668 - "* Datei nicht unter Versionskontrolle, hier abgeschnitten durch %s.\n" 1669 1669 - "* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n" 1670 1670 - 1671 1671 - #: lib/diff.tcl:482 1672 1672 - msgid "Failed to unstage selected hunk." 1673 1673 - msgstr "" 1674 1674 - "Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung." 1675 1675 - 1676 1676 - #: lib/diff.tcl:489 1677 1677 - msgid "Failed to stage selected hunk." 1678 1678 - msgstr "Fehler beim Bereitstellen des gewählten Kontexts." 1679 1679 - 1680 1680 - #: lib/diff.tcl:568 1681 1681 - msgid "Failed to unstage selected line." 1682 1682 - msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung." 1683 1683 - 1684 1684 - #: lib/diff.tcl:576 1685 1685 - msgid "Failed to stage selected line." 1686 1686 - msgstr "Fehler beim Bereitstellen der gewählten Zeile." 1687 1687 - 1688 1688 - #: lib/encoding.tcl:443 1689 1689 - msgid "Default" 1690 1690 - msgstr "Voreinstellung" 1691 1691 - 1692 1692 - #: lib/encoding.tcl:448 2702 2702 + #: lib/error.tcl:20 1693 2703 #, tcl-format 1694 1694 - msgid "System (%s)" 1695 1695 - msgstr "Systemweit (%s)" 1696 1696 - 1697 1697 - #: lib/encoding.tcl:459 lib/encoding.tcl:465 1698 1698 - msgid "Other" 1699 1699 - msgstr "Andere" 1700 1700 - 1701 1701 - #: lib/error.tcl:20 lib/error.tcl:114 1702 1702 - msgid "error" 1703 1703 - msgstr "Fehler" 2704 2704 + msgid "%s: error" 2705 2705 + msgstr "%s: Fehler" 1704 2706 1705 2707 #: lib/error.tcl:36 1706 1706 - msgid "warning" 1707 1707 - msgstr "Warnung" 1708 1708 - 1709 1709 - #: lib/error.tcl:94 1710 1710 - msgid "You must correct the above errors before committing." 1711 1711 - msgstr "" 1712 1712 - "Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können." 1713 1713 - 1714 1714 - #: lib/index.tcl:6 1715 1715 - msgid "Unable to unlock the index." 1716 1716 - msgstr "Bereitstellung kann nicht wieder freigegeben werden." 1717 1717 - 1718 1718 - #: lib/index.tcl:15 1719 1719 - msgid "Index Error" 1720 1720 - msgstr "Fehler in Bereitstellung" 1721 1721 - 1722 1722 - #: lib/index.tcl:17 1723 1723 - msgid "" 1724 1724 - "Updating the Git index failed. A rescan will be automatically started to " 1725 1725 - "resynchronize git-gui." 1726 1726 - msgstr "" 1727 1727 - "Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine " 1728 1728 - "Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu " 1729 1729 - "synchronisieren." 1730 1730 - 1731 1731 - #: lib/index.tcl:28 1732 1732 - msgid "Continue" 1733 1733 - msgstr "Fortsetzen" 1734 1734 - 1735 1735 - #: lib/index.tcl:31 1736 1736 - msgid "Unlock Index" 1737 1737 - msgstr "Bereitstellung freigeben" 1738 1738 - 1739 1739 - #: lib/index.tcl:289 1740 2708 #, tcl-format 1741 1741 - msgid "Unstaging %s from commit" 1742 1742 - msgstr "Datei »%s« aus der Bereitstellung herausnehmen" 2709 2709 + msgid "%s: warning" 2710 2710 + msgstr "%s: Warnung" 1743 2711 1744 1744 - #: lib/index.tcl:328 1745 1745 - msgid "Ready to commit." 1746 1746 - msgstr "Bereit zum Eintragen." 1747 1747 - 1748 1748 - #: lib/index.tcl:341 2712 2712 + #: lib/error.tcl:80 1749 2713 #, tcl-format 1750 1750 - msgid "Adding %s" 1751 1751 - msgstr "»%s« hinzufügen..." 2714 2714 + msgid "%s hook failed:" 2715 2715 + msgstr "%s hook fehlgeschlagen:" 1752 2716 1753 1753 - #: lib/index.tcl:398 1754 1754 - #, tcl-format 1755 1755 - msgid "Revert changes in file %s?" 1756 1756 - msgstr "Änderungen in Datei »%s« verwerfen?" 1757 1757 - 1758 1758 - #: lib/index.tcl:400 1759 1759 - #, tcl-format 1760 1760 - msgid "Revert changes in these %i files?" 1761 1761 - msgstr "Änderungen in den gewählten %i Dateien verwerfen?" 1762 1762 - 1763 1763 - #: lib/index.tcl:408 1764 1764 - msgid "Any unstaged changes will be permanently lost by the revert." 2717 2717 + #: lib/error.tcl:96 2718 2718 + msgid "You must correct the above errors before committing." 1765 2719 msgstr "" 1766 1766 - "Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen." 2720 2720 + "Sie müssen die obigen Fehler zuerst beheben, bevor Sie committen können." 1767 2721 1768 1768 - #: lib/index.tcl:411 1769 1769 - msgid "Do Nothing" 1770 1770 - msgstr "Nichts tun" 1771 1771 - 1772 1772 - #: lib/index.tcl:429 1773 1773 - msgid "Reverting selected files" 1774 1774 - msgstr "Änderungen in gewählten Dateien verwerfen" 1775 1775 - 1776 1776 - #: lib/index.tcl:433 2722 2722 + #: lib/error.tcl:116 1777 2723 #, tcl-format 1778 1778 - msgid "Reverting %s" 1779 1779 - msgstr "Änderungen in %s verwerfen" 2724 2724 + msgid "%s (%s): error" 2725 2725 + msgstr "%s (%s): Fehler" 1780 2726 1781 2727 #: lib/merge.tcl:13 1782 2728 msgid "" ··· 1786 2732 msgstr "" 1787 2733 "Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n" 1788 2734 "\n" 1789 1789 - "Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie " 2735 2735 + "Sie müssen zuerst den Nachbesserungs-Commit abschließen, bevor Sie " 1790 2736 "zusammenführen können.\n" 1791 2737 1792 2738 #: lib/merge.tcl:27 ··· 1798 2744 "\n" 1799 2745 "The rescan will be automatically started now.\n" 1800 2746 msgstr "" 1801 1801 - "Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" 2747 2747 + "Der letzte geladene Status stimmt nicht mehr mit dem Repository überein.\n" 1802 2748 "\n" 1803 1803 - "Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " 2749 2749 + "Ein anderes Git-Programm hat das Repository seit dem letzten Laden " 1804 2750 "geändert. Vor einem Zusammenführen muss neu geladen werden.\n" 1805 2751 "\n" 1806 2752 "Es wird gleich neu geladen.\n" ··· 1817 2763 msgstr "" 1818 2764 "Zusammenführung mit Konflikten.\n" 1819 2765 "\n" 1820 1820 - "Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese " 1821 1821 - "Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder " 1822 1822 - "bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst " 1823 1823 - "danach kann eine neue Zusammenführung begonnen werden.\n" 2766 2766 + "Die Datei »%s« enthält Konflikte beim Zusammenführen.\n" 2767 2767 + "\n" 2768 2768 + "Sie müssen diese Konflikte per Hand auflösen. Anschließend müssen Sie die " 2769 2769 + "Datei wieder bereitstellen und committen, um die Zusammenführung " 2770 2770 + "abzuschließen. Erst danach kann eine neue Zusammenführung begonnen werden.\n" 1824 2771 1825 2772 #: lib/merge.tcl:55 1826 2773 #, tcl-format ··· 1834 2781 msgstr "" 1835 2782 "Es liegen Änderungen vor.\n" 1836 2783 "\n" 1837 1837 - "Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte " 1838 1838 - "Version abschließen, bevor Sie eine Zusammenführung beginnen. Mit dieser " 1839 1839 - "Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich " 1840 1840 - "einfacher beheben oder abbrechen.\n" 2784 2784 + "Die Datei »%s« wurde geändert.\n" 2785 2785 + "\n" 2786 2786 + "Sie sollten zuerst den bereitgestellten Commit abschließen, bevor Sie eine " 2787 2787 + "Zusammenführung beginnen. Mit dieser Reihenfolge können Sie mögliche " 2788 2788 + "Konflikte beim Zusammenführen wesentlich einfacher beheben oder abbrechen.\n" 1841 2789 1842 1842 - #: lib/merge.tcl:107 2790 2790 + #: lib/merge.tcl:108 1843 2791 #, tcl-format 1844 2792 msgid "%s of %s" 1845 2793 msgstr "%s von %s" 1846 2794 1847 1847 - #: lib/merge.tcl:120 2795 2795 + #: lib/merge.tcl:126 1848 2796 #, tcl-format 1849 2797 msgid "Merging %s and %s..." 1850 2798 msgstr "Zusammenführen von %s und %s..." 1851 2799 1852 1852 - #: lib/merge.tcl:131 2800 2800 + #: lib/merge.tcl:137 1853 2801 msgid "Merge completed successfully." 1854 2802 msgstr "Zusammenführen erfolgreich abgeschlossen." 1855 2803 1856 1856 - #: lib/merge.tcl:133 2804 2804 + #: lib/merge.tcl:139 1857 2805 msgid "Merge failed. Conflict resolution is required." 1858 2806 msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig." 1859 2807 1860 1860 - #: lib/merge.tcl:158 2808 2808 + #: lib/merge.tcl:156 2809 2809 + #, tcl-format 2810 2810 + msgid "%s (%s): Merge" 2811 2811 + msgstr "%s (%s): Zusammenführen" 2812 2812 + 2813 2813 + #: lib/merge.tcl:164 1861 2814 #, tcl-format 1862 2815 msgid "Merge Into %s" 1863 2816 msgstr "Zusammenführen in »%s«" 1864 2817 1865 1865 - #: lib/merge.tcl:177 2818 2818 + #: lib/merge.tcl:183 1866 2819 msgid "Revision To Merge" 1867 2820 msgstr "Zusammenzuführende Version" 1868 2821 1869 1869 - #: lib/merge.tcl:212 2822 2822 + #: lib/merge.tcl:218 1870 2823 msgid "" 1871 2824 "Cannot abort while amending.\n" 1872 2825 "\n" ··· 1874 2827 msgstr "" 1875 2828 "Abbruch der Nachbesserung ist nicht möglich.\n" 1876 2829 "\n" 1877 1877 - "Sie müssen die Nachbesserung der Version abschließen.\n" 2830 2830 + "Sie müssen die Nachbesserung diese Commits abschließen.\n" 1878 2831 1879 1879 - #: lib/merge.tcl:222 2832 2832 + #: lib/merge.tcl:228 1880 2833 msgid "" 1881 2834 "Abort merge?\n" 1882 2835 "\n" ··· 1886 2839 msgstr "" 1887 2840 "Zusammenführen abbrechen?\n" 1888 2841 "\n" 1889 1889 - "Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen " 1890 1890 - "verloren.\n" 2842 2842 + "Wenn Sie abbrechen, gehen alle noch nicht committeten Änderungen verloren.\n" 1891 2843 "\n" 1892 2844 "Zusammenführen jetzt abbrechen?" 1893 2845 1894 1894 - #: lib/merge.tcl:228 2846 2846 + #: lib/merge.tcl:234 1895 2847 msgid "" 1896 2848 "Reset changes?\n" 1897 2849 "\n" ··· 1899 2851 "\n" 1900 2852 "Continue with resetting the current changes?" 1901 2853 msgstr "" 1902 1902 - "Änderungen zurücksetzen?\n" 2854 2854 + "Änderungen verwerfen?\n" 1903 2855 "\n" 1904 1904 - "Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen " 1905 1905 - "verloren.\n" 2856 2856 + "Alle noch nicht committeten Änderungen würden verloren gehen.\n" 1906 2857 "\n" 1907 1907 - "Änderungen jetzt zurücksetzen?" 2858 2858 + "Änderungen jetzt verwerfen?" 1908 2859 1909 1909 - #: lib/merge.tcl:239 2860 2860 + #: lib/merge.tcl:246 1910 2861 msgid "Aborting" 1911 2862 msgstr "Abbruch" 1912 2863 1913 1913 - #: lib/merge.tcl:239 2864 2864 + #: lib/merge.tcl:247 1914 2865 msgid "files reset" 1915 2866 msgstr "Dateien zurückgesetzt" 1916 2867 1917 1917 - #: lib/merge.tcl:267 2868 2868 + #: lib/merge.tcl:277 1918 2869 msgid "Abort failed." 1919 2870 msgstr "Abbruch fehlgeschlagen." 1920 2871 1921 1921 - #: lib/merge.tcl:269 2872 2872 + #: lib/merge.tcl:279 1922 2873 msgid "Abort completed. Ready." 1923 2874 msgstr "Abbruch durchgeführt. Bereit." 1924 1924 - 1925 1925 - #: lib/mergetool.tcl:8 1926 1926 - msgid "Force resolution to the base version?" 1927 1927 - msgstr "Konflikt durch Basisversion ersetzen?" 1928 1928 - 1929 1929 - #: lib/mergetool.tcl:9 1930 1930 - msgid "Force resolution to this branch?" 1931 1931 - msgstr "Konflikt durch diesen Zweig ersetzen?" 1932 1932 - 1933 1933 - #: lib/mergetool.tcl:10 1934 1934 - msgid "Force resolution to the other branch?" 1935 1935 - msgstr "Konflikt durch anderen Zweig ersetzen?" 1936 1936 - 1937 1937 - #: lib/mergetool.tcl:14 1938 1938 - #, tcl-format 1939 1939 - msgid "" 1940 1940 - "Note that the diff shows only conflicting changes.\n" 1941 1941 - "\n" 1942 1942 - "%s will be overwritten.\n" 1943 1943 - "\n" 1944 1944 - "This operation can be undone only by restarting the merge." 1945 1945 - msgstr "" 1946 1946 - "Hinweis: Der Vergleich zeigt nur konfliktverursachende Änderungen an.\n" 1947 1947 - "\n" 1948 1948 - "»%s« wird überschrieben.\n" 1949 1949 - "\n" 1950 1950 - "Diese Operation kann nur rückgängig gemacht werden, wenn die\n" 1951 1951 - "Zusammenführung erneut gestartet wird." 1952 1952 - 1953 1953 - #: lib/mergetool.tcl:45 1954 1954 - #, tcl-format 1955 1955 - msgid "File %s seems to have unresolved conflicts, still stage?" 1956 1956 - msgstr "Datei »%s« hat nicht aufgelöste Konflikte. Trotzdem bereitstellen?" 1957 1957 - 1958 1958 - #: lib/mergetool.tcl:60 1959 1959 - #, tcl-format 1960 1960 - msgid "Adding resolution for %s" 1961 1961 - msgstr "Auflösung hinzugefügt für %s" 1962 1962 - 1963 1963 - #: lib/mergetool.tcl:141 1964 1964 - msgid "Cannot resolve deletion or link conflicts using a tool" 1965 1965 - msgstr "" 1966 1966 - "Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch " 1967 1967 - "das Zusamenführungswerkzeug gelöst werden." 1968 1968 - 1969 1969 - #: lib/mergetool.tcl:146 1970 1970 - msgid "Conflict file does not exist" 1971 1971 - msgstr "Konflikt-Datei existiert nicht" 1972 1972 - 1973 1973 - #: lib/mergetool.tcl:264 1974 1974 - #, tcl-format 1975 1975 - msgid "Not a GUI merge tool: '%s'" 1976 1976 - msgstr "Kein GUI Zusammenführungswerkzeug: »%s«" 1977 1977 - 1978 1978 - #: lib/mergetool.tcl:268 1979 1979 - #, tcl-format 1980 1980 - msgid "Unsupported merge tool '%s'" 1981 1981 - msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«" 1982 1982 - 1983 1983 - #: lib/mergetool.tcl:303 1984 1984 - msgid "Merge tool is already running, terminate it?" 1985 1985 - msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?" 1986 1986 - 1987 1987 - #: lib/mergetool.tcl:323 1988 1988 - #, tcl-format 1989 1989 - msgid "" 1990 1990 - "Error retrieving versions:\n" 1991 1991 - "%s" 1992 1992 - msgstr "" 1993 1993 - "Fehler beim Abrufen der Dateiversionen:\n" 1994 1994 - "%s" 1995 1995 - 1996 1996 - #: lib/mergetool.tcl:343 1997 1997 - #, tcl-format 1998 1998 - msgid "" 1999 1999 - "Could not start the merge tool:\n" 2000 2000 - "\n" 2001 2001 - "%s" 2002 2002 - msgstr "" 2003 2003 - "Zusammenführungswerkzeug konnte nicht gestartet werden:\n" 2004 2004 - "\n" 2005 2005 - "%s" 2006 2006 - 2007 2007 - #: lib/mergetool.tcl:347 2008 2008 - msgid "Running merge tool..." 2009 2009 - msgstr "Zusammenführungswerkzeug starten..." 2010 2010 - 2011 2011 - #: lib/mergetool.tcl:375 lib/mergetool.tcl:383 2012 2012 - msgid "Merge tool failed." 2013 2013 - msgstr "Zusammenführungswerkzeug fehlgeschlagen." 2014 2014 - 2015 2015 - #: lib/option.tcl:11 2016 2016 - #, tcl-format 2017 2017 - msgid "Invalid global encoding '%s'" 2018 2018 - msgstr "Ungültige globale Zeichenkodierung »%s«" 2019 2019 - 2020 2020 - #: lib/option.tcl:19 2021 2021 - #, tcl-format 2022 2022 - msgid "Invalid repo encoding '%s'" 2023 2023 - msgstr "Ungültige Archiv-Zeichenkodierung »%s«" 2024 2024 - 2025 2025 - #: lib/option.tcl:117 2026 2026 - msgid "Restore Defaults" 2027 2027 - msgstr "Voreinstellungen wiederherstellen" 2028 2028 - 2029 2029 - #: lib/option.tcl:121 2030 2030 - msgid "Save" 2031 2031 - msgstr "Speichern" 2032 2032 - 2033 2033 - #: lib/option.tcl:131 2034 2034 - #, tcl-format 2035 2035 - msgid "%s Repository" 2036 2036 - msgstr "Projektarchiv %s" 2037 2037 - 2038 2038 - #: lib/option.tcl:132 2039 2039 - msgid "Global (All Repositories)" 2040 2040 - msgstr "Global (Alle Projektarchive)" 2041 2041 - 2042 2042 - #: lib/option.tcl:138 2043 2043 - msgid "User Name" 2044 2044 - msgstr "Benutzername" 2045 2045 - 2046 2046 - #: lib/option.tcl:139 2047 2047 - msgid "Email Address" 2048 2048 - msgstr "E-Mail-Adresse" 2049 2049 - 2050 2050 - #: lib/option.tcl:141 2051 2051 - msgid "Summarize Merge Commits" 2052 2052 - msgstr "Zusammenführungs-Versionen zusammenfassen" 2053 2053 - 2054 2054 - #: lib/option.tcl:142 2055 2055 - msgid "Merge Verbosity" 2056 2056 - msgstr "Ausführlichkeit der Zusammenführen-Meldungen" 2057 2057 - 2058 2058 - #: lib/option.tcl:143 2059 2059 - msgid "Show Diffstat After Merge" 2060 2060 - msgstr "Vergleichsstatistik nach Zusammenführen anzeigen" 2061 2061 - 2062 2062 - #: lib/option.tcl:144 2063 2063 - msgid "Use Merge Tool" 2064 2064 - msgstr "Zusammenführungswerkzeug" 2065 2065 - 2066 2066 - #: lib/option.tcl:146 2067 2067 - msgid "Trust File Modification Timestamps" 2068 2068 - msgstr "Auf Dateiänderungsdatum verlassen" 2069 2069 - 2070 2070 - #: lib/option.tcl:147 2071 2071 - msgid "Prune Tracking Branches During Fetch" 2072 2072 - msgstr "Übernahmezweige aufräumen während Anforderung" 2073 2073 - 2074 2074 - #: lib/option.tcl:148 2075 2075 - msgid "Match Tracking Branches" 2076 2076 - msgstr "Passend zu Übernahmezweig" 2077 2077 - 2078 2078 - #: lib/option.tcl:149 2079 2079 - msgid "Blame Copy Only On Changed Files" 2080 2080 - msgstr "Kopie-Annotieren nur bei geänderten Dateien" 2081 2081 - 2082 2082 - #: lib/option.tcl:150 2083 2083 - msgid "Minimum Letters To Blame Copy On" 2084 2084 - msgstr "Mindestzahl Zeichen für Kopie-Annotieren" 2085 2085 - 2086 2086 - #: lib/option.tcl:151 2087 2087 - msgid "Blame History Context Radius (days)" 2088 2088 - msgstr "Anzahl Tage für Historien-Kontext" 2089 2089 - 2090 2090 - #: lib/option.tcl:152 2091 2091 - msgid "Number of Diff Context Lines" 2092 2092 - msgstr "Anzahl der Kontextzeilen beim Vergleich" 2093 2093 - 2094 2094 - #: lib/option.tcl:153 2095 2095 - msgid "Commit Message Text Width" 2096 2096 - msgstr "Textbreite der Versionsbeschreibung" 2097 2097 - 2098 2098 - #: lib/option.tcl:154 2099 2099 - msgid "New Branch Name Template" 2100 2100 - msgstr "Namensvorschlag für neue Zweige" 2101 2101 - 2102 2102 - #: lib/option.tcl:155 2103 2103 - msgid "Default File Contents Encoding" 2104 2104 - msgstr "Voreingestellte Zeichenkodierung" 2105 2105 - 2106 2106 - #: lib/option.tcl:203 2107 2107 - msgid "Change" 2108 2108 - msgstr "Ändern" 2109 2109 - 2110 2110 - #: lib/option.tcl:230 2111 2111 - msgid "Spelling Dictionary:" 2112 2112 - msgstr "Wörterbuch Rechtschreibprüfung:" 2113 2113 - 2114 2114 - #: lib/option.tcl:254 2115 2115 - msgid "Change Font" 2116 2116 - msgstr "Schriftart ändern" 2117 2117 - 2118 2118 - #: lib/option.tcl:258 2119 2119 - #, tcl-format 2120 2120 - msgid "Choose %s" 2121 2121 - msgstr "%s wählen" 2122 2122 - 2123 2123 - #: lib/option.tcl:264 2124 2124 - msgid "pt." 2125 2125 - msgstr "pt." 2126 2126 - 2127 2127 - #: lib/option.tcl:278 2128 2128 - msgid "Preferences" 2129 2129 - msgstr "Einstellungen" 2130 2130 - 2131 2131 - #: lib/option.tcl:314 2132 2132 - msgid "Failed to completely save options:" 2133 2133 - msgstr "Optionen konnten nicht gespeichert werden:" 2134 2134 - 2135 2135 - #: lib/remote_add.tcl:19 2136 2136 - msgid "Add Remote" 2137 2137 - msgstr "Externes Archiv hinzufügen" 2138 2138 - 2139 2139 - #: lib/remote_add.tcl:24 2140 2140 - msgid "Add New Remote" 2141 2141 - msgstr "Neues externes Archiv hinzufügen" 2142 2142 - 2143 2143 - #: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 2144 2144 - msgid "Add" 2145 2145 - msgstr "Hinzufügen" 2146 2146 - 2147 2147 - #: lib/remote_add.tcl:37 2148 2148 - msgid "Remote Details" 2149 2149 - msgstr "Einzelheiten des externen Archivs" 2150 2150 - 2151 2151 - #: lib/remote_add.tcl:50 2152 2152 - msgid "Location:" 2153 2153 - msgstr "Adresse:" 2154 2154 - 2155 2155 - #: lib/remote_add.tcl:62 2156 2156 - msgid "Further Action" 2157 2157 - msgstr "Weitere Aktion jetzt" 2158 2158 - 2159 2159 - #: lib/remote_add.tcl:65 2160 2160 - msgid "Fetch Immediately" 2161 2161 - msgstr "Gleich anfordern" 2162 2162 - 2163 2163 - #: lib/remote_add.tcl:71 2164 2164 - msgid "Initialize Remote Repository and Push" 2165 2165 - msgstr "Externes Archiv initialisieren und dahin versenden" 2166 2166 - 2167 2167 - #: lib/remote_add.tcl:77 2168 2168 - msgid "Do Nothing Else Now" 2169 2169 - msgstr "Nichts tun" 2170 2170 - 2171 2171 - #: lib/remote_add.tcl:101 2172 2172 - msgid "Please supply a remote name." 2173 2173 - msgstr "Bitte geben Sie einen Namen des externen Archivs an." 2174 2174 - 2175 2175 - #: lib/remote_add.tcl:114 2176 2176 - #, tcl-format 2177 2177 - msgid "'%s' is not an acceptable remote name." 2178 2178 - msgstr "»%s« ist kein zulässiger Name eines externen Archivs." 2179 2179 - 2180 2180 - #: lib/remote_add.tcl:125 2181 2181 - #, tcl-format 2182 2182 - msgid "Failed to add remote '%s' of location '%s'." 2183 2183 - msgstr "Fehler beim Hinzufügen des externen Archivs »%s« aus Herkunftsort »%s«." 2184 2184 - 2185 2185 - #: lib/remote_add.tcl:133 lib/transport.tcl:6 2186 2186 - #, tcl-format 2187 2187 - msgid "fetch %s" 2188 2188 - msgstr "»%s« anfordern" 2189 2189 - 2190 2190 - #: lib/remote_add.tcl:134 2191 2191 - #, tcl-format 2192 2192 - msgid "Fetching the %s" 2193 2193 - msgstr "»%s« anfordern" 2194 2194 - 2195 2195 - #: lib/remote_add.tcl:157 2196 2196 - #, tcl-format 2197 2197 - msgid "Do not know how to initialize repository at location '%s'." 2198 2198 - msgstr "Initialisieren eines externen Archivs an Adresse »%s« ist nicht möglich." 2199 2199 - 2200 2200 - #: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 2201 2201 - #: lib/transport.tcl:81 2202 2202 - #, tcl-format 2203 2203 - msgid "push %s" 2204 2204 - msgstr "»%s« versenden..." 2205 2205 - 2206 2206 - #: lib/remote_add.tcl:164 2207 2207 - #, tcl-format 2208 2208 - msgid "Setting up the %s (at %s)" 2209 2209 - msgstr "Einrichten von »%s« an »%s«" 2210 2210 - 2211 2211 - #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 2212 2212 - msgid "Delete Branch Remotely" 2213 2213 - msgstr "Zweig in externem Archiv löschen" 2214 2214 - 2215 2215 - #: lib/remote_branch_delete.tcl:47 2216 2216 - msgid "From Repository" 2217 2217 - msgstr "In Projektarchiv" 2218 2218 - 2219 2219 - #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 2220 2220 - msgid "Remote:" 2221 2221 - msgstr "Externes Archiv:" 2222 2222 - 2223 2223 - #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 2224 2224 - msgid "Arbitrary Location:" 2225 2225 - msgstr "Adresse:" 2226 2226 - 2227 2227 - #: lib/remote_branch_delete.tcl:84 2228 2228 - msgid "Branches" 2229 2229 - msgstr "Zweige" 2230 2230 - 2231 2231 - #: lib/remote_branch_delete.tcl:109 2232 2232 - msgid "Delete Only If" 2233 2233 - msgstr "Nur löschen, wenn" 2234 2234 - 2235 2235 - #: lib/remote_branch_delete.tcl:111 2236 2236 - msgid "Merged Into:" 2237 2237 - msgstr "Zusammengeführt mit:" 2238 2238 - 2239 2239 - #: lib/remote_branch_delete.tcl:152 2240 2240 - msgid "A branch is required for 'Merged Into'." 2241 2241 - msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden." 2242 2242 - 2243 2243 - #: lib/remote_branch_delete.tcl:184 2244 2244 - #, tcl-format 2245 2245 - msgid "" 2246 2246 - "The following branches are not completely merged into %s:\n" 2247 2247 - "\n" 2248 2248 - " - %s" 2249 2249 - msgstr "" 2250 2250 - "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\n" 2251 2251 - "\n" 2252 2252 - " - %s" 2253 2253 - 2254 2254 - #: lib/remote_branch_delete.tcl:189 2255 2255 - #, tcl-format 2256 2256 - msgid "" 2257 2257 - "One or more of the merge tests failed because you have not fetched the " 2258 2258 - "necessary commits. Try fetching from %s first." 2259 2259 - msgstr "" 2260 2260 - "Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die " 2261 2261 - "notwendigen Versionen vorher angefordert haben. Sie sollten versuchen, " 2262 2262 - "zuerst von »%s« anzufordern." 2263 2263 - 2264 2264 - #: lib/remote_branch_delete.tcl:207 2265 2265 - msgid "Please select one or more branches to delete." 2266 2266 - msgstr "Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll." 2267 2267 - 2268 2268 - #: lib/remote_branch_delete.tcl:226 2269 2269 - #, tcl-format 2270 2270 - msgid "Deleting branches from %s" 2271 2271 - msgstr "Zweige auf »%s« werden gelöscht" 2272 2272 - 2273 2273 - #: lib/remote_branch_delete.tcl:292 2274 2274 - msgid "No repository selected." 2275 2275 - msgstr "Kein Projektarchiv ausgewählt." 2276 2276 - 2277 2277 - #: lib/remote_branch_delete.tcl:297 2278 2278 - #, tcl-format 2279 2279 - msgid "Scanning %s..." 2280 2280 - msgstr "»%s« laden..." 2281 2281 - 2282 2282 - #: lib/remote.tcl:163 2283 2283 - msgid "Remove Remote" 2284 2284 - msgstr "Externes Archiv entfernen" 2285 2285 - 2286 2286 - #: lib/remote.tcl:168 2287 2287 - msgid "Prune from" 2288 2288 - msgstr "Aufräumen von" 2289 2289 - 2290 2290 - #: lib/remote.tcl:173 2291 2291 - msgid "Fetch from" 2292 2292 - msgstr "Anfordern von" 2293 2293 - 2294 2294 - #: lib/remote.tcl:215 2295 2295 - msgid "Push to" 2296 2296 - msgstr "Versenden nach" 2297 2297 - 2298 2298 - #: lib/search.tcl:21 2299 2299 - msgid "Find:" 2300 2300 - msgstr "Suchen:" 2301 2301 - 2302 2302 - #: lib/search.tcl:23 2303 2303 - msgid "Next" 2304 2304 - msgstr "Nächster" 2305 2305 - 2306 2306 - #: lib/search.tcl:24 2307 2307 - msgid "Prev" 2308 2308 - msgstr "Voriger" 2309 2309 - 2310 2310 - #: lib/search.tcl:25 2311 2311 - msgid "Case-Sensitive" 2312 2312 - msgstr "Groß-/Kleinschreibung unterscheiden" 2313 2313 - 2314 2314 - #: lib/shortcut.tcl:21 lib/shortcut.tcl:62 2315 2315 - msgid "Cannot write shortcut:" 2316 2316 - msgstr "Fehler beim Schreiben der Verknüpfung:" 2317 2317 - 2318 2318 - #: lib/shortcut.tcl:137 2319 2319 - msgid "Cannot write icon:" 2320 2320 - msgstr "Fehler beim Erstellen des Icons:" 2321 2321 - 2322 2322 - #: lib/spellcheck.tcl:57 2323 2323 - msgid "Unsupported spell checker" 2324 2324 - msgstr "Rechtschreibprüfungsprogramm nicht unterstützt" 2325 2325 - 2326 2326 - #: lib/spellcheck.tcl:65 2327 2327 - msgid "Spell checking is unavailable" 2328 2328 - msgstr "Rechtschreibprüfung nicht verfügbar" 2329 2329 - 2330 2330 - #: lib/spellcheck.tcl:68 2331 2331 - msgid "Invalid spell checking configuration" 2332 2332 - msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung" 2333 2333 - 2334 2334 - #: lib/spellcheck.tcl:70 2335 2335 - #, tcl-format 2336 2336 - msgid "Reverting dictionary to %s." 2337 2337 - msgstr "Wörterbuch auf %s zurückgesetzt." 2338 2338 - 2339 2339 - #: lib/spellcheck.tcl:73 2340 2340 - msgid "Spell checker silently failed on startup" 2341 2341 - msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen" 2342 2342 - 2343 2343 - #: lib/spellcheck.tcl:80 2344 2344 - msgid "Unrecognized spell checker" 2345 2345 - msgstr "Unbekanntes Rechtschreibprüfungsprogramm" 2346 2346 - 2347 2347 - #: lib/spellcheck.tcl:186 2348 2348 - msgid "No Suggestions" 2349 2349 - msgstr "Keine Vorschläge" 2350 2350 - 2351 2351 - #: lib/spellcheck.tcl:388 2352 2352 - msgid "Unexpected EOF from spell checker" 2353 2353 - msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm" 2354 2354 - 2355 2355 - #: lib/spellcheck.tcl:392 2356 2356 - msgid "Spell Checker Failed" 2357 2357 - msgstr "Rechtschreibprüfung fehlgeschlagen" 2358 2358 - 2359 2359 - #: lib/sshkey.tcl:31 2360 2360 - msgid "No keys found." 2361 2361 - msgstr "Keine Schlüssel gefunden." 2362 2362 - 2363 2363 - #: lib/sshkey.tcl:34 2364 2364 - #, tcl-format 2365 2365 - msgid "Found a public key in: %s" 2366 2366 - msgstr "Öffentlicher Schlüssel gefunden in: %s" 2367 2367 - 2368 2368 - #: lib/sshkey.tcl:40 2369 2369 - msgid "Generate Key" 2370 2370 - msgstr "Schlüssel erzeugen" 2371 2371 - 2372 2372 - #: lib/sshkey.tcl:56 2373 2373 - msgid "Copy To Clipboard" 2374 2374 - msgstr "In Zwischenablage kopieren" 2375 2375 - 2376 2376 - #: lib/sshkey.tcl:70 2377 2377 - msgid "Your OpenSSH Public Key" 2378 2378 - msgstr "Ihr OpenSSH öffenlicher Schlüssel" 2379 2379 - 2380 2380 - #: lib/sshkey.tcl:78 2381 2381 - msgid "Generating..." 2382 2382 - msgstr "Erzeugen..." 2383 2383 - 2384 2384 - #: lib/sshkey.tcl:84 2385 2385 - #, tcl-format 2386 2386 - msgid "" 2387 2387 - "Could not start ssh-keygen:\n" 2388 2388 - "\n" 2389 2389 - "%s" 2390 2390 - msgstr "" 2391 2391 - "Konnte »ssh-keygen« nicht starten:\n" 2392 2392 - "\n" 2393 2393 - "%s" 2394 2394 - 2395 2395 - #: lib/sshkey.tcl:111 2396 2396 - msgid "Generation failed." 2397 2397 - msgstr "Schlüsselerzeugung fehlgeschlagen." 2398 2398 - 2399 2399 - #: lib/sshkey.tcl:118 2400 2400 - msgid "Generation succeeded, but no keys found." 2401 2401 - msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden." 2402 2402 - 2403 2403 - #: lib/sshkey.tcl:121 2404 2404 - #, tcl-format 2405 2405 - msgid "Your key is in: %s" 2406 2406 - msgstr "Ihr Schlüssel ist abgelegt in: %s" 2407 2407 - 2408 2408 - #: lib/status_bar.tcl:83 2409 2409 - #, tcl-format 2410 2410 - msgid "%s ... %*i of %*i %s (%3i%%)" 2411 2411 - msgstr "%s ... %*i von %*i %s (%3i%%)" 2412 2412 - 2413 2413 - #: lib/tools_dlg.tcl:22 2414 2414 - msgid "Add Tool" 2415 2415 - msgstr "Werkzeug hinzufügen" 2416 2416 - 2417 2417 - #: lib/tools_dlg.tcl:28 2418 2418 - msgid "Add New Tool Command" 2419 2419 - msgstr "Neues Kommando für Werkzeug hinzufügen" 2420 2420 - 2421 2421 - #: lib/tools_dlg.tcl:33 2422 2422 - msgid "Add globally" 2423 2423 - msgstr "Global hinzufügen" 2424 2424 - 2425 2425 - #: lib/tools_dlg.tcl:45 2426 2426 - msgid "Tool Details" 2427 2427 - msgstr "Einzelheiten des Werkzeugs" 2428 2428 - 2429 2429 - #: lib/tools_dlg.tcl:48 2430 2430 - msgid "Use '/' separators to create a submenu tree:" 2431 2431 - msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:" 2432 2432 - 2433 2433 - #: lib/tools_dlg.tcl:61 2434 2434 - msgid "Command:" 2435 2435 - msgstr "Kommando:" 2436 2436 - 2437 2437 - #: lib/tools_dlg.tcl:74 2438 2438 - msgid "Show a dialog before running" 2439 2439 - msgstr "Bestätigungsfrage vor Starten anzeigen" 2440 2440 - 2441 2441 - #: lib/tools_dlg.tcl:80 2442 2442 - msgid "Ask the user to select a revision (sets $REVISION)" 2443 2443 - msgstr "Benutzer nach Version fragen (setzt $REVISION)" 2444 2444 - 2445 2445 - #: lib/tools_dlg.tcl:85 2446 2446 - msgid "Ask the user for additional arguments (sets $ARGS)" 2447 2447 - msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)" 2448 2448 - 2449 2449 - #: lib/tools_dlg.tcl:92 2450 2450 - msgid "Don't show the command output window" 2451 2451 - msgstr "Kein Ausgabefenster zeigen" 2452 2452 - 2453 2453 - #: lib/tools_dlg.tcl:97 2454 2454 - msgid "Run only if a diff is selected ($FILENAME not empty)" 2455 2455 - msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)" 2456 2456 - 2457 2457 - #: lib/tools_dlg.tcl:121 2458 2458 - msgid "Please supply a name for the tool." 2459 2459 - msgstr "Bitte geben Sie einen Werkzeugnamen an." 2460 2460 - 2461 2461 - #: lib/tools_dlg.tcl:129 2462 2462 - #, tcl-format 2463 2463 - msgid "Tool '%s' already exists." 2464 2464 - msgstr "Werkzeug »%s« existiert bereits." 2465 2465 - 2466 2466 - #: lib/tools_dlg.tcl:151 2467 2467 - #, tcl-format 2468 2468 - msgid "" 2469 2469 - "Could not add tool:\n" 2470 2470 - "%s" 2471 2471 - msgstr "" 2472 2472 - "Werkzeug konnte nicht hinzugefügt werden:\n" 2473 2473 - "\n" 2474 2474 - "%s" 2475 2475 - 2476 2476 - #: lib/tools_dlg.tcl:190 2477 2477 - msgid "Remove Tool" 2478 2478 - msgstr "Werkzeug entfernen" 2479 2479 - 2480 2480 - #: lib/tools_dlg.tcl:196 2481 2481 - msgid "Remove Tool Commands" 2482 2482 - msgstr "Werkzeugkommandos entfernen" 2483 2483 - 2484 2484 - #: lib/tools_dlg.tcl:200 2485 2485 - msgid "Remove" 2486 2486 - msgstr "Entfernen" 2487 2487 - 2488 2488 - #: lib/tools_dlg.tcl:236 2489 2489 - msgid "(Blue denotes repository-local tools)" 2490 2490 - msgstr "(Werkzeuge für lokales Archiv werden in Blau angezeigt)" 2491 2491 - 2492 2492 - #: lib/tools_dlg.tcl:297 2493 2493 - #, tcl-format 2494 2494 - msgid "Run Command: %s" 2495 2495 - msgstr "Kommando aufrufen: %s" 2496 2496 - 2497 2497 - #: lib/tools_dlg.tcl:311 2498 2498 - msgid "Arguments" 2499 2499 - msgstr "Argumente" 2500 2500 - 2501 2501 - #: lib/tools_dlg.tcl:348 2502 2502 - msgid "OK" 2503 2503 - msgstr "Ok" 2504 2504 - 2505 2505 - #: lib/tools.tcl:75 2506 2506 - #, tcl-format 2507 2507 - msgid "Running %s requires a selected file." 2508 2508 - msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein." 2509 2509 - 2510 2510 - #: lib/tools.tcl:90 2511 2511 - #, tcl-format 2512 2512 - msgid "Are you sure you want to run %s?" 2513 2513 - msgstr "Wollen Sie %s wirklich starten?" 2514 2514 - 2515 2515 - #: lib/tools.tcl:110 2516 2516 - #, tcl-format 2517 2517 - msgid "Tool: %s" 2518 2518 - msgstr "Werkzeug: %s" 2519 2519 - 2520 2520 - #: lib/tools.tcl:111 2521 2521 - #, tcl-format 2522 2522 - msgid "Running: %s" 2523 2523 - msgstr "Starten: %s" 2524 2524 - 2525 2525 - #: lib/tools.tcl:149 2526 2526 - #, tcl-format 2527 2527 - msgid "Tool completed successfully: %s" 2528 2528 - msgstr "Werkzeug erfolgreich abgeschlossen: %s" 2529 2529 - 2530 2530 - #: lib/tools.tcl:151 2531 2531 - #, tcl-format 2532 2532 - msgid "Tool failed: %s" 2533 2533 - msgstr "Werkzeug fehlgeschlagen: %s" 2534 2534 - 2535 2535 - #: lib/transport.tcl:7 2536 2536 - #, tcl-format 2537 2537 - msgid "Fetching new changes from %s" 2538 2538 - msgstr "Neue Änderungen von »%s« holen" 2539 2539 - 2540 2540 - #: lib/transport.tcl:18 2541 2541 - #, tcl-format 2542 2542 - msgid "remote prune %s" 2543 2543 - msgstr "Aufräumen von »%s«" 2544 2544 - 2545 2545 - #: lib/transport.tcl:19 2546 2546 - #, tcl-format 2547 2547 - msgid "Pruning tracking branches deleted from %s" 2548 2548 - msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden" 2549 2549 - 2550 2550 - #: lib/transport.tcl:26 2551 2551 - #, tcl-format 2552 2552 - msgid "Pushing changes to %s" 2553 2553 - msgstr "Änderungen nach »%s« versenden" 2554 2554 - 2555 2555 - #: lib/transport.tcl:64 2556 2556 - #, tcl-format 2557 2557 - msgid "Mirroring to %s" 2558 2558 - msgstr "Spiegeln nach %s" 2559 2559 - 2560 2560 - #: lib/transport.tcl:82 2561 2561 - #, tcl-format 2562 2562 - msgid "Pushing %s %s to %s" 2563 2563 - msgstr "%s %s nach %s versenden" 2564 2564 - 2565 2565 - #: lib/transport.tcl:100 2566 2566 - msgid "Push Branches" 2567 2567 - msgstr "Zweige versenden" 2568 2568 - 2569 2569 - #: lib/transport.tcl:114 2570 2570 - msgid "Source Branches" 2571 2571 - msgstr "Lokale Zweige" 2572 2572 - 2573 2573 - #: lib/transport.tcl:131 2574 2574 - msgid "Destination Repository" 2575 2575 - msgstr "Ziel-Projektarchiv" 2576 2576 - 2577 2577 - #: lib/transport.tcl:169 2578 2578 - msgid "Transfer Options" 2579 2579 - msgstr "Netzwerk-Einstellungen" 2580 2580 - 2581 2581 - #: lib/transport.tcl:171 2582 2582 - msgid "Force overwrite existing branch (may discard changes)" 2583 2583 - msgstr "" 2584 2584 - "Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)" 2585 2585 - 2586 2586 - #: lib/transport.tcl:175 2587 2587 - msgid "Use thin pack (for slow network connections)" 2588 2588 - msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)" 2589 2589 - 2590 2590 - #: lib/transport.tcl:179 2591 2591 - msgid "Include tags" 2592 2592 - msgstr "Mit Markierungen übertragen"

+1389 -1117

git-gui/po/git-gui.pot

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

+278 -37

git-gui/po/glossary/de.po

··· 6 6 msgid "" 7 7 msgstr "" 8 8 "Project-Id-Version: git-gui glossary\n" 9 9 - "POT-Creation-Date: 2008-01-07 21:20+0100\n" 10 10 - "PO-Revision-Date: 2008-02-16 21:48+0100\n" 9 9 + "POT-Creation-Date: 2020-01-26 22:26+0100\n" 10 10 + "PO-Revision-Date: 2020-02-09 21:22+0100\n" 11 11 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n" 12 12 "Language-Team: German \n" 13 13 + "Language: de_DE\n" 13 14 "MIME-Version: 1.0\n" 14 15 "Content-Type: text/plain; charset=UTF-8\n" 15 16 "Content-Transfer-Encoding: 8bit\n" ··· 19 20 "English Term (Dear translator: This file will never be visible to the user!)" 20 21 msgstr "" 21 22 "Deutsche Übersetzung.\n" 23 23 + "Git-core glossary:\n" 24 24 + " https://github.com/ruester/git-po-de/wiki/Translation-Guidelines\n" 25 25 + "\n" 22 26 "Andere deutsche SCM:\n" 23 27 " http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://" 24 28 "tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po " ··· 32 36 " http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po " 33 37 "(username=guest, password empty, schlecht)" 34 38 39 39 + #. "prematurely stop and abandon an operation" 40 40 + msgid "abort" 41 41 + msgstr "abbrechen" 42 42 + 35 43 #. "" 36 44 msgid "amend" 37 45 msgstr "nachbessern (ergänzen)" 38 46 47 47 + #. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" 48 48 + msgid "ancestor" 49 49 + msgstr "Vorgänger-Commit" 50 50 + 39 51 #. "" 40 52 msgid "annotate" 41 53 msgstr "annotieren" 54 54 + 55 55 + #. "The person who initially created (authored) a commit" 56 56 + msgid "author" 57 57 + msgstr "Autor" 58 58 + 59 59 + #. "a repository with only .git directory, without working directory" 60 60 + msgid "bare repository" 61 61 + msgstr "bloßes Projektarchiv" 62 62 + 63 63 + #. "a parent version of the current file" 64 64 + msgid "base" 65 65 + msgstr "Ursprung" 66 66 + 67 67 + #. "" 68 68 + msgid "bisect" 69 69 + msgstr "binäre Suche [noun], binäre Suche benutzen [verb]" 70 70 + 71 71 + #. "get the authors responsible for each line in a file" 72 72 + msgid "blame" 73 73 + msgstr "annotieren" 74 74 + 75 75 + #. "" 76 76 + msgid "blob" 77 77 + msgstr "Blob" 42 78 43 79 #. "A 'branch' is an active line of development." 44 80 msgid "branch [noun]" 45 45 - msgstr "Zweig" 81 81 + msgstr "Branch" 46 82 47 83 #. "" 48 84 msgid "branch [verb]" 49 49 - msgstr "verzweigen" 85 85 + msgstr "branchen" 50 86 51 87 #. "" 52 88 msgid "checkout [noun]" 53 89 msgstr "" 54 54 - "Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? " 55 55 - "Source Safe: Auscheckvorgang)" 90 90 + "Arbeitskopie (Checkout; Erstellung einer Arbeitskopie; Auscheck? Source " 91 91 + "Safe: Auscheckvorgang)" 56 92 57 93 #. "The action of updating the working tree to a revision which was stored in the object database." 58 94 msgid "checkout [verb]" 59 95 msgstr "" 60 60 - "Arbeitskopie erstellen; Zweig umstellen [checkout a branch] (auschecken? " 61 61 - "ausspielen? abrufen? Source Safe: auschecken)" 96 96 + "Arbeitskopie erstellen; Branch auschecken [checkout a branch] (umstellen? " 97 97 + "Source Safe: auschecken)" 98 98 + 99 99 + #. "to select and apply a single commit to the current HEAD without merging" 100 100 + msgid "cherry-pick" 101 101 + msgstr "cherry-pick (pflücken?)" 102 102 + 103 103 + #. "a commit that directly succeeds the current one in git's graph of commits" 104 104 + msgid "child commit" 105 105 + msgstr "Kind-Commit" 106 106 + 107 107 + #. "clean the state of the git repository, often after manually stopped operation" 108 108 + msgid "cleanup" 109 109 + msgstr "aufräumen" 62 110 63 111 #. "" 64 112 msgid "clone [verb]" ··· 66 114 67 115 #. "A single point in the git history." 68 116 msgid "commit [noun]" 69 69 - msgstr "" 70 70 - "Version; Eintragung; Änderung (Buchung?, Eintragung?, Übertragung?, " 71 71 - "Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)" 117 117 + msgstr "Commit (Version?)" 72 118 73 119 #. "The action of storing a new snapshot of the project's state in the git history." 74 120 msgid "commit [verb]" 75 121 msgstr "" 76 76 - "eintragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, " 77 77 - "übergeben?, einspielen?, einpflegen?, ablegen?)" 122 122 + "committen (eintragen?, TortoiseSVN: übertragen; Source Safe: einchecken)" 123 123 + 124 124 + #. "a message that gets attached with any commit" 125 125 + msgid "commit message" 126 126 + msgstr "Commit-Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)" 127 127 + 128 128 + #. "The person who committed a commit (to the current branch), which might be different than the author." 129 129 + msgid "committer" 130 130 + msgstr "Committer" 131 131 + 132 132 + #. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" 133 133 + msgid "descendant" 134 134 + msgstr "Nachfolger-Commit" 135 135 + 136 136 + #. "checkout of a revision rather than some head" 137 137 + msgid "detached HEAD" 138 138 + msgstr "losgelöster HEAD / Branchspitze" 139 139 + 140 140 + #. "checkout of a revision rather than some head" 141 141 + msgid "detached checkout" 142 142 + msgstr "losgelöster Commit (von Branch losgelöster Commit?)" 78 143 79 144 #. "" 80 145 msgid "diff [noun]" 81 81 - msgstr "Vergleich (Source Safe: Unterschiede)" 146 146 + msgstr "Vergleich (Diff? Source Safe: Unterschiede)" 82 147 83 148 #. "" 84 149 msgid "diff [verb]" 85 150 msgstr "vergleichen" 86 151 87 87 - #. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." 88 88 - msgid "fast forward merge" 89 89 - msgstr "Schnellzusammenführung" 152 152 + #. "" 153 153 + msgid "directory" 154 154 + msgstr "Verzeichnis" 155 155 + 156 156 + #. "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." 157 157 + msgid "fast-forward" 158 158 + msgstr "vorspulen" 90 159 91 160 #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." 92 161 msgid "fetch" 93 162 msgstr "anfordern (holen?)" 163 163 + 164 164 + #. "any merge strategy that works on a file by file basis" 165 165 + msgid "file level merging" 166 166 + msgstr "Datei-basiertes zusammenführen" 167 167 + 168 168 + #. "" 169 169 + msgid "file" 170 170 + msgstr "Datei" 171 171 + 172 172 + #. "the last revision in a branch" 173 173 + msgid "head" 174 174 + msgstr "HEAD / Branchspitze" 175 175 + 176 176 + #. "script that gets executed automatically on some event" 177 177 + msgid "hook" 178 178 + msgstr "Hook (in der dt. Informatik wohl als Einschubmethode bezeichnet)" 94 179 95 180 #. "One context of consecutive lines in a whole patch, which consists of many such hunks" 96 181 msgid "hunk" 97 97 - msgstr "Kontext" 182 182 + msgstr "Patch-Block (Kontext?)" 98 183 99 184 #. "A collection of files. The index is a stored version of your working tree." 100 185 msgid "index (in git-gui: staging area)" 101 101 - msgstr "Bereitstellung" 186 186 + msgstr "" 187 187 + "Bereitstellung (sofern der git index gemeint ist. In git-gui sowieso: " 188 188 + "staging area)" 189 189 + 190 190 + #. "the first checkout during a clone operation" 191 191 + msgid "initial checkout" 192 192 + msgstr "Erstellen der Arbeitskopie, auschecken" 193 193 + 194 194 + #. "The very first commit in a repository" 195 195 + msgid "initial commit" 196 196 + msgstr "Allererster Commit" 197 197 + 198 198 + #. "a branch that resides in the local git repository" 199 199 + msgid "local branch" 200 200 + msgstr "Lokaler Branch" 201 201 + 202 202 + #. "a Git object that is not part of any pack" 203 203 + msgid "loose object" 204 204 + msgstr "loses Objekt" 205 205 + 206 206 + #. "a branch called by convention 'master' that exists in a newly created git repository" 207 207 + msgid "master branch" 208 208 + msgstr "Master-Branch" 102 209 103 210 #. "A successful merge results in the creation of a new commit representing the result of the merge." 104 211 msgid "merge [noun]" ··· 112 219 msgid "message" 113 220 msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)" 114 221 115 115 - #. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." 222 222 + #. "a remote called by convention 'origin' that the current git repository has been cloned from" 223 223 + msgid "origin" 224 224 + msgstr "origin" 225 225 + 226 226 + #. "" 227 227 + msgid "orphan commit" 228 228 + msgstr "verwaister Commit" 229 229 + 230 230 + #. "" 231 231 + msgid "orphan reference" 232 232 + msgstr "verwaiste Referenz" 233 233 + 234 234 + #. "a file containing many git objects packed together" 235 235 + msgid "pack [noun]" 236 236 + msgstr "Pack-Datei" 237 237 + 238 238 + #. "the process of creating a pack file" 239 239 + msgid "pack [verb]" 240 240 + msgstr "Pack-Datei erstellen" 241 241 + 242 242 + #. "a Git object part of some pack" 243 243 + msgid "packed object" 244 244 + msgstr "gepacktes Objekt" 245 245 + 246 246 + #. "a commit that directly precedes the current one in git's graph of commits" 247 247 + msgid "parent commit" 248 248 + msgstr "Eltern-Commit" 249 249 + 250 250 + msgid "patch" 251 251 + msgstr "Patch" 252 252 + 253 253 + #. "The path to a file" 254 254 + msgid "path" 255 255 + msgstr "Pfad" 256 256 + 257 257 + #. "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." 116 258 msgid "prune" 117 117 - msgstr "aufräumen (entfernen?)" 259 259 + msgstr "veraltete Branches entfernen (aufräumen?, entfernen?)" 118 260 119 261 #. "Pulling a branch means to fetch it and merge it." 120 262 msgid "pull" 121 121 - msgstr "übernehmen (ziehen?)" 263 263 + msgstr "" 264 264 + "übernehmen (pull? ziehen? Vorsicht: zusammenführen = merge, aber pull kann " 265 265 + "auch rebase bewirken)" 122 266 123 267 #. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" 124 268 msgid "push" 125 269 msgstr "versenden (ausliefern? hochladen? verschicken? schieben?)" 126 270 271 271 + #. "The process of rebasing one set of commits on top of another branch's head" 272 272 + msgid "rebase [noun]" 273 273 + msgstr "der Rebase (das Umpflanzen)" 274 274 + 275 275 + #. "Re-apply one set of commits on top of another branch's head. Contrary to merge." 276 276 + msgid "rebase [verb]" 277 277 + msgstr "rebase (umpflanzen)" 278 278 + 127 279 #. "" 128 280 msgid "redo" 129 281 msgstr "wiederholen" 130 282 131 131 - #. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." 132 132 - msgid "remote" 133 133 - msgstr "Andere Archive (Gegenseite?, Entfernte?, Server?)" 283 283 + #. "" 284 284 + msgid "reference" 285 285 + msgstr "Referenz" 286 286 + 287 287 + #. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" 288 288 + msgid "reflog" 289 289 + msgstr "Commit-Log, »reflog«" 290 290 + 291 291 + msgid "refmap" 292 292 + msgstr "Refmap" 293 293 + 294 294 + #. "" 295 295 + msgid "refspec" 296 296 + msgstr "Refspec" 297 297 + 298 298 + #. "The adjective for anything which is outside of the current (local) repository" 299 299 + msgid "remote [adj]" 300 300 + msgstr "Extern (Andere?, Gegenseite?, Entfernte?, Server?)" 301 301 + 302 302 + #. "A branch in any other ('remote') repository" 303 303 + msgid "remote branch" 304 304 + msgstr "Externer branch" 305 305 + 306 306 + #. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." 307 307 + msgid "remote repository" 308 308 + msgstr "Externes Repository" 134 309 135 310 #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" 136 311 msgid "repository" 137 137 - msgstr "Projektarchiv" 312 312 + msgstr "Repository" 138 313 139 314 #. "" 140 315 msgid "reset" 141 141 - msgstr "zurücksetzen (zurückkehren?)" 316 316 + msgstr "umsetzen (reset to commit), Änderungen verwerfen (reset to HEAD)" 317 317 + 318 318 + #. "decide which changes from alternative versions of a file should persist in Git" 319 319 + msgid "resolve (a conflict)" 320 320 + msgstr "auflösen (einen Konflikt)" 321 321 + 322 322 + #. "abandon changes and go to pristine version" 323 323 + msgid "revert changes" 324 324 + msgstr "" 325 325 + "verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also " 326 326 + "mit neuem commit; umkehren?)" 142 327 143 328 #. "" 144 329 msgid "revert" 145 145 - msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)" 330 330 + msgstr "" 331 331 + "verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also " 332 332 + "mit neuem commit; umkehren?)" 333 333 + 334 334 + #. "expression that signifies a revision in git" 335 335 + msgid "revision expression" 336 336 + msgstr "Version Regexp-Ausdruck" 146 337 147 338 #. "A particular state of files and directories which was stored in the object database." 148 339 msgid "revision" 149 149 - msgstr "Version (TortoiseSVN: Revision; Source Safe: Version)" 340 340 + msgstr "" 341 341 + "Version (aber was macht das Wort revision hier im Git?? TortoiseSVN: " 342 342 + "Revision; Source Safe: Version)" 150 343 151 344 #. "" 152 345 msgid "sign off" 153 153 - msgstr "abzeichnen (gegenzeichnen?, freizeichnen?, absegnen?)" 346 346 + msgstr "abzeichnen (signieren? gegenzeichnen?, freizeichnen?)" 347 347 + 348 348 + #. "see: staging area. In some areas of git this is called 'index'." 349 349 + msgid "stage [noun], index" 350 350 + msgstr "Bereitstellung" 351 351 + 352 352 + #. "add some content of files and directories to the staging area in preparation for a commit" 353 353 + msgid "stage [verb]" 354 354 + msgstr "bereitstellen" 154 355 155 155 - #. "" 356 356 + #. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." 156 357 msgid "staging area" 157 358 msgstr "Bereitstellung" 158 359 360 360 + #. "The place (stack) where changes can be temporarily saved without committing" 361 361 + msgid "stash [noun]" 362 362 + msgstr "der Stash" 363 363 + 364 364 + #. "temporarily save changes in a stack without committing" 365 365 + msgid "stash [verb]" 366 366 + msgstr "in Stash speichern; \"stash\" benutzen" 367 367 + 159 368 #. "" 160 369 msgid "status" 161 370 msgstr "Status" 162 371 163 163 - #. "A ref pointing to a tag or commit object" 372 372 + #. "" 373 373 + msgid "submodule" 374 374 + msgstr "Submodul (Untermodul?)" 375 375 + 376 376 + #. "A ref pointing to some commit object. In other words: A label on a specific commit." 164 377 msgid "tag [noun]" 165 165 - msgstr "Markierung" 378 378 + msgstr "Tag (Markierung?)" 166 379 167 167 - #. "" 380 380 + #. "The process of creating a tag at a specific commit object" 168 381 msgid "tag [verb]" 169 169 - msgstr "markieren" 382 382 + msgstr "taggen (markieren?)" 383 383 + 384 384 + #. "The person who created a tag" 385 385 + msgid "tagger" 386 386 + msgstr "Tag-Ersteller (Markierungs-Ersteller?)" 387 387 + 388 388 + #. "file whose content is tracked/not tracked by git" 389 389 + msgid "tracked/untracked" 390 390 + msgstr "versioniert/unversioniert" 170 391 171 392 #. "A regular git branch that is used to follow changes from another repository." 172 393 msgid "tracking branch" 173 173 - msgstr "Übernahmezweig" 394 394 + msgstr "Tracking-Branch (Verfolgungsbranch? Übernahmebranch?)" 395 395 + 396 396 + #. "" 397 397 + msgid "trailer" 398 398 + msgstr "Anhang" 399 399 + 400 400 + #. "1. tree object, 2. directory tree" 401 401 + msgid "tree" 402 402 + msgstr "1. Baum-Objekt, 2. Verzeichnisbaum" 174 403 175 404 #. "" 176 405 msgid "undo" 177 406 msgstr "rückgängig" 178 407 408 408 + #. "Remove content of files from the staging area again so that it will not be part of the next commit" 409 409 + msgid "unstage" 410 410 + msgstr "aus Bereitstellung herausnehmen" 411 411 + 412 412 + #. "Retrieving the temporarily saved changes back again from the stash" 413 413 + msgid "unstash [verb]" 414 414 + msgstr "aus Stash zurückladen" 415 415 + 179 416 #. "" 180 417 msgid "update" 181 418 msgstr "aktualisieren" 182 419 183 420 #. "" 421 421 + msgid "upstream branch" 422 422 + msgstr "Upstream-Branch" 423 423 + 424 424 + #. "" 184 425 msgid "verify" 185 426 msgstr "überprüfen" 186 427 187 428 #. "The tree of actual checked out files." 188 188 - msgid "working copy, working tree" 429 429 + msgid "working directory, working copy, working tree" 189 430 msgstr "Arbeitskopie"

+240 -10

git-gui/po/glossary/git-gui-glossary.pot

··· 6 6 msgid "" 7 7 msgstr "" 8 8 "Project-Id-Version: PACKAGE VERSION\n" 9 9 - "POT-Creation-Date: 2008-01-07 21:20+0100\n" 9 9 + "POT-Creation-Date: 2020-01-26 22:26+0100\n" 10 10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 11 11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 12 "Language-Team: LANGUAGE <LL@li.org>\n" ··· 18 18 msgid "English Term (Dear translator: This file will never be visible to the user!)" 19 19 msgstr "" 20 20 21 21 + #. "prematurely stop and abandon an operation" 22 22 + msgid "abort" 23 23 + msgstr "" 24 24 + 21 25 #. "" 22 26 msgid "amend" 23 27 msgstr "" 24 28 29 29 + #. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" 30 30 + msgid "ancestor" 31 31 + msgstr "" 32 32 + 25 33 #. "" 26 34 msgid "annotate" 27 35 msgstr "" 28 36 37 37 + #. "The person who initially created (authored) a commit" 38 38 + msgid "author" 39 39 + msgstr "" 40 40 + 41 41 + #. "a repository with only .git directory, without working directory" 42 42 + msgid "bare repository" 43 43 + msgstr "" 44 44 + 45 45 + #. "a parent version of the current file" 46 46 + msgid "base" 47 47 + msgstr "" 48 48 + 49 49 + #. "" 50 50 + msgid "bisect" 51 51 + msgstr "" 52 52 + 53 53 + #. "get the authors responsible for each line in a file" 54 54 + msgid "blame" 55 55 + msgstr "" 56 56 + 57 57 + #. "" 58 58 + msgid "blob" 59 59 + msgstr "" 60 60 + 29 61 #. "A 'branch' is an active line of development." 30 62 msgid "branch [noun]" 31 63 msgstr "" ··· 42 74 msgid "checkout [verb]" 43 75 msgstr "" 44 76 77 77 + #. "to select and apply a single commit to the current HEAD without merging" 78 78 + msgid "cherry-pick" 79 79 + msgstr "" 80 80 + 81 81 + #. "a commit that directly succeeds the current one in git's graph of commits" 82 82 + msgid "child commit" 83 83 + msgstr "" 84 84 + 85 85 + #. "clean the state of the git repository, often after manually stopped operation" 86 86 + msgid "cleanup" 87 87 + msgstr "" 88 88 + 45 89 #. "" 46 90 msgid "clone [verb]" 47 91 msgstr "" ··· 54 98 msgid "commit [verb]" 55 99 msgstr "" 56 100 101 101 + #. "a message that gets attached with any commit" 102 102 + msgid "commit message" 103 103 + msgstr "" 104 104 + 105 105 + #. "The person who committed a commit (to the current branch), which might be different than the author." 106 106 + msgid "committer" 107 107 + msgstr "" 108 108 + 109 109 + #. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" 110 110 + msgid "descendant" 111 111 + msgstr "" 112 112 + 113 113 + #. "checkout of a revision rather than some head" 114 114 + msgid "detached HEAD" 115 115 + msgstr "" 116 116 + 117 117 + #. "checkout of a revision rather than some head" 118 118 + msgid "detached checkout" 119 119 + msgstr "" 120 120 + 57 121 #. "" 58 122 msgid "diff [noun]" 59 123 msgstr "" ··· 62 126 msgid "diff [verb]" 63 127 msgstr "" 64 128 65 65 - #. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." 66 66 - msgid "fast forward merge" 129 129 + #. "" 130 130 + msgid "directory" 131 131 + msgstr "" 132 132 + 133 133 + #. "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." 134 134 + msgid "fast-forward" 67 135 msgstr "" 68 136 69 137 #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." 70 138 msgid "fetch" 71 139 msgstr "" 72 140 141 141 + #. "any merge strategy that works on a file by file basis" 142 142 + msgid "file level merging" 143 143 + msgstr "" 144 144 + 145 145 + #. "" 146 146 + msgid "file" 147 147 + msgstr "" 148 148 + 149 149 + #. "the last revision in a branch" 150 150 + msgid "head" 151 151 + msgstr "" 152 152 + 153 153 + #. "script that gets executed automatically on some event" 154 154 + msgid "hook" 155 155 + msgstr "" 156 156 + 73 157 #. "One context of consecutive lines in a whole patch, which consists of many such hunks" 74 158 msgid "hunk" 75 159 msgstr "" ··· 78 162 msgid "index (in git-gui: staging area)" 79 163 msgstr "" 80 164 165 165 + #. "the first checkout during a clone operation" 166 166 + msgid "initial checkout" 167 167 + msgstr "" 168 168 + 169 169 + #. "The very first commit in a repository" 170 170 + msgid "initial commit" 171 171 + msgstr "" 172 172 + 173 173 + #. "a branch that resides in the local git repository" 174 174 + msgid "local branch" 175 175 + msgstr "" 176 176 + 177 177 + #. "a Git object that is not part of any pack" 178 178 + msgid "loose object" 179 179 + msgstr "" 180 180 + 181 181 + #. "a branch called by convention 'master' that exists in a newly created git repository" 182 182 + msgid "master branch" 183 183 + msgstr "" 184 184 + 81 185 #. "A successful merge results in the creation of a new commit representing the result of the merge." 82 186 msgid "merge [noun]" 83 187 msgstr "" ··· 90 194 msgid "message" 91 195 msgstr "" 92 196 93 93 - #. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." 197 197 + #. "a remote called by convention 'origin' that the current git repository has been cloned from" 198 198 + msgid "origin" 199 199 + msgstr "" 200 200 + 201 201 + #. "" 202 202 + msgid "orphan commit" 203 203 + msgstr "" 204 204 + 205 205 + #. "" 206 206 + msgid "orphan reference" 207 207 + msgstr "" 208 208 + 209 209 + #. "a file containing many git objects packed together" 210 210 + msgid "pack [noun]" 211 211 + msgstr "" 212 212 + 213 213 + #. "the process of creating a pack file" 214 214 + msgid "pack [verb]" 215 215 + msgstr "" 216 216 + 217 217 + #. "a Git object part of some pack" 218 218 + msgid "packed object" 219 219 + msgstr "" 220 220 + 221 221 + #. "a commit that directly precedes the current one in git's graph of commits" 222 222 + msgid "parent commit" 223 223 + msgstr "" 224 224 + 225 225 + msgid "patch" "" 226 226 + msgstr "" 227 227 + 228 228 + #. "The path to a file" 229 229 + msgid "path" 230 230 + msgstr "" 231 231 + 232 232 + #. "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." 94 233 msgid "prune" 95 234 msgstr "" 96 235 ··· 102 241 msgid "push" 103 242 msgstr "" 104 243 244 244 + #. "The process of rebasing one set of commits on top of another branch's head" 245 245 + msgid "rebase [noun]" 246 246 + msgstr "" 247 247 + 248 248 + #. "Re-apply one set of commits on top of another branch's head. Contrary to merge." 249 249 + msgid "rebase [verb]" 250 250 + msgstr "" 251 251 + 105 252 #. "" 106 253 msgid "redo" 107 254 msgstr "" 108 255 109 109 - #. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." 110 110 - msgid "remote" 256 256 + #. "" 257 257 + msgid "reference" 258 258 + msgstr "" 259 259 + 260 260 + #. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" 261 261 + msgid "reflog" 262 262 + msgstr "" 263 263 + 264 264 + msgid "refmap" "" 265 265 + msgstr "" 266 266 + 267 267 + #. "" 268 268 + msgid "refspec" 269 269 + msgstr "" 270 270 + 271 271 + #. "The adjective for anything which is outside of the current (local) repository" 272 272 + msgid "remote [adj]" 273 273 + msgstr "" 274 274 + 275 275 + #. "A branch in any other ('remote') repository" 276 276 + msgid "remote branch" 277 277 + msgstr "" 278 278 + 279 279 + #. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." 280 280 + msgid "remote repository" 111 281 msgstr "" 112 282 113 283 #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" ··· 118 288 msgid "reset" 119 289 msgstr "" 120 290 291 291 + #. "decide which changes from alternative versions of a file should persist in Git" 292 292 + msgid "resolve (a conflict)" 293 293 + msgstr "" 294 294 + 295 295 + #. "abandon changes and go to pristine version" 296 296 + msgid "revert changes" 297 297 + msgstr "" 298 298 + 121 299 #. "" 122 300 msgid "revert" 301 301 + msgstr "" 302 302 + 303 303 + #. "expression that signifies a revision in git" 304 304 + msgid "revision expression" 123 305 msgstr "" 124 306 125 307 #. "A particular state of files and directories which was stored in the object database." ··· 130 312 msgid "sign off" 131 313 msgstr "" 132 314 133 133 - #. "" 315 315 + #. "see: staging area. In some areas of git this is called 'index'." 316 316 + msgid "stage [noun], index" 317 317 + msgstr "" 318 318 + 319 319 + #. "add some content of files and directories to the staging area in preparation for a commit" 320 320 + msgid "stage [verb]" 321 321 + msgstr "" 322 322 + 323 323 + #. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." 134 324 msgid "staging area" 135 325 msgstr "" 136 326 327 327 + #. "The place (stack) where changes can be temporarily saved without committing" 328 328 + msgid "stash [noun]" 329 329 + msgstr "" 330 330 + 331 331 + #. "temporarily save changes in a stack without committing" 332 332 + msgid "stash [verb]" 333 333 + msgstr "" 334 334 + 137 335 #. "" 138 336 msgid "status" 139 337 msgstr "" 140 338 141 141 - #. "A ref pointing to a tag or commit object" 339 339 + #. "" 340 340 + msgid "submodule" 341 341 + msgstr "" 342 342 + 343 343 + #. "A ref pointing to some commit object. In other words: A label on a specific commit." 142 344 msgid "tag [noun]" 143 345 msgstr "" 144 346 145 145 - #. "" 347 347 + #. "The process of creating a tag at a specific commit object" 146 348 msgid "tag [verb]" 147 349 msgstr "" 148 350 351 351 + #. "The person who created a tag" 352 352 + msgid "tagger" 353 353 + msgstr "" 354 354 + 355 355 + #. "file whose content is tracked/not tracked by git" 356 356 + msgid "tracked/untracked" 357 357 + msgstr "" 358 358 + 149 359 #. "A regular git branch that is used to follow changes from another repository." 150 360 msgid "tracking branch" 151 361 msgstr "" 152 362 153 363 #. "" 364 364 + msgid "trailer" 365 365 + msgstr "" 366 366 + 367 367 + #. "1. tree object, 2. directory tree" 368 368 + msgid "tree" 369 369 + msgstr "" 370 370 + 371 371 + #. "" 154 372 msgid "undo" 155 373 msgstr "" 156 374 375 375 + #. "Remove content of files from the staging area again so that it will not be part of the next commit" 376 376 + msgid "unstage" 377 377 + msgstr "" 378 378 + 379 379 + #. "Retrieving the temporarily saved changes back again from the stash" 380 380 + msgid "unstash [verb]" 381 381 + msgstr "" 382 382 + 157 383 #. "" 158 384 msgid "update" 159 385 msgstr "" 160 386 161 387 #. "" 388 388 + msgid "upstream branch" 389 389 + msgstr "" 390 390 + 391 391 + #. "" 162 392 msgid "verify" 163 393 msgstr "" 164 394 165 395 #. "The tree of actual checked out files." 166 166 - msgid "working copy, working tree" 396 396 + msgid "working directory, working copy, working tree" 167 397 msgstr "" 168 398

+65 -36

git-gui/po/glossary/git-gui-glossary.txt

··· 1 1 "English Term (Dear translator: This file will never be visible to the user!)" "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" 2 2 + "abort" "prematurely stop and abandon an operation" 2 3 "amend" "" 4 4 + "ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" 3 5 "annotate" "" 6 6 + "author" "The person who initially created (authored) a commit" 7 7 + "bare repository" "a repository with only .git directory, without working directory" 8 8 + "base" "a parent version of the current file" 9 9 + "bisect" "" 10 10 + "blame" "get the authors responsible for each line in a file" 11 11 + "blob" "" 4 12 "branch [noun]" "A 'branch' is an active line of development." 5 13 "branch [verb]" "" 6 14 "checkout [noun]" "" 7 15 "checkout [verb]" "The action of updating the working tree to a revision which was stored in the object database." 16 16 + "cherry-pick" "to select and apply a single commit to the current HEAD without merging" 17 17 + "child commit" "a commit that directly succeeds the current one in git's graph of commits" 18 18 + "cleanup" "clean the state of the git repository, often after manually stopped operation" 8 19 "clone [verb]" "" 9 20 "commit [noun]" "A single point in the git history." 10 21 "commit [verb]" "The action of storing a new snapshot of the project's state in the git history." 22 22 + "commit message" "a message that gets attached with any commit" 23 23 + "committer" "The person who committed a commit (to the current branch), which might be different than the author." 24 24 + "descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)" 25 25 + "detached HEAD" "checkout of a revision rather than some head" 26 26 + "detached checkout" "checkout of a revision rather than some head" 11 27 "diff [noun]" "" 12 28 "diff [verb]" "" 13 13 - "fast forward merge" "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." 29 29 + "directory" "" 30 30 + "fast-forward" "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." 14 31 "fetch" "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." 32 32 + "file level merging" "any merge strategy that works on a file by file basis" 33 33 + "file" "" 34 34 + "head" "the last revision in a branch" 35 35 + "hook" "script that gets executed automatically on some event" 15 36 "hunk" "One context of consecutive lines in a whole patch, which consists of many such hunks" 16 37 "index (in git-gui: staging area)" "A collection of files. The index is a stored version of your working tree." 38 38 + "initial checkout" "the first checkout during a clone operation" 39 39 + "initial commit" "The very first commit in a repository" 40 40 + "local branch" "a branch that resides in the local git repository" 41 41 + "loose object" "a Git object that is not part of any pack" 42 42 + "master branch" "a branch called by convention 'master' that exists in a newly created git repository" 17 43 "merge [noun]" "A successful merge results in the creation of a new commit representing the result of the merge." 18 44 "merge [verb]" "To bring the contents of another branch into the current branch." 19 45 "message" "" 20 20 - "prune" "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." 46 46 + "origin" "a remote called by convention 'origin' that the current git repository has been cloned from" 47 47 + "orphan commit" "" 48 48 + "orphan reference" "" 49 49 + "pack [noun]" "a file containing many git objects packed together" 50 50 + "pack [verb]" "the process of creating a pack file" 51 51 + "packed object" "a Git object part of some pack" 52 52 + "parent commit" "a commit that directly precedes the current one in git's graph of commits" 53 53 + "patch" "" 54 54 + "path" "The path to a file" 55 55 + "prune" "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." 21 56 "pull" "Pulling a branch means to fetch it and merge it." 22 57 "push" "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" 58 58 + "rebase [noun]" "The process of rebasing one set of commits on top of another branch's head" 59 59 + "rebase [verb]" "Re-apply one set of commits on top of another branch's head. Contrary to merge." 23 60 "redo" "" 24 24 - "remote" "An other repository ('remote'). One might have a set of remotes whose branches one tracks." 61 61 + "reference" "" 62 62 + "reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" 63 63 + "refmap" "" 64 64 + "refspec" "" 65 65 + "remote [adj]" "The adjective for anything which is outside of the current (local) repository" 66 66 + "remote branch" "A branch in any other ('remote') repository" 67 67 + "remote repository" "An other repository ('remote'). One might have a set of remotes whose branches one tracks." 25 68 "repository" "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" 26 69 "reset" "" 70 70 + "resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git" 71 71 + "revert changes" "abandon changes and go to pristine version" 27 72 "revert" "" 73 73 + "revision expression" "expression that signifies a revision in git" 28 74 "revision" "A particular state of files and directories which was stored in the object database." 29 75 "sign off" "" 30 30 - "staging area" "" 76 76 + "stage [noun], index" "see: staging area. In some areas of git this is called 'index'." 77 77 + "stage [verb]" "add some content of files and directories to the staging area in preparation for a commit" 78 78 + "staging area" "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." 79 79 + "stash [noun]" "The place (stack) where changes can be temporarily saved without committing" 80 80 + "stash [verb]" "temporarily save changes in a stack without committing" 31 81 "status" "" 32 32 - "tag [noun]" "A ref pointing to a tag or commit object" 33 33 - "tag [verb]" "" 82 82 + "submodule" "" 83 83 + "tag [noun]" "A ref pointing to some commit object. In other words: A label on a specific commit." 84 84 + "tag [verb]" "The process of creating a tag at a specific commit object" 85 85 + "tagger" "The person who created a tag" 86 86 + "tracked/untracked" "file whose content is tracked/not tracked by git" 34 87 "tracking branch" "A regular git branch that is used to follow changes from another repository." 88 88 + "trailer" "" 89 89 + "tree" "1. tree object, 2. directory tree" 35 90 "undo" "" 91 91 + "unstage" "Remove content of files from the staging area again so that it will not be part of the next commit" 92 92 + "unstash [verb]" "Retrieving the temporarily saved changes back again from the stash" 36 93 "update" "" 94 94 + "upstream branch" "" 37 95 "verify" "" 38 38 - "working copy, working tree" "The tree of actual checked out files." 39 39 - "ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" 40 40 - "abort" "prematurely stop and abandon an operation" 41 41 - "bare repository" "a repository with only .git directory, without working directory" 42 42 - "base" "a parent version of the current file" 43 43 - "blame" "get the authors responsible for each line in a file" 44 44 - "cherry-pick" "to select and apply a single commit without merging" 45 45 - "child" "a commit that directly succeeds the current one in git's graph of commits" 46 46 - "cleanup" "clean the state of the git repository, often after manually stopped operation" 47 47 - "commit message" "a message that gets attached with any commit" 48 48 - "descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)" 49 49 - "detached checkout" "checkout of a revision rather than a some head" 50 50 - "file level merging" "any merge strategy that works on a file by file basis" 51 51 - "head" "the last revision in a branch" 52 52 - "hook" "script that gets executed automatically on some event" 53 53 - "initial checkout" "the first checkout during a clone operation" 54 54 - "local branch" "a branch that resides in the local git repository" 55 55 - "loose object" "a Git object that is not part of any pack" 56 56 - "master branch" "a branch called by convention 'master' that exists in a newly created git repository" 57 57 - "origin" "a remote called by convention 'origin' that the current git repository has been cloned from" 58 58 - "pack [noun]" "a file containing many git objects packed together" 59 59 - "packed object" "a Git object part of some pack" 60 60 - "parent" "a commit that directly precedes the current one in git's graph of commits" 61 61 - "reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" 62 62 - "resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git" 63 63 - "revert changes" "abandon changes and go to pristine version" 64 64 - "revision expression" "expression that signifies a revision in git" 65 65 - "stage/unstage" "add some content of files and directories to the staging area in preparation for a commit" 66 66 - "stash" "temporarily save changes in a stack without committing" 67 67 - "tracked/untracked" "file whose content is tracked/not tracked by git" 96 96 + "working directory, working copy, working tree" "The tree of actual checked out files."