diff options
| -rw-r--r-- | git-gui/Makefile | 14 | ||||
| -rw-r--r-- | git-gui/lib/commit.tcl | 2 | ||||
| -rw-r--r-- | git-gui/lib/git-gui.ico | bin | 318 -> 3638 bytes | |||
| -rw-r--r-- | git-gui/po/de.po | 308 | ||||
| -rw-r--r-- | git-gui/po/git-gui.pot | 404 | ||||
| -rw-r--r-- | git-gui/po/glossary/it.po | 16 | ||||
| -rw-r--r-- | git-gui/po/hu.po | 682 | ||||
| -rw-r--r-- | git-gui/po/it.po | 461 | ||||
| -rw-r--r-- | git-gui/po/ja.po | 418 |
9 files changed, 1248 insertions, 1057 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index e860319278..26ac4b6bb0 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -43,11 +43,11 @@ endif RM_RF ?= rm -rf RMDIR ?= rmdir -INSTALL_D0 = $(INSTALL) -d -m755 # space is required here +INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here INSTALL_D1 = -INSTALL_R0 = $(INSTALL) -m644 # space is required here +INSTALL_R0 = $(INSTALL) -m 644 # space is required here INSTALL_R1 = -INSTALL_X0 = $(INSTALL) -m755 # space is required here +INSTALL_X0 = $(INSTALL) -m 755 # space is required here INSTALL_X1 = INSTALL_A0 = find # space is required here INSTALL_A1 = | cpio -pud @@ -71,11 +71,11 @@ ifndef V QUIET_2DEVNULL = 2>/dev/null INSTALL_D0 = dir= - INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir" + INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir" INSTALL_R0 = src= - INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src + INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src INSTALL_X0 = src= - INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src + INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src INSTALL_A0 = src= INSTALL_A1 = && echo ' ' INSTALL ' ' `basename "$$src"` && find "$$src" | cpio -pud @@ -212,7 +212,7 @@ $(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES) update-po:: $(PO_TEMPLATE) $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) $(ALL_MSGFILES): %.msg : %.po - $(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) $(QUIET_MSGFMT1) + $(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1) lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS $(QUIET_INDEX)if echo \ diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 10b0430f54..b2d2d53086 100644 --- a/git-gui/lib/commit.tcl +++ b/git-gui/lib/commit.tcl @@ -184,7 +184,7 @@ You must stage at least 1 file before you can commit. A good commit message has the following format: -- First line: Describe in one sentance what you did. +- First line: Describe in one sentence what you did. - Second line: Blank - Remaining lines: Describe why this change is good. "] diff --git a/git-gui/lib/git-gui.ico b/git-gui/lib/git-gui.ico Binary files differindex 563dd66238..334cfa5a1a 100644 --- a/git-gui/lib/git-gui.ico +++ b/git-gui/lib/git-gui.ico diff --git a/git-gui/po/de.po b/git-gui/po/de.po index 3df30edb87..ac8ae0a205 100644 --- a/git-gui/po/de.po +++ b/git-gui/po/de.po @@ -7,41 +7,41 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-19 21:10+0200\n" -"PO-Revision-Date: 2007-10-20 15:28+0200\n" +"POT-Creation-Date: 2007-11-24 10:36+0100\n" +"PO-Revision-Date: 2007-11-24 10:55+0100\n" "Last-Translator: Christian Stimming <stimming@tuhh.de>\n" "Language-Team: German\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: git-gui.sh:41 git-gui.sh:590 git-gui.sh:604 git-gui.sh:617 git-gui.sh:700 -#: git-gui.sh:719 +#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 +#: git-gui.sh:733 msgid "git-gui: fatal error" msgstr "git-gui: Programmfehler" -#: git-gui.sh:551 +#: git-gui.sh:565 #, tcl-format msgid "Invalid font specified in %s:" msgstr "Ungültige Zeichensatz-Angabe in %s:" -#: git-gui.sh:576 +#: git-gui.sh:590 msgid "Main Font" msgstr "Programmschriftart" -#: git-gui.sh:577 +#: git-gui.sh:591 msgid "Diff/Console Font" msgstr "Vergleich-Schriftart" -#: git-gui.sh:591 +#: git-gui.sh:605 msgid "Cannot find git in PATH." msgstr "Git kann im PATH nicht gefunden werden." -#: git-gui.sh:618 +#: git-gui.sh:632 msgid "Cannot parse Git version string:" msgstr "Git Versionsangabe kann nicht erkannt werden:" -#: git-gui.sh:636 +#: git-gui.sh:650 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -60,81 +60,81 @@ msgstr "" "\n" "Soll angenommen werden, »%s« sei Version 1.5.0?\n" -#: git-gui.sh:874 +#: git-gui.sh:888 msgid "Git directory not found:" msgstr "Git-Verzeichnis nicht gefunden:" -#: git-gui.sh:881 +#: git-gui.sh:895 msgid "Cannot move to top of working directory:" msgstr "" "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt " "werden:" -#: git-gui.sh:888 +#: git-gui.sh:902 msgid "Cannot use funny .git directory:" msgstr "Unerwartete Struktur des .git Verzeichnis:" -#: git-gui.sh:893 +#: git-gui.sh:907 msgid "No working directory" msgstr "Kein Arbeitsverzeichnis" -#: git-gui.sh:1040 +#: git-gui.sh:1054 msgid "Refreshing file status..." msgstr "Dateistatus aktualisieren..." -#: git-gui.sh:1105 +#: git-gui.sh:1119 msgid "Scanning for modified files ..." msgstr "Nach geänderten Dateien suchen..." -#: git-gui.sh:1280 lib/browser.tcl:245 +#: git-gui.sh:1294 lib/browser.tcl:245 msgid "Ready." msgstr "Bereit." -#: git-gui.sh:1546 +#: git-gui.sh:1560 msgid "Unmodified" msgstr "Unverändert" -#: git-gui.sh:1548 +#: git-gui.sh:1562 msgid "Modified, not staged" msgstr "Verändert, nicht bereitgestellt" -#: git-gui.sh:1549 git-gui.sh:1554 +#: git-gui.sh:1563 git-gui.sh:1568 msgid "Staged for commit" msgstr "Bereitgestellt zum Eintragen" -#: git-gui.sh:1550 git-gui.sh:1555 +#: git-gui.sh:1564 git-gui.sh:1569 msgid "Portions staged for commit" msgstr "Teilweise bereitgestellt zum Eintragen" -#: git-gui.sh:1551 git-gui.sh:1556 +#: git-gui.sh:1565 git-gui.sh:1570 msgid "Staged for commit, missing" msgstr "Bereitgestellt zum Eintragen, fehlend" -#: git-gui.sh:1553 +#: git-gui.sh:1567 msgid "Untracked, not staged" msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt" -#: git-gui.sh:1558 +#: git-gui.sh:1572 msgid "Missing" msgstr "Fehlend" -#: git-gui.sh:1559 +#: git-gui.sh:1573 msgid "Staged for removal" msgstr "Bereitgestellt zum Löschen" -#: git-gui.sh:1560 +#: git-gui.sh:1574 msgid "Staged for removal, still present" msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden" -#: git-gui.sh:1562 git-gui.sh:1563 git-gui.sh:1564 git-gui.sh:1565 +#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 msgid "Requires merge resolution" msgstr "Konfliktauflösung nötig" -#: git-gui.sh:1600 +#: git-gui.sh:1614 msgid "Starting gitk... please wait..." msgstr "Gitk wird gestartet... bitte warten." -#: git-gui.sh:1609 +#: git-gui.sh:1623 #, tcl-format msgid "" "Unable to start gitk:\n" @@ -145,295 +145,295 @@ msgstr "" "\n" "%s existiert nicht" -#: git-gui.sh:1809 lib/choose_repository.tcl:35 +#: git-gui.sh:1823 lib/choose_repository.tcl:35 msgid "Repository" msgstr "Projektarchiv" -#: git-gui.sh:1810 +#: git-gui.sh:1824 msgid "Edit" msgstr "Bearbeiten" -#: git-gui.sh:1812 lib/choose_rev.tcl:560 +#: git-gui.sh:1826 lib/choose_rev.tcl:560 msgid "Branch" msgstr "Zweig" -#: git-gui.sh:1815 lib/choose_rev.tcl:547 +#: git-gui.sh:1829 lib/choose_rev.tcl:547 msgid "Commit@@noun" msgstr "Version" -#: git-gui.sh:1818 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 msgid "Merge" msgstr "Zusammenführen" -#: git-gui.sh:1819 lib/choose_rev.tcl:556 +#: git-gui.sh:1833 lib/choose_rev.tcl:556 msgid "Remote" msgstr "Andere Archive" -#: git-gui.sh:1828 +#: git-gui.sh:1842 msgid "Browse Current Branch's Files" msgstr "Aktuellen Zweig durchblättern" -#: git-gui.sh:1832 +#: git-gui.sh:1846 msgid "Browse Branch Files..." msgstr "Einen Zweig durchblättern..." -#: git-gui.sh:1837 +#: git-gui.sh:1851 msgid "Visualize Current Branch's History" msgstr "Aktuellen Zweig darstellen" -#: git-gui.sh:1841 +#: git-gui.sh:1855 msgid "Visualize All Branch History" msgstr "Alle Zweige darstellen" -#: git-gui.sh:1848 +#: git-gui.sh:1862 #, tcl-format msgid "Browse %s's Files" msgstr "Zweig »%s« durchblättern" -#: git-gui.sh:1850 +#: git-gui.sh:1864 #, tcl-format msgid "Visualize %s's History" msgstr "Historie von »%s« darstellen" -#: git-gui.sh:1855 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 msgid "Database Statistics" msgstr "Datenbankstatistik" -#: git-gui.sh:1858 lib/database.tcl:34 +#: git-gui.sh:1872 lib/database.tcl:34 msgid "Compress Database" msgstr "Datenbank komprimieren" -#: git-gui.sh:1861 +#: git-gui.sh:1875 msgid "Verify Database" msgstr "Datenbank überprüfen" -#: git-gui.sh:1868 git-gui.sh:1872 git-gui.sh:1876 lib/shortcut.tcl:7 +#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71 msgid "Create Desktop Icon" msgstr "Desktop-Icon erstellen" -#: git-gui.sh:1881 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 +#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 msgid "Quit" msgstr "Beenden" -#: git-gui.sh:1888 +#: git-gui.sh:1902 msgid "Undo" msgstr "Rückgängig" -#: git-gui.sh:1891 +#: git-gui.sh:1905 msgid "Redo" msgstr "Wiederholen" -#: git-gui.sh:1895 git-gui.sh:2388 +#: git-gui.sh:1909 git-gui.sh:2403 msgid "Cut" msgstr "Ausschneiden" -#: git-gui.sh:1898 git-gui.sh:2391 git-gui.sh:2462 git-gui.sh:2534 +#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 #: lib/console.tcl:67 msgid "Copy" msgstr "Kopieren" -#: git-gui.sh:1901 git-gui.sh:2394 +#: git-gui.sh:1915 git-gui.sh:2409 msgid "Paste" msgstr "Einfügen" -#: git-gui.sh:1904 git-gui.sh:2397 lib/branch_delete.tcl:26 +#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 #: lib/remote_branch_delete.tcl:38 msgid "Delete" msgstr "Löschen" -#: git-gui.sh:1908 git-gui.sh:2401 git-gui.sh:2538 lib/console.tcl:69 +#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 msgid "Select All" msgstr "Alle auswählen" -#: git-gui.sh:1917 +#: git-gui.sh:1931 msgid "Create..." msgstr "Erstellen..." -#: git-gui.sh:1923 +#: git-gui.sh:1937 msgid "Checkout..." msgstr "Umstellen..." -#: git-gui.sh:1929 +#: git-gui.sh:1943 msgid "Rename..." msgstr "Umbenennen..." -#: git-gui.sh:1934 git-gui.sh:2033 +#: git-gui.sh:1948 git-gui.sh:2048 msgid "Delete..." msgstr "Löschen..." -#: git-gui.sh:1939 +#: git-gui.sh:1953 msgid "Reset..." msgstr "Zurücksetzen..." -#: git-gui.sh:1951 git-gui.sh:2335 +#: git-gui.sh:1965 git-gui.sh:2350 msgid "New Commit" msgstr "Neue Version" -#: git-gui.sh:1959 git-gui.sh:2342 +#: git-gui.sh:1973 git-gui.sh:2357 msgid "Amend Last Commit" msgstr "Letzte Version nachbessern" -#: git-gui.sh:1968 git-gui.sh:2302 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 msgid "Rescan" msgstr "Neu laden" -#: git-gui.sh:1974 +#: git-gui.sh:1988 msgid "Stage To Commit" msgstr "Zum Eintragen bereitstellen" -#: git-gui.sh:1979 +#: git-gui.sh:1994 msgid "Stage Changed Files To Commit" msgstr "Geänderte Dateien zum Eintragen bereitstellen" -#: git-gui.sh:1985 +#: git-gui.sh:2000 msgid "Unstage From Commit" msgstr "Aus der Bereitstellung herausnehmen" -#: git-gui.sh:1990 lib/index.tcl:352 +#: git-gui.sh:2005 lib/index.tcl:393 msgid "Revert Changes" msgstr "Änderungen revidieren" -#: git-gui.sh:1997 git-gui.sh:2314 git-gui.sh:2412 +#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 msgid "Sign Off" msgstr "Abzeichnen" -#: git-gui.sh:2001 git-gui.sh:2318 +#: git-gui.sh:2016 git-gui.sh:2333 msgid "Commit@@verb" msgstr "Eintragen" -#: git-gui.sh:2012 +#: git-gui.sh:2027 msgid "Local Merge..." msgstr "Lokales Zusammenführen..." -#: git-gui.sh:2017 +#: git-gui.sh:2032 msgid "Abort Merge..." msgstr "Zusammenführen abbrechen..." -#: git-gui.sh:2029 +#: git-gui.sh:2044 msgid "Push..." msgstr "Versenden..." -#: git-gui.sh:2040 lib/choose_repository.tcl:40 +#: git-gui.sh:2055 lib/choose_repository.tcl:40 msgid "Apple" msgstr "Apple" -#: git-gui.sh:2043 git-gui.sh:2065 lib/about.tcl:13 +#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 #: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 #, tcl-format msgid "About %s" msgstr "Über %s" -#: git-gui.sh:2047 +#: git-gui.sh:2062 msgid "Preferences..." msgstr "Einstellungen..." -#: git-gui.sh:2055 git-gui.sh:2580 +#: git-gui.sh:2070 git-gui.sh:2595 msgid "Options..." msgstr "Optionen..." -#: git-gui.sh:2061 lib/choose_repository.tcl:46 +#: git-gui.sh:2076 lib/choose_repository.tcl:46 msgid "Help" msgstr "Hilfe" -#: git-gui.sh:2102 +#: git-gui.sh:2117 msgid "Online Documentation" msgstr "Online-Dokumentation" -#: git-gui.sh:2186 +#: git-gui.sh:2201 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" +msgstr "Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis nicht gefunden" -#: git-gui.sh:2219 +#: git-gui.sh:2234 msgid "Current Branch:" msgstr "Aktueller Zweig:" -#: git-gui.sh:2240 +#: git-gui.sh:2255 msgid "Staged Changes (Will Commit)" msgstr "Bereitgestellte Änderungen (zum Eintragen)" -#: git-gui.sh:2259 +#: git-gui.sh:2274 msgid "Unstaged Changes" msgstr "Nicht bereitgestellte Änderungen" -#: git-gui.sh:2308 +#: git-gui.sh:2323 msgid "Stage Changed" msgstr "Alles bereitstellen" -#: git-gui.sh:2324 lib/transport.tcl:93 lib/transport.tcl:182 +#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 msgid "Push" msgstr "Versenden" -#: git-gui.sh:2354 +#: git-gui.sh:2369 msgid "Initial Commit Message:" msgstr "Erste Versionsbeschreibung:" -#: git-gui.sh:2355 +#: git-gui.sh:2370 msgid "Amended Commit Message:" msgstr "Nachgebesserte Versionsbeschreibung:" -#: git-gui.sh:2356 +#: git-gui.sh:2371 msgid "Amended Initial Commit Message:" msgstr "Nachgebesserte erste Versionsbeschreibung:" -#: git-gui.sh:2357 +#: git-gui.sh:2372 msgid "Amended Merge Commit Message:" msgstr "Nachgebesserte Zusammenführungs-Versionsbeschreibung:" -#: git-gui.sh:2358 +#: git-gui.sh:2373 msgid "Merge Commit Message:" msgstr "Zusammenführungs-Versionsbeschreibung:" -#: git-gui.sh:2359 +#: git-gui.sh:2374 msgid "Commit Message:" msgstr "Versionsbeschreibung:" -#: git-gui.sh:2404 git-gui.sh:2542 lib/console.tcl:71 +#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 msgid "Copy All" msgstr "Alle kopieren" -#: git-gui.sh:2428 lib/blame.tcl:104 +#: git-gui.sh:2443 lib/blame.tcl:104 msgid "File:" msgstr "Datei:" -#: git-gui.sh:2530 +#: git-gui.sh:2545 msgid "Refresh" msgstr "Aktualisieren" -#: git-gui.sh:2551 +#: git-gui.sh:2566 msgid "Apply/Reverse Hunk" msgstr "Änderung anwenden/umkehren" -#: git-gui.sh:2557 +#: git-gui.sh:2572 msgid "Decrease Font Size" msgstr "Schriftgröße verkleinern" -#: git-gui.sh:2561 +#: git-gui.sh:2576 msgid "Increase Font Size" msgstr "Schriftgröße vergrößern" -#: git-gui.sh:2566 +#: git-gui.sh:2581 msgid "Show Less Context" msgstr "Weniger Kontext anzeigen" -#: git-gui.sh:2573 +#: git-gui.sh:2588 msgid "Show More Context" msgstr "Mehr Kontext anzeigen" -#: git-gui.sh:2587 +#: git-gui.sh:2602 msgid "Unstage Hunk From Commit" msgstr "Aus der Bereitstellung herausnehmen" -#: git-gui.sh:2589 +#: git-gui.sh:2604 msgid "Stage Hunk For Commit" msgstr "In die Bereitstellung hinzufügen" -#: git-gui.sh:2608 +#: git-gui.sh:2623 msgid "Initializing..." msgstr "Initialisieren..." -#: git-gui.sh:2699 +#: git-gui.sh:2718 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -443,15 +443,23 @@ msgid "" "by %s:\n" "\n" msgstr "" +"Möglicherweise gibt es Probleme mit manchen Umgebungsvariablen.\n" +"\n" +"Die folgenden Umgebungsvariablen können vermutlich nicht \n" +"von %s an Git weitergegeben werden:\n" +"\n" -#: git-gui.sh:2729 +#: git-gui.sh:2748 msgid "" "\n" "This is due to a known issue with the\n" "Tcl binary distributed by Cygwin." msgstr "" +"\n" +"Dies ist ein bekanntes Problem der Tcl-Version, die\n" +"in Cygwin mitgeliefert wird." -#: git-gui.sh:2734 +#: git-gui.sh:2753 #, tcl-format msgid "" "\n" @@ -461,6 +469,11 @@ msgid "" "user.email settings into your personal\n" "~/.gitconfig file.\n" msgstr "" +"\n" +"\n" +"Um den Namen »%s« zu ändern, sollten Sie die \n" +"gewünschten Werte für die Einstellung user.name und \n" +"user.email in Ihre Datei ~/.gitconfig einfügen.\n" #: lib/about.tcl:25 msgid "git-gui - a graphical user interface for Git." @@ -485,19 +498,19 @@ msgstr "%s lesen..." #: lib/blame.tcl:473 msgid "Loading copy/move tracking annotations..." -msgstr "" +msgstr "Annotierungen für Kopieren/Verschieben werden geladen..." #: lib/blame.tcl:493 msgid "lines annotated" -msgstr "" +msgstr "Zeilen annotiert" #: lib/blame.tcl:674 msgid "Loading original location annotations..." -msgstr "" +msgstr "Annotierungen für ursprünglichen Ort werden geladen..." #: lib/blame.tcl:677 msgid "Annotation complete." -msgstr "" +msgstr "Annotierung vollständig." #: lib/blame.tcl:731 msgid "Loading annotation..." @@ -733,7 +746,7 @@ msgstr "Änderungen »%s« von »%s« anfordern" #: lib/checkout_op.tcl:127 #, tcl-format msgid "fatal: Cannot resolve %s" -msgstr "" +msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden" #: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31 msgid "Close" @@ -994,20 +1007,20 @@ msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar." #: lib/choose_repository.tcl:617 msgid "Failed to configure origin" -msgstr "" +msgstr "Der Ursprungsort konnte nicht eingerichtet werden" #: lib/choose_repository.tcl:629 msgid "Counting objects" -msgstr "" +msgstr "Objekte werden gezählt" #: lib/choose_repository.tcl:630 msgid "buckets" -msgstr "" +msgstr "Buckets" #: lib/choose_repository.tcl:654 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" -msgstr "" +msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s" #: lib/choose_repository.tcl:690 #, tcl-format @@ -1017,11 +1030,11 @@ msgstr "Von »%s« konnte nichts kopiert werden." #: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 #: lib/choose_repository.tcl:918 msgid "The 'master' branch has not been initialized." -msgstr "" +msgstr "Der »master«-Zweig wurde noch nicht initialisiert." #: lib/choose_repository.tcl:705 msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "" +msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert." #: lib/choose_repository.tcl:717 #, tcl-format @@ -1052,24 +1065,24 @@ msgstr "Objekte" #: lib/choose_repository.tcl:792 #, tcl-format msgid "Unable to hardlink object: %s" -msgstr "Objekt kann nicht hartverlinkt werden: %s" +msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s" #: lib/choose_repository.tcl:847 msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" +msgstr "Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die Ausgaben auf der Konsole für weitere Angaben." #: lib/choose_repository.tcl:858 msgid "Cannot fetch tags. See console output for details." -msgstr "" +msgstr "Markierungen konnten nicht angefordert werden. Kontrollieren Sie die Ausgaben auf der Konsole für weitere Angaben." #: lib/choose_repository.tcl:882 msgid "Cannot determine HEAD. See console output for details." -msgstr "" +msgstr "Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die Ausgaben auf der Konsole für weitere Angaben." #: lib/choose_repository.tcl:891 #, tcl-format msgid "Unable to cleanup %s" -msgstr "" +msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden." #: lib/choose_repository.tcl:897 msgid "Clone failed." @@ -1077,25 +1090,25 @@ msgstr "Kopieren fehlgeschlagen." #: lib/choose_repository.tcl:904 msgid "No default branch obtained." -msgstr "" +msgstr "Kein voreingestellter Zweig gefunden." #: lib/choose_repository.tcl:915 #, tcl-format msgid "Cannot resolve %s as a commit." -msgstr "" +msgstr "»%s« wurde nicht als Version gefunden." #: lib/choose_repository.tcl:927 msgid "Creating working directory" msgstr "Arbeitskopie erstellen" -#: lib/choose_repository.tcl:928 lib/index.tcl:15 lib/index.tcl:80 -#: lib/index.tcl:149 +#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127 +#: lib/index.tcl:193 msgid "files" msgstr "Dateien" #: lib/choose_repository.tcl:957 msgid "Initial file checkout failed." -msgstr "" +msgstr "Erstellen der Arbeitskopie fehlgeschlagen." #: lib/choose_repository.tcl:973 msgid "Open" @@ -1246,7 +1259,7 @@ msgid "" "\n" "A good commit message has the following format:\n" "\n" -"- First line: Describe in one sentance what you did.\n" +"- First line: Describe in one sentence what you did.\n" "- Second line: Blank\n" "- Remaining lines: Describe why this change is good.\n" msgstr "" @@ -1291,7 +1304,7 @@ msgstr "Keine Änderungen, die eingetragen werden können." #: lib/commit.tcl:303 #, tcl-format msgid "warning: Tcl does not support encoding '%s'." -msgstr "" +msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht." #: lib/commit.tcl:317 msgid "commit-tree failed:" @@ -1446,32 +1459,54 @@ msgid "You must correct the above errors before committing." msgstr "" "Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können." -#: lib/index.tcl:241 +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "Bereitstellung kann nicht wieder freigegeben werden." + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "Fehler in Bereitstellung" + +#: lib/index.tcl:21 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu synchronisieren." + +#: lib/index.tcl:27 +msgid "Continue" +msgstr "Fortsetzen" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "Bereitstellung freigeben" + +#: lib/index.tcl:282 #, tcl-format msgid "Unstaging %s from commit" msgstr "Datei »%s« aus der Bereitstellung herausnehmen" -#: lib/index.tcl:285 +#: lib/index.tcl:326 #, tcl-format msgid "Adding %s" msgstr "»%s« hinzufügen..." -#: lib/index.tcl:340 +#: lib/index.tcl:381 #, tcl-format msgid "Revert changes in file %s?" msgstr "Änderungen in Datei »%s« revidieren?" -#: lib/index.tcl:342 +#: lib/index.tcl:383 #, tcl-format msgid "Revert changes in these %i files?" msgstr "Änderungen in den gewählten %i Dateien revidieren?" -#: lib/index.tcl:348 +#: lib/index.tcl:389 msgid "Any unstaged changes will be permanently lost by the revert." msgstr "" "Alle nicht bereitgestellten Änderungen werden beim Revidieren verloren gehen." -#: lib/index.tcl:351 +#: lib/index.tcl:392 msgid "Do Nothing" msgstr "Nichts tun" @@ -1867,12 +1902,3 @@ msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)" #: lib/transport.tcl:168 msgid "Include tags" msgstr "Mit Markierungen übertragen" - -#~ msgid "Next >" -#~ msgstr "Weiter >" - -#~ msgid "Fetch" -#~ msgstr "Anfordern" - -#~ msgid "Unstaged Changes (Will Not Be Committed)" -#~ msgstr "Nicht bereitgestellte Änderungen (werden nicht eingetragen)" diff --git a/git-gui/po/git-gui.pot b/git-gui/po/git-gui.pot index 00f0f5922a..dfa48ae263 100644 --- a/git-gui/po/git-gui.pot +++ b/git-gui/po/git-gui.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-10 04:04-0400\n" +"POT-Creation-Date: 2007-11-24 10:36+0100\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" @@ -16,33 +16,33 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 -#: git-gui.sh:763 +#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 +#: git-gui.sh:733 msgid "git-gui: fatal error" msgstr "" -#: git-gui.sh:595 +#: git-gui.sh:565 #, tcl-format msgid "Invalid font specified in %s:" msgstr "" -#: git-gui.sh:620 +#: git-gui.sh:590 msgid "Main Font" msgstr "" -#: git-gui.sh:621 +#: git-gui.sh:591 msgid "Diff/Console Font" msgstr "" -#: git-gui.sh:635 +#: git-gui.sh:605 msgid "Cannot find git in PATH." msgstr "" -#: git-gui.sh:662 +#: git-gui.sh:632 msgid "Cannot parse Git version string:" msgstr "" -#: git-gui.sh:680 +#: git-gui.sh:650 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -54,79 +54,79 @@ msgid "" "Assume '%s' is version 1.5.0?\n" msgstr "" -#: git-gui.sh:853 +#: git-gui.sh:888 msgid "Git directory not found:" msgstr "" -#: git-gui.sh:860 +#: git-gui.sh:895 msgid "Cannot move to top of working directory:" msgstr "" -#: git-gui.sh:867 +#: git-gui.sh:902 msgid "Cannot use funny .git directory:" msgstr "" -#: git-gui.sh:872 +#: git-gui.sh:907 msgid "No working directory" msgstr "" -#: git-gui.sh:1019 +#: git-gui.sh:1054 msgid "Refreshing file status..." msgstr "" -#: git-gui.sh:1084 +#: git-gui.sh:1119 msgid "Scanning for modified files ..." msgstr "" -#: git-gui.sh:1259 lib/browser.tcl:245 +#: git-gui.sh:1294 lib/browser.tcl:245 msgid "Ready." msgstr "" -#: git-gui.sh:1525 +#: git-gui.sh:1560 msgid "Unmodified" msgstr "" -#: git-gui.sh:1527 +#: git-gui.sh:1562 msgid "Modified, not staged" msgstr "" -#: git-gui.sh:1528 git-gui.sh:1533 +#: git-gui.sh:1563 git-gui.sh:1568 msgid "Staged for commit" msgstr "" -#: git-gui.sh:1529 git-gui.sh:1534 +#: git-gui.sh:1564 git-gui.sh:1569 msgid "Portions staged for commit" msgstr "" -#: git-gui.sh:1530 git-gui.sh:1535 +#: git-gui.sh:1565 git-gui.sh:1570 msgid "Staged for commit, missing" msgstr "" -#: git-gui.sh:1532 +#: git-gui.sh:1567 msgid "Untracked, not staged" msgstr "" -#: git-gui.sh:1537 +#: git-gui.sh:1572 msgid "Missing" msgstr "" -#: git-gui.sh:1538 +#: git-gui.sh:1573 msgid "Staged for removal" msgstr "" -#: git-gui.sh:1539 +#: git-gui.sh:1574 msgid "Staged for removal, still present" msgstr "" -#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544 +#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 msgid "Requires merge resolution" msgstr "" -#: git-gui.sh:1579 +#: git-gui.sh:1614 msgid "Starting gitk... please wait..." msgstr "" -#: git-gui.sh:1588 +#: git-gui.sh:1623 #, tcl-format msgid "" "Unable to start gitk:\n" @@ -134,295 +134,295 @@ msgid "" "%s does not exist" msgstr "" -#: git-gui.sh:1788 lib/choose_repository.tcl:32 +#: git-gui.sh:1823 lib/choose_repository.tcl:35 msgid "Repository" msgstr "" -#: git-gui.sh:1789 +#: git-gui.sh:1824 msgid "Edit" msgstr "" -#: git-gui.sh:1791 lib/choose_rev.tcl:560 +#: git-gui.sh:1826 lib/choose_rev.tcl:560 msgid "Branch" msgstr "" -#: git-gui.sh:1794 lib/choose_rev.tcl:547 +#: git-gui.sh:1829 lib/choose_rev.tcl:547 msgid "Commit@@noun" msgstr "" -#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 msgid "Merge" msgstr "" -#: git-gui.sh:1798 lib/choose_rev.tcl:556 +#: git-gui.sh:1833 lib/choose_rev.tcl:556 msgid "Remote" msgstr "" -#: git-gui.sh:1807 +#: git-gui.sh:1842 msgid "Browse Current Branch's Files" msgstr "" -#: git-gui.sh:1811 +#: git-gui.sh:1846 msgid "Browse Branch Files..." msgstr "" -#: git-gui.sh:1816 +#: git-gui.sh:1851 msgid "Visualize Current Branch's History" msgstr "" -#: git-gui.sh:1820 +#: git-gui.sh:1855 msgid "Visualize All Branch History" msgstr "" -#: git-gui.sh:1827 +#: git-gui.sh:1862 #, tcl-format msgid "Browse %s's Files" msgstr "" -#: git-gui.sh:1829 +#: git-gui.sh:1864 #, tcl-format msgid "Visualize %s's History" msgstr "" -#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 msgid "Database Statistics" msgstr "" -#: git-gui.sh:1837 lib/database.tcl:34 +#: git-gui.sh:1872 lib/database.tcl:34 msgid "Compress Database" msgstr "" -#: git-gui.sh:1840 +#: git-gui.sh:1875 msgid "Verify Database" msgstr "" -#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9 -#: lib/shortcut.tcl:45 lib/shortcut.tcl:84 +#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7 +#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 msgid "Create Desktop Icon" msgstr "" -#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95 +#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 msgid "Quit" msgstr "" -#: git-gui.sh:1867 +#: git-gui.sh:1902 msgid "Undo" msgstr "" -#: git-gui.sh:1870 +#: git-gui.sh:1905 msgid "Redo" msgstr "" -#: git-gui.sh:1874 git-gui.sh:2366 +#: git-gui.sh:1909 git-gui.sh:2403 msgid "Cut" msgstr "" -#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512 +#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 #: lib/console.tcl:67 msgid "Copy" msgstr "" -#: git-gui.sh:1880 git-gui.sh:2372 +#: git-gui.sh:1915 git-gui.sh:2409 msgid "Paste" msgstr "" -#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26 +#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 #: lib/remote_branch_delete.tcl:38 msgid "Delete" msgstr "" -#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69 +#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 msgid "Select All" msgstr "" -#: git-gui.sh:1896 +#: git-gui.sh:1931 msgid "Create..." msgstr "" -#: git-gui.sh:1902 +#: git-gui.sh:1937 msgid "Checkout..." msgstr "" -#: git-gui.sh:1908 +#: git-gui.sh:1943 msgid "Rename..." msgstr "" -#: git-gui.sh:1913 git-gui.sh:2012 +#: git-gui.sh:1948 git-gui.sh:2048 msgid "Delete..." msgstr "" -#: git-gui.sh:1918 +#: git-gui.sh:1953 msgid "Reset..." msgstr "" -#: git-gui.sh:1930 git-gui.sh:2313 +#: git-gui.sh:1965 git-gui.sh:2350 msgid "New Commit" msgstr "" -#: git-gui.sh:1938 git-gui.sh:2320 +#: git-gui.sh:1973 git-gui.sh:2357 msgid "Amend Last Commit" msgstr "" -#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 msgid "Rescan" msgstr "" -#: git-gui.sh:1953 +#: git-gui.sh:1988 msgid "Stage To Commit" msgstr "" -#: git-gui.sh:1958 +#: git-gui.sh:1994 msgid "Stage Changed Files To Commit" msgstr "" -#: git-gui.sh:1964 +#: git-gui.sh:2000 msgid "Unstage From Commit" msgstr "" -#: git-gui.sh:1969 lib/index.tcl:352 +#: git-gui.sh:2005 lib/index.tcl:393 msgid "Revert Changes" msgstr "" -#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390 +#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 msgid "Sign Off" msgstr "" -#: git-gui.sh:1980 git-gui.sh:2296 +#: git-gui.sh:2016 git-gui.sh:2333 msgid "Commit@@verb" msgstr "" -#: git-gui.sh:1991 +#: git-gui.sh:2027 msgid "Local Merge..." msgstr "" -#: git-gui.sh:1996 +#: git-gui.sh:2032 msgid "Abort Merge..." msgstr "" -#: git-gui.sh:2008 +#: git-gui.sh:2044 msgid "Push..." msgstr "" -#: git-gui.sh:2019 lib/choose_repository.tcl:41 +#: git-gui.sh:2055 lib/choose_repository.tcl:40 msgid "Apple" msgstr "" -#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 +#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 +#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 #, tcl-format msgid "About %s" msgstr "" -#: git-gui.sh:2026 +#: git-gui.sh:2062 msgid "Preferences..." msgstr "" -#: git-gui.sh:2034 git-gui.sh:2558 +#: git-gui.sh:2070 git-gui.sh:2595 msgid "Options..." msgstr "" -#: git-gui.sh:2040 lib/choose_repository.tcl:47 +#: git-gui.sh:2076 lib/choose_repository.tcl:46 msgid "Help" msgstr "" -#: git-gui.sh:2081 +#: git-gui.sh:2117 msgid "Online Documentation" msgstr "" -#: git-gui.sh:2165 +#: git-gui.sh:2201 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "" -#: git-gui.sh:2198 +#: git-gui.sh:2234 msgid "Current Branch:" msgstr "" -#: git-gui.sh:2219 +#: git-gui.sh:2255 msgid "Staged Changes (Will Commit)" msgstr "" -#: git-gui.sh:2239 +#: git-gui.sh:2274 msgid "Unstaged Changes" msgstr "" -#: git-gui.sh:2286 +#: git-gui.sh:2323 msgid "Stage Changed" msgstr "" -#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182 +#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 msgid "Push" msgstr "" -#: git-gui.sh:2332 +#: git-gui.sh:2369 msgid "Initial Commit Message:" msgstr "" -#: git-gui.sh:2333 +#: git-gui.sh:2370 msgid "Amended Commit Message:" msgstr "" -#: git-gui.sh:2334 +#: git-gui.sh:2371 msgid "Amended Initial Commit Message:" msgstr "" -#: git-gui.sh:2335 +#: git-gui.sh:2372 msgid "Amended Merge Commit Message:" msgstr "" -#: git-gui.sh:2336 +#: git-gui.sh:2373 msgid "Merge Commit Message:" msgstr "" -#: git-gui.sh:2337 +#: git-gui.sh:2374 msgid "Commit Message:" msgstr "" -#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71 +#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 msgid "Copy All" msgstr "" -#: git-gui.sh:2406 lib/blame.tcl:104 +#: git-gui.sh:2443 lib/blame.tcl:104 msgid "File:" msgstr "" -#: git-gui.sh:2508 +#: git-gui.sh:2545 msgid "Refresh" msgstr "" -#: git-gui.sh:2529 +#: git-gui.sh:2566 msgid "Apply/Reverse Hunk" msgstr "" -#: git-gui.sh:2535 +#: git-gui.sh:2572 msgid "Decrease Font Size" msgstr "" -#: git-gui.sh:2539 +#: git-gui.sh:2576 msgid "Increase Font Size" msgstr "" -#: git-gui.sh:2544 +#: git-gui.sh:2581 msgid "Show Less Context" msgstr "" -#: git-gui.sh:2551 +#: git-gui.sh:2588 msgid "Show More Context" msgstr "" -#: git-gui.sh:2565 +#: git-gui.sh:2602 msgid "Unstage Hunk From Commit" msgstr "" -#: git-gui.sh:2567 +#: git-gui.sh:2604 msgid "Stage Hunk For Commit" msgstr "" -#: git-gui.sh:2586 +#: git-gui.sh:2623 msgid "Initializing..." msgstr "" -#: git-gui.sh:2677 +#: git-gui.sh:2718 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -433,14 +433,14 @@ msgid "" "\n" msgstr "" -#: git-gui.sh:2707 +#: git-gui.sh:2748 msgid "" "\n" "This is due to a known issue with the\n" "Tcl binary distributed by Cygwin." msgstr "" -#: git-gui.sh:2712 +#: git-gui.sh:2753 #, tcl-format msgid "" "\n" @@ -555,7 +555,7 @@ msgstr "" msgid "Create New Branch" msgstr "" -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375 msgid "Create" msgstr "" @@ -703,9 +703,9 @@ msgstr "" msgid "Browse Branch Files" msgstr "" -#: lib/browser.tcl:277 lib/choose_repository.tcl:215 -#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315 -#: lib/choose_repository.tcl:811 +#: lib/browser.tcl:277 lib/choose_repository.tcl:391 +#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492 +#: lib/choose_repository.tcl:989 msgid "Browse" msgstr "" @@ -844,209 +844,225 @@ msgid "" "If you like this text, it can be your font." msgstr "" -#: lib/choose_repository.tcl:25 +#: lib/choose_repository.tcl:27 msgid "Git Gui" msgstr "" -#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204 +#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380 msgid "Create New Repository" msgstr "" -#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291 +#: lib/choose_repository.tcl:86 +msgid "New..." +msgstr "" + +#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468 msgid "Clone Existing Repository" msgstr "" -#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800 +#: lib/choose_repository.tcl:99 +msgid "Clone..." +msgstr "" + +#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978 msgid "Open Existing Repository" msgstr "" -#: lib/choose_repository.tcl:91 -msgid "Next >" +#: lib/choose_repository.tcl:112 +msgid "Open..." +msgstr "" + +#: lib/choose_repository.tcl:125 +msgid "Recent Repositories" msgstr "" -#: lib/choose_repository.tcl:152 +#: lib/choose_repository.tcl:131 +msgid "Open Recent Repository:" +msgstr "" + +#: lib/choose_repository.tcl:294 #, tcl-format msgid "Location %s already exists." msgstr "" -#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165 -#: lib/choose_repository.tcl:172 +#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307 +#: lib/choose_repository.tcl:314 #, tcl-format msgid "Failed to create repository %s:" msgstr "" -#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309 +#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486 msgid "Directory:" msgstr "" -#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363 -#: lib/choose_repository.tcl:834 +#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544 +#: lib/choose_repository.tcl:1013 msgid "Git Repository" msgstr "" -#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260 +#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437 #, tcl-format msgid "Directory %s already exists." msgstr "" -#: lib/choose_repository.tcl:265 +#: lib/choose_repository.tcl:442 #, tcl-format msgid "File %s already exists." msgstr "" -#: lib/choose_repository.tcl:286 +#: lib/choose_repository.tcl:463 msgid "Clone" msgstr "" -#: lib/choose_repository.tcl:299 +#: lib/choose_repository.tcl:476 msgid "URL:" msgstr "" -#: lib/choose_repository.tcl:319 +#: lib/choose_repository.tcl:496 msgid "Clone Type:" msgstr "" -#: lib/choose_repository.tcl:325 +#: lib/choose_repository.tcl:502 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "" -#: lib/choose_repository.tcl:331 +#: lib/choose_repository.tcl:508 msgid "Full Copy (Slower, Redundant Backup)" msgstr "" -#: lib/choose_repository.tcl:337 +#: lib/choose_repository.tcl:514 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "" -#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418 -#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630 -#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848 +#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 +#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808 +#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027 #, tcl-format msgid "Not a Git repository: %s" msgstr "" -#: lib/choose_repository.tcl:405 +#: lib/choose_repository.tcl:586 msgid "Standard only available for local repository." msgstr "" -#: lib/choose_repository.tcl:409 +#: lib/choose_repository.tcl:590 msgid "Shared only available for local repository." msgstr "" -#: lib/choose_repository.tcl:439 +#: lib/choose_repository.tcl:617 msgid "Failed to configure origin" msgstr "" -#: lib/choose_repository.tcl:451 +#: lib/choose_repository.tcl:629 msgid "Counting objects" msgstr "" -#: lib/choose_repository.tcl:452 +#: lib/choose_repository.tcl:630 msgid "buckets" msgstr "" -#: lib/choose_repository.tcl:476 +#: lib/choose_repository.tcl:654 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" msgstr "" -#: lib/choose_repository.tcl:512 +#: lib/choose_repository.tcl:690 #, tcl-format msgid "Nothing to clone from %s." msgstr "" -#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728 -#: lib/choose_repository.tcl:740 +#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 +#: lib/choose_repository.tcl:918 msgid "The 'master' branch has not been initialized." msgstr "" -#: lib/choose_repository.tcl:527 +#: lib/choose_repository.tcl:705 msgid "Hardlinks are unavailable. Falling back to copying." msgstr "" -#: lib/choose_repository.tcl:539 +#: lib/choose_repository.tcl:717 #, tcl-format msgid "Cloning from %s" msgstr "" -#: lib/choose_repository.tcl:570 +#: lib/choose_repository.tcl:748 msgid "Copying objects" msgstr "" -#: lib/choose_repository.tcl:571 +#: lib/choose_repository.tcl:749 msgid "KiB" msgstr "" -#: lib/choose_repository.tcl:595 +#: lib/choose_repository.tcl:773 #, tcl-format msgid "Unable to copy object: %s" msgstr "" -#: lib/choose_repository.tcl:605 +#: lib/choose_repository.tcl:783 msgid "Linking objects" msgstr "" -#: lib/choose_repository.tcl:606 +#: lib/choose_repository.tcl:784 msgid "objects" msgstr "" -#: lib/choose_repository.tcl:614 +#: lib/choose_repository.tcl:792 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "" -#: lib/choose_repository.tcl:669 +#: lib/choose_repository.tcl:847 msgid "Cannot fetch branches and objects. See console output for details." msgstr "" -#: lib/choose_repository.tcl:680 +#: lib/choose_repository.tcl:858 msgid "Cannot fetch tags. See console output for details." msgstr "" -#: lib/choose_repository.tcl:704 +#: lib/choose_repository.tcl:882 msgid "Cannot determine HEAD. See console output for details." msgstr "" -#: lib/choose_repository.tcl:713 +#: lib/choose_repository.tcl:891 #, tcl-format msgid "Unable to cleanup %s" msgstr "" -#: lib/choose_repository.tcl:719 +#: lib/choose_repository.tcl:897 msgid "Clone failed." msgstr "" -#: lib/choose_repository.tcl:726 +#: lib/choose_repository.tcl:904 msgid "No default branch obtained." msgstr "" -#: lib/choose_repository.tcl:737 +#: lib/choose_repository.tcl:915 #, tcl-format msgid "Cannot resolve %s as a commit." msgstr "" -#: lib/choose_repository.tcl:749 +#: lib/choose_repository.tcl:927 msgid "Creating working directory" msgstr "" -#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80 -#: lib/index.tcl:149 +#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127 +#: lib/index.tcl:193 msgid "files" msgstr "" -#: lib/choose_repository.tcl:779 +#: lib/choose_repository.tcl:957 msgid "Initial file checkout failed." msgstr "" -#: lib/choose_repository.tcl:795 +#: lib/choose_repository.tcl:973 msgid "Open" msgstr "" -#: lib/choose_repository.tcl:805 +#: lib/choose_repository.tcl:983 msgid "Repository:" msgstr "" -#: lib/choose_repository.tcl:854 +#: lib/choose_repository.tcl:1033 #, tcl-format msgid "Failed to open repository %s:" msgstr "" @@ -1161,7 +1177,7 @@ msgid "" "\n" "A good commit message has the following format:\n" "\n" -"- First line: Describe in one sentance what you did.\n" +"- First line: Describe in one sentence what you did.\n" "- Second line: Blank\n" "- Remaining lines: Describe why this change is good.\n" msgstr "" @@ -1330,31 +1346,53 @@ msgstr "" msgid "You must correct the above errors before committing." msgstr "" -#: lib/index.tcl:241 +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "" + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "" + +#: lib/index.tcl:21 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" + +#: lib/index.tcl:27 +msgid "Continue" +msgstr "" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "" + +#: lib/index.tcl:282 #, tcl-format msgid "Unstaging %s from commit" msgstr "" -#: lib/index.tcl:285 +#: lib/index.tcl:326 #, tcl-format msgid "Adding %s" msgstr "" -#: lib/index.tcl:340 +#: lib/index.tcl:381 #, tcl-format msgid "Revert changes in file %s?" msgstr "" -#: lib/index.tcl:342 +#: lib/index.tcl:383 #, tcl-format msgid "Revert changes in these %i files?" msgstr "" -#: lib/index.tcl:348 +#: lib/index.tcl:389 msgid "Any unstaged changes will be permanently lost by the revert." msgstr "" -#: lib/index.tcl:351 +#: lib/index.tcl:392 msgid "Do Nothing" msgstr "" @@ -1539,18 +1577,6 @@ msgstr "" msgid "Failed to completely save options:" msgstr "" -#: lib/remote.tcl:165 -msgid "Prune from" -msgstr "" - -#: lib/remote.tcl:170 -msgid "Fetch from" -msgstr "" - -#: lib/remote.tcl:213 -msgid "Push to" -msgstr "" - #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 msgid "Delete Remote Branch" msgstr "" @@ -1627,11 +1653,23 @@ msgstr "" msgid "Scanning %s..." msgstr "" -#: lib/shortcut.tcl:26 lib/shortcut.tcl:74 -msgid "Cannot write script:" +#: lib/remote.tcl:165 +msgid "Prune from" +msgstr "" + +#: lib/remote.tcl:170 +msgid "Fetch from" +msgstr "" + +#: lib/remote.tcl:213 +msgid "Push to" +msgstr "" + +#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 +msgid "Cannot write shortcut:" msgstr "" -#: lib/shortcut.tcl:149 +#: lib/shortcut.tcl:136 msgid "Cannot write icon:" msgstr "" diff --git a/git-gui/po/glossary/it.po b/git-gui/po/glossary/it.po index 8e3d9a2f07..bb46b48d6b 100644 --- a/git-gui/po/glossary/it.po +++ b/git-gui/po/glossary/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git-gui glossary\n" -"POT-Creation-Date: 2007-10-05 22:30+0200\n" +"POT-Creation-Date: 2007-10-19 21:43+0200\n" "PO-Revision-Date: 2007-10-10 15:24+0200\n" "Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n" "Language-Team: Italian \n" @@ -50,8 +50,8 @@ msgstr "attivazione, checkout, revisione attiva, prelievo (TortoiseCVS)?" #. "The action of updating the working tree to a revision which was stored in the object database." msgid "checkout [verb]" msgstr "" -"attivare, effettuare un checkout, attivare revisione, prelevare (TortoiseCVS), " -"ritirare (TSVN)?" +"attivare, effettuare un checkout, attivare revisione, prelevare " +"(TortoiseCVS), ritirare (TSVN)?" #. "" msgid "clone [verb]" @@ -99,7 +99,7 @@ msgstr "effettuare la fusione, unire, fondere, eseguire la fusione" msgid "message" msgstr "messaggio, commento" -#. "" +#. "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>'." msgid "prune" msgstr "potatura" @@ -117,6 +117,10 @@ msgstr "propaga" msgid "redo" msgstr "ripeti, rifai" +#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." +msgid "remote" +msgstr "remoto" + #. "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?)" msgid "repository" msgstr "archivio, repository, database? deposito (rapidsvn)?" @@ -160,8 +164,8 @@ msgstr "etichettare" #. "A regular git branch that is used to follow changes from another repository." msgid "tracking branch" msgstr "" -"duplicato locale di ramo remoto, ramo in 'tracking', ramo inseguitore? ramo di {inseguimento,allineamento," -"rilevamento,puntamento}?" +"duplicato locale di ramo remoto, ramo in 'tracking', ramo inseguitore? ramo " +"di {inseguimento,allineamento,rilevamento,puntamento}?" #. "" msgid "undo" diff --git a/git-gui/po/hu.po b/git-gui/po/hu.po index e8c04f7aea..627c05eb99 100644 --- a/git-gui/po/hu.po +++ b/git-gui/po/hu.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git-gui-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-10 04:04-0400\n" -"PO-Revision-Date: 2007-07-27 13:15+0200\n" +"POT-Creation-Date: 2007-11-24 10:36+0100\n" +"PO-Revision-Date: 2007-12-04 01:15+0100\n" "Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n" "Language-Team: Hungarian\n" "MIME-Version: 1.0\n" @@ -16,33 +16,33 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 -#: git-gui.sh:763 +#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 +#: git-gui.sh:733 msgid "git-gui: fatal error" -msgstr "" +msgstr "git-gui: végzetes hiba" -#: git-gui.sh:595 -#, fuzzy, tcl-format +#: git-gui.sh:565 +#, tcl-format msgid "Invalid font specified in %s:" -msgstr "Érvénytelen font lett megadva a grafikus felületben.%s:" +msgstr "Érvénytelen font lett megadva itt: %s:" -#: git-gui.sh:620 +#: git-gui.sh:590 msgid "Main Font" msgstr "Fő betűtípus" -#: git-gui.sh:621 +#: git-gui.sh:591 msgid "Diff/Console Font" msgstr "Diff/konzol betűtípus" -#: git-gui.sh:635 +#: git-gui.sh:605 msgid "Cannot find git in PATH." msgstr "A git nem található a PATH-ban." -#: git-gui.sh:662 +#: git-gui.sh:632 msgid "Cannot parse Git version string:" msgstr "Nem értelmezhető a Git verzió sztring:" -#: git-gui.sh:680 +#: git-gui.sh:650 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -61,80 +61,79 @@ msgstr "" "\n" "Feltételezhetjük, hogy a(z) '%s' verziója legalább 1.5.0?\n" -#: git-gui.sh:853 +#: git-gui.sh:888 msgid "Git directory not found:" msgstr "A Git könyvtár nem található:" -#: git-gui.sh:860 -#, fuzzy +#: git-gui.sh:895 msgid "Cannot move to top of working directory:" -msgstr "Nem használható vicces .git könyvtár:" +msgstr "Nem lehet a munkakönyvtár tetejére lépni:" -#: git-gui.sh:867 +#: git-gui.sh:902 msgid "Cannot use funny .git directory:" msgstr "Nem használható vicces .git könyvtár:" -#: git-gui.sh:872 +#: git-gui.sh:907 msgid "No working directory" msgstr "Nincs munkakönyvtár" -#: git-gui.sh:1019 +#: git-gui.sh:1054 msgid "Refreshing file status..." msgstr "A fájlok státuszának frissítése..." -#: git-gui.sh:1084 +#: git-gui.sh:1119 msgid "Scanning for modified files ..." msgstr "Módosított fájlok keresése ..." -#: git-gui.sh:1259 lib/browser.tcl:245 +#: git-gui.sh:1294 lib/browser.tcl:245 msgid "Ready." msgstr "Kész." -#: git-gui.sh:1525 +#: git-gui.sh:1560 msgid "Unmodified" msgstr "Nem módosított" -#: git-gui.sh:1527 +#: git-gui.sh:1562 msgid "Modified, not staged" msgstr "Módosított, de nem kiválasztott" -#: git-gui.sh:1528 git-gui.sh:1533 +#: git-gui.sh:1563 git-gui.sh:1568 msgid "Staged for commit" msgstr "Kiválasztva commitolásra" -#: git-gui.sh:1529 git-gui.sh:1534 +#: git-gui.sh:1564 git-gui.sh:1569 msgid "Portions staged for commit" msgstr "Részek kiválasztva commitolásra" -#: git-gui.sh:1530 git-gui.sh:1535 +#: git-gui.sh:1565 git-gui.sh:1570 msgid "Staged for commit, missing" msgstr "Kiválasztva commitolásra, hiányzó" -#: git-gui.sh:1532 +#: git-gui.sh:1567 msgid "Untracked, not staged" msgstr "Nem követett, nem kiválasztott" -#: git-gui.sh:1537 +#: git-gui.sh:1572 msgid "Missing" msgstr "Hiányzó" -#: git-gui.sh:1538 +#: git-gui.sh:1573 msgid "Staged for removal" msgstr "Kiválasztva eltávolításra" -#: git-gui.sh:1539 +#: git-gui.sh:1574 msgid "Staged for removal, still present" msgstr "Kiválasztva eltávolításra, jelenleg is elérhető" -#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544 +#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 msgid "Requires merge resolution" msgstr "Merge feloldás szükséges" -#: git-gui.sh:1579 +#: git-gui.sh:1614 msgid "Starting gitk... please wait..." msgstr "A gitk indítása... várjunk..." -#: git-gui.sh:1588 +#: git-gui.sh:1623 #, tcl-format msgid "" "Unable to start gitk:\n" @@ -145,300 +144,295 @@ msgstr "" "\n" "A(z) %s nem létezik" -#: git-gui.sh:1788 lib/choose_repository.tcl:32 +#: git-gui.sh:1823 lib/choose_repository.tcl:35 msgid "Repository" msgstr "Repó" -#: git-gui.sh:1789 +#: git-gui.sh:1824 msgid "Edit" msgstr "Szerkesztés" -#: git-gui.sh:1791 lib/choose_rev.tcl:560 +#: git-gui.sh:1826 lib/choose_rev.tcl:560 msgid "Branch" msgstr "Branch" -#: git-gui.sh:1794 lib/choose_rev.tcl:547 -#, fuzzy +#: git-gui.sh:1829 lib/choose_rev.tcl:547 msgid "Commit@@noun" -msgstr "Commit" +msgstr "Commit@@főnév" -#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 msgid "Merge" msgstr "Merge" -#: git-gui.sh:1798 lib/choose_rev.tcl:556 -#, fuzzy +#: git-gui.sh:1833 lib/choose_rev.tcl:556 msgid "Remote" -msgstr "Távoli:" +msgstr "Távoli" -#: git-gui.sh:1807 +#: git-gui.sh:1842 msgid "Browse Current Branch's Files" msgstr "A jelenlegi branch fájljainak böngészése" -#: git-gui.sh:1811 +#: git-gui.sh:1846 msgid "Browse Branch Files..." msgstr "A branch fájljainak böngészése..." -#: git-gui.sh:1816 +#: git-gui.sh:1851 msgid "Visualize Current Branch's History" msgstr "A jelenlegi branch történetének vizualizálása" -#: git-gui.sh:1820 +#: git-gui.sh:1855 msgid "Visualize All Branch History" msgstr "Az összes branch történetének vizualizálása" -#: git-gui.sh:1827 +#: git-gui.sh:1862 #, tcl-format msgid "Browse %s's Files" msgstr "A(z) %s branch fájljainak böngészése" -#: git-gui.sh:1829 +#: git-gui.sh:1864 #, tcl-format msgid "Visualize %s's History" msgstr "A(z) %s branch történetének vizualizálása" -#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 msgid "Database Statistics" msgstr "Adatbázis statisztikák" -#: git-gui.sh:1837 lib/database.tcl:34 +#: git-gui.sh:1872 lib/database.tcl:34 msgid "Compress Database" msgstr "Adatbázis tömörítése" -#: git-gui.sh:1840 +#: git-gui.sh:1875 msgid "Verify Database" msgstr "Adatbázis ellenőrzése" -#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9 -#: lib/shortcut.tcl:45 lib/shortcut.tcl:84 +#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7 +#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 msgid "Create Desktop Icon" msgstr "Asztal ikon létrehozása" -#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95 +#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 msgid "Quit" msgstr "Kilépés" -#: git-gui.sh:1867 +#: git-gui.sh:1902 msgid "Undo" msgstr "Visszavonás" -#: git-gui.sh:1870 +#: git-gui.sh:1905 msgid "Redo" msgstr "Mégis" -#: git-gui.sh:1874 git-gui.sh:2366 +#: git-gui.sh:1909 git-gui.sh:2403 msgid "Cut" msgstr "Kivágás" -#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512 +#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 #: lib/console.tcl:67 msgid "Copy" msgstr "Másolás" -#: git-gui.sh:1880 git-gui.sh:2372 +#: git-gui.sh:1915 git-gui.sh:2409 msgid "Paste" msgstr "Beillesztés" -#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26 +#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 #: lib/remote_branch_delete.tcl:38 msgid "Delete" msgstr "Törlés" -#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69 +#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 msgid "Select All" msgstr "Mindent kiválaszt" -#: git-gui.sh:1896 +#: git-gui.sh:1931 msgid "Create..." msgstr "Létrehozás..." -#: git-gui.sh:1902 +#: git-gui.sh:1937 msgid "Checkout..." msgstr "Checkout..." -#: git-gui.sh:1908 +#: git-gui.sh:1943 msgid "Rename..." msgstr "Átnevezés..." -#: git-gui.sh:1913 git-gui.sh:2012 +#: git-gui.sh:1948 git-gui.sh:2048 msgid "Delete..." msgstr "Törlés..." -#: git-gui.sh:1918 +#: git-gui.sh:1953 msgid "Reset..." msgstr "Visszaállítás..." -#: git-gui.sh:1930 git-gui.sh:2313 +#: git-gui.sh:1965 git-gui.sh:2350 msgid "New Commit" msgstr "Új commit" -#: git-gui.sh:1938 git-gui.sh:2320 +#: git-gui.sh:1973 git-gui.sh:2357 msgid "Amend Last Commit" msgstr "Utolsó commit javítása" -#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 msgid "Rescan" msgstr "Keresés újra" -#: git-gui.sh:1953 +#: git-gui.sh:1988 msgid "Stage To Commit" msgstr "Kiválasztás commitolásra" -#: git-gui.sh:1958 +#: git-gui.sh:1994 msgid "Stage Changed Files To Commit" msgstr "Módosított fájlok kiválasztása commitolásra" -#: git-gui.sh:1964 +#: git-gui.sh:2000 msgid "Unstage From Commit" msgstr "Commitba való kiválasztás visszavonása" -#: git-gui.sh:1969 lib/index.tcl:352 +#: git-gui.sh:2005 lib/index.tcl:393 msgid "Revert Changes" msgstr "Változtatások visszaállítása" -#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390 +#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 msgid "Sign Off" msgstr "Aláír" -#: git-gui.sh:1980 git-gui.sh:2296 -#, fuzzy +#: git-gui.sh:2016 git-gui.sh:2333 msgid "Commit@@verb" -msgstr "Commit" +msgstr "Commit@@ige" -#: git-gui.sh:1991 +#: git-gui.sh:2027 msgid "Local Merge..." msgstr "Helyi merge..." -#: git-gui.sh:1996 +#: git-gui.sh:2032 msgid "Abort Merge..." msgstr "Merge megszakítása..." -#: git-gui.sh:2008 +#: git-gui.sh:2044 msgid "Push..." msgstr "Push..." -#: git-gui.sh:2019 lib/choose_repository.tcl:41 +#: git-gui.sh:2055 lib/choose_repository.tcl:40 msgid "Apple" msgstr "Apple" -#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 +#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 +#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 #, tcl-format msgid "About %s" msgstr "Névjegy: %s" -#: git-gui.sh:2026 +#: git-gui.sh:2062 msgid "Preferences..." -msgstr "" +msgstr "Beállítások..." -#: git-gui.sh:2034 git-gui.sh:2558 +#: git-gui.sh:2070 git-gui.sh:2595 msgid "Options..." msgstr "Opciók..." -#: git-gui.sh:2040 lib/choose_repository.tcl:47 +#: git-gui.sh:2076 lib/choose_repository.tcl:46 msgid "Help" msgstr "Segítség" -#: git-gui.sh:2081 +#: git-gui.sh:2117 msgid "Online Documentation" msgstr "Online dokumentáció" -#: git-gui.sh:2165 +#: git-gui.sh:2201 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "" +msgstr "végzetes hiba: nem érhető el a(z) %s útvonal: Nincs ilyen fájl vagy könyvtár" -#: git-gui.sh:2198 +#: git-gui.sh:2234 msgid "Current Branch:" msgstr "Jelenlegi branch:" -#: git-gui.sh:2219 -#, fuzzy +#: git-gui.sh:2255 msgid "Staged Changes (Will Commit)" msgstr "Kiválasztott változtatások (commitolva lesz)" -#: git-gui.sh:2239 -#, fuzzy +#: git-gui.sh:2274 msgid "Unstaged Changes" -msgstr "Változtatások kiválasztása" +msgstr "Kiválasztatlan változtatások" -#: git-gui.sh:2286 +#: git-gui.sh:2323 msgid "Stage Changed" msgstr "Változtatások kiválasztása" -#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182 +#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 msgid "Push" msgstr "Push" -#: git-gui.sh:2332 +#: git-gui.sh:2369 msgid "Initial Commit Message:" msgstr "Kezdeti commit üzenet:" -#: git-gui.sh:2333 +#: git-gui.sh:2370 msgid "Amended Commit Message:" msgstr "Javító commit üzenet:" -#: git-gui.sh:2334 +#: git-gui.sh:2371 msgid "Amended Initial Commit Message:" msgstr "Kezdeti javító commit üzenet:" -#: git-gui.sh:2335 +#: git-gui.sh:2372 msgid "Amended Merge Commit Message:" msgstr "Javító merge commit üzenet:" -#: git-gui.sh:2336 +#: git-gui.sh:2373 msgid "Merge Commit Message:" msgstr "Merge commit üzenet:" -#: git-gui.sh:2337 +#: git-gui.sh:2374 msgid "Commit Message:" msgstr "Commit üzenet:" -#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71 +#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 msgid "Copy All" msgstr "Összes másolása" -#: git-gui.sh:2406 lib/blame.tcl:104 +#: git-gui.sh:2443 lib/blame.tcl:104 msgid "File:" msgstr "Fájl:" -#: git-gui.sh:2508 +#: git-gui.sh:2545 msgid "Refresh" msgstr "Frissítés" -#: git-gui.sh:2529 +#: git-gui.sh:2566 msgid "Apply/Reverse Hunk" msgstr "Hunk alkalmazása/visszaállítása" -#: git-gui.sh:2535 +#: git-gui.sh:2572 msgid "Decrease Font Size" msgstr "Font méret csökkentése" -#: git-gui.sh:2539 +#: git-gui.sh:2576 msgid "Increase Font Size" msgstr "Fönt méret növelése" -#: git-gui.sh:2544 +#: git-gui.sh:2581 msgid "Show Less Context" msgstr "Kevesebb környezet mutatása" -#: git-gui.sh:2551 +#: git-gui.sh:2588 msgid "Show More Context" msgstr "Több környezet mutatása" -#: git-gui.sh:2565 +#: git-gui.sh:2602 msgid "Unstage Hunk From Commit" msgstr "Hunk törlése commitból" -#: git-gui.sh:2567 +#: git-gui.sh:2604 msgid "Stage Hunk For Commit" msgstr "Hunk kiválasztása commitba" -#: git-gui.sh:2586 +#: git-gui.sh:2623 msgid "Initializing..." msgstr "Inicializálás..." -#: git-gui.sh:2677 +#: git-gui.sh:2718 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -448,15 +442,24 @@ msgid "" "by %s:\n" "\n" msgstr "" +"Lehetséges, hogy környezeti problémák vannak.\n" +"\n" +"A következő környezeti változók valószínűleg\n" +"figyelmen kívül lesznek hagyva a(z) %s által\n" +"indított folyamatok által:\n" +"\n" -#: git-gui.sh:2707 +#: git-gui.sh:2748 msgid "" "\n" "This is due to a known issue with the\n" "Tcl binary distributed by Cygwin." msgstr "" +"\n" +"Ez a Cygwin által terjesztett Tcl binárisban\n" +"lévő ismert hiba miatt van." -#: git-gui.sh:2712 +#: git-gui.sh:2753 #, tcl-format msgid "" "\n" @@ -466,6 +469,12 @@ msgid "" "user.email settings into your personal\n" "~/.gitconfig file.\n" msgstr "" +"\n" +"\n" +"Egy jó helyettesítés a(z) %s számára\n" +"a user.name és user.email beállítások\n" +"elhelyezése a személyes\n" +"~/.gitconfig fájlba.\n" #: lib/about.tcl:25 msgid "git-gui - a graphical user interface for Git." @@ -490,50 +499,47 @@ msgstr "A(z) %s olvasása..." #: lib/blame.tcl:473 msgid "Loading copy/move tracking annotations..." -msgstr "" +msgstr "A másolást/átnevezést követő annotációk betöltése..." #: lib/blame.tcl:493 msgid "lines annotated" -msgstr "" +msgstr "sor annotálva" #: lib/blame.tcl:674 msgid "Loading original location annotations..." -msgstr "" +msgstr "Az eredeti hely annotációk betöltése..." #: lib/blame.tcl:677 msgid "Annotation complete." -msgstr "" +msgstr "Az annotáció kész." #: lib/blame.tcl:731 -#, fuzzy msgid "Loading annotation..." -msgstr "A(z) %s betöltése..." +msgstr "Az annotáció betöltése..." #: lib/blame.tcl:787 msgid "Author:" -msgstr "" +msgstr "Szerző:" #: lib/blame.tcl:791 -#, fuzzy msgid "Committer:" -msgstr "Commit:" +msgstr "Commiter:" #: lib/blame.tcl:796 msgid "Original File:" -msgstr "" +msgstr "Eredeti fájl:" #: lib/blame.tcl:910 msgid "Originally By:" -msgstr "" +msgstr "Eredeti szerző:" #: lib/blame.tcl:916 -#, fuzzy msgid "In File:" -msgstr "Fájl:" +msgstr "Ebben a fájlban:" #: lib/blame.tcl:921 msgid "Copied Or Moved Here By:" -msgstr "" +msgstr "Ide másolta vagy helyezte:" #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 msgid "Checkout Branch" @@ -574,7 +580,7 @@ msgstr "Branch létrehozása" msgid "Create New Branch" msgstr "Új branch létrehozása" -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375 msgid "Create" msgstr "Létrehozás" @@ -727,9 +733,9 @@ msgstr "[Fel a szülőhöz]" msgid "Browse Branch Files" msgstr "A branch fájljainak böngészése" -#: lib/browser.tcl:277 lib/choose_repository.tcl:215 -#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315 -#: lib/choose_repository.tcl:811 +#: lib/browser.tcl:277 lib/choose_repository.tcl:391 +#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492 +#: lib/choose_repository.tcl:989 msgid "Browse" msgstr "Böngészés" @@ -741,7 +747,7 @@ msgstr "A(z) %s letöltése innen: %s" #: lib/checkout_op.tcl:127 #, tcl-format msgid "fatal: Cannot resolve %s" -msgstr "" +msgstr "végzetes: Nem lehet feloldani a következőt: %s" #: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31 msgid "Close" @@ -797,9 +803,9 @@ msgstr "" "Az újrakeresés most automatikusan el fog indulni.\n" #: lib/checkout_op.tcl:322 -#, fuzzy, tcl-format +#, tcl-format msgid "Updating working directory to '%s'..." -msgstr "Nincs munkakönyvtár" +msgstr "A munkkönyvtár frissiítése a következőre: '%s'..." #: lib/checkout_op.tcl:353 #, tcl-format @@ -828,9 +834,9 @@ msgstr "" "checkout'-ból." #: lib/checkout_op.tcl:446 -#, fuzzy, tcl-format +#, tcl-format msgid "Checked out '%s'." -msgstr "Checkout..." +msgstr "'%s' kifejtve." #: lib/checkout_op.tcl:478 #, tcl-format @@ -869,244 +875,251 @@ msgstr "" "Ennek nem szabad megtörténnie. A(z) %s most kilép és feladja." #: lib/choose_font.tcl:39 -#, fuzzy msgid "Select" -msgstr "Mindent kiválaszt" +msgstr "Kiválaszt" #: lib/choose_font.tcl:53 msgid "Font Family" -msgstr "" +msgstr "Font család" #: lib/choose_font.tcl:73 -#, fuzzy msgid "Font Size" -msgstr "Font méret csökkentése" +msgstr "Font méret" #: lib/choose_font.tcl:90 msgid "Font Example" -msgstr "" +msgstr "Font példa" #: lib/choose_font.tcl:101 msgid "" "This is example text.\n" "If you like this text, it can be your font." msgstr "" +"Ez egy példa szöveg.\n" +"Ha ez megfelel, ez lehet a betűtípus." -#: lib/choose_repository.tcl:25 +#: lib/choose_repository.tcl:27 msgid "Git Gui" -msgstr "" +msgstr "Git Gui" -#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204 -#, fuzzy +#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380 msgid "Create New Repository" -msgstr "Forrás repó" +msgstr "Új repó létrehozása" + +#: lib/choose_repository.tcl:86 +msgid "New..." +msgstr "Új..." -#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291 -#, fuzzy +#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468 msgid "Clone Existing Repository" -msgstr "Cél repó" +msgstr "Létező repó másolása" + +#: lib/choose_repository.tcl:99 +msgid "Clone..." +msgstr "Másolás..." -#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800 -#, fuzzy +#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978 msgid "Open Existing Repository" -msgstr "Cél repó" +msgstr "Létező könyvtár megnyitása" -#: lib/choose_repository.tcl:91 -msgid "Next >" -msgstr "" +#: lib/choose_repository.tcl:112 +msgid "Open..." +msgstr "Meggyitás..." + +#: lib/choose_repository.tcl:125 +msgid "Recent Repositories" +msgstr "Legutóbbi repók" -#: lib/choose_repository.tcl:152 -#, fuzzy, tcl-format +#: lib/choose_repository.tcl:131 +msgid "Open Recent Repository:" +msgstr "Legutóbbi repók megnyitása:" + +#: lib/choose_repository.tcl:294 +#, tcl-format msgid "Location %s already exists." -msgstr "A(z) '%s' branch már létezik." +msgstr "A(z) '%s' hely már létezik." -#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165 -#: lib/choose_repository.tcl:172 -#, fuzzy, tcl-format +#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307 +#: lib/choose_repository.tcl:314 +#, tcl-format msgid "Failed to create repository %s:" -msgstr "Nem sikerült teljesen elmenteni a beállításokat:" +msgstr "Nem sikerült letrehozni a(z) %s repót:" -#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309 +#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486 msgid "Directory:" -msgstr "" +msgstr "Könyvtár:" -#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363 -#: lib/choose_repository.tcl:834 -#, fuzzy +#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544 +#: lib/choose_repository.tcl:1013 msgid "Git Repository" -msgstr "Repó" +msgstr "Git repó" -#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260 -#, fuzzy, tcl-format +#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437 +#, tcl-format msgid "Directory %s already exists." -msgstr "A(z) '%s' branch már létezik." +msgstr "A(z) '%s' könyvtár már létezik." -#: lib/choose_repository.tcl:265 -#, fuzzy, tcl-format +#: lib/choose_repository.tcl:442 +#, tcl-format msgid "File %s already exists." -msgstr "A(z) '%s' branch már létezik." +msgstr "A(z) '%s' fájl már létezik." -#: lib/choose_repository.tcl:286 -#, fuzzy +#: lib/choose_repository.tcl:463 msgid "Clone" msgstr "Bezárás" -#: lib/choose_repository.tcl:299 +#: lib/choose_repository.tcl:476 msgid "URL:" -msgstr "" +msgstr "URL:" -#: lib/choose_repository.tcl:319 +#: lib/choose_repository.tcl:496 msgid "Clone Type:" -msgstr "" +msgstr "Másolás típusa:" -#: lib/choose_repository.tcl:325 +#: lib/choose_repository.tcl:502 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" -msgstr "" +msgstr "Általános (Gyors, félig-redundáns, hardlinkek)" -#: lib/choose_repository.tcl:331 +#: lib/choose_repository.tcl:508 msgid "Full Copy (Slower, Redundant Backup)" -msgstr "" +msgstr "Teljes másolás (Lassabb, redundáns biztonsági mentés)" -#: lib/choose_repository.tcl:337 +#: lib/choose_repository.tcl:514 msgid "Shared (Fastest, Not Recommended, No Backup)" -msgstr "" +msgstr "Megosztott (Leggyorsabb, nem ajánlott, nincs mentés)" -#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418 -#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630 -#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848 -#, fuzzy, tcl-format +#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 +#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808 +#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027 +#, tcl-format msgid "Not a Git repository: %s" -msgstr "Nincs kiválasztott repó." +msgstr "Nem Git repó: %s" -#: lib/choose_repository.tcl:405 +#: lib/choose_repository.tcl:586 msgid "Standard only available for local repository." -msgstr "" +msgstr "A standard csak helyi repókra érhető el." -#: lib/choose_repository.tcl:409 +#: lib/choose_repository.tcl:590 msgid "Shared only available for local repository." -msgstr "" +msgstr "A megosztott csak helyi repókra érhető el." -#: lib/choose_repository.tcl:439 +#: lib/choose_repository.tcl:617 msgid "Failed to configure origin" -msgstr "" +msgstr "Nem sikerült beállítani az origint" -#: lib/choose_repository.tcl:451 +#: lib/choose_repository.tcl:629 msgid "Counting objects" -msgstr "" +msgstr "Objektumok számolása" -#: lib/choose_repository.tcl:452 +#: lib/choose_repository.tcl:630 msgid "buckets" -msgstr "" +msgstr "vödrök" -#: lib/choose_repository.tcl:476 +#: lib/choose_repository.tcl:654 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" -msgstr "" +msgstr "Nem sikerült másolni az objects/info/alternates-t: %s" -#: lib/choose_repository.tcl:512 -#, fuzzy, tcl-format +#: lib/choose_repository.tcl:690 +#, tcl-format msgid "Nothing to clone from %s." -msgstr "Új változások letöltése innen: %s" +msgstr "Semmi másolni való nincs innen: %s" -#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728 -#: lib/choose_repository.tcl:740 +#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 +#: lib/choose_repository.tcl:918 msgid "The 'master' branch has not been initialized." -msgstr "" +msgstr "A 'master' branch nincs inicializálva." -#: lib/choose_repository.tcl:527 +#: lib/choose_repository.tcl:705 msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "" +msgstr "Nem érhetőek el hardlinkek. Másolás használata." -#: lib/choose_repository.tcl:539 -#, fuzzy, tcl-format +#: lib/choose_repository.tcl:717 +#, tcl-format msgid "Cloning from %s" -msgstr "A(z) %s letöltése innen: %s" +msgstr "Másolás innen: %s" -#: lib/choose_repository.tcl:570 -#, fuzzy +#: lib/choose_repository.tcl:748 msgid "Copying objects" -msgstr "Az objektum adatbázis tömörítése" +msgstr "Objektumok másolása" -#: lib/choose_repository.tcl:571 +#: lib/choose_repository.tcl:749 msgid "KiB" -msgstr "" +msgstr "KiB" -#: lib/choose_repository.tcl:595 +#: lib/choose_repository.tcl:773 #, tcl-format msgid "Unable to copy object: %s" -msgstr "" +msgstr "Nem sikerült másolni az objektumot: %s" -#: lib/choose_repository.tcl:605 +#: lib/choose_repository.tcl:783 msgid "Linking objects" -msgstr "" +msgstr "Objektumok összefűzése" -#: lib/choose_repository.tcl:606 +#: lib/choose_repository.tcl:784 msgid "objects" -msgstr "" +msgstr "objektum" -#: lib/choose_repository.tcl:614 +#: lib/choose_repository.tcl:792 #, tcl-format msgid "Unable to hardlink object: %s" -msgstr "" +msgstr "Nem sikerült hardlinkelni az objektumot: %s" -#: lib/choose_repository.tcl:669 +#: lib/choose_repository.tcl:847 msgid "Cannot fetch branches and objects. See console output for details." -msgstr "" +msgstr "Nem sikerült letölteni a branch-eket és az objektumokat. Bővebben a konzolos kimenetben." -#: lib/choose_repository.tcl:680 +#: lib/choose_repository.tcl:858 msgid "Cannot fetch tags. See console output for details." -msgstr "" +msgstr "Nem sikerült letölteni a tageket. Bővebben a konzolos kimenetben." -#: lib/choose_repository.tcl:704 +#: lib/choose_repository.tcl:882 msgid "Cannot determine HEAD. See console output for details." -msgstr "" +msgstr "Nem sikerült megállapítani a HEAD-et. Bővebben a konzolos kimenetben." -#: lib/choose_repository.tcl:713 +#: lib/choose_repository.tcl:891 #, tcl-format msgid "Unable to cleanup %s" -msgstr "" +msgstr "Nem sikerült tiszítani: %s." -#: lib/choose_repository.tcl:719 -#, fuzzy +#: lib/choose_repository.tcl:897 msgid "Clone failed." -msgstr "A félbeszakítás nem sikerült." +msgstr "A másolás nem sikerült." -#: lib/choose_repository.tcl:726 +#: lib/choose_repository.tcl:904 msgid "No default branch obtained." -msgstr "" +msgstr "Nincs alapértelmezett branch." -#: lib/choose_repository.tcl:737 +#: lib/choose_repository.tcl:915 #, tcl-format msgid "Cannot resolve %s as a commit." -msgstr "" +msgstr "Nem sikerült felöldani a(z) %s objektumot commitként." -#: lib/choose_repository.tcl:749 -#, fuzzy +#: lib/choose_repository.tcl:927 msgid "Creating working directory" -msgstr "Nincs munkakönyvtár" +msgstr "Munkakönyvtár létrehozása" -#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80 -#: lib/index.tcl:149 +#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127 +#: lib/index.tcl:193 msgid "files" -msgstr "" +msgstr "fájl" -#: lib/choose_repository.tcl:779 +#: lib/choose_repository.tcl:957 msgid "Initial file checkout failed." -msgstr "" +msgstr "A kezdeti fájl-kibontás sikertelen." -#: lib/choose_repository.tcl:795 +#: lib/choose_repository.tcl:973 msgid "Open" -msgstr "" +msgstr "Megnyitás" -#: lib/choose_repository.tcl:805 -#, fuzzy +#: lib/choose_repository.tcl:983 msgid "Repository:" -msgstr "Repó" +msgstr "Repó:" -#: lib/choose_repository.tcl:854 -#, fuzzy, tcl-format +#: lib/choose_repository.tcl:1033 +#, tcl-format msgid "Failed to open repository %s:" -msgstr "Nem sikerült teljesen elmenteni a beállításokat:" +msgstr "Nem sikerült megnyitni a(z) %s repót:" #: lib/choose_rev.tcl:53 msgid "This Detached Checkout" @@ -1143,11 +1156,11 @@ msgstr "A revízió kifejezés üres." #: lib/choose_rev.tcl:530 msgid "Updated" -msgstr "" +msgstr "Frissítve" #: lib/choose_rev.tcl:558 msgid "URL" -msgstr "" +msgstr "URL" #: lib/commit.tcl:9 msgid "" @@ -1243,7 +1256,7 @@ msgid "" "\n" "A good commit message has the following format:\n" "\n" -"- First line: Describe in one sentance what you did.\n" +"- First line: Describe in one sentence what you did.\n" "- Second line: Blank\n" "- Remaining lines: Describe why this change is good.\n" msgstr "" @@ -1262,7 +1275,7 @@ msgstr "a write-tree sikertelen:" #: lib/commit.tcl:275 #, tcl-format msgid "Commit %s appears to be corrupt" -msgstr "" +msgstr "A(z) %s commit sérültnek tűnik" #: lib/commit.tcl:279 msgid "" @@ -1285,7 +1298,7 @@ msgstr "Nincs commitolandó változtatás." #: lib/commit.tcl:303 #, tcl-format msgid "warning: Tcl does not support encoding '%s'." -msgstr "" +msgstr "figyelmeztetés: a Tcl nem támogatja a(z) '%s' kódolást." #: lib/commit.tcl:317 msgid "commit-tree failed:" @@ -1358,11 +1371,17 @@ msgid "" "\n" "Compress the database now?" msgstr "" +"Ennek a repónak jelenleg %i különálló objektuma van.\n" +"\n" +"Az optimális teljesítményhez erősen ajánlott az adatbázis tömörítése, ha " +"több mint %i objektum létezik.\n" +"\n" +"Lehet most tömöríteni az adatbázist?" #: lib/date.tcl:25 -#, fuzzy, tcl-format +#, tcl-format msgid "Invalid date from Git: %s" -msgstr "Érvénytelen revízió: %s" +msgstr "Érvénytelen dátum a Git-től: %s" #: lib/diff.tcl:42 #, tcl-format @@ -1387,14 +1406,14 @@ msgstr "" "Egy újrakeresés fog indulni a hasonló állapotú fájlok megtalálása érdekében." #: lib/diff.tcl:81 -#, fuzzy, tcl-format +#, tcl-format msgid "Loading diff of %s..." -msgstr "A(z) %s betöltése..." +msgstr "A(z) %s diff-jének betöltése..." #: lib/diff.tcl:114 lib/diff.tcl:184 #, tcl-format msgid "Unable to display %s" -msgstr "" +msgstr "Nem lehet megjeleníteni a következőt: %s" #: lib/diff.tcl:115 msgid "Error loading file:" @@ -1402,11 +1421,11 @@ msgstr "Hiba a fájl betöltése közben:" #: lib/diff.tcl:122 msgid "Git Repository (subproject)" -msgstr "" +msgstr "Git repó (alprojekt)" #: lib/diff.tcl:134 msgid "* Binary file (not showing content)." -msgstr "" +msgstr "* Bináris fájl (tartalom elrejtése)." #: lib/diff.tcl:185 msgid "Error loading diff:" @@ -1432,33 +1451,57 @@ msgstr "figyelmeztetés" msgid "You must correct the above errors before committing." msgstr "Ki kell javítanunk a fenti hibákat commit előtt." -#: lib/index.tcl:241 -#, fuzzy, tcl-format +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "Nem sikerült az index zárolásának feloldása." + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "Index hiba" + +#: lib/index.tcl:21 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"A Git index frissítése sikertelen volt. Egy újraolvasás automatikusan elindult, hogy " +"a git-gui újra szinkonban legyen." + +#: lib/index.tcl:27 +msgid "Continue" +msgstr "Folytatás" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "Index zárolásának feloldása" + +#: lib/index.tcl:282 +#, tcl-format msgid "Unstaging %s from commit" -msgstr "Commitba való kiválasztás visszavonása" +msgstr "A(z) %s commitba való kiválasztásának visszavonása" -#: lib/index.tcl:285 -#, fuzzy, tcl-format +#: lib/index.tcl:326 +#, tcl-format msgid "Adding %s" -msgstr "A(z) %s olvasása..." +msgstr "A(z) %s hozzáadása..." -#: lib/index.tcl:340 +#: lib/index.tcl:381 #, tcl-format msgid "Revert changes in file %s?" msgstr "Visszaállítja a változtatásokat a(z) %s fájlban?" -#: lib/index.tcl:342 +#: lib/index.tcl:383 #, tcl-format msgid "Revert changes in these %i files?" msgstr "Visszaállítja a változtatásokat ebben e %i fájlban?" -#: lib/index.tcl:348 +#: lib/index.tcl:389 msgid "Any unstaged changes will be permanently lost by the revert." msgstr "" "Minden nem kiválasztott változtatás el fog veszni ezáltal a visszaállítás " "által." -#: lib/index.tcl:351 +#: lib/index.tcl:392 msgid "Do Nothing" msgstr "Ne csináljunk semmit" @@ -1661,43 +1704,26 @@ msgid "New Branch Name Template" msgstr "Új branch név sablon" #: lib/option.tcl:176 -#, fuzzy msgid "Change Font" -msgstr "Fő betűtípus" +msgstr "Betűtípus megváltoztatása" #: lib/option.tcl:180 #, tcl-format msgid "Choose %s" -msgstr "" +msgstr "%s választása" #: lib/option.tcl:186 msgid "pt." -msgstr "" +msgstr "pt." #: lib/option.tcl:200 msgid "Preferences" -msgstr "" +msgstr "Beállítások" #: lib/option.tcl:235 msgid "Failed to completely save options:" msgstr "Nem sikerült teljesen elmenteni a beállításokat:" -#: lib/remote.tcl:165 -#, fuzzy -msgid "Prune from" -msgstr "Törlés innen: %s..." - -# tcl-format -#: lib/remote.tcl:170 -#, fuzzy -msgid "Fetch from" -msgstr "Letöltés innen: %s..." - -#: lib/remote.tcl:213 -#, fuzzy -msgid "Push to" -msgstr "Push" - #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 msgid "Delete Remote Branch" msgstr "Távoli branch törlése" @@ -1735,12 +1761,15 @@ msgid "A branch is required for 'Merged Into'." msgstr "Egy branch szükséges a 'Merge-ölt a következőbe'-hez." #: lib/remote_branch_delete.tcl:184 -#, fuzzy, tcl-format +#, tcl-format msgid "" "The following branches are not completely merged into %s:\n" "\n" " - %s" -msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:" +msgstr "" +"A következő branchek nem teljesen lettek merge-ölve ebbe: %s:" +"\n" +" - %s" #: lib/remote_branch_delete.tcl:189 #, tcl-format @@ -1779,11 +1808,24 @@ msgstr "Nincs kiválasztott repó." msgid "Scanning %s..." msgstr "Keresés itt: %s..." -#: lib/shortcut.tcl:26 lib/shortcut.tcl:74 -msgid "Cannot write script:" -msgstr "Nem sikerült írni a scriptet:" +#: lib/remote.tcl:165 +msgid "Prune from" +msgstr "Törlés innen" -#: lib/shortcut.tcl:149 +# tcl-format +#: lib/remote.tcl:170 +msgid "Fetch from" +msgstr "Letöltés innen" + +#: lib/remote.tcl:213 +msgid "Push to" +msgstr "Push ide" + +#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 +msgid "Cannot write shortcut:" +msgstr "Nem sikerült írni a gyorsbillentyűt:" + +#: lib/shortcut.tcl:136 msgid "Cannot write icon:" msgstr "Nem sikerült írni az ikont:" @@ -1793,9 +1835,9 @@ msgid "%s ... %*i of %*i %s (%3i%%)" msgstr "%s ... %*i / %*i %s (%3i%%)" #: lib/transport.tcl:6 -#, fuzzy, tcl-format +#, tcl-format msgid "fetch %s" -msgstr "Letöltés" +msgstr "a(z) %s letöltése" #: lib/transport.tcl:7 #, tcl-format @@ -1805,7 +1847,7 @@ msgstr "Új változások letöltése innen: %s" #: lib/transport.tcl:18 #, tcl-format msgid "remote prune %s" -msgstr "" +msgstr "a(z) %s távoli törlése" #: lib/transport.tcl:19 #, tcl-format @@ -1815,7 +1857,7 @@ msgstr "A %s repóból törölt követő branchek törlése" #: lib/transport.tcl:25 lib/transport.tcl:71 #, tcl-format msgid "push %s" -msgstr "" +msgstr "%s push-olása" #: lib/transport.tcl:26 #, tcl-format @@ -1845,7 +1887,7 @@ msgstr "Átviteli opciók" #: lib/transport.tcl:160 msgid "Force overwrite existing branch (may discard changes)" -msgstr "" +msgstr "Létező branch felülírásának erőltetése (lehet, hogy el fog dobni változtatásokat)" #: lib/transport.tcl:164 msgid "Use thin pack (for slow network connections)" diff --git a/git-gui/po/it.po b/git-gui/po/it.po index 7668414104..33a8399175 100644 --- a/git-gui/po/it.po +++ b/git-gui/po/it.po @@ -9,41 +9,41 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-10 14:42+0200\n" -"PO-Revision-Date: 2007-10-10 15:27+0200\n" -"Last-Translator: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n" +"POT-Creation-Date: 2007-11-09 11:18+0100\n" +"PO-Revision-Date: 2007-11-01 21:05+0100\n" +"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 -#: git-gui.sh:763 +#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 +#: git-gui.sh:733 msgid "git-gui: fatal error" msgstr "git-gui: errore grave" -#: git-gui.sh:595 +#: git-gui.sh:565 #, tcl-format msgid "Invalid font specified in %s:" msgstr "Caratteri non validi specificati in %s:" -#: git-gui.sh:620 +#: git-gui.sh:590 msgid "Main Font" msgstr "Caratteri principali" -#: git-gui.sh:621 +#: git-gui.sh:591 msgid "Diff/Console Font" msgstr "Caratteri per confronti e terminale" -#: git-gui.sh:635 +#: git-gui.sh:605 msgid "Cannot find git in PATH." msgstr "Impossibile trovare git nel PATH" -#: git-gui.sh:662 +#: git-gui.sh:632 msgid "Cannot parse Git version string:" msgstr "Impossibile determinare la versione di Git:" -#: git-gui.sh:680 +#: git-gui.sh:650 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -54,7 +54,7 @@ msgid "" "\n" "Assume '%s' is version 1.5.0?\n" msgstr "" -"La versione di GIT non può essere determinata.\n" +"La versione di Git non può essere determinata.\n" "\n" "%s riporta che la versione è '%s'.\n" "\n" @@ -62,79 +62,79 @@ msgstr "" "\n" "Assumere che '%s' sia alla versione 1.5.0?\n" -#: git-gui.sh:853 +#: git-gui.sh:888 msgid "Git directory not found:" msgstr "Non trovo la directory di git: " -#: git-gui.sh:860 +#: git-gui.sh:895 msgid "Cannot move to top of working directory:" msgstr "Impossibile spostarsi sulla directory principale del progetto:" -#: git-gui.sh:867 +#: git-gui.sh:902 msgid "Cannot use funny .git directory:" msgstr "Impossibile usare una .git directory strana:" -#: git-gui.sh:872 +#: git-gui.sh:907 msgid "No working directory" msgstr "Nessuna directory di lavoro" -#: git-gui.sh:1019 +#: git-gui.sh:1054 msgid "Refreshing file status..." msgstr "Controllo dello stato dei file in corso..." -#: git-gui.sh:1084 +#: git-gui.sh:1119 msgid "Scanning for modified files ..." msgstr "Ricerca di file modificati in corso..." -#: git-gui.sh:1259 lib/browser.tcl:245 +#: git-gui.sh:1294 lib/browser.tcl:245 msgid "Ready." msgstr "Pronto." -#: git-gui.sh:1525 +#: git-gui.sh:1560 msgid "Unmodified" msgstr "Non modificato" -#: git-gui.sh:1527 +#: git-gui.sh:1562 msgid "Modified, not staged" msgstr "Modificato, non preparato per una nuova revisione" -#: git-gui.sh:1528 git-gui.sh:1533 +#: git-gui.sh:1563 git-gui.sh:1568 msgid "Staged for commit" msgstr "Preparato per una nuova revisione" -#: git-gui.sh:1529 git-gui.sh:1534 +#: git-gui.sh:1564 git-gui.sh:1569 msgid "Portions staged for commit" msgstr "Parti preparate per una nuova revisione" -#: git-gui.sh:1530 git-gui.sh:1535 +#: git-gui.sh:1565 git-gui.sh:1570 msgid "Staged for commit, missing" msgstr "Preparato per una nuova revisione, mancante" -#: git-gui.sh:1532 +#: git-gui.sh:1567 msgid "Untracked, not staged" msgstr "Non tracciato, non preparato per una nuova revisione" -#: git-gui.sh:1537 +#: git-gui.sh:1572 msgid "Missing" msgstr "Mancante" -#: git-gui.sh:1538 +#: git-gui.sh:1573 msgid "Staged for removal" msgstr "Preparato per la rimozione" -#: git-gui.sh:1539 +#: git-gui.sh:1574 msgid "Staged for removal, still present" msgstr "Preparato alla rimozione, ancora presente" -#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544 +#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 msgid "Requires merge resolution" msgstr "Richiede risoluzione dei conflitti" -#: git-gui.sh:1579 +#: git-gui.sh:1614 msgid "Starting gitk... please wait..." msgstr "Avvio di gitk... attendere..." -#: git-gui.sh:1588 +#: git-gui.sh:1623 #, tcl-format msgid "" "Unable to start gitk:\n" @@ -145,297 +145,297 @@ msgstr "" "\n" "%s non esiste" -#: git-gui.sh:1788 lib/choose_repository.tcl:32 +#: git-gui.sh:1823 lib/choose_repository.tcl:35 msgid "Repository" msgstr "Archivio" -#: git-gui.sh:1789 +#: git-gui.sh:1824 msgid "Edit" msgstr "Modifica" -#: git-gui.sh:1791 lib/choose_rev.tcl:560 +#: git-gui.sh:1826 lib/choose_rev.tcl:560 msgid "Branch" msgstr "Ramo" -#: git-gui.sh:1794 lib/choose_rev.tcl:547 +#: git-gui.sh:1829 lib/choose_rev.tcl:547 msgid "Commit@@noun" msgstr "Revisione" -#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 msgid "Merge" msgstr "Fusione (Merge)" -#: git-gui.sh:1798 lib/choose_rev.tcl:556 +#: git-gui.sh:1833 lib/choose_rev.tcl:556 msgid "Remote" msgstr "Remoto" -#: git-gui.sh:1807 +#: git-gui.sh:1842 msgid "Browse Current Branch's Files" -msgstr "Esplora i file del ramo corrente" +msgstr "Esplora i file del ramo attuale" -#: git-gui.sh:1811 +#: git-gui.sh:1846 msgid "Browse Branch Files..." msgstr "Esplora i file del ramo..." -#: git-gui.sh:1816 +#: git-gui.sh:1851 msgid "Visualize Current Branch's History" -msgstr "Visualizza la cronologia del ramo corrente" +msgstr "Visualizza la cronologia del ramo attuale" -#: git-gui.sh:1820 +#: git-gui.sh:1855 msgid "Visualize All Branch History" msgstr "Visualizza la cronologia di tutti i rami" -#: git-gui.sh:1827 +#: git-gui.sh:1862 #, tcl-format msgid "Browse %s's Files" msgstr "Esplora i file di %s" -#: git-gui.sh:1829 +#: git-gui.sh:1864 #, tcl-format msgid "Visualize %s's History" msgstr "Visualizza la cronologia di %s" -#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 msgid "Database Statistics" msgstr "Statistiche dell'archivio" -#: git-gui.sh:1837 lib/database.tcl:34 +#: git-gui.sh:1872 lib/database.tcl:34 msgid "Compress Database" msgstr "Comprimi l'archivio" -#: git-gui.sh:1840 +#: git-gui.sh:1875 msgid "Verify Database" msgstr "Verifica l'archivio" -#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9 -#: lib/shortcut.tcl:45 lib/shortcut.tcl:84 +#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7 +#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 msgid "Create Desktop Icon" msgstr "Crea icona desktop" -#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95 +#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 msgid "Quit" msgstr "Esci" -#: git-gui.sh:1867 +#: git-gui.sh:1902 msgid "Undo" msgstr "Annulla" -#: git-gui.sh:1870 +#: git-gui.sh:1905 msgid "Redo" msgstr "Ripeti" -#: git-gui.sh:1874 git-gui.sh:2366 +#: git-gui.sh:1909 git-gui.sh:2403 msgid "Cut" msgstr "Taglia" -#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512 +#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 #: lib/console.tcl:67 msgid "Copy" msgstr "Copia" -#: git-gui.sh:1880 git-gui.sh:2372 +#: git-gui.sh:1915 git-gui.sh:2409 msgid "Paste" msgstr "Incolla" -#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26 +#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 #: lib/remote_branch_delete.tcl:38 msgid "Delete" msgstr "Elimina" -#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69 +#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 msgid "Select All" msgstr "Seleziona tutto" -#: git-gui.sh:1896 +#: git-gui.sh:1931 msgid "Create..." msgstr "Crea..." -#: git-gui.sh:1902 +#: git-gui.sh:1937 msgid "Checkout..." msgstr "Attiva..." -#: git-gui.sh:1908 +#: git-gui.sh:1943 msgid "Rename..." msgstr "Rinomina" -#: git-gui.sh:1913 git-gui.sh:2012 +#: git-gui.sh:1948 git-gui.sh:2048 msgid "Delete..." msgstr "Elimina..." -#: git-gui.sh:1918 +#: git-gui.sh:1953 msgid "Reset..." msgstr "Ripristina..." -#: git-gui.sh:1930 git-gui.sh:2313 +#: git-gui.sh:1965 git-gui.sh:2350 msgid "New Commit" msgstr "Nuova revisione" -#: git-gui.sh:1938 git-gui.sh:2320 +#: git-gui.sh:1973 git-gui.sh:2357 msgid "Amend Last Commit" msgstr "Correggi l'ultima revisione" -#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 msgid "Rescan" msgstr "Analizza nuovamente" -#: git-gui.sh:1953 +#: git-gui.sh:1988 msgid "Stage To Commit" msgstr "Prepara per una nuova revisione" -#: git-gui.sh:1958 +#: git-gui.sh:1994 msgid "Stage Changed Files To Commit" msgstr "Prepara i file modificati per una nuova revisione" -#: git-gui.sh:1964 +#: git-gui.sh:2000 msgid "Unstage From Commit" msgstr "Annulla preparazione" -#: git-gui.sh:1969 lib/index.tcl:352 +#: git-gui.sh:2005 lib/index.tcl:393 msgid "Revert Changes" msgstr "Annulla modifiche" -#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390 +#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 msgid "Sign Off" msgstr "Sign Off" -#: git-gui.sh:1980 git-gui.sh:2296 +#: git-gui.sh:2016 git-gui.sh:2333 msgid "Commit@@verb" msgstr "Nuova revisione" -#: git-gui.sh:1991 +#: git-gui.sh:2027 msgid "Local Merge..." msgstr "Fusione locale..." -#: git-gui.sh:1996 +#: git-gui.sh:2032 msgid "Abort Merge..." msgstr "Interrompi fusione..." -#: git-gui.sh:2008 +#: git-gui.sh:2044 msgid "Push..." msgstr "Propaga..." -#: git-gui.sh:2019 lib/choose_repository.tcl:41 +#: git-gui.sh:2055 lib/choose_repository.tcl:40 msgid "Apple" msgstr "Apple" -#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 +#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 +#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 #, tcl-format msgid "About %s" msgstr "Informazioni su %s" -#: git-gui.sh:2026 +#: git-gui.sh:2062 msgid "Preferences..." msgstr "Preferenze..." -#: git-gui.sh:2034 git-gui.sh:2558 +#: git-gui.sh:2070 git-gui.sh:2595 msgid "Options..." msgstr "Opzioni..." -#: git-gui.sh:2040 lib/choose_repository.tcl:47 +#: git-gui.sh:2076 lib/choose_repository.tcl:46 msgid "Help" msgstr "Aiuto" -#: git-gui.sh:2081 +#: git-gui.sh:2117 msgid "Online Documentation" msgstr "Documentazione sul web" -#: git-gui.sh:2165 +#: git-gui.sh:2201 #, 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:2198 +#: git-gui.sh:2234 msgid "Current Branch:" msgstr "Ramo attuale:" -#: git-gui.sh:2219 +#: git-gui.sh:2255 msgid "Staged Changes (Will Commit)" msgstr "Modifiche preparate (saranno nella nuova revisione)" -#: git-gui.sh:2239 +#: git-gui.sh:2274 msgid "Unstaged Changes" msgstr "Modifiche non preparate" -#: git-gui.sh:2286 +#: git-gui.sh:2323 msgid "Stage Changed" msgstr "Prepara modificati" -#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182 +#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 msgid "Push" msgstr "Propaga (Push)" -#: git-gui.sh:2332 +#: git-gui.sh:2369 msgid "Initial Commit Message:" msgstr "Messaggio di revisione iniziale:" -#: git-gui.sh:2333 +#: git-gui.sh:2370 msgid "Amended Commit Message:" msgstr "Messaggio di revisione corretto:" -#: git-gui.sh:2334 +#: git-gui.sh:2371 msgid "Amended Initial Commit Message:" msgstr "Messaggio iniziale di revisione corretto:" -#: git-gui.sh:2335 +#: git-gui.sh:2372 msgid "Amended Merge Commit Message:" msgstr "Messaggio di fusione corretto:" -#: git-gui.sh:2336 +#: git-gui.sh:2373 msgid "Merge Commit Message:" msgstr "Messaggio di fusione:" -#: git-gui.sh:2337 +#: git-gui.sh:2374 msgid "Commit Message:" msgstr "Messaggio di revisione:" -#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71 +#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 msgid "Copy All" msgstr "Copia tutto" -#: git-gui.sh:2406 lib/blame.tcl:104 +#: git-gui.sh:2443 lib/blame.tcl:104 msgid "File:" msgstr "File:" -#: git-gui.sh:2508 +#: git-gui.sh:2545 msgid "Refresh" msgstr "Rinfresca" -#: git-gui.sh:2529 +#: git-gui.sh:2566 msgid "Apply/Reverse Hunk" msgstr "Applica/Inverti sezione" -#: git-gui.sh:2535 +#: git-gui.sh:2572 msgid "Decrease Font Size" msgstr "Diminuisci dimensione caratteri" -#: git-gui.sh:2539 +#: git-gui.sh:2576 msgid "Increase Font Size" msgstr "Aumenta dimensione caratteri" -#: git-gui.sh:2544 +#: git-gui.sh:2581 msgid "Show Less Context" msgstr "Mostra meno contesto" -#: git-gui.sh:2551 +#: git-gui.sh:2588 msgid "Show More Context" msgstr "Mostra più contesto" -#: git-gui.sh:2565 +#: git-gui.sh:2602 msgid "Unstage Hunk From Commit" msgstr "Sezione non preparata per una nuova revisione" -#: git-gui.sh:2567 +#: git-gui.sh:2604 msgid "Stage Hunk For Commit" msgstr "Prepara sezione per una nuova revisione" -#: git-gui.sh:2586 +#: git-gui.sh:2623 msgid "Initializing..." msgstr "Inizializzazione..." -#: git-gui.sh:2677 +#: git-gui.sh:2718 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -452,7 +452,7 @@ msgstr "" "da %s:\n" "\n" -#: git-gui.sh:2707 +#: git-gui.sh:2748 msgid "" "\n" "This is due to a known issue with the\n" @@ -462,7 +462,7 @@ msgstr "" "Ciò è dovuto a un problema conosciuto\n" "causato dall'eseguibile Tcl distribuito da Cygwin." -#: git-gui.sh:2712 +#: git-gui.sh:2753 #, tcl-format msgid "" "\n" @@ -582,7 +582,7 @@ msgstr "Crea ramo" msgid "Create New Branch" msgstr "Crea nuovo ramo" -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375 msgid "Create" msgstr "Crea" @@ -682,7 +682,7 @@ msgid "" "Failed to delete branches:\n" "%s" msgstr "" -"Cancellazione rami fallita:\n" +"Impossibile cancellare i rami:\n" "%s" #: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 @@ -736,9 +736,9 @@ msgstr "[Directory superiore]" msgid "Browse Branch Files" msgstr "Esplora i file del ramo" -#: lib/browser.tcl:277 lib/choose_repository.tcl:215 -#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315 -#: lib/choose_repository.tcl:811 +#: lib/browser.tcl:277 lib/choose_repository.tcl:391 +#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492 +#: lib/choose_repository.tcl:989 msgid "Browse" msgstr "Sfoglia" @@ -782,11 +782,12 @@ msgstr "La strategia di fusione '%s' non è supportata." #: lib/checkout_op.tcl:239 #, tcl-format msgid "Failed to update '%s'." -msgstr "Aggiornamento di '%s' fallito." +msgstr "Impossibile aggiornare '%s'." #: lib/checkout_op.tcl:251 msgid "Staging area (index) is already locked." -msgstr "L'area di preparazione per una nuova revisione (indice) è già bloccata." +msgstr "" +"L'area di preparazione per una nuova revisione (indice) è già bloccata." #: lib/checkout_op.tcl:266 msgid "" @@ -801,7 +802,7 @@ msgstr "" "\n" "Un altro programma Git ha modificato questo archivio dall'ultima analisi. " "Bisogna effettuare una nuova analisi prima di poter cambiare il ramo " -"corrente.\n" +"attuale.\n" "\n" "La nuova analisi comincerà ora.\n" @@ -870,7 +871,7 @@ msgid "" "\n" "This should not have occurred. %s will now close and give up." msgstr "" -"Preparazione ramo corrente fallita.\n" +"Impossibile preparare il ramo attuale.\n" "\n" "Questa directory di lavoro è stata convertita solo parzialmente. I file sono " "stati aggiornati correttamente, ma l'aggiornamento di un file di Git ha " @@ -902,214 +903,230 @@ msgstr "" "Questo è un testo d'esempio.\n" "Se ti piace questo testo, può essere il carattere giusto." -#: lib/choose_repository.tcl:25 +#: lib/choose_repository.tcl:27 msgid "Git Gui" msgstr "Git Gui" -#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204 +#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380 msgid "Create New Repository" msgstr "Crea nuovo archivio" -#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291 +#: lib/choose_repository.tcl:86 +msgid "New..." +msgstr "Nuovo..." + +#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468 msgid "Clone Existing Repository" msgstr "Clona archivio esistente" -#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800 +#: lib/choose_repository.tcl:99 +msgid "Clone..." +msgstr "Clona..." + +#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978 msgid "Open Existing Repository" msgstr "Apri archivio esistente" -#: lib/choose_repository.tcl:91 -msgid "Next >" -msgstr "Successivo >" +#: lib/choose_repository.tcl:112 +msgid "Open..." +msgstr "Apri..." + +#: lib/choose_repository.tcl:125 +msgid "Recent Repositories" +msgstr "Archivi recenti" + +#: lib/choose_repository.tcl:131 +msgid "Open Recent Repository:" +msgstr "Apri archivio recente:" -#: lib/choose_repository.tcl:152 +#: lib/choose_repository.tcl:294 #, tcl-format msgid "Location %s already exists." msgstr "La posizione %s esiste già." -#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165 -#: lib/choose_repository.tcl:172 +#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307 +#: lib/choose_repository.tcl:314 #, tcl-format msgid "Failed to create repository %s:" msgstr "Impossibile creare l'archivio %s:" -#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309 +#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486 msgid "Directory:" msgstr "Directory:" -#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363 -#: lib/choose_repository.tcl:834 +#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544 +#: lib/choose_repository.tcl:1013 msgid "Git Repository" msgstr "Archivio Git" -#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260 +#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437 #, tcl-format msgid "Directory %s already exists." msgstr "La directory %s esiste già." -#: lib/choose_repository.tcl:265 +#: lib/choose_repository.tcl:442 #, tcl-format msgid "File %s already exists." msgstr "Il file %s esiste già." -#: lib/choose_repository.tcl:286 +#: lib/choose_repository.tcl:463 msgid "Clone" msgstr "Clona" -#: lib/choose_repository.tcl:299 +#: lib/choose_repository.tcl:476 msgid "URL:" msgstr "URL:" -#: lib/choose_repository.tcl:319 +#: lib/choose_repository.tcl:496 msgid "Clone Type:" msgstr "Tipo di clone:" -#: lib/choose_repository.tcl:325 +#: lib/choose_repository.tcl:502 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "Standard (veloce, semi-ridondante, con hardlink)" -#: lib/choose_repository.tcl:331 +#: lib/choose_repository.tcl:508 msgid "Full Copy (Slower, Redundant Backup)" msgstr "Copia completa (più lento, backup ridondante)" -#: lib/choose_repository.tcl:337 +#: lib/choose_repository.tcl:514 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "Shared (il più veloce, non raccomandato, nessun backup)" -#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418 -#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630 -#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848 +#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 +#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808 +#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027 #, tcl-format msgid "Not a Git repository: %s" msgstr "%s non è un archivio Git." -#: lib/choose_repository.tcl:405 +#: lib/choose_repository.tcl:586 msgid "Standard only available for local repository." msgstr "Standard è disponibile solo per archivi locali." -#: lib/choose_repository.tcl:409 +#: lib/choose_repository.tcl:590 msgid "Shared only available for local repository." msgstr "Shared è disponibile solo per archivi locali." -#: lib/choose_repository.tcl:439 +#: lib/choose_repository.tcl:617 msgid "Failed to configure origin" msgstr "Impossibile configurare origin" -#: lib/choose_repository.tcl:451 +#: lib/choose_repository.tcl:629 msgid "Counting objects" msgstr "Calcolo oggetti" -#: lib/choose_repository.tcl:452 +#: lib/choose_repository.tcl:630 msgid "buckets" msgstr "" -#: lib/choose_repository.tcl:476 +#: lib/choose_repository.tcl:654 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" msgstr "Impossibile copiare oggetti/info/alternate: %s" -#: lib/choose_repository.tcl:512 +#: lib/choose_repository.tcl:690 #, tcl-format msgid "Nothing to clone from %s." msgstr "Niente da clonare da %s." -#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728 -#: lib/choose_repository.tcl:740 +#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 +#: lib/choose_repository.tcl:918 msgid "The 'master' branch has not been initialized." msgstr "Il ramo 'master' non è stato inizializzato." -#: lib/choose_repository.tcl:527 +#: lib/choose_repository.tcl:705 msgid "Hardlinks are unavailable. Falling back to copying." msgstr "Impossibile utilizzare gli hardlink. Si ricorrerà alla copia." -#: lib/choose_repository.tcl:539 +#: lib/choose_repository.tcl:717 #, tcl-format msgid "Cloning from %s" msgstr "Clonazione da %s" -#: lib/choose_repository.tcl:570 +#: lib/choose_repository.tcl:748 msgid "Copying objects" msgstr "Copia degli oggetti" -#: lib/choose_repository.tcl:571 +#: lib/choose_repository.tcl:749 msgid "KiB" msgstr "KiB" -#: lib/choose_repository.tcl:595 +#: lib/choose_repository.tcl:773 #, tcl-format msgid "Unable to copy object: %s" msgstr "Impossibile copiare oggetto: %s" -#: lib/choose_repository.tcl:605 +#: lib/choose_repository.tcl:783 msgid "Linking objects" msgstr "Collegamento oggetti" -#: lib/choose_repository.tcl:606 +#: lib/choose_repository.tcl:784 msgid "objects" msgstr "oggetti" -#: lib/choose_repository.tcl:614 +#: lib/choose_repository.tcl:792 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "Hardlink impossibile sull'oggetto: %s" -#: lib/choose_repository.tcl:669 +#: lib/choose_repository.tcl:847 msgid "Cannot fetch branches and objects. See console output for details." msgstr "" "Impossibile recuperare rami e oggetti. Controllare i dettagli forniti dalla " "console." -#: lib/choose_repository.tcl:680 +#: lib/choose_repository.tcl:858 msgid "Cannot fetch tags. See console output for details." msgstr "" "Impossibile recuperare le etichette. Controllare i dettagli forniti dalla " "console." -#: lib/choose_repository.tcl:704 +#: lib/choose_repository.tcl:882 msgid "Cannot determine HEAD. See console output for details." msgstr "" "Impossibile determinare HEAD. Controllare i dettagli forniti dalla console." -#: lib/choose_repository.tcl:713 +#: lib/choose_repository.tcl:891 #, tcl-format msgid "Unable to cleanup %s" msgstr "Impossibile ripulire %s" -#: lib/choose_repository.tcl:719 +#: lib/choose_repository.tcl:897 msgid "Clone failed." -msgstr "Clonazione fallita." +msgstr "Clonazione non riuscita." -#: lib/choose_repository.tcl:726 +#: lib/choose_repository.tcl:904 msgid "No default branch obtained." msgstr "Non è stato trovato un ramo predefinito." -#: lib/choose_repository.tcl:737 +#: lib/choose_repository.tcl:915 #, tcl-format msgid "Cannot resolve %s as a commit." msgstr "Impossibile risolvere %s come una revisione." -#: lib/choose_repository.tcl:749 +#: lib/choose_repository.tcl:927 msgid "Creating working directory" msgstr "Creazione directory di lavoro" -#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80 -#: lib/index.tcl:149 +#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127 +#: lib/index.tcl:193 msgid "files" msgstr "file" -#: lib/choose_repository.tcl:779 +#: lib/choose_repository.tcl:957 msgid "Initial file checkout failed." -msgstr "Attivazione iniziale impossibile." +msgstr "Attivazione iniziale non riuscita." -#: lib/choose_repository.tcl:795 +#: lib/choose_repository.tcl:973 msgid "Open" msgstr "Apri" -#: lib/choose_repository.tcl:805 +#: lib/choose_repository.tcl:983 msgid "Repository:" msgstr "Archivio:" -#: lib/choose_repository.tcl:854 +#: lib/choose_repository.tcl:1033 #, tcl-format msgid "Failed to open repository %s:" msgstr "Impossibile accedere all'archivio %s:" @@ -1164,8 +1181,8 @@ msgid "" msgstr "" "Non c'è niente da correggere.\n" "\n" -"Stai per creare la revisione iniziale. Non esiste una revisione " -"precedente da correggere.\n" +"Stai per creare la revisione iniziale. Non esiste una revisione precedente " +"da correggere.\n" #: lib/commit.tcl:18 msgid "" @@ -1242,8 +1259,8 @@ msgid "" msgstr "" "Nessuna modifica per la nuova revisione.\n" "\n" -"Devi preparare per una nuova revisione almeno 1 file prima di effettuare questa " -"operazione.\n" +"Devi preparare per una nuova revisione almeno 1 file prima di effettuare " +"questa operazione.\n" #: lib/commit.tcl:183 msgid "" @@ -1265,12 +1282,12 @@ msgstr "" #: lib/commit.tcl:257 msgid "write-tree failed:" -msgstr "write-tree fallito:" +msgstr "write-tree non riuscito:" #: lib/commit.tcl:275 #, tcl-format msgid "Commit %s appears to be corrupt" -msgstr "La revisione %s sembra essere corrotta" +msgstr "La revisione %s sembra essere danneggiata" #: lib/commit.tcl:279 msgid "" @@ -1297,11 +1314,11 @@ msgstr "attenzione: Tcl non supporta la codifica '%s'." #: lib/commit.tcl:317 msgid "commit-tree failed:" -msgstr "commit-tree fallito:" +msgstr "commit-tree non riuscito:" #: lib/commit.tcl:339 msgid "update-ref failed:" -msgstr "update-ref fallito:" +msgstr "update-ref non riuscito:" #: lib/commit.tcl:430 #, tcl-format @@ -1318,7 +1335,7 @@ msgstr "Successo" #: lib/console.tcl:196 msgid "Error: Command Failed" -msgstr "Errore: comando fallito" +msgstr "Errore: comando non riuscito" #: lib/database.tcl:43 msgid "Number of loose objects" @@ -1429,7 +1446,7 @@ msgstr "Errore nel caricamento delle differenze:" #: lib/diff.tcl:302 msgid "Failed to unstage selected hunk." -msgstr "La sezione scelta è ancora pronta per una nuova revisione." +msgstr "Impossibile rimuovere la sezione scelta dalla nuova revisione." #: lib/diff.tcl:309 msgid "Failed to stage selected hunk." @@ -1445,35 +1462,60 @@ msgstr "attenzione" #: lib/error.tcl:81 msgid "You must correct the above errors before committing." -msgstr "Bisogna correggere gli errori suddetti prima di creare una nuova revisione." +msgstr "" +"Bisogna correggere gli errori suddetti prima di creare una nuova revisione." -#: lib/index.tcl:241 +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "Impossibile sbloccare l'accesso all'indice" + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "Errore nell'indice" + +#: lib/index.tcl:21 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"Impossibile aggiornare l'indice. Ora sarà avviata una nuova analisi che " +"aggiornerà git-gui." + +#: lib/index.tcl:27 +msgid "Continue" +msgstr "Continua" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "Sblocca l'accesso all'indice" + +#: lib/index.tcl:282 #, tcl-format msgid "Unstaging %s from commit" msgstr "%s non farà parte della prossima revisione" -#: lib/index.tcl:285 +#: lib/index.tcl:326 #, tcl-format msgid "Adding %s" msgstr "Aggiunta di %s in corso" -#: lib/index.tcl:340 +#: lib/index.tcl:381 #, tcl-format msgid "Revert changes in file %s?" msgstr "Annullare le modifiche nel file %s?" -#: lib/index.tcl:342 +#: lib/index.tcl:383 #, tcl-format msgid "Revert changes in these %i files?" msgstr "Annullare le modifiche in questi %i file?" -#: lib/index.tcl:348 +#: lib/index.tcl:389 msgid "Any unstaged changes will be permanently lost by the revert." msgstr "" "Tutte le modifiche non preparate per una nuova revisione saranno perse per " "sempre." -#: lib/index.tcl:351 +#: lib/index.tcl:392 msgid "Do Nothing" msgstr "Non fare niente" @@ -1519,8 +1561,8 @@ msgstr "" "Il file %s ha dei conflitti.\n" "\n" "Bisogna risolvere i conflitti, preparare il file per una nuova revisione ed " -"infine crearla per completare la fusione corrente. Solo a questo punto " -"potrai iniziare un'altra fusione.\n" +"infine crearla per completare la fusione attuale. Solo a questo punto potrai " +"iniziare un'altra fusione.\n" #: lib/merge.tcl:54 #, tcl-format @@ -1536,9 +1578,9 @@ msgstr "" "\n" "Il file %s è stato modificato.\n" "\n" -"Bisogna completare la creazione della revisione corrente prima di iniziare una fusione. " -"In questo modo sarà più facile interrompere una fusione non riuscita, nel " -"caso ce ne fosse bisogno.\n" +"Bisogna completare la creazione della revisione attuale prima di iniziare " +"una fusione. In questo modo sarà più facile interrompere una fusione non " +"riuscita, nel caso ce ne fosse bisogno.\n" #: lib/merge.tcl:106 #, tcl-format @@ -1556,7 +1598,7 @@ msgstr "Fusione completata con successo." #: lib/merge.tcl:133 msgid "Merge failed. Conflict resolution is required." -msgstr "Fusione fallita. Bisogna risolvere i conflitti." +msgstr "Fusione non riuscita. Bisogna risolvere i conflitti." #: lib/merge.tcl:158 #, tcl-format @@ -1587,10 +1629,10 @@ msgid "" msgstr "" "Interrompere fusione?\n" "\n" -"L'interruzione della fusione corrente causerà la perdita di *TUTTE* le " +"L'interruzione della fusione attuale causerà la perdita di *TUTTE* le " "modifiche non ancora presenti nell'archivio.\n" "\n" -"Continuare con l'interruzione della fusione corrente?" +"Continuare con l'interruzione della fusione attuale?" #: lib/merge.tcl:228 msgid "" @@ -1605,7 +1647,7 @@ msgstr "" "L'annullamento delle modifiche causerà la perdita di *TUTTE* le modifiche " "non ancora presenti nell'archivio.\n" "\n" -"Continuare con l'annullamento delle modifiche correnti?" +"Continuare con l'annullamento delle modifiche attuali?" #: lib/merge.tcl:239 msgid "Aborting" @@ -1613,7 +1655,7 @@ msgstr "Interruzione in corso" #: lib/merge.tcl:266 msgid "Abort failed." -msgstr "Interruzione fallita." +msgstr "Interruzione non riuscita." #: lib/merge.tcl:268 msgid "Abort completed. Ready." @@ -1621,7 +1663,7 @@ msgstr "Interruzione completata. Pronto." #: lib/option.tcl:82 msgid "Restore Defaults" -msgstr "Ripristina predefiniti" +msgstr "Ripristina valori predefiniti" #: lib/option.tcl:86 msgid "Save" @@ -1763,8 +1805,8 @@ msgid "" "One or more of the merge tests failed because you have not fetched the " "necessary commits. Try fetching from %s first." msgstr "" -"Una o più verifiche di fusione sono fallite perché mancano le revisioni " -"necessarie. Prova prima a recuperarle da %s." +"Impossibile verificare una o più fusioni: mancano le revisioni necessarie. " +"Prova prima a recuperarle da %s." #: lib/remote_branch_delete.tcl:207 msgid "Please select one or more branches to delete." @@ -1794,18 +1836,18 @@ msgstr "Nessun archivio selezionato." msgid "Scanning %s..." msgstr "Analisi in corso %s..." -#: lib/shortcut.tcl:26 lib/shortcut.tcl:74 -msgid "Cannot write script:" -msgstr "Impossibile scrivere script:" +#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 +msgid "Cannot write shortcut:" +msgstr "Impossibile scrivere shortcut:" -#: lib/shortcut.tcl:149 +#: lib/shortcut.tcl:136 msgid "Cannot write icon:" msgstr "Impossibile scrivere icona:" #: lib/status_bar.tcl:83 #, tcl-format msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i di %*i %s (%3i%%)" +msgstr "%1$s ... %6$s: %2$*i di %4$*i (%7$3i%%)" #: lib/transport.tcl:6 #, tcl-format @@ -1869,4 +1911,3 @@ msgstr "Utilizza 'thin pack' (per connessioni lente)" #: lib/transport.tcl:168 msgid "Include tags" msgstr "Includi etichette" - diff --git a/git-gui/po/ja.po b/git-gui/po/ja.po index f3a547b1b9..e2cf5bdc06 100644 --- a/git-gui/po/ja.po +++ b/git-gui/po/ja.po @@ -8,41 +8,41 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-10 04:04-0400\n" -"PO-Revision-Date: 2007-10-31 16:23+0900\n" +"POT-Creation-Date: 2007-11-24 10:36+0100\n" +"PO-Revision-Date: 2007-12-05 06:12+0900\n" "Last-Translator: しらいし ななこ <nanako3@bluebottle.com>\n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 -#: git-gui.sh:763 +#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714 +#: git-gui.sh:733 msgid "git-gui: fatal error" msgstr "git-gui: 致命的なエラー" -#: git-gui.sh:595 +#: git-gui.sh:565 #, tcl-format msgid "Invalid font specified in %s:" msgstr "%s に無効なフォントが指定されています:" -#: git-gui.sh:620 +#: git-gui.sh:590 msgid "Main Font" msgstr "主フォント" -#: git-gui.sh:621 +#: git-gui.sh:591 msgid "Diff/Console Font" msgstr "diff/コンソール・フォント" -#: git-gui.sh:635 +#: git-gui.sh:605 msgid "Cannot find git in PATH." msgstr "PATH 中に git が見つかりません" -#: git-gui.sh:662 +#: git-gui.sh:632 msgid "Cannot parse Git version string:" msgstr "Git バージョン名が理解できません:" -#: git-gui.sh:680 +#: git-gui.sh:650 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -61,79 +61,79 @@ msgstr "" "\n" "'%s' はバージョン 1.5.0 と思って良いですか？\n" -#: git-gui.sh:853 +#: git-gui.sh:888 msgid "Git directory not found:" msgstr "Git ディレクトリが見つかりません:" -#: git-gui.sh:860 +#: git-gui.sh:895 msgid "Cannot move to top of working directory:" msgstr "作業ディレクトリの最上位に移動できません" -#: git-gui.sh:867 +#: git-gui.sh:902 msgid "Cannot use funny .git directory:" msgstr "変な .git ディレクトリは使えません" -#: git-gui.sh:872 +#: git-gui.sh:907 msgid "No working directory" msgstr "作業ディレクトリがありません" -#: git-gui.sh:1019 +#: git-gui.sh:1054 msgid "Refreshing file status..." msgstr "ファイル状態を更新しています…" -#: git-gui.sh:1084 +#: git-gui.sh:1119 msgid "Scanning for modified files ..." msgstr "変更されたファイルをスキャンしています…" -#: git-gui.sh:1259 lib/browser.tcl:245 +#: git-gui.sh:1294 lib/browser.tcl:245 msgid "Ready." msgstr "準備完了" -#: git-gui.sh:1525 +#: git-gui.sh:1560 msgid "Unmodified" msgstr "変更無し" -#: git-gui.sh:1527 +#: git-gui.sh:1562 msgid "Modified, not staged" msgstr "変更あり、コミット未予定" -#: git-gui.sh:1528 git-gui.sh:1533 +#: git-gui.sh:1563 git-gui.sh:1568 msgid "Staged for commit" msgstr "コミット予定済" -#: git-gui.sh:1529 git-gui.sh:1534 +#: git-gui.sh:1564 git-gui.sh:1569 msgid "Portions staged for commit" msgstr "部分的にコミット予定済" -#: git-gui.sh:1530 git-gui.sh:1535 +#: git-gui.sh:1565 git-gui.sh:1570 msgid "Staged for commit, missing" msgstr "コミット予定済、ファイル無し" -#: git-gui.sh:1532 +#: git-gui.sh:1567 msgid "Untracked, not staged" msgstr "管理外、コミット未予定" -#: git-gui.sh:1537 +#: git-gui.sh:1572 msgid "Missing" msgstr "ファイル無し" -#: git-gui.sh:1538 +#: git-gui.sh:1573 msgid "Staged for removal" msgstr "削除予定済" -#: git-gui.sh:1539 +#: git-gui.sh:1574 msgid "Staged for removal, still present" msgstr "削除予定済、ファイル未削除" -#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544 +#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579 msgid "Requires merge resolution" msgstr "要マージ解決" -#: git-gui.sh:1579 +#: git-gui.sh:1614 msgid "Starting gitk... please wait..." msgstr "gitk を起動中…お待ち下さい…" -#: git-gui.sh:1588 +#: git-gui.sh:1623 #, tcl-format msgid "" "Unable to start gitk:\n" @@ -144,295 +144,297 @@ msgstr "" "\n" "%s がありません" -#: git-gui.sh:1788 lib/choose_repository.tcl:32 +#: git-gui.sh:1823 lib/choose_repository.tcl:35 msgid "Repository" msgstr "リポジトリ" -#: git-gui.sh:1789 +#: git-gui.sh:1824 msgid "Edit" msgstr "編集" -#: git-gui.sh:1791 lib/choose_rev.tcl:560 +#: git-gui.sh:1826 lib/choose_rev.tcl:560 msgid "Branch" msgstr "ブランチ" -#: git-gui.sh:1794 lib/choose_rev.tcl:547 +#: git-gui.sh:1829 lib/choose_rev.tcl:547 msgid "Commit@@noun" msgstr "コミット" -#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 msgid "Merge" msgstr "マージ" -#: git-gui.sh:1798 lib/choose_rev.tcl:556 +#: git-gui.sh:1833 lib/choose_rev.tcl:556 msgid "Remote" msgstr "リモート" -#: git-gui.sh:1807 +#: git-gui.sh:1842 msgid "Browse Current Branch's Files" msgstr "現在のブランチのファイルを見る" -#: git-gui.sh:1811 +#: git-gui.sh:1846 msgid "Browse Branch Files..." msgstr "ブランチのファイルを見る…" -#: git-gui.sh:1816 +#: git-gui.sh:1851 msgid "Visualize Current Branch's History" msgstr "現在のブランチの履歴を見る" -#: git-gui.sh:1820 +#: git-gui.sh:1855 msgid "Visualize All Branch History" msgstr "全てのブランチの履歴を見る" -#: git-gui.sh:1827 +#: git-gui.sh:1862 #, tcl-format msgid "Browse %s's Files" msgstr "ブランチ %s のファイルを見る" -#: git-gui.sh:1829 +#: git-gui.sh:1864 #, tcl-format msgid "Visualize %s's History" msgstr "ブランチ %s の履歴を見る" -#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67 msgid "Database Statistics" msgstr "データベース統計" -#: git-gui.sh:1837 lib/database.tcl:34 +#: git-gui.sh:1872 lib/database.tcl:34 msgid "Compress Database" msgstr "データベース圧縮" -#: git-gui.sh:1840 +#: git-gui.sh:1875 msgid "Verify Database" msgstr "データベース検証" -#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9 -#: lib/shortcut.tcl:45 lib/shortcut.tcl:84 +#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7 +#: lib/shortcut.tcl:39 lib/shortcut.tcl:71 msgid "Create Desktop Icon" msgstr "デスクトップ・アイコンを作る" -#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95 +#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184 msgid "Quit" msgstr "終了" -#: git-gui.sh:1867 +#: git-gui.sh:1902 msgid "Undo" msgstr "元に戻す" -#: git-gui.sh:1870 +#: git-gui.sh:1905 msgid "Redo" msgstr "やり直し" -#: git-gui.sh:1874 git-gui.sh:2366 +#: git-gui.sh:1909 git-gui.sh:2403 msgid "Cut" msgstr "切り取り" -#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512 +#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549 #: lib/console.tcl:67 msgid "Copy" msgstr "コピー" -#: git-gui.sh:1880 git-gui.sh:2372 +#: git-gui.sh:1915 git-gui.sh:2409 msgid "Paste" msgstr "貼り付け" -#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26 +#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26 #: lib/remote_branch_delete.tcl:38 msgid "Delete" msgstr "削除" -#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69 +#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69 msgid "Select All" msgstr "全て選択" -#: git-gui.sh:1896 +#: git-gui.sh:1931 msgid "Create..." msgstr "作成…" -#: git-gui.sh:1902 +#: git-gui.sh:1937 msgid "Checkout..." msgstr "チェックアウト" -#: git-gui.sh:1908 +#: git-gui.sh:1943 msgid "Rename..." msgstr "名前変更…" -#: git-gui.sh:1913 git-gui.sh:2012 +#: git-gui.sh:1948 git-gui.sh:2048 msgid "Delete..." msgstr "削除…" -#: git-gui.sh:1918 +#: git-gui.sh:1953 msgid "Reset..." msgstr "リセット…" -#: git-gui.sh:1930 git-gui.sh:2313 +#: git-gui.sh:1965 git-gui.sh:2350 msgid "New Commit" msgstr "新規コミット" -#: git-gui.sh:1938 git-gui.sh:2320 +#: git-gui.sh:1973 git-gui.sh:2357 msgid "Amend Last Commit" msgstr "最新コミットを訂正" -#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99 msgid "Rescan" msgstr "再スキャン" -#: git-gui.sh:1953 +#: git-gui.sh:1988 msgid "Stage To Commit" msgstr "コミット予定する" -#: git-gui.sh:1958 +#: git-gui.sh:1994 msgid "Stage Changed Files To Commit" msgstr "変更されたファイルをコミット予定" -#: git-gui.sh:1964 +#: git-gui.sh:2000 msgid "Unstage From Commit" msgstr "コミットから降ろす" -#: git-gui.sh:1969 lib/index.tcl:352 +#: git-gui.sh:2005 lib/index.tcl:393 msgid "Revert Changes" msgstr "変更を元に戻す" -#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390 +#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427 msgid "Sign Off" msgstr "署名" -#: git-gui.sh:1980 git-gui.sh:2296 +#: git-gui.sh:2016 git-gui.sh:2333 msgid "Commit@@verb" msgstr "コミット" -#: git-gui.sh:1991 +#: git-gui.sh:2027 msgid "Local Merge..." msgstr "ローカル・マージ…" -#: git-gui.sh:1996 +#: git-gui.sh:2032 msgid "Abort Merge..." msgstr "マージ中止…" -#: git-gui.sh:2008 +#: git-gui.sh:2044 msgid "Push..." msgstr "プッシュ…" -#: git-gui.sh:2019 lib/choose_repository.tcl:41 +#: git-gui.sh:2055 lib/choose_repository.tcl:40 msgid "Apple" msgstr "りんご" -#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 +#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13 +#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49 #, tcl-format msgid "About %s" msgstr "%s について" -#: git-gui.sh:2026 +#: git-gui.sh:2062 msgid "Preferences..." msgstr "設定…" -#: git-gui.sh:2034 git-gui.sh:2558 +#: git-gui.sh:2070 git-gui.sh:2595 msgid "Options..." msgstr "オプション…" -#: git-gui.sh:2040 lib/choose_repository.tcl:47 +#: git-gui.sh:2076 lib/choose_repository.tcl:46 msgid "Help" msgstr "ヘルプ" -#: git-gui.sh:2081 +#: git-gui.sh:2117 msgid "Online Documentation" msgstr "オンライン・ドキュメント" -#: git-gui.sh:2165 +#: git-gui.sh:2201 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "致命的: パス %s が stat できません。そのようなファイルやディレクトリはありません" +msgstr "" +"致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま" +"せん" -#: git-gui.sh:2198 +#: git-gui.sh:2234 msgid "Current Branch:" msgstr "現在のブランチ" -#: git-gui.sh:2219 +#: git-gui.sh:2255 msgid "Staged Changes (Will Commit)" msgstr "ステージングされた（コミット予定済の）変更" -#: git-gui.sh:2239 +#: git-gui.sh:2274 msgid "Unstaged Changes" msgstr "コミット予定に入っていない変更" -#: git-gui.sh:2286 +#: git-gui.sh:2323 msgid "Stage Changed" msgstr "変更をコミット予定に入れる" -#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182 +#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182 msgid "Push" msgstr "プッシュ" -#: git-gui.sh:2332 +#: git-gui.sh:2369 msgid "Initial Commit Message:" msgstr "最初のコミットメッセージ:" -#: git-gui.sh:2333 +#: git-gui.sh:2370 msgid "Amended Commit Message:" msgstr "訂正したコミットメッセージ:" -#: git-gui.sh:2334 +#: git-gui.sh:2371 msgid "Amended Initial Commit Message:" msgstr "訂正した最初のコミットメッセージ:" -#: git-gui.sh:2335 +#: git-gui.sh:2372 msgid "Amended Merge Commit Message:" msgstr "訂正したマージコミットメッセージ:" -#: git-gui.sh:2336 +#: git-gui.sh:2373 msgid "Merge Commit Message:" msgstr "マージコミットメッセージ:" -#: git-gui.sh:2337 +#: git-gui.sh:2374 msgid "Commit Message:" msgstr "コミットメッセージ:" -#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71 +#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71 msgid "Copy All" msgstr "全てコピー" -#: git-gui.sh:2406 lib/blame.tcl:104 +#: git-gui.sh:2443 lib/blame.tcl:104 msgid "File:" msgstr "ファイル:" -#: git-gui.sh:2508 +#: git-gui.sh:2545 msgid "Refresh" msgstr "再読み込み" -#: git-gui.sh:2529 +#: git-gui.sh:2566 msgid "Apply/Reverse Hunk" msgstr "パッチを適用/取り消す" -#: git-gui.sh:2535 +#: git-gui.sh:2572 msgid "Decrease Font Size" msgstr "フォントを小さく" -#: git-gui.sh:2539 +#: git-gui.sh:2576 msgid "Increase Font Size" msgstr "フォントを大きく" -#: git-gui.sh:2544 +#: git-gui.sh:2581 msgid "Show Less Context" msgstr "文脈を少なく" -#: git-gui.sh:2551 +#: git-gui.sh:2588 msgid "Show More Context" msgstr "文脈を多く" -#: git-gui.sh:2565 +#: git-gui.sh:2602 msgid "Unstage Hunk From Commit" msgstr "パッチをコミット予定から外す" -#: git-gui.sh:2567 +#: git-gui.sh:2604 msgid "Stage Hunk For Commit" msgstr "パッチをコミット予定に加える" -#: git-gui.sh:2586 +#: git-gui.sh:2623 msgid "Initializing..." msgstr "初期化しています…" -#: git-gui.sh:2677 +#: git-gui.sh:2718 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -447,7 +449,7 @@ msgstr "" "以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\n" "\n" -#: git-gui.sh:2707 +#: git-gui.sh:2748 msgid "" "\n" "This is due to a known issue with the\n" @@ -457,7 +459,7 @@ msgstr "" "これは Cygwin で配布されている Tcl バイナリに\n" "関しての既知の問題によります" -#: git-gui.sh:2712 +#: git-gui.sh:2753 #, tcl-format msgid "" "\n" @@ -576,7 +578,7 @@ msgstr "ブランチを作成" msgid "Create New Branch" msgstr "ブランチを新規作成" -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375 msgid "Create" msgstr "作成" @@ -729,9 +731,9 @@ msgstr "[上位フォルダへ]" msgid "Browse Branch Files" msgstr "現在のブランチのファイルを見る" -#: lib/browser.tcl:277 lib/choose_repository.tcl:215 -#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315 -#: lib/choose_repository.tcl:811 +#: lib/browser.tcl:277 lib/choose_repository.tcl:391 +#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492 +#: lib/choose_repository.tcl:989 msgid "Browse" msgstr "ブラウズ" @@ -891,209 +893,225 @@ msgstr "" "これはサンプル文です。\n" "このフォントが気に入ればお使いになれます。" -#: lib/choose_repository.tcl:25 +#: lib/choose_repository.tcl:27 msgid "Git Gui" msgstr "Git GUI" -#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204 +#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380 msgid "Create New Repository" msgstr "新しいリポジトリを作る" -#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291 +#: lib/choose_repository.tcl:86 +msgid "New..." +msgstr "新規…" + +#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468 msgid "Clone Existing Repository" msgstr "既存リポジトリを複製する" -#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800 +#: lib/choose_repository.tcl:99 +msgid "Clone..." +msgstr "複製…" + +#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978 msgid "Open Existing Repository" msgstr "既存リポジトリを開く" -#: lib/choose_repository.tcl:91 -msgid "Next >" -msgstr "次 >" +#: lib/choose_repository.tcl:112 +msgid "Open..." +msgstr "開く…" + +#: lib/choose_repository.tcl:125 +msgid "Recent Repositories" +msgstr "最近使ったリポジトリ" + +#: lib/choose_repository.tcl:131 +msgid "Open Recent Repository:" +msgstr "最近使ったリポジトリを開く" -#: lib/choose_repository.tcl:152 +#: lib/choose_repository.tcl:294 #, tcl-format msgid "Location %s already exists." msgstr "'%s' は既に存在します。" -#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165 -#: lib/choose_repository.tcl:172 +#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307 +#: lib/choose_repository.tcl:314 #, tcl-format msgid "Failed to create repository %s:" msgstr "リポジトリ %s を作製できません:" -#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309 +#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486 msgid "Directory:" msgstr "ディレクトリ:" -#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363 -#: lib/choose_repository.tcl:834 +#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544 +#: lib/choose_repository.tcl:1013 msgid "Git Repository" msgstr "GIT リポジトリ" -#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260 +#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437 #, tcl-format msgid "Directory %s already exists." msgstr "ディレクトリ '%s' は既に存在します。" -#: lib/choose_repository.tcl:265 +#: lib/choose_repository.tcl:442 #, tcl-format msgid "File %s already exists." msgstr "ファイル '%s' は既に存在します。" -#: lib/choose_repository.tcl:286 +#: lib/choose_repository.tcl:463 msgid "Clone" msgstr "複製" -#: lib/choose_repository.tcl:299 +#: lib/choose_repository.tcl:476 msgid "URL:" msgstr "URL:" -#: lib/choose_repository.tcl:319 +#: lib/choose_repository.tcl:496 msgid "Clone Type:" msgstr "複製方式:" -#: lib/choose_repository.tcl:325 +#: lib/choose_repository.tcl:502 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "標準(高速・中冗長度・ハードリンク)" -#: lib/choose_repository.tcl:331 +#: lib/choose_repository.tcl:508 msgid "Full Copy (Slower, Redundant Backup)" msgstr "全複写(低速・冗長バックアップ)" -#: lib/choose_repository.tcl:337 +#: lib/choose_repository.tcl:514 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "共有(最高速・非推奨・バックアップ無し)" -#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418 -#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630 -#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848 +#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597 +#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808 +#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027 #, tcl-format msgid "Not a Git repository: %s" msgstr "Git リポジトリではありません: %s" -#: lib/choose_repository.tcl:405 +#: lib/choose_repository.tcl:586 msgid "Standard only available for local repository." msgstr "標準方式は同一計算機上のリポジトリにのみ使えます。" -#: lib/choose_repository.tcl:409 +#: lib/choose_repository.tcl:590 msgid "Shared only available for local repository." msgstr "共有方式は同一計算機上のリポジトリにのみ使えます。" -#: lib/choose_repository.tcl:439 +#: lib/choose_repository.tcl:617 msgid "Failed to configure origin" msgstr "origin を設定できませんでした" -#: lib/choose_repository.tcl:451 +#: lib/choose_repository.tcl:629 msgid "Counting objects" msgstr "オブジェクトを数えています" -#: lib/choose_repository.tcl:452 +#: lib/choose_repository.tcl:630 msgid "buckets" msgstr "バケツ" -#: lib/choose_repository.tcl:476 +#: lib/choose_repository.tcl:654 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" msgstr "objects/info/alternates を複写できません: %s" -#: lib/choose_repository.tcl:512 +#: lib/choose_repository.tcl:690 #, tcl-format msgid "Nothing to clone from %s." msgstr "%s から複製する内容はありません" -#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728 -#: lib/choose_repository.tcl:740 +#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906 +#: lib/choose_repository.tcl:918 msgid "The 'master' branch has not been initialized." msgstr "'master' ブランチが初期化されていません" -#: lib/choose_repository.tcl:527 +#: lib/choose_repository.tcl:705 msgid "Hardlinks are unavailable. Falling back to copying." msgstr "ハードリンクが作れないので、コピーします" -#: lib/choose_repository.tcl:539 +#: lib/choose_repository.tcl:717 #, tcl-format msgid "Cloning from %s" msgstr "%s から複製しています" -#: lib/choose_repository.tcl:570 +#: lib/choose_repository.tcl:748 msgid "Copying objects" msgstr "オブジェクトを複写しています" -#: lib/choose_repository.tcl:571 +#: lib/choose_repository.tcl:749 msgid "KiB" msgstr "KiB" -#: lib/choose_repository.tcl:595 +#: lib/choose_repository.tcl:773 #, tcl-format msgid "Unable to copy object: %s" msgstr "オブジェクトを複写できません: %s" -#: lib/choose_repository.tcl:605 +#: lib/choose_repository.tcl:783 msgid "Linking objects" msgstr "オブジェクトを連結しています" -#: lib/choose_repository.tcl:606 +#: lib/choose_repository.tcl:784 msgid "objects" msgstr "オブジェクト" -#: lib/choose_repository.tcl:614 +#: lib/choose_repository.tcl:792 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "オブジェクトをハードリンクできません: %s" -#: lib/choose_repository.tcl:669 +#: lib/choose_repository.tcl:847 msgid "Cannot fetch branches and objects. See console output for details." msgstr "ブランチやオブジェクトを取得できません。コンソール出力を見て下さい" -#: lib/choose_repository.tcl:680 +#: lib/choose_repository.tcl:858 msgid "Cannot fetch tags. See console output for details." msgstr "タグを取得できません。コンソール出力を見て下さい" -#: lib/choose_repository.tcl:704 +#: lib/choose_repository.tcl:882 msgid "Cannot determine HEAD. See console output for details." msgstr "HEAD を確定できません。コンソール出力を見て下さい" -#: lib/choose_repository.tcl:713 +#: lib/choose_repository.tcl:891 #, tcl-format msgid "Unable to cleanup %s" msgstr "%s を掃除できません" -#: lib/choose_repository.tcl:719 +#: lib/choose_repository.tcl:897 msgid "Clone failed." msgstr "複写に失敗しました。" -#: lib/choose_repository.tcl:726 +#: lib/choose_repository.tcl:904 msgid "No default branch obtained." msgstr "デフォールト・ブランチが取得されませんでした" -#: lib/choose_repository.tcl:737 +#: lib/choose_repository.tcl:915 #, tcl-format msgid "Cannot resolve %s as a commit." msgstr "%s をコミットとして解釈できません" -#: lib/choose_repository.tcl:749 +#: lib/choose_repository.tcl:927 msgid "Creating working directory" msgstr "作業ディレクトリを作成しています" -#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80 -#: lib/index.tcl:149 +#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127 +#: lib/index.tcl:193 msgid "files" msgstr "ファイル" -#: lib/choose_repository.tcl:779 +#: lib/choose_repository.tcl:957 msgid "Initial file checkout failed." msgstr "初期チェックアウトに失敗しました" -#: lib/choose_repository.tcl:795 +#: lib/choose_repository.tcl:973 msgid "Open" msgstr "開く" -#: lib/choose_repository.tcl:805 +#: lib/choose_repository.tcl:983 msgid "Repository:" msgstr "リポジトリ:" -#: lib/choose_repository.tcl:854 +#: lib/choose_repository.tcl:1033 #, tcl-format msgid "Failed to open repository %s:" msgstr "リポジトリ %s を開けません:" @@ -1232,7 +1250,7 @@ msgid "" "\n" "A good commit message has the following format:\n" "\n" -"- First line: Describe in one sentance what you did.\n" +"- First line: Describe in one sentence what you did.\n" "- Second line: Blank\n" "- Remaining lines: Describe why this change is good.\n" msgstr "" @@ -1349,7 +1367,8 @@ msgid "" msgstr "" "このリポジトリにはおおよそ %i 個の個別オブジェクトがあります\n" "\n" -"最適な性能を保つために、%i 個以上の個別オブジェクトを作る毎にデータベースを圧縮することを推奨します\n" +"最適な性能を保つために、%i 個以上の個別オブジェクトを作る毎にデータベースを圧" +"縮することを推奨します\n" "\n" "データベースを圧縮しますか？" @@ -1426,31 +1445,53 @@ msgstr "警告" msgid "You must correct the above errors before committing." msgstr "コミットする前に、以上のエラーを修正して下さい" -#: lib/index.tcl:241 +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "インデックスをロックできません" + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "索引エラー" + +#: lib/index.tcl:21 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンします。" + +#: lib/index.tcl:27 +msgid "Continue" +msgstr "続行" + +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "インデックスのロック解除" + +#: lib/index.tcl:282 #, tcl-format msgid "Unstaging %s from commit" msgstr "コミットから '%s' を降ろす" -#: lib/index.tcl:285 +#: lib/index.tcl:326 #, tcl-format msgid "Adding %s" msgstr "コミットに %s を加えています" -#: lib/index.tcl:340 +#: lib/index.tcl:381 #, tcl-format msgid "Revert changes in file %s?" msgstr "ファイル %s にした変更を元に戻しますか？" -#: lib/index.tcl:342 +#: lib/index.tcl:383 #, tcl-format msgid "Revert changes in these %i files?" msgstr "これら %i 個のファイルにした変更を元に戻しますか？" -#: lib/index.tcl:348 +#: lib/index.tcl:389 msgid "Any unstaged changes will be permanently lost by the revert." msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。" -#: lib/index.tcl:351 +#: lib/index.tcl:392 msgid "Do Nothing" msgstr "何もしない" @@ -1669,18 +1710,6 @@ msgstr "設定" msgid "Failed to completely save options:" msgstr "完全にオプションを保存できません:" -#: lib/remote.tcl:165 -msgid "Prune from" -msgstr "から刈込む…" - -#: lib/remote.tcl:170 -msgid "Fetch from" -msgstr "取得元" - -#: lib/remote.tcl:213 -msgid "Push to" -msgstr "プッシュ先" - #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 msgid "Delete Remote Branch" msgstr "リモート・ブランチを削除" @@ -1765,11 +1794,23 @@ msgstr "リポジトリが選択されていません。" msgid "Scanning %s..." msgstr "%s をスキャンしています…" -#: lib/shortcut.tcl:26 lib/shortcut.tcl:74 -msgid "Cannot write script:" -msgstr "スクリプトが書けません:" +#: lib/remote.tcl:165 +msgid "Prune from" +msgstr "から刈込む…" + +#: lib/remote.tcl:170 +msgid "Fetch from" +msgstr "取得元" -#: lib/shortcut.tcl:149 +#: lib/remote.tcl:213 +msgid "Push to" +msgstr "プッシュ先" + +#: lib/shortcut.tcl:20 lib/shortcut.tcl:61 +msgid "Cannot write shortcut:" +msgstr "ショートカットが書けません:" + +#: lib/shortcut.tcl:136 msgid "Cannot write icon:" msgstr "アイコンが書けません:" @@ -1840,4 +1881,3 @@ msgstr "Thin Pack を使う（遅いネットワーク接続）" #: lib/transport.tcl:168 msgid "Include tags" msgstr "タグを含める" - |