development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://repo.or.cz/git-gui

Browse source 
* git://repo.or.cz/git-gui:
  git-gui 0.12
  git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
  git-gui: Update Hungarian translation for 0.12
  git-gui: Fixed typos in Swedish translation.
  git-gui: Updated Swedish translation (515t0f0u).
  git gui: update Italian translation
  git-gui: Update Japanese translation for 0.12
  git-gui: Starting translation for Norwegian
  git-gui: Update German (completed) translation.
  git-gui: Update po template to include 'Mirroring %s' message
  git-gui: Fix commit encoding handling.
  git-gui: Fix handling of relative paths in blame.
This commit is contained in:
Junio C Hamano 2008-12-17 21:56:48 -08:00
parent 1df2713249 e612120d23
commit b4955fb611
11 changed files with 3157 additions and 423 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-gui/GIT-VERSION-GEN
View file

@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
DEF_VER=0.11.GITGUI
DEF_VER=0.12.GITGUI
LF='
'

19
git-gui/git-gui.sh
View file

@ -2630,6 +2630,20 @@ proc usage {} {
exit 1
}
proc normalize_relpath {path} {
set elements {}
foreach item [file split $path] {
if {$item eq {.}} continue
if {$item eq {..} && [llength $elements] > 0
&& [lindex $elements end] ne {..}} {
set elements [lrange $elements 0 end-1]
continue
}
lappend elements $item
}
return [eval file join $elements]
}
# -- Not a normal commit type invocation? Do that instead!
#
switch -- $subcommand {
@ -2648,7 +2662,7 @@ blame {
foreach a $argv {
if {$is_path || [file exists $_prefix$a]} {
if {$path ne {}} usage
set path $_prefix$a
set path [normalize_relpath $_prefix$a]
break
} elseif {$a eq {--}} {
if {$path ne {}} {
@ -2671,7 +2685,7 @@ blame {
unset is_path
if {$head ne {} && $path eq {}} {
set path $_prefix$head
set path [normalize_relpath $_prefix$head]
set head {}
}
@ -3315,7 +3329,6 @@ by %s:
{^GIT_PAGER$} -
{^GIT_TRACE$} -
{^GIT_CONFIG$} -
{^GIT_CONFIG_LOCAL$} -
{^GIT_(AUTHOR|COMMITTER)_DATE$} {
append msg " - $name\n"
incr ignored_env

5
git-gui/lib/blame.tcl
View file

@ -940,9 +940,8 @@ method _showcommit {cur_w lno} {
catch {
set fd [git_read cat-file commit $cmit]
fconfigure $fd -encoding binary -translation lf
if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
set enc utf-8
}
# By default commits are assumed to be in utf-8
set enc utf-8
while {[gets $fd line] > 0} {
if {[string match {encoding *} $line]} {
set enc [string tolower [string range $line 9 end]]

7
git-gui/lib/commit.tcl
View file

@ -27,9 +27,8 @@ You are currently in the middle of a merge that has not been fully completed. Y
if {[catch {
set fd [git_read cat-file commit $curHEAD]
fconfigure $fd -encoding binary -translation lf
if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
set enc utf-8
}
# By default commits are assumed to be in utf-8
set enc utf-8
while {[gets $fd line] > 0} {
if {[string match {parent *} $line]} {
lappend parents [string range $line 7 end]
@ -208,7 +207,7 @@ A good commit message has the following format:
if {$use_enc ne {}} {
fconfigure $msg_wt -encoding $use_enc
} else {
puts stderr [mc "warning: Tcl does not support encoding '%s'." $enc]
error_popup [mc "warning: Tcl does not support encoding '%s'." $enc]
fconfigure $msg_wt -encoding utf-8
}
puts $msg_wt $msg

279
git-gui/po/de.po
View file

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-25 13:32+0200\n"
"PO-Revision-Date: 2008-10-25 22:47+0200\n"
"POT-Creation-Date: 2008-12-06 20:51+0100\n"
"PO-Revision-Date: 2008-12-06 21:22+0100\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
@ -86,17 +86,15 @@ msgstr "Dateistatus aktualisieren..."
msgid "Scanning for modified files ..."
msgstr "Nach geänderten Dateien suchen..."
#: git-gui.sh:1325
#, fuzzy
#: git-gui.sh:1367
msgid "Calling prepare-commit-msg hook..."
msgstr "Aufrufen der Vor-Eintragen-Kontrolle..."
msgstr "Aufrufen der Eintragen-Vorbereiten-Kontrolle..."
#: git-gui.sh:1342
#, fuzzy
#: git-gui.sh:1384
msgid "Commit declined by prepare-commit-msg hook."
msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)."
msgstr "Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (»prepare-commit hook«)."
#: git-gui.sh:1502 lib/browser.tcl:246
#: git-gui.sh:1542 lib/browser.tcl:246
msgid "Ready."
msgstr "Bereit."
@ -180,7 +178,11 @@ msgstr "Zusammenführen"
msgid "Remote"
msgstr "Andere Archive"
#: git-gui.sh:2242
#: git-gui.sh:2293
msgid "Tools"
msgstr "Werkzeuge"
#: git-gui.sh:2302
msgid "Explore Working Copy"
msgstr "Arbeitskopie im Dateimanager"
@ -363,7 +365,11 @@ msgstr "Einstellungen..."
msgid "Options..."
msgstr "Optionen..."
#: git-gui.sh:2113 lib/choose_repository.tcl:47
#: git-gui.sh:2576
msgid "Remove..."
msgstr "Entfernen..."
#: git-gui.sh:2585 lib/choose_repository.tcl:50
msgid "Help"
msgstr "Hilfe"
@ -371,7 +377,11 @@ msgstr "Hilfe"
msgid "Online Documentation"
msgstr "Online-Dokumentation"
#: git-gui.sh:2238
#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
msgid "Show SSH Key"
msgstr "SSH-Schlüssel anzeigen"
#: git-gui.sh:2707
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
@ -548,7 +558,11 @@ msgstr "Version:"
msgid "Copy Commit"
msgstr "Version kopieren"
#: lib/blame.tcl:260
#: lib/blame.tcl:275
msgid "Find Text..."
msgstr "Text suchen..."
#: lib/blame.tcl:284
msgid "Do Full Copy Detection"
msgstr "Volle Kopie-Erkennung"
@ -609,12 +623,11 @@ msgstr "Eintragender:"
msgid "Original File:"
msgstr "Ursprüngliche Datei:"
#: lib/blame.tcl:1013
#, fuzzy
#: lib/blame.tcl:1021
msgid "Cannot find HEAD commit:"
msgstr "Elternversion kann nicht gefunden werden:"
msgstr "Zweigspitze (»HEAD«) kann nicht gefunden werden:"
#: lib/blame.tcl:1068
#: lib/blame.tcl:1076
msgid "Cannot find parent commit:"
msgstr "Elternversion kann nicht gefunden werden:"
@ -1049,7 +1062,7 @@ msgstr "Zuletzt benutztes Projektarchiv öffnen:"
msgid "Failed to create repository %s:"
msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
#: lib/choose_repository.tcl:387
msgid "Directory:"
msgstr "Verzeichnis:"
@ -1058,12 +1071,12 @@ msgstr "Verzeichnis:"
msgid "Git Repository"
msgstr "Git Projektarchiv"
#: lib/choose_repository.tcl:437
#: lib/choose_repository.tcl:442
#, tcl-format
msgid "Directory %s already exists."
msgstr "Verzeichnis »%s« existiert bereits."
#: lib/choose_repository.tcl:441
#: lib/choose_repository.tcl:446
#, tcl-format
msgid "File %s already exists."
msgstr "Datei »%s« existiert bereits."
@ -1072,11 +1085,11 @@ msgstr "Datei »%s« existiert bereits."
msgid "Clone"
msgstr "Klonen"
#: lib/choose_repository.tcl:467
#: lib/choose_repository.tcl:473
msgid "Source Location:"
msgstr ""
msgstr "Herkunft:"
#: lib/choose_repository.tcl:478
#: lib/choose_repository.tcl:484
msgid "Target Directory:"
msgstr "Zielverzeichnis:"
@ -1565,20 +1578,24 @@ msgid ""
"LOCAL: deleted\n"
"REMOTE:\n"
msgstr ""
"LOKAL: gelöscht\n"
"ANDERES:\n"
#: lib/diff.tcl:125
msgid ""
"REMOTE: deleted\n"
"LOCAL:\n"
msgstr ""
"ANDERES: gelöscht\n"
"LOKAL:\n"
#: lib/diff.tcl:132
msgid "LOCAL:\n"
msgstr ""
msgstr "LOKAL:\n"
#: lib/diff.tcl:135
msgid "REMOTE:\n"
msgstr ""
msgstr "ANDERES:\n"
#: lib/diff.tcl:197 lib/diff.tcl:296
#, tcl-format
@ -1603,6 +1620,8 @@ msgid ""
"* Untracked file is %d bytes.\n"
"* Showing only first %d bytes.\n"
msgstr ""
"* Datei nicht unter Versionskontrolle, Dateigröße %d Bytes.\n"
"* Nur erste %d Bytes werden angezeigt.\n"
#: lib/diff.tcl:228
#, tcl-format
@ -1611,8 +1630,11 @@ msgid ""
"* Untracked file clipped here by %s.\n"
"* To see the entire file, use an external editor.\n"
msgstr ""
"\n"
"* Datei nicht unter Versionskontrolle, hier abgeschnitten durch %s.\n"
"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n"
#: lib/diff.tcl:437
#: lib/diff.tcl:436
msgid "Failed to unstage selected hunk."
msgstr ""
"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
@ -2045,7 +2067,7 @@ msgstr "Namensvorschlag für neue Zweige"
#: lib/option.tcl:155
msgid "Default File Contents Encoding"
msgstr "Vorgestellte Zeichenkodierung"
msgstr "Voreingestellte Zeichenkodierung"
#: lib/option.tcl:203
msgid "Change"
@ -2113,19 +2135,18 @@ msgid "Do Nothing Else Now"
msgstr "Nichts tun"
#: lib/remote_add.tcl:101
#, fuzzy
msgid "Please supply a remote name."
msgstr "Bitte geben Sie einen Zweignamen an."
msgstr "Bitte geben Sie einen Namen des anderen Archivs an."
#: lib/remote_add.tcl:114
#, fuzzy, tcl-format
#, tcl-format
msgid "'%s' is not an acceptable remote name."
msgstr "»%s« ist kein zulässiger Zweigname."
msgstr "»%s« ist kein zulässiger Name eines anderen Archivs."
#: lib/remote_add.tcl:125
#, fuzzy, tcl-format
#, tcl-format
msgid "Failed to add remote '%s' of location '%s'."
msgstr "Fehler beim Umbenennen von »%s«."
msgstr "Fehler beim Hinzufügen des anderen Archivs »%s« aus Herkunftsort »%s«."
#: lib/remote_add.tcl:133 lib/transport.tcl:6
#, tcl-format
@ -2133,16 +2154,18 @@ msgid "fetch %s"
msgstr "»%s« anfordern"
#: lib/remote_add.tcl:134
#, fuzzy, tcl-format
#, tcl-format
msgid "Fetching the %s"
msgstr "Änderungen »%s« von »%s« anfordern"
msgstr "»%s« anfordern"
#: lib/remote_add.tcl:157
#, tcl-format
msgid "Do not know how to initialize repository at location '%s'."
msgstr "Initialisieren eines anderen Archivs an Adresse »%s« ist nicht möglich."
msgstr ""
"Initialisieren eines anderen Archivs an Adresse »%s« ist nicht möglich."
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
#: lib/transport.tcl:81
#, tcl-format
msgid "push %s"
msgstr "»%s« versenden..."
@ -2266,9 +2289,9 @@ msgstr "Nächster"
msgid "Prev"
msgstr "Voriger"
#: lib/search.tcl:24
#: lib/search.tcl:25
msgid "Case-Sensitive"
msgstr ""
msgstr "Groß-/Kleinschreibung unterscheiden"
#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
msgid "Cannot write shortcut:"
@ -2315,11 +2338,182 @@ msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm"
msgid "Spell Checker Failed"
msgstr "Rechtschreibprüfung fehlgeschlagen"
#: lib/sshkey.tcl:31
msgid "No keys found."
msgstr "Keine Schlüssel gefunden."
#: lib/sshkey.tcl:34
#, tcl-format
msgid "Found a public key in: %s"
msgstr "Öffentlicher Schlüssel gefunden in: %s"
#: lib/sshkey.tcl:40
msgid "Generate Key"
msgstr "Schlüssel erzeugen"
#: lib/sshkey.tcl:56
msgid "Copy To Clipboard"
msgstr "In Zwischenablage kopieren"
#: lib/sshkey.tcl:70
msgid "Your OpenSSH Public Key"
msgstr "Ihr OpenSSH öffenlicher Schlüssel"
#: lib/sshkey.tcl:78
msgid "Generating..."
msgstr "Erzeugen..."
#: lib/sshkey.tcl:84
#, tcl-format
msgid ""
"Could not start ssh-keygen:\n"
"\n"
"%s"
msgstr ""
"Konnte »ssh-keygen« nicht starten:\n"
"\n"
"%s"
#: lib/sshkey.tcl:111
msgid "Generation failed."
msgstr "Schlüsselerzeugung fehlgeschlagen."
#: lib/sshkey.tcl:118
msgid "Generation succeded, but no keys found."
msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden."
#: lib/sshkey.tcl:121
#, tcl-format
msgid "Your key is in: %s"
msgstr "Ihr Schlüssel ist abgelegt in: %s"
#: lib/status_bar.tcl:83
#, tcl-format
msgid "%s ... %*i of %*i %s (%3i%%)"
msgstr "%s ... %*i von %*i %s (%3i%%)"
#: lib/tools_dlg.tcl:22
msgid "Add Tool"
msgstr "Werkzeug hinzufügen"
#: lib/tools_dlg.tcl:28
msgid "Add New Tool Command"
msgstr "Neues Kommando für Werkzeug hinzufügen"
#: lib/tools_dlg.tcl:33
msgid "Add globally"
msgstr "Global hinzufügen"
#: lib/tools_dlg.tcl:45
msgid "Tool Details"
msgstr "Einzelheiten des Werkzeugs"
#: lib/tools_dlg.tcl:48
msgid "Use '/' separators to create a submenu tree:"
msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:"
#: lib/tools_dlg.tcl:61
msgid "Command:"
msgstr "Kommando:"
#: lib/tools_dlg.tcl:74
msgid "Show a dialog before running"
msgstr "Bestätigungsfrage vor Starten anzeigen"
#: lib/tools_dlg.tcl:80
msgid "Ask the user to select a revision (sets $REVISION)"
msgstr "Benutzer nach Version fragen (setzt $REVISION)"
#: lib/tools_dlg.tcl:85
msgid "Ask the user for additional arguments (sets $ARGS)"
msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)"
#: lib/tools_dlg.tcl:92
msgid "Don't show the command output window"
msgstr "Kein Ausgabefenster zeigen"
#: lib/tools_dlg.tcl:97
msgid "Run only if a diff is selected ($FILENAME not empty)"
msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)"
#: lib/tools_dlg.tcl:121
msgid "Please supply a name for the tool."
msgstr "Bitte geben Sie einen Werkzeugnamen an."
#: lib/tools_dlg.tcl:129
#, tcl-format
msgid "Tool '%s' already exists."
msgstr "Werkzeug »%s« existiert bereits."
#: lib/tools_dlg.tcl:151
#, tcl-format
msgid ""
"Could not add tool:\n"
"%s"
msgstr ""
"Werkzeug konnte nicht hinzugefügt werden:\n"
"\n"
"%s"
#: lib/tools_dlg.tcl:190
msgid "Remove Tool"
msgstr "Werkzeug entfernen"
#: lib/tools_dlg.tcl:196
msgid "Remove Tool Commands"
msgstr "Werkzeugkommandos entfernen"
#: lib/tools_dlg.tcl:200
msgid "Remove"
msgstr "Entfernen"
#: lib/tools_dlg.tcl:236
msgid "(Blue denotes repository-local tools)"
msgstr "(Werkzeuge für lokales Archiv werden in Blau angezeigt)"
#: lib/tools_dlg.tcl:297
#, tcl-format
msgid "Run Command: %s"
msgstr "Kommando aufrufen: %s"
#: lib/tools_dlg.tcl:311
msgid "Arguments"
msgstr "Argumente"
#: lib/tools_dlg.tcl:348
msgid "OK"
msgstr "Ok"
#: lib/tools.tcl:75
#, tcl-format
msgid "Running %s requires a selected file."
msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein."
#: lib/tools.tcl:90
#, tcl-format
msgid "Are you sure you want to run %s?"
msgstr "Wollen Sie %s wirklich starten?"
#: lib/tools.tcl:110
#, tcl-format
msgid "Tool: %s"
msgstr "Werkzeug: %s"
#: lib/tools.tcl:111
#, tcl-format
msgid "Running: %s"
msgstr "Starten: %s"
#: lib/tools.tcl:149
#, tcl-format
msgid "Tool completed succesfully: %s"
msgstr "Werkzeug erfolgreich abgeschlossen: %s"
#: lib/tools.tcl:151
#, tcl-format
msgid "Tool failed: %s"
msgstr "Werkzeug fehlgeschlagen: %s"
#: lib/transport.tcl:7
#, tcl-format
msgid "Fetching new changes from %s"
@ -2340,7 +2534,12 @@ msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurde
msgid "Pushing changes to %s"
msgstr "Änderungen nach »%s« versenden"
#: lib/transport.tcl:72
#: lib/transport.tcl:64
#, tcl-format
msgid "Mirroring to %s"
msgstr "Spiegeln nach %s"
#: lib/transport.tcl:82
#, tcl-format
msgid "Pushing %s %s to %s"
msgstr "%s %s nach %s versenden"

184
git-gui/po/git-gui.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-16 13:56-0800\n"
"POT-Creation-Date: 2008-12-08 08:31-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -234,25 +234,25 @@ msgstr ""
msgid "Redo"
msgstr ""
#: git-gui.sh:2378 git-gui.sh:2923
#: git-gui.sh:2378 git-gui.sh:2937
msgid "Cut"
msgstr ""
#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
#: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096
#: lib/console.tcl:69
msgid "Copy"
msgstr ""
#: git-gui.sh:2384 git-gui.sh:2929
#: git-gui.sh:2384 git-gui.sh:2943
msgid "Paste"
msgstr ""
#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
#: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr ""
#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
#: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71
msgid "Select All"
msgstr ""
@ -284,15 +284,15 @@ msgstr ""
msgid "Commit@@verb"
msgstr ""
#: git-gui.sh:2443 git-gui.sh:2864
#: git-gui.sh:2443 git-gui.sh:2878
msgid "New Commit"
msgstr ""
#: git-gui.sh:2451 git-gui.sh:2871
#: git-gui.sh:2451 git-gui.sh:2885
msgid "Amend Last Commit"
msgstr ""
#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
#: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr ""
@ -312,15 +312,15 @@ msgstr ""
msgid "Revert Changes"
msgstr ""
#: git-gui.sh:2491 git-gui.sh:3069
#: git-gui.sh:2491 git-gui.sh:3083
msgid "Show Less Context"
msgstr ""
#: git-gui.sh:2495 git-gui.sh:3073
#: git-gui.sh:2495 git-gui.sh:3087
msgid "Show More Context"
msgstr ""
#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
#: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961
msgid "Sign Off"
msgstr ""
@ -354,7 +354,7 @@ msgstr ""
msgid "Preferences..."
msgstr ""
#: git-gui.sh:2565 git-gui.sh:3115
#: git-gui.sh:2565 git-gui.sh:3129
msgid "Options..."
msgstr ""
@ -374,124 +374,124 @@ msgstr ""
msgid "Show SSH Key"
msgstr ""
#: git-gui.sh:2707
#: git-gui.sh:2721
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
#: git-gui.sh:2740
#: git-gui.sh:2754
msgid "Current Branch:"
msgstr ""
#: git-gui.sh:2761
#: git-gui.sh:2775
msgid "Staged Changes (Will Commit)"
msgstr ""
#: git-gui.sh:2781
#: git-gui.sh:2795
msgid "Unstaged Changes"
msgstr ""
#: git-gui.sh:2831
#: git-gui.sh:2845
msgid "Stage Changed"
msgstr ""
#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
#: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193
msgid "Push"
msgstr ""
#: git-gui.sh:2885
#: git-gui.sh:2899
msgid "Initial Commit Message:"
msgstr ""
#: git-gui.sh:2886
#: git-gui.sh:2900
msgid "Amended Commit Message:"
msgstr ""
#: git-gui.sh:2887
#: git-gui.sh:2901
msgid "Amended Initial Commit Message:"
msgstr ""
#: git-gui.sh:2888
#: git-gui.sh:2902
msgid "Amended Merge Commit Message:"
msgstr ""
#: git-gui.sh:2889
#: git-gui.sh:2903
msgid "Merge Commit Message:"
msgstr ""
#: git-gui.sh:2890
#: git-gui.sh:2904
msgid "Commit Message:"
msgstr ""
#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
#: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73
msgid "Copy All"
msgstr ""
#: git-gui.sh:2963 lib/blame.tcl:104
#: git-gui.sh:2977 lib/blame.tcl:104
msgid "File:"
msgstr ""
#: git-gui.sh:3078
#: git-gui.sh:3092
msgid "Refresh"
msgstr ""
#: git-gui.sh:3099
#: git-gui.sh:3113
msgid "Decrease Font Size"
msgstr ""
#: git-gui.sh:3103
#: git-gui.sh:3117
msgid "Increase Font Size"
msgstr ""
#: git-gui.sh:3111 lib/blame.tcl:281
#: git-gui.sh:3125 lib/blame.tcl:281
msgid "Encoding"
msgstr ""
#: git-gui.sh:3122
#: git-gui.sh:3136
msgid "Apply/Reverse Hunk"
msgstr ""
#: git-gui.sh:3127
#: git-gui.sh:3141
msgid "Apply/Reverse Line"
msgstr ""
#: git-gui.sh:3137
#: git-gui.sh:3151
msgid "Run Merge Tool"
msgstr ""
#: git-gui.sh:3142
#: git-gui.sh:3156
msgid "Use Remote Version"
msgstr ""
#: git-gui.sh:3146
#: git-gui.sh:3160
msgid "Use Local Version"
msgstr ""
#: git-gui.sh:3150
#: git-gui.sh:3164
msgid "Revert To Base"
msgstr ""
#: git-gui.sh:3169
#: git-gui.sh:3183
msgid "Unstage Hunk From Commit"
msgstr ""
#: git-gui.sh:3170
#: git-gui.sh:3184
msgid "Unstage Line From Commit"
msgstr ""
#: git-gui.sh:3172
#: git-gui.sh:3186
msgid "Stage Hunk For Commit"
msgstr ""
#: git-gui.sh:3173
#: git-gui.sh:3187
msgid "Stage Line For Commit"
msgstr ""
#: git-gui.sh:3196
#: git-gui.sh:3210
msgid "Initializing..."
msgstr ""
#: git-gui.sh:3301
#: git-gui.sh:3315
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@ -502,14 +502,14 @@ msgid ""
"\n"
msgstr ""
#: git-gui.sh:3331
#: git-gui.sh:3345
msgid ""
"\n"
"This is due to a known issue with the\n"
"Tcl binary distributed by Cygwin."
msgstr ""
#: git-gui.sh:3336
#: git-gui.sh:3350
#, tcl-format
msgid ""
"\n"
@ -589,43 +589,43 @@ msgstr ""
msgid "Loading annotation..."
msgstr ""
#: lib/blame.tcl:964
#: lib/blame.tcl:963
msgid "Author:"
msgstr ""
#: lib/blame.tcl:968
#: lib/blame.tcl:967
msgid "Committer:"
msgstr ""
#: lib/blame.tcl:973
#: lib/blame.tcl:972
msgid "Original File:"
msgstr ""
#: lib/blame.tcl:1021
#: lib/blame.tcl:1020
msgid "Cannot find HEAD commit:"
msgstr ""
#: lib/blame.tcl:1076
#: lib/blame.tcl:1075
msgid "Cannot find parent commit:"
msgstr ""
#: lib/blame.tcl:1091
#: lib/blame.tcl:1090
msgid "Unable to display parent"
msgstr ""
#: lib/blame.tcl:1092 lib/diff.tcl:297
#: lib/blame.tcl:1091 lib/diff.tcl:297
msgid "Error loading diff:"
msgstr ""
#: lib/blame.tcl:1232
#: lib/blame.tcl:1231
msgid "Originally By:"
msgstr ""
#: lib/blame.tcl:1238
#: lib/blame.tcl:1237
msgid "In File:"
msgstr ""
#: lib/blame.tcl:1243
#: lib/blame.tcl:1242
msgid "Copied Or Moved Here By:"
msgstr ""
@ -642,7 +642,7 @@ msgstr ""
#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
#: lib/transport.tcl:97
#: lib/transport.tcl:108
msgid "Cancel"
msgstr ""
@ -1254,19 +1254,19 @@ msgid ""
"current merge activity.\n"
msgstr ""
#: lib/commit.tcl:49
#: lib/commit.tcl:48
msgid "Error loading commit data for amend:"
msgstr ""
#: lib/commit.tcl:76
#: lib/commit.tcl:75
msgid "Unable to obtain your identity:"
msgstr ""
#: lib/commit.tcl:81
#: lib/commit.tcl:80
msgid "Invalid GIT_COMMITTER_IDENT:"
msgstr ""
#: lib/commit.tcl:133
#: lib/commit.tcl:132
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
@ -1276,7 +1276,7 @@ msgid ""
"The rescan will be automatically started now.\n"
msgstr ""
#: lib/commit.tcl:156
#: lib/commit.tcl:155
#, tcl-format
msgid ""
"Unmerged files cannot be committed.\n"
@ -1285,7 +1285,7 @@ msgid ""
"before committing.\n"
msgstr ""
#: lib/commit.tcl:164
#: lib/commit.tcl:163
#, tcl-format
msgid ""
"Unknown file state %s detected.\n"
@ -1293,14 +1293,14 @@ msgid ""
"File %s cannot be committed by this program.\n"
msgstr ""
#: lib/commit.tcl:172
#: lib/commit.tcl:171
msgid ""
"No changes to commit.\n"
"\n"
"You must stage at least 1 file before you can commit.\n"
msgstr ""
#: lib/commit.tcl:187
#: lib/commit.tcl:186
msgid ""
"Please supply a commit message.\n"
"\n"
@ -1311,45 +1311,45 @@ msgid ""
"- Remaining lines: Describe why this change is good.\n"
msgstr ""
#: lib/commit.tcl:211
#: lib/commit.tcl:210
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
msgstr ""
#: lib/commit.tcl:227
#: lib/commit.tcl:226
msgid "Calling pre-commit hook..."
msgstr ""
#: lib/commit.tcl:242
#: lib/commit.tcl:241
msgid "Commit declined by pre-commit hook."
msgstr ""
#: lib/commit.tcl:265
#: lib/commit.tcl:264
msgid "Calling commit-msg hook..."
msgstr ""
#: lib/commit.tcl:280
#: lib/commit.tcl:279
msgid "Commit declined by commit-msg hook."
msgstr ""
#: lib/commit.tcl:293
#: lib/commit.tcl:292
msgid "Committing changes..."
msgstr ""
#: lib/commit.tcl:309
#: lib/commit.tcl:308
msgid "write-tree failed:"
msgstr ""
#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
#: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373
msgid "Commit failed."
msgstr ""
#: lib/commit.tcl:327
#: lib/commit.tcl:326
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr ""
#: lib/commit.tcl:332
#: lib/commit.tcl:331
msgid ""
"No changes to commit.\n"
"\n"
@ -1358,19 +1358,19 @@ msgid ""
"A rescan will be automatically started now.\n"
msgstr ""
#: lib/commit.tcl:339
#: lib/commit.tcl:338
msgid "No changes to commit."
msgstr ""
#: lib/commit.tcl:353
#: lib/commit.tcl:352
msgid "commit-tree failed:"
msgstr ""
#: lib/commit.tcl:373
#: lib/commit.tcl:372
msgid "update-ref failed:"
msgstr ""
#: lib/commit.tcl:461
#: lib/commit.tcl:460
#, tcl-format
msgid "Created commit %s: %s"
msgstr ""
@ -1999,7 +1999,8 @@ msgstr ""
msgid "Do not know how to initialize repository at location '%s'."
msgstr ""
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
#: lib/transport.tcl:81
#, tcl-format
msgid "push %s"
msgstr ""
@ -2017,11 +2018,11 @@ msgstr ""
msgid "From Repository"
msgstr ""
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
msgid "Remote:"
msgstr ""
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
msgid "Arbitrary Location:"
msgstr ""
@ -2336,35 +2337,40 @@ msgstr ""
msgid "Pushing changes to %s"
msgstr ""
#: lib/transport.tcl:72
#: lib/transport.tcl:64
#, tcl-format
msgid "Mirroring to %s"
msgstr ""
#: lib/transport.tcl:82
#, tcl-format
msgid "Pushing %s %s to %s"
msgstr ""
#: lib/transport.tcl:89
#: lib/transport.tcl:100
msgid "Push Branches"
msgstr ""
#: lib/transport.tcl:103
#: lib/transport.tcl:114
msgid "Source Branches"
msgstr ""
#: lib/transport.tcl:120
#: lib/transport.tcl:131
msgid "Destination Repository"
msgstr ""
#: lib/transport.tcl:158
#: lib/transport.tcl:169
msgid "Transfer Options"
msgstr ""
#: lib/transport.tcl:160
#: lib/transport.tcl:171
msgid "Force overwrite existing branch (may discard changes)"
msgstr ""
#: lib/transport.tcl:164
#: lib/transport.tcl:175
msgid "Use thin pack (for slow network connections)"
msgstr ""
#: lib/transport.tcl:168
#: lib/transport.tcl:179
msgid "Include tags"
msgstr ""

186
git-gui/po/hu.po
View file

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui-i 18n\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-16 13:56-0800\n"
"PO-Revision-Date: 2008-11-17 23:03+0100\n"
"POT-Creation-Date: 2008-12-08 08:31-0800\n"
"PO-Revision-Date: 2008-12-10 15:00+0100\n"
"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
"Language-Team: Hungarian\n"
"MIME-Version: 1.0\n"
@ -241,25 +241,25 @@ msgstr "Visszavonás"
msgid "Redo"
msgstr "Mégis"
#: git-gui.sh:2378 git-gui.sh:2923
#: git-gui.sh:2378 git-gui.sh:2937
msgid "Cut"
msgstr "Kivágás"
#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
#: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096
#: lib/console.tcl:69
msgid "Copy"
msgstr "Másolás"
#: git-gui.sh:2384 git-gui.sh:2929
#: git-gui.sh:2384 git-gui.sh:2943
msgid "Paste"
msgstr "Beillesztés"
#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
#: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr "Törlés"
#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
#: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71
msgid "Select All"
msgstr "Mindent kiválaszt"
@ -291,15 +291,15 @@ msgstr "Kész"
msgid "Commit@@verb"
msgstr "Commit@@ige"
#: git-gui.sh:2443 git-gui.sh:2864
#: git-gui.sh:2443 git-gui.sh:2878
msgid "New Commit"
msgstr "Új commit"
#: git-gui.sh:2451 git-gui.sh:2871
#: git-gui.sh:2451 git-gui.sh:2885
msgid "Amend Last Commit"
msgstr "Utolsó commit javítása"
#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
#: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr "Keresés újra"
@ -319,15 +319,15 @@ msgstr "Commitba való kiválasztás visszavonása"
msgid "Revert Changes"
msgstr "Változtatások visszaállítása"
#: git-gui.sh:2491 git-gui.sh:3069
#: git-gui.sh:2491 git-gui.sh:3083
msgid "Show Less Context"
msgstr "Kevesebb környezet mutatása"
#: git-gui.sh:2495 git-gui.sh:3073
#: git-gui.sh:2495 git-gui.sh:3087
msgid "Show More Context"
msgstr "Több környezet mutatása"
#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
#: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961
msgid "Sign Off"
msgstr "Aláír"
@ -361,7 +361,7 @@ msgstr "Névjegy: %s"
msgid "Preferences..."
msgstr "Beállítások..."
#: git-gui.sh:2565 git-gui.sh:3115
#: git-gui.sh:2565 git-gui.sh:3129
msgid "Options..."
msgstr "Opciók..."
@ -381,125 +381,125 @@ msgstr "Online dokumentáció"
msgid "Show SSH Key"
msgstr "SSH kulcs mutatása"
#: git-gui.sh:2707
#: git-gui.sh:2721
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
"végzetes hiba: nem érhető el a(z) %s útvonal: Nincs ilyen fájl vagy könyvtár"
#: git-gui.sh:2740
#: git-gui.sh:2754
msgid "Current Branch:"
msgstr "Jelenlegi branch:"
#: git-gui.sh:2761
#: git-gui.sh:2775
msgid "Staged Changes (Will Commit)"
msgstr "Kiválasztott változtatások (commitolva lesz)"
#: git-gui.sh:2781
#: git-gui.sh:2795
msgid "Unstaged Changes"
msgstr "Kiválasztatlan változtatások"
#: git-gui.sh:2831
#: git-gui.sh:2845
msgid "Stage Changed"
msgstr "Változtatások kiválasztása"
#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
#: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193
msgid "Push"
msgstr "Push"
#: git-gui.sh:2885
#: git-gui.sh:2899
msgid "Initial Commit Message:"
msgstr "Kezdeti commit üzenet:"
#: git-gui.sh:2886
#: git-gui.sh:2900
msgid "Amended Commit Message:"
msgstr "Javító commit üzenet:"
#: git-gui.sh:2887
#: git-gui.sh:2901
msgid "Amended Initial Commit Message:"
msgstr "Kezdeti javító commit üzenet:"
#: git-gui.sh:2888
#: git-gui.sh:2902
msgid "Amended Merge Commit Message:"
msgstr "Javító merge commit üzenet:"
#: git-gui.sh:2889
#: git-gui.sh:2903
msgid "Merge Commit Message:"
msgstr "Merge commit üzenet:"
#: git-gui.sh:2890
#: git-gui.sh:2904
msgid "Commit Message:"
msgstr "Commit üzenet:"
#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
#: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73
msgid "Copy All"
msgstr "Összes másolása"
#: git-gui.sh:2963 lib/blame.tcl:104
#: git-gui.sh:2977 lib/blame.tcl:104
msgid "File:"
msgstr "Fájl:"
#: git-gui.sh:3078
#: git-gui.sh:3092
msgid "Refresh"
msgstr "Frissítés"
#: git-gui.sh:3099
#: git-gui.sh:3113
msgid "Decrease Font Size"
msgstr "Font méret csökkentése"
#: git-gui.sh:3103
#: git-gui.sh:3117
msgid "Increase Font Size"
msgstr "Fönt méret növelése"
#: git-gui.sh:3111 lib/blame.tcl:281
#: git-gui.sh:3125 lib/blame.tcl:281
msgid "Encoding"
msgstr "Kódolás"
#: git-gui.sh:3122
#: git-gui.sh:3136
msgid "Apply/Reverse Hunk"
msgstr "Hunk alkalmazása/visszaállítása"
#: git-gui.sh:3127
#: git-gui.sh:3141
msgid "Apply/Reverse Line"
msgstr "Sor alkalmazása/visszaállítása"
#: git-gui.sh:3137
#: git-gui.sh:3151
msgid "Run Merge Tool"
msgstr "Merge eszköz futtatása"
#: git-gui.sh:3142
#: git-gui.sh:3156
msgid "Use Remote Version"
msgstr "Távoli verzió használata"
#: git-gui.sh:3146
#: git-gui.sh:3160
msgid "Use Local Version"
msgstr "Helyi verzió használata"
#: git-gui.sh:3150
#: git-gui.sh:3164
msgid "Revert To Base"
msgstr "Visszaállítás az alaphoz"
#: git-gui.sh:3169
#: git-gui.sh:3183
msgid "Unstage Hunk From Commit"
msgstr "Hunk törlése commitból"
#: git-gui.sh:3170
#: git-gui.sh:3184
msgid "Unstage Line From Commit"
msgstr "A sor kiválasztásának törlése"
#: git-gui.sh:3172
#: git-gui.sh:3186
msgid "Stage Hunk For Commit"
msgstr "Hunk kiválasztása commitba"
#: git-gui.sh:3173
#: git-gui.sh:3187
msgid "Stage Line For Commit"
msgstr "Sor kiválasztása commitba"
#: git-gui.sh:3196
#: git-gui.sh:3210
msgid "Initializing..."
msgstr "Inicializálás..."
#: git-gui.sh:3301
#: git-gui.sh:3315
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@ -516,7 +516,7 @@ msgstr ""
"indított folyamatok által:\n"
"\n"
#: git-gui.sh:3331
#: git-gui.sh:3345
msgid ""
"\n"
"This is due to a known issue with the\n"
@ -526,7 +526,7 @@ msgstr ""
"Ez a Cygwin által terjesztett Tcl binárisban\n"
"lévő ismert hiba miatt van."
#: git-gui.sh:3336
#: git-gui.sh:3350
#, tcl-format
msgid ""
"\n"
@ -612,43 +612,43 @@ msgstr "Futtatás másolás-érzékelésen keresztül..."
msgid "Loading annotation..."
msgstr "Az annotáció betöltése..."
#: lib/blame.tcl:964
#: lib/blame.tcl:963
msgid "Author:"
msgstr "Szerző:"
#: lib/blame.tcl:968
#: lib/blame.tcl:967
msgid "Committer:"
msgstr "Commiter:"
#: lib/blame.tcl:973
#: lib/blame.tcl:972
msgid "Original File:"
msgstr "Eredeti fájl:"
#: lib/blame.tcl:1021
#: lib/blame.tcl:1020
msgid "Cannot find HEAD commit:"
msgstr "Nem található a HEAD commit:"
#: lib/blame.tcl:1076
#: lib/blame.tcl:1075
msgid "Cannot find parent commit:"
msgstr "Nem található a szülő commit:"
#: lib/blame.tcl:1091
#: lib/blame.tcl:1090
msgid "Unable to display parent"
msgstr "Nem lehet megjeleníteni a szülőt"
#: lib/blame.tcl:1092 lib/diff.tcl:297
#: lib/blame.tcl:1091 lib/diff.tcl:297
msgid "Error loading diff:"
msgstr "Hiba a diff betöltése közben:"
#: lib/blame.tcl:1232
#: lib/blame.tcl:1231
msgid "Originally By:"
msgstr "Eredeti szerző:"
#: lib/blame.tcl:1238
#: lib/blame.tcl:1237
msgid "In File:"
msgstr "Ebben a fájlban:"
#: lib/blame.tcl:1243
#: lib/blame.tcl:1242
msgid "Copied Or Moved Here By:"
msgstr "Ide másolta vagy helyezte:"
@ -665,7 +665,7 @@ msgstr "Checkout"
#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
#: lib/transport.tcl:97
#: lib/transport.tcl:108
msgid "Cancel"
msgstr "Mégsem"
@ -1317,19 +1317,19 @@ msgstr ""
"A jelenlegi merge még nem teljesen fejeződött be. Csak akkor javíthat egy "
"előbbi commitot, hogyha megszakítja a jelenlegi merge folyamatot.\n"
#: lib/commit.tcl:49
#: lib/commit.tcl:48
msgid "Error loading commit data for amend:"
msgstr "Hiba a javítandó commit adat betöltése közben:"
#: lib/commit.tcl:76
#: lib/commit.tcl:75
msgid "Unable to obtain your identity:"
msgstr "Nem sikerült megállapítani az azonosítót:"
#: lib/commit.tcl:81
#: lib/commit.tcl:80
msgid "Invalid GIT_COMMITTER_IDENT:"
msgstr "Érvénytelen GIT_COMMITTER_IDENT:"
#: lib/commit.tcl:133
#: lib/commit.tcl:132
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
@ -1346,7 +1346,7 @@ msgstr ""
"\n"
"Az újrakeresés most automatikusan el fog indulni.\n"
#: lib/commit.tcl:156
#: lib/commit.tcl:155
#, tcl-format
msgid ""
"Unmerged files cannot be committed.\n"
@ -1359,7 +1359,7 @@ msgstr ""
"A(z) %s fájlban ütközések vannak. Egyszer azokat ki kell javítani, majd "
"hozzá ki kell választani a fájlt mielőtt commitolni lehetne.\n"
#: lib/commit.tcl:164
#: lib/commit.tcl:163
#, tcl-format
msgid ""
"Unknown file state %s detected.\n"
@ -1370,7 +1370,7 @@ msgstr ""
"\n"
"A(z) %s fájlt nem tudja ez a program commitolni.\n"
#: lib/commit.tcl:172
#: lib/commit.tcl:171
msgid ""
"No changes to commit.\n"
"\n"
@ -1380,7 +1380,7 @@ msgstr ""
"\n"
"Legalább egy fájl ki kell választani, hogy commitolni lehessen.\n"
#: lib/commit.tcl:187
#: lib/commit.tcl:186
msgid ""
"Please supply a commit message.\n"
"\n"
@ -1398,45 +1398,45 @@ msgstr ""
"- Második sor: Üres\n"
"- A többi sor: Leírja, hogy miért jó ez a változtatás.\n"
#: lib/commit.tcl:211
#: lib/commit.tcl:210
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
msgstr "figyelmeztetés: a Tcl nem támogatja a(z) '%s' kódolást."
#: lib/commit.tcl:227
#: lib/commit.tcl:226
msgid "Calling pre-commit hook..."
msgstr "A pre-commit hurok meghívása..."
#: lib/commit.tcl:242
#: lib/commit.tcl:241
msgid "Commit declined by pre-commit hook."
msgstr "A commitot megakadályozta a pre-commit hurok. "
#: lib/commit.tcl:265
#: lib/commit.tcl:264
msgid "Calling commit-msg hook..."
msgstr "A commit-msg hurok meghívása..."
#: lib/commit.tcl:280
#: lib/commit.tcl:279
msgid "Commit declined by commit-msg hook."
msgstr "A commiot megakadályozta a commit-msg hurok."
#: lib/commit.tcl:293
#: lib/commit.tcl:292
msgid "Committing changes..."
msgstr "A változtatások commitolása..."
#: lib/commit.tcl:309
#: lib/commit.tcl:308
msgid "write-tree failed:"
msgstr "a write-tree sikertelen:"
#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
#: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373
msgid "Commit failed."
msgstr "A commit nem sikerült."
#: lib/commit.tcl:327
#: lib/commit.tcl:326
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr "A(z) %s commit sérültnek tűnik"
#: lib/commit.tcl:332
#: lib/commit.tcl:331
msgid ""
"No changes to commit.\n"
"\n"
@ -1450,19 +1450,19 @@ msgstr ""
"\n"
"Az újrakeresés most automatikusan el fog indulni.\n"
#: lib/commit.tcl:339
#: lib/commit.tcl:338
msgid "No changes to commit."
msgstr "Nincs commitolandó változtatás."
#: lib/commit.tcl:353
#: lib/commit.tcl:352
msgid "commit-tree failed:"
msgstr "a commit-tree sikertelen:"
#: lib/commit.tcl:373
#: lib/commit.tcl:372
msgid "update-ref failed:"
msgstr "az update-ref sikertelen:"
#: lib/commit.tcl:461
#: lib/commit.tcl:460
#, tcl-format
msgid "Created commit %s: %s"
msgstr "Létrejött a %s commit: %s"
@ -2168,7 +2168,8 @@ msgstr "A(z) %s letöltése"
msgid "Do not know how to initialize repository at location '%s'."
msgstr "Nem tudni, hogy hogy kell a(z) '%s' helyen repót inicializálni."
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
#: lib/transport.tcl:81
#, tcl-format
msgid "push %s"
msgstr "%s push-olása"
@ -2186,11 +2187,11 @@ msgstr "Távoli Branch törlése"
msgid "From Repository"
msgstr "Forrás repó"
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
msgid "Remote:"
msgstr "Távoli:"
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
msgid "Arbitrary Location:"
msgstr "Önkényes hely:"
@ -2519,38 +2520,43 @@ msgstr "A %s repóból törölt követő branchek törlése"
msgid "Pushing changes to %s"
msgstr "Változások pusholása ide: %s"
#: lib/transport.tcl:72
#: lib/transport.tcl:64
#, tcl-format
msgid "Mirroring to %s"
msgstr "Tükrözés a következő helyre: %s"
#: lib/transport.tcl:82
#, tcl-format
msgid "Pushing %s %s to %s"
msgstr "Pusholás: %s %s, ide: %s"
#: lib/transport.tcl:89
#: lib/transport.tcl:100
msgid "Push Branches"
msgstr "Branchek pusholása"
#: lib/transport.tcl:103
#: lib/transport.tcl:114
msgid "Source Branches"
msgstr "Forrás branchek"
#: lib/transport.tcl:120
#: lib/transport.tcl:131
msgid "Destination Repository"
msgstr "Cél repó"
#: lib/transport.tcl:158
#: lib/transport.tcl:169
msgid "Transfer Options"
msgstr "Átviteli opciók"
#: lib/transport.tcl:160
#: lib/transport.tcl:171
msgid "Force overwrite existing branch (may discard changes)"
msgstr ""
"Létező branch felülírásának erőltetése (lehet, hogy el fog dobni "
"változtatásokat)"
#: lib/transport.tcl:164
#: lib/transport.tcl:175
msgid "Use thin pack (for slow network connections)"
msgstr "Vékony csomagok használata (lassú hálózati kapcsolatok számára)"
#: lib/transport.tcl:168
#: lib/transport.tcl:179
msgid "Include tags"
msgstr "Tageket is"

186
git-gui/po/it.po
View file

@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-16 13:56-0800\n"
"PO-Revision-Date: 2008-11-17 16:04+0100\n"
"POT-Creation-Date: 2008-12-08 08:31-0800\n"
"PO-Revision-Date: 2008-12-09 13:04+0100\n"
"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@ -242,25 +242,25 @@ msgstr "Annulla"
msgid "Redo"
msgstr "Ripeti"
#: git-gui.sh:2378 git-gui.sh:2923
#: git-gui.sh:2378 git-gui.sh:2937
msgid "Cut"
msgstr "Taglia"
#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
#: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096
#: lib/console.tcl:69
msgid "Copy"
msgstr "Copia"
#: git-gui.sh:2384 git-gui.sh:2929
#: git-gui.sh:2384 git-gui.sh:2943
msgid "Paste"
msgstr "Incolla"
#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
#: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr "Elimina"
#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
#: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71
msgid "Select All"
msgstr "Seleziona tutto"
@ -292,15 +292,15 @@ msgstr "Fatto"
msgid "Commit@@verb"
msgstr "Nuova revisione"
#: git-gui.sh:2443 git-gui.sh:2864
#: git-gui.sh:2443 git-gui.sh:2878
msgid "New Commit"
msgstr "Nuova revisione"
#: git-gui.sh:2451 git-gui.sh:2871
#: git-gui.sh:2451 git-gui.sh:2885
msgid "Amend Last Commit"
msgstr "Correggi l'ultima revisione"
#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
#: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr "Analizza nuovamente"
@ -320,15 +320,15 @@ msgstr "Annulla preparazione"
msgid "Revert Changes"
msgstr "Annulla modifiche"
#: git-gui.sh:2491 git-gui.sh:3069
#: git-gui.sh:2491 git-gui.sh:3083
msgid "Show Less Context"
msgstr "Mostra meno contesto"
#: git-gui.sh:2495 git-gui.sh:3073
#: git-gui.sh:2495 git-gui.sh:3087
msgid "Show More Context"
msgstr "Mostra più contesto"
#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
#: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961
msgid "Sign Off"
msgstr "Sign Off"
@ -362,7 +362,7 @@ msgstr "Informazioni su %s"
msgid "Preferences..."
msgstr "Preferenze..."
#: git-gui.sh:2565 git-gui.sh:3115
#: git-gui.sh:2565 git-gui.sh:3129
msgid "Options..."
msgstr "Opzioni..."
@ -382,126 +382,126 @@ msgstr "Documentazione sul web"
msgid "Show SSH Key"
msgstr "Mostra chave SSH"
#: git-gui.sh:2707
#: git-gui.sh:2721
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
"errore grave: impossibile effettuare lo stat del path %s: file o directory "
"non trovata"
#: git-gui.sh:2740
#: git-gui.sh:2754
msgid "Current Branch:"
msgstr "Ramo attuale:"
#: git-gui.sh:2761
#: git-gui.sh:2775
msgid "Staged Changes (Will Commit)"
msgstr "Modifiche preparate (saranno nella nuova revisione)"
#: git-gui.sh:2781
#: git-gui.sh:2795
msgid "Unstaged Changes"
msgstr "Modifiche non preparate"
#: git-gui.sh:2831
#: git-gui.sh:2845
msgid "Stage Changed"
msgstr "Prepara modificati"
#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
#: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193
msgid "Push"
msgstr "Propaga (Push)"
#: git-gui.sh:2885
#: git-gui.sh:2899
msgid "Initial Commit Message:"
msgstr "Messaggio di revisione iniziale:"
#: git-gui.sh:2886
#: git-gui.sh:2900
msgid "Amended Commit Message:"
msgstr "Messaggio di revisione corretto:"
#: git-gui.sh:2887
#: git-gui.sh:2901
msgid "Amended Initial Commit Message:"
msgstr "Messaggio iniziale di revisione corretto:"
#: git-gui.sh:2888
#: git-gui.sh:2902
msgid "Amended Merge Commit Message:"
msgstr "Messaggio di fusione corretto:"
#: git-gui.sh:2889
#: git-gui.sh:2903
msgid "Merge Commit Message:"
msgstr "Messaggio di fusione:"
#: git-gui.sh:2890
#: git-gui.sh:2904
msgid "Commit Message:"
msgstr "Messaggio di revisione:"
#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
#: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73
msgid "Copy All"
msgstr "Copia tutto"
#: git-gui.sh:2963 lib/blame.tcl:104
#: git-gui.sh:2977 lib/blame.tcl:104
msgid "File:"
msgstr "File:"
#: git-gui.sh:3078
#: git-gui.sh:3092
msgid "Refresh"
msgstr "Rinfresca"
#: git-gui.sh:3099
#: git-gui.sh:3113
msgid "Decrease Font Size"
msgstr "Diminuisci dimensione caratteri"
#: git-gui.sh:3103
#: git-gui.sh:3117
msgid "Increase Font Size"
msgstr "Aumenta dimensione caratteri"
#: git-gui.sh:3111 lib/blame.tcl:281
#: git-gui.sh:3125 lib/blame.tcl:281
msgid "Encoding"
msgstr "Codifica"
#: git-gui.sh:3122
#: git-gui.sh:3136
msgid "Apply/Reverse Hunk"
msgstr "Applica/Inverti sezione"
#: git-gui.sh:3127
#: git-gui.sh:3141
msgid "Apply/Reverse Line"
msgstr "Applica/Inverti riga"
#: git-gui.sh:3137
#: git-gui.sh:3151
msgid "Run Merge Tool"
msgstr "Avvia programma esterno per la risoluzione dei conflitti"
#: git-gui.sh:3142
#: git-gui.sh:3156
msgid "Use Remote Version"
msgstr "Usa versione remota"
#: git-gui.sh:3146
#: git-gui.sh:3160
msgid "Use Local Version"
msgstr "Usa versione locale"
#: git-gui.sh:3150
#: git-gui.sh:3164
msgid "Revert To Base"
msgstr "Ritorna alla revisione comune"
#: git-gui.sh:3169
#: git-gui.sh:3183
msgid "Unstage Hunk From Commit"
msgstr "Annulla preparazione della sezione per una nuova revisione"
#: git-gui.sh:3170
#: git-gui.sh:3184
msgid "Unstage Line From Commit"
msgstr "Annulla preparazione della linea per una nuova revisione"
#: git-gui.sh:3172
#: git-gui.sh:3186
msgid "Stage Hunk For Commit"
msgstr "Prepara sezione per una nuova revisione"
#: git-gui.sh:3173
#: git-gui.sh:3187
msgid "Stage Line For Commit"
msgstr "Prepara linea per una nuova revisione"
#: git-gui.sh:3196
#: git-gui.sh:3210
msgid "Initializing..."
msgstr "Inizializzazione..."
#: git-gui.sh:3301
#: git-gui.sh:3315
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@ -518,7 +518,7 @@ msgstr ""
"da %s:\n"
"\n"
#: git-gui.sh:3331
#: git-gui.sh:3345
msgid ""
"\n"
"This is due to a known issue with the\n"
@ -528,7 +528,7 @@ msgstr ""
"Ciò è dovuto a un problema conosciuto\n"
"causato dall'eseguibile Tcl distribuito da Cygwin."
#: git-gui.sh:3336
#: git-gui.sh:3350
#, tcl-format
msgid ""
"\n"
@ -613,43 +613,43 @@ msgstr "Ricerca accurata delle copie in corso..."
msgid "Loading annotation..."
msgstr "Caricamento annotazioni..."
#: lib/blame.tcl:964
#: lib/blame.tcl:963
msgid "Author:"
msgstr "Autore:"
#: lib/blame.tcl:968
#: lib/blame.tcl:967
msgid "Committer:"
msgstr "Revisione creata da:"
#: lib/blame.tcl:973
#: lib/blame.tcl:972
msgid "Original File:"
msgstr "File originario:"
#: lib/blame.tcl:1021
#: lib/blame.tcl:1020
msgid "Cannot find HEAD commit:"
msgstr "Impossibile trovare la revisione HEAD:"
#: lib/blame.tcl:1076
#: lib/blame.tcl:1075
msgid "Cannot find parent commit:"
msgstr "Impossibile trovare la revisione precedente:"
#: lib/blame.tcl:1091
#: lib/blame.tcl:1090
msgid "Unable to display parent"
msgstr "Impossibile visualizzare la revisione precedente"
#: lib/blame.tcl:1092 lib/diff.tcl:297
#: lib/blame.tcl:1091 lib/diff.tcl:297
msgid "Error loading diff:"
msgstr "Errore nel caricamento delle differenze:"
#: lib/blame.tcl:1232
#: lib/blame.tcl:1231
msgid "Originally By:"
msgstr "In origine da:"
#: lib/blame.tcl:1238
#: lib/blame.tcl:1237
msgid "In File:"
msgstr "Nel file:"
#: lib/blame.tcl:1243
#: lib/blame.tcl:1242
msgid "Copied Or Moved Here By:"
msgstr "Copiato o spostato qui da:"
@ -666,7 +666,7 @@ msgstr "Attiva"
#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
#: lib/transport.tcl:97
#: lib/transport.tcl:108
msgid "Cancel"
msgstr "Annulla"
@ -1324,19 +1324,19 @@ msgstr ""
"completata. Non puoi correggere la revisione precedente a meno che prima tu "
"non interrompa l'operazione di fusione in corso.\n"
#: lib/commit.tcl:49
#: lib/commit.tcl:48
msgid "Error loading commit data for amend:"
msgstr "Errore durante il caricamento dei dati della revisione da correggere:"
#: lib/commit.tcl:76
#: lib/commit.tcl:75
msgid "Unable to obtain your identity:"
msgstr "Impossibile ottenere la tua identità:"
#: lib/commit.tcl:81
#: lib/commit.tcl:80
msgid "Invalid GIT_COMMITTER_IDENT:"
msgstr "GIT_COMMITTER_IDENT non valida:"
#: lib/commit.tcl:133
#: lib/commit.tcl:132
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
@ -1353,7 +1353,7 @@ msgstr ""
"\n"
"La nuova analisi comincerà ora.\n"
#: lib/commit.tcl:156
#: lib/commit.tcl:155
#, tcl-format
msgid ""
"Unmerged files cannot be committed.\n"
@ -1366,7 +1366,7 @@ msgstr ""
"Il file %s presenta dei conflitti. Devi risolverli e preparare il file per "
"creare una nuova revisione prima di effettuare questa azione.\n"
#: lib/commit.tcl:164
#: lib/commit.tcl:163
#, tcl-format
msgid ""
"Unknown file state %s detected.\n"
@ -1377,7 +1377,7 @@ msgstr ""
"\n"
"Questo programma non può creare una revisione contenente il file %s.\n"
#: lib/commit.tcl:172
#: lib/commit.tcl:171
msgid ""
"No changes to commit.\n"
"\n"
@ -1388,7 +1388,7 @@ msgstr ""
"Devi preparare per una nuova revisione almeno 1 file prima di effettuare "
"questa operazione.\n"
#: lib/commit.tcl:187
#: lib/commit.tcl:186
msgid ""
"Please supply a commit message.\n"
"\n"
@ -1406,45 +1406,45 @@ msgstr ""
"- Seconda linea: vuota.\n"
"- Terza linea: spiega a cosa serve la tua modifica.\n"
#: lib/commit.tcl:211
#: lib/commit.tcl:210
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
msgstr "attenzione: Tcl non supporta la codifica '%s'."
#: lib/commit.tcl:227
#: lib/commit.tcl:226
msgid "Calling pre-commit hook..."
msgstr "Avvio pre-commit hook..."
#: lib/commit.tcl:242
#: lib/commit.tcl:241
msgid "Commit declined by pre-commit hook."
msgstr "Revisione rifiutata dal pre-commit hook."
#: lib/commit.tcl:265
#: lib/commit.tcl:264
msgid "Calling commit-msg hook..."
msgstr "Avvio commit-msg hook..."
#: lib/commit.tcl:280
#: lib/commit.tcl:279
msgid "Commit declined by commit-msg hook."
msgstr "Revisione rifiutata dal commit-msg hook."
#: lib/commit.tcl:293
#: lib/commit.tcl:292
msgid "Committing changes..."
msgstr "Archiviazione modifiche..."
#: lib/commit.tcl:309
#: lib/commit.tcl:308
msgid "write-tree failed:"
msgstr "write-tree non riuscito:"
#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
#: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373
msgid "Commit failed."
msgstr "Impossibile creare una nuova revisione."
#: lib/commit.tcl:327
#: lib/commit.tcl:326
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr "La revisione %s sembra essere danneggiata"
#: lib/commit.tcl:332
#: lib/commit.tcl:331
msgid ""
"No changes to commit.\n"
"\n"
@ -1458,19 +1458,19 @@ msgstr ""
"\n"
"Si procederà subito ad una nuova analisi.\n"
#: lib/commit.tcl:339
#: lib/commit.tcl:338
msgid "No changes to commit."
msgstr "Nessuna modifica per la nuova revisione."
#: lib/commit.tcl:353
#: lib/commit.tcl:352
msgid "commit-tree failed:"
msgstr "commit-tree non riuscito:"
#: lib/commit.tcl:373
#: lib/commit.tcl:372
msgid "update-ref failed:"
msgstr "update-ref non riuscito:"
#: lib/commit.tcl:461
#: lib/commit.tcl:460
#, tcl-format
msgid "Created commit %s: %s"
msgstr "Creata revisione %s: %s"
@ -2186,7 +2186,8 @@ msgstr "Recupero %s"
msgid "Do not know how to initialize repository at location '%s'."
msgstr "Impossibile inizializzare l'archivio posto in '%s'."
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
#: lib/transport.tcl:81
#, tcl-format
msgid "push %s"
msgstr "propaga verso %s"
@ -2204,11 +2205,11 @@ msgstr "Elimina ramo remoto"
msgid "From Repository"
msgstr "Da archivio"
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
msgid "Remote:"
msgstr "Remoto:"
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
msgid "Arbitrary Location:"
msgstr "Posizione specifica:"
@ -2537,35 +2538,40 @@ msgstr "Effettua potatura dei duplicati locali di rami remoti cancellati da %s"
msgid "Pushing changes to %s"
msgstr "Propagazione modifiche a %s"
#: lib/transport.tcl:72
#: lib/transport.tcl:64
#, tcl-format
msgid "Mirroring to %s"
msgstr "Mirroring verso %s"
#: lib/transport.tcl:82
#, tcl-format
msgid "Pushing %s %s to %s"
msgstr "Propagazione %s %s a %s"
#: lib/transport.tcl:89
#: lib/transport.tcl:100
msgid "Push Branches"
msgstr "Propaga rami"
#: lib/transport.tcl:103
#: lib/transport.tcl:114
msgid "Source Branches"
msgstr "Rami di origine"
#: lib/transport.tcl:120
#: lib/transport.tcl:131
msgid "Destination Repository"
msgstr "Archivio di destinazione"
#: lib/transport.tcl:158
#: lib/transport.tcl:169
msgid "Transfer Options"
msgstr "Opzioni di trasferimento"
#: lib/transport.tcl:160
#: lib/transport.tcl:171
msgid "Force overwrite existing branch (may discard changes)"
msgstr "Sovrascrivi ramo esistente (alcune modifiche potrebbero essere perse)"
#: lib/transport.tcl:164
#: lib/transport.tcl:175
msgid "Use thin pack (for slow network connections)"
msgstr "Utilizza 'thin pack' (per connessioni lente)"
#: lib/transport.tcl:168
#: lib/transport.tcl:179
msgid "Include tags"
msgstr "Includi etichette"

11
git-gui/po/ja.po
View file

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-16 13:56-0800\n"
"PO-Revision-Date: 2008-11-26 19:17+0900\n"
"POT-Creation-Date: 2008-12-08 08:31-0800\n"
"PO-Revision-Date: 2008-12-09 06:27+0900\n"
"Last-Translator: しらいし ななこ <nanako3@lavabit.com>\n"
"Language-Team: Japanese\n"
"MIME-Version: 1.0\n"
@ -2501,7 +2501,12 @@ msgstr "%s から削除されたトラッキング・ブランチを刈ってい
msgid "Pushing changes to %s"
msgstr "%s へ変更をプッシュしています"
#: lib/transport.tcl:72
#: lib/transport.tcl:64
#, tcl-format
msgid "Mirroring to %s"
msgstr "%s へミラーしています"
#: lib/transport.tcl:82
#, tcl-format
msgid "Pushing %s %s to %s"
msgstr "%3$s へ %1$s %2$s をプッシュしています"

2484
git-gui/po/nb.po Normal file
View file

File diff suppressed because it is too large Load diff

217
git-gui/po/sv.po
View file

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-16 13:56-0800\n"
"PO-Revision-Date: 2008-11-21 08:35+0100\n"
"POT-Creation-Date: 2008-12-08 08:31-0800\n"
"PO-Revision-Date: 2008-12-10 09:49+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
@ -87,11 +87,15 @@ msgstr "Söker efter ändrade filer..."
#: git-gui.sh:1367
msgid "Calling prepare-commit-msg hook..."
msgstr "Anropar kroken för förberedning av incheckningsmeddelande (prepare-commit-msg)..."
msgstr ""
"Anropar kroken för förberedelse av incheckningsmeddelande (prepare-commit-"
"msg)..."
#: git-gui.sh:1384
msgid "Commit declined by prepare-commit-msg hook."
msgstr "Incheckningen avvisades av kroken för förberedning av incheckningsmeddelande (prepare-commit-msg)."
msgstr ""
"Incheckningen avvisades av kroken för förberedelse av incheckningsmeddelande "
"(prepare-commit-msg)."
#: git-gui.sh:1542 lib/browser.tcl:246
msgid "Ready."
@ -241,25 +245,25 @@ msgstr "Ångra"
msgid "Redo"
msgstr "Gör om"
#: git-gui.sh:2378 git-gui.sh:2923
#: git-gui.sh:2378 git-gui.sh:2937
msgid "Cut"
msgstr "Klipp ut"
#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
#: git-gui.sh:2381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096
#: lib/console.tcl:69
msgid "Copy"
msgstr "Kopiera"
#: git-gui.sh:2384 git-gui.sh:2929
#: git-gui.sh:2384 git-gui.sh:2943
msgid "Paste"
msgstr "Klistra in"
#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
#: git-gui.sh:2387 git-gui.sh:2946 lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr "Ta bort"
#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
#: git-gui.sh:2391 git-gui.sh:2950 git-gui.sh:3100 lib/console.tcl:71
msgid "Select All"
msgstr "Markera alla"
@ -291,15 +295,15 @@ msgstr "Färdig"
msgid "Commit@@verb"
msgstr "Checka in"
#: git-gui.sh:2443 git-gui.sh:2864
#: git-gui.sh:2443 git-gui.sh:2878
msgid "New Commit"
msgstr "Ny incheckning"
#: git-gui.sh:2451 git-gui.sh:2871
#: git-gui.sh:2451 git-gui.sh:2885
msgid "Amend Last Commit"
msgstr "Lägg till föregående incheckning"
#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
#: git-gui.sh:2461 git-gui.sh:2839 lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr "Sök på nytt"
@ -319,15 +323,15 @@ msgstr "Ta bort från incheckningskö"
msgid "Revert Changes"
msgstr "Återställ ändringar"
#: git-gui.sh:2491 git-gui.sh:3069
#: git-gui.sh:2491 git-gui.sh:3083
msgid "Show Less Context"
msgstr "Visa mindre sammanhang"
#: git-gui.sh:2495 git-gui.sh:3073
#: git-gui.sh:2495 git-gui.sh:3087
msgid "Show More Context"
msgstr "Visa mer sammanhang"
#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
#: git-gui.sh:2502 git-gui.sh:2852 git-gui.sh:2961
msgid "Sign Off"
msgstr "Skriv under"
@ -361,7 +365,7 @@ msgstr "Om %s"
msgid "Preferences..."
msgstr "Inställningar..."
#: git-gui.sh:2565 git-gui.sh:3115
#: git-gui.sh:2565 git-gui.sh:3129
msgid "Options..."
msgstr "Alternativ..."
@ -381,125 +385,125 @@ msgstr "Webbdokumentation"
msgid "Show SSH Key"
msgstr "Visa SSH-nyckel"
#: git-gui.sh:2707
#: git-gui.sh:2721
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
"ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas"
#: git-gui.sh:2740
#: git-gui.sh:2754
msgid "Current Branch:"
msgstr "Aktuell gren:"
#: git-gui.sh:2761
#: git-gui.sh:2775
msgid "Staged Changes (Will Commit)"
msgstr "Köade ändringar (kommer att checkas in)"
#: git-gui.sh:2781
#: git-gui.sh:2795
msgid "Unstaged Changes"
msgstr "Oköade ändringar"
#: git-gui.sh:2831
#: git-gui.sh:2845
msgid "Stage Changed"
msgstr "Köa ändrade"
#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
#: git-gui.sh:2864 lib/transport.tcl:104 lib/transport.tcl:193
msgid "Push"
msgstr "Sänd"
#: git-gui.sh:2885
#: git-gui.sh:2899
msgid "Initial Commit Message:"
msgstr "Inledande incheckningsmeddelande:"
#: git-gui.sh:2886
#: git-gui.sh:2900
msgid "Amended Commit Message:"
msgstr "Utökat incheckningsmeddelande:"
#: git-gui.sh:2887
#: git-gui.sh:2901
msgid "Amended Initial Commit Message:"
msgstr "Utökat inledande incheckningsmeddelande:"
#: git-gui.sh:2888
#: git-gui.sh:2902
msgid "Amended Merge Commit Message:"
msgstr "Utökat incheckningsmeddelande för sammanslagning:"
#: git-gui.sh:2889
#: git-gui.sh:2903
msgid "Merge Commit Message:"
msgstr "Incheckningsmeddelande för sammanslagning:"
#: git-gui.sh:2890
#: git-gui.sh:2904
msgid "Commit Message:"
msgstr "Incheckningsmeddelande:"
#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
#: git-gui.sh:2953 git-gui.sh:3104 lib/console.tcl:73
msgid "Copy All"
msgstr "Kopiera alla"
#: git-gui.sh:2963 lib/blame.tcl:104
#: git-gui.sh:2977 lib/blame.tcl:104
msgid "File:"
msgstr "Fil:"
#: git-gui.sh:3078
#: git-gui.sh:3092
msgid "Refresh"
msgstr "Uppdatera"
#: git-gui.sh:3099
#: git-gui.sh:3113
msgid "Decrease Font Size"
msgstr "Minska teckensnittsstorlek"
#: git-gui.sh:3103
#: git-gui.sh:3117
msgid "Increase Font Size"
msgstr "Öka teckensnittsstorlek"
#: git-gui.sh:3111 lib/blame.tcl:281
#: git-gui.sh:3125 lib/blame.tcl:281
msgid "Encoding"
msgstr "Teckenkodning"
#: git-gui.sh:3122
#: git-gui.sh:3136
msgid "Apply/Reverse Hunk"
msgstr "Använd/återställ del"
#: git-gui.sh:3127
#: git-gui.sh:3141
msgid "Apply/Reverse Line"
msgstr "Använd/återställ rad"
#: git-gui.sh:3137
#: git-gui.sh:3151
msgid "Run Merge Tool"
msgstr "Starta verktyg för sammanslagning"
#: git-gui.sh:3142
#: git-gui.sh:3156
msgid "Use Remote Version"
msgstr "Använd versionen från fjärrarkivet"
#: git-gui.sh:3146
#: git-gui.sh:3160
msgid "Use Local Version"
msgstr "Använd lokala versionen"
#: git-gui.sh:3150
#: git-gui.sh:3164
msgid "Revert To Base"
msgstr "Återställ till basversionen"
#: git-gui.sh:3169
#: git-gui.sh:3183
msgid "Unstage Hunk From Commit"
msgstr "Ta bort del ur incheckningskö"
#: git-gui.sh:3170
#: git-gui.sh:3184
msgid "Unstage Line From Commit"
msgstr "Ta bort rad ur incheckningskö"
#: git-gui.sh:3172
#: git-gui.sh:3186
msgid "Stage Hunk For Commit"
msgstr "Ställ del i incheckningskö"
#: git-gui.sh:3173
#: git-gui.sh:3187
msgid "Stage Line For Commit"
msgstr "Ställ rad i incheckningskö"
#: git-gui.sh:3196
#: git-gui.sh:3210
msgid "Initializing..."
msgstr "Initierar..."
#: git-gui.sh:3301
#: git-gui.sh:3315
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@ -516,7 +520,7 @@ msgstr ""
"av %s:\n"
"\n"
#: git-gui.sh:3331
#: git-gui.sh:3345
msgid ""
"\n"
"This is due to a known issue with the\n"
@ -526,7 +530,7 @@ msgstr ""
"Detta beror på ett känt problem med\n"
"Tcl-binären som följer med Cygwin."
#: git-gui.sh:3336
#: git-gui.sh:3350
#, tcl-format
msgid ""
"\n"
@ -612,43 +616,43 @@ msgstr "Kör grundlig kopieringsigenkänning..."
msgid "Loading annotation..."
msgstr "Läser in annotering..."
#: lib/blame.tcl:964
#: lib/blame.tcl:963
msgid "Author:"
msgstr "Författare:"
#: lib/blame.tcl:968
#: lib/blame.tcl:967
msgid "Committer:"
msgstr "Incheckare:"
#: lib/blame.tcl:973
#: lib/blame.tcl:972
msgid "Original File:"
msgstr "Ursprunglig fil:"
#: lib/blame.tcl:1021
#: lib/blame.tcl:1020
msgid "Cannot find HEAD commit:"
msgstr "Hittar inte incheckning för HEAD:"
#: lib/blame.tcl:1076
#: lib/blame.tcl:1075
msgid "Cannot find parent commit:"
msgstr "Hittar inte föräldraincheckning:"
#: lib/blame.tcl:1091
#: lib/blame.tcl:1090
msgid "Unable to display parent"
msgstr "Kan inte visa förälder"
#: lib/blame.tcl:1092 lib/diff.tcl:297
#: lib/blame.tcl:1091 lib/diff.tcl:297
msgid "Error loading diff:"
msgstr "Fel vid inläsning av differens:"
#: lib/blame.tcl:1232
#: lib/blame.tcl:1231
msgid "Originally By:"
msgstr "Ursprungligen av:"
#: lib/blame.tcl:1238
#: lib/blame.tcl:1237
msgid "In File:"
msgstr "I filen:"
#: lib/blame.tcl:1243
#: lib/blame.tcl:1242
msgid "Copied Or Moved Here By:"
msgstr "Kopierad eller flyttad hit av:"
@ -665,7 +669,7 @@ msgstr "Checka ut"
#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
#: lib/transport.tcl:97
#: lib/transport.tcl:108
msgid "Cancel"
msgstr "Avbryt"
@ -1314,19 +1318,19 @@ msgstr ""
"utöka tidigare incheckningar om du inte först avbryter den pågående "
"sammanslagningen.\n"
#: lib/commit.tcl:49
#: lib/commit.tcl:48
msgid "Error loading commit data for amend:"
msgstr "Fel vid inläsning av incheckningsdata för utökning:"
#: lib/commit.tcl:76
#: lib/commit.tcl:75
msgid "Unable to obtain your identity:"
msgstr "Kunde inte hämta din identitet:"
#: lib/commit.tcl:81
#: lib/commit.tcl:80
msgid "Invalid GIT_COMMITTER_IDENT:"
msgstr "Felaktig GIT_COMMITTER_IDENT:"
#: lib/commit.tcl:133
#: lib/commit.tcl:132
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
@ -1342,7 +1346,7 @@ msgstr ""
"\n"
"Sökningen kommer att startas automatiskt nu.\n"
#: lib/commit.tcl:156
#: lib/commit.tcl:155
#, tcl-format
msgid ""
"Unmerged files cannot be committed.\n"
@ -1355,7 +1359,7 @@ msgstr ""
"Filen %s har sammanslagningskonflikter. Du måste lösa dem och köa filen "
"innan du checkar in den.\n"
#: lib/commit.tcl:164
#: lib/commit.tcl:163
#, tcl-format
msgid ""
"Unknown file state %s detected.\n"
@ -1366,7 +1370,7 @@ msgstr ""
"\n"
"Filen %s kan inte checkas in av programmet.\n"
#: lib/commit.tcl:172
#: lib/commit.tcl:171
msgid ""
"No changes to commit.\n"
"\n"
@ -1376,7 +1380,7 @@ msgstr ""
"\n"
"Du måste köa åtminstone en fil innan du kan checka in.\n"
#: lib/commit.tcl:187
#: lib/commit.tcl:186
msgid ""
"Please supply a commit message.\n"
"\n"
@ -1394,45 +1398,45 @@ msgstr ""
"- Andra raden: Tom\n"
"- Följande rader: Beskriv varför det här är en bra ändring.\n"
#: lib/commit.tcl:211
#: lib/commit.tcl:210
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"."
#: lib/commit.tcl:227
#: lib/commit.tcl:226
msgid "Calling pre-commit hook..."
msgstr "Anropar kroken före incheckning (pre-commit)..."
#: lib/commit.tcl:242
#: lib/commit.tcl:241
msgid "Commit declined by pre-commit hook."
msgstr "Incheckningen avvisades av kroken före incheckning (pre-commit)."
#: lib/commit.tcl:265
#: lib/commit.tcl:264
msgid "Calling commit-msg hook..."
msgstr "Anropar kroken för incheckningsmeddelande (commit-msg)..."
#: lib/commit.tcl:280
#: lib/commit.tcl:279
msgid "Commit declined by commit-msg hook."
msgstr "Incheckning avvisad av kroken för incheckningsmeddelande (commit-msg)."
#: lib/commit.tcl:293
#: lib/commit.tcl:292
msgid "Committing changes..."
msgstr "Checkar in ändringar..."
#: lib/commit.tcl:309
#: lib/commit.tcl:308
msgid "write-tree failed:"
msgstr "write-tree misslyckades:"
#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
#: lib/commit.tcl:309 lib/commit.tcl:353 lib/commit.tcl:373
msgid "Commit failed."
msgstr "Incheckningen misslyckades."
#: lib/commit.tcl:327
#: lib/commit.tcl:326
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr "Incheckningen %s verkar vara trasig"
#: lib/commit.tcl:332
#: lib/commit.tcl:331
msgid ""
"No changes to commit.\n"
"\n"
@ -1446,19 +1450,19 @@ msgstr ""
"\n"
"En sökning kommer att startas automatiskt nu.\n"
#: lib/commit.tcl:339
#: lib/commit.tcl:338
msgid "No changes to commit."
msgstr "Inga ändringar att checka in."
#: lib/commit.tcl:353
#: lib/commit.tcl:352
msgid "commit-tree failed:"
msgstr "commit-tree misslyckades:"
#: lib/commit.tcl:373
#: lib/commit.tcl:372
msgid "update-ref failed:"
msgstr "update-ref misslyckades:"
#: lib/commit.tcl:461
#: lib/commit.tcl:460
#, tcl-format
msgid "Created commit %s: %s"
msgstr "Skapade incheckningen %s: %s"
@ -1565,14 +1569,16 @@ msgstr "Läser differens för %s..."
msgid ""
"LOCAL: deleted\n"
"REMOTE:\n"
msgstr "LOKAL: borttagen\n"
msgstr ""
"LOKAL: borttagen\n"
"FJÄRR:\n"
#: lib/diff.tcl:125
msgid ""
"REMOTE: deleted\n"
"LOCAL:\n"
msgstr "FJÄRR: borttagen\n"
msgstr ""
"FJÄRR: borttagen\n"
"LOKAL:\n"
#: lib/diff.tcl:132
@ -1605,7 +1611,8 @@ msgstr "* Binärfil (visar inte innehållet)."
msgid ""
"* Untracked file is %d bytes.\n"
"* Showing only first %d bytes.\n"
msgstr "* Den ospårade filen är %d byte.\n"
msgstr ""
"* Den ospårade filen är %d byte.\n"
"* Visar endast inledande %d byte.\n"
#: lib/diff.tcl:228
@ -1935,7 +1942,8 @@ msgstr "Verktyget för sammanslagning körs redan. Vill du avsluta det?"
msgid ""
"Error retrieving versions:\n"
"%s"
msgstr "Fel vid hämtning av versioner:\n"
msgstr ""
"Fel vid hämtning av versioner:\n"
"%s"
#: lib/mergetool.tcl:343
@ -1944,7 +1952,8 @@ msgid ""
"Could not start the merge tool:\n"
"\n"
"%s"
msgstr "Kunde inte starta verktyg för sammanslagning:\n"
msgstr ""
"Kunde inte starta verktyg för sammanslagning:\n"
"\n"
"%s"
@ -2157,7 +2166,8 @@ msgstr "Hämtar %s"
msgid "Do not know how to initialize repository at location '%s'."
msgstr "Vet inte hur arkivet på platsen \"%s\" skall initieras."
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
#: lib/transport.tcl:81
#, tcl-format
msgid "push %s"
msgstr "sänd %s"
@ -2175,11 +2185,11 @@ msgstr "Ta bort gren från fjärrarkiv"
msgid "From Repository"
msgstr "Från arkiv"
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
msgid "Remote:"
msgstr "Fjärrarkiv:"
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
msgid "Arbitrary Location:"
msgstr "Godtycklig plats:"
@ -2343,7 +2353,8 @@ msgid ""
"Could not start ssh-keygen:\n"
"\n"
"%s"
msgstr "Kunde inte starta ssh-keygen:\n"
msgstr ""
"Kunde inte starta ssh-keygen:\n"
"\n"
"%s"
@ -2388,7 +2399,7 @@ msgstr "Exekverar: %s"
#: lib/tools.tcl:149
#, tcl-format
msgid "Tool completed succesfully: %s"
msgstr "Verktyget avslutades framgångsrikt."
msgstr "Verktyget avslutades framgångsrikt: %s"
#: lib/tools.tcl:151
#, tcl-format
@ -2453,7 +2464,8 @@ msgstr "Verktyget \"%s\" finns redan."
msgid ""
"Could not add tool:\n"
"%s"
msgstr "Kunde inte lägga till verktyget:\n"
msgstr ""
"Kunde inte lägga till verktyget:\n"
"%s"
#: lib/tools_dlg.tcl:190
@ -2505,36 +2517,41 @@ msgstr "Tar bort spårande grenar som tagits bort från %s"
msgid "Pushing changes to %s"
msgstr "Sänder ändringar till %s"
#: lib/transport.tcl:72
#: lib/transport.tcl:64
#, tcl-format
msgid "Mirroring to %s"
msgstr "Speglar till %s"
#: lib/transport.tcl:82
#, tcl-format
msgid "Pushing %s %s to %s"
msgstr "Sänder %s %s till %s"
#: lib/transport.tcl:89
#: lib/transport.tcl:100
msgid "Push Branches"
msgstr "Sänd grenar"
#: lib/transport.tcl:103
#: lib/transport.tcl:114
msgid "Source Branches"
msgstr "Källgrenar"
#: lib/transport.tcl:120
#: lib/transport.tcl:131
msgid "Destination Repository"
msgstr "Destinationsarkiv"
#: lib/transport.tcl:158
#: lib/transport.tcl:169
msgid "Transfer Options"
msgstr "Överföringsalternativ"
#: lib/transport.tcl:160
#: lib/transport.tcl:171
msgid "Force overwrite existing branch (may discard changes)"
msgstr "Tvinga överskrivning av befintlig gren (kan kasta bort ändringar)"
#: lib/transport.tcl:164
#: lib/transport.tcl:175
msgid "Use thin pack (for slow network connections)"
msgstr "Använd tunt paket (för långsamma nätverksanslutningar)"
#: lib/transport.tcl:168
#: lib/transport.tcl:179
msgid "Include tags"
msgstr "Ta med taggar"