![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Dec 2008 06:54:39 +0000 (22:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Dec 2008 06:54:39 +0000 (22:54 -0800) |
* git://repo.or.cz/git-gui:
git-gui: update Japanese translation
git-gui: french translation update
Updated Swedish translation (514t0f0u).
git gui: update Italian translation
Update Hungarian translation. 100% completed.
git-gui: update Japanese translation
git-gui: french translation update
Updated Swedish translation (514t0f0u).
git gui: update Italian translation
Update Hungarian translation. 100% completed.
| 1 | 2 | |||
|---|---|---|---|---|
| git-gui/po/fr.po | patch | | diff1 | | | | blob | history |
| git-gui/po/hu.po | patch | | diff1 | | | | blob | history |
| git-gui/po/it.po | patch | | diff1 | | | | blob | history |
| git-gui/po/ja.po | patch | | diff1 | | | | blob | history |
| git-gui/po/sv.po | patch | | diff1 | | | | blob | history |
diff --cc git-gui/po/fr.po
index 26b866f5510788fd0dac1df1d7f59114713ce53a,0000000000000000000000000000000000000000..45773ab3d89f84757cf1f7dc0a7d0626ce88f1ec
mode 100644,000000..100644
mode 100644,000000..100644
--- 1/git-gui/po/fr.po
--- /dev/null
+++ b/git-gui/po/fr.po
- # translation of fr.po to Français
++# translation of fr.po to French
+# Translation of git-gui to French.
+# Copyright (C) 2008 Shawn Pearce, et al.
+# This file is distributed under the same license as the git package.
+#
+# Christian Couder <chriscool@tuxfamily.org>, 2008.
+# Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-08-02 14:45-0700\n"
- "PO-Revision-Date: 2008-08-11 17:12-0400\n"
- "Last-Translator: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>\n"
- "Language-Team: Français <fr@li.org>\n"
++"POT-Creation-Date: 2008-11-16 13:56-0800\n"
++"PO-Revision-Date: 2008-11-20 10:20+0100\n"
++"Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n"
++"Language-Team: French\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
- #: git-gui.sh:41 git-gui.sh:688 git-gui.sh:702 git-gui.sh:715 git-gui.sh:798
- #: git-gui.sh:817
++#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847
++#: git-gui.sh:866
+msgid "git-gui: fatal error"
+msgstr "git-gui: erreur fatale"
+
- #: git-gui.sh:644
++#: git-gui.sh:689
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "Police invalide spécifiée dans %s :"
+
- #: git-gui.sh:674
++#: git-gui.sh:723
+msgid "Main Font"
+msgstr "Police principale"
+
- #: git-gui.sh:675
++#: git-gui.sh:724
+msgid "Diff/Console Font"
+msgstr "Police diff/console"
+
- #: git-gui.sh:689
++#: git-gui.sh:738
+msgid "Cannot find git in PATH."
+msgstr "Impossible de trouver git dans PATH."
+
- #: git-gui.sh:716
++#: git-gui.sh:765
+msgid "Cannot parse Git version string:"
+msgstr "Impossible de parser la version de Git :"
+
- #: git-gui.sh:734
++#: git-gui.sh:783
+#, tcl-format
+msgid ""
+"Git version cannot be determined.\n"
+"\n"
+"%s claims it is version '%s'.\n"
+"\n"
+"%s requires at least Git 1.5.0 or later.\n"
+"\n"
+"Assume '%s' is version 1.5.0?\n"
+msgstr ""
+"Impossible de déterminer la version de Git.\n"
+"\n"
+"%s affirme qu'il s'agit de la version '%s'.\n"
+"\n"
+"%s nécessite au moins Git 1.5.0.\n"
+"\n"
+"Peut'on considérer que '%s' est en version 1.5.0 ?\n"
+
- #: git-gui.sh:972
++#: git-gui.sh:1062
+msgid "Git directory not found:"
+msgstr "Impossible de trouver le répertoire git :"
+
- #: git-gui.sh:979
++#: git-gui.sh:1069
+msgid "Cannot move to top of working directory:"
+msgstr "Impossible d'aller à la racine du répertoire de travail :"
+
- #: git-gui.sh:986
++#: git-gui.sh:1076
+msgid "Cannot use funny .git directory:"
+msgstr "Impossible d'utiliser le répertoire .git:"
+
- #: git-gui.sh:991
++#: git-gui.sh:1081
+msgid "No working directory"
+msgstr "Aucun répertoire de travail"
+
- #: git-gui.sh:1138 lib/checkout_op.tcl:305
++#: git-gui.sh:1247 lib/checkout_op.tcl:305
+msgid "Refreshing file status..."
+msgstr "Rafraichissement du status des fichiers..."
+
- #: git-gui.sh:1194
++#: git-gui.sh:1303
+msgid "Scanning for modified files ..."
+msgstr "Recherche de fichiers modifiés..."
+
- #: git-gui.sh:1369 lib/browser.tcl:246
++#: git-gui.sh:1367
++msgid "Calling prepare-commit-msg hook..."
++msgstr "Lancement de l'action de préparation du message de commit..."
++
++#: git-gui.sh:1384
++msgid "Commit declined by prepare-commit-msg hook."
++msgstr "Commit refusé par l'action de préparation du message de commit."
++
++#: git-gui.sh:1542 lib/browser.tcl:246
+msgid "Ready."
+msgstr "Prêt."
+
- #: git-gui.sh:1635
++#: git-gui.sh:1819
+msgid "Unmodified"
+msgstr "Non modifié"
+
- #: git-gui.sh:1637
++#: git-gui.sh:1821
+msgid "Modified, not staged"
+msgstr "Modifié, pas indexé"
+
- #: git-gui.sh:1638 git-gui.sh:1643
++#: git-gui.sh:1822 git-gui.sh:1830
+msgid "Staged for commit"
+msgstr "Indexé"
+
- #: git-gui.sh:1639 git-gui.sh:1644
++#: git-gui.sh:1823 git-gui.sh:1831
+msgid "Portions staged for commit"
+msgstr "Portions indexées"
+
- #: git-gui.sh:1640 git-gui.sh:1645
++#: git-gui.sh:1824 git-gui.sh:1832
+msgid "Staged for commit, missing"
+msgstr "Indexés, manquant"
+
- #: git-gui.sh:1642
++#: git-gui.sh:1826
++msgid "File type changed, not staged"
++msgstr "Le type de fichier a changé, non indexé"
++
++#: git-gui.sh:1827
++msgid "File type changed, staged"
++msgstr "Le type de fichier a changé, indexé"
++
++#: git-gui.sh:1829
+msgid "Untracked, not staged"
+msgstr "Non versionné, non indexé"
+
- #: git-gui.sh:1647
++#: git-gui.sh:1834
+msgid "Missing"
+msgstr "Manquant"
+
- #: git-gui.sh:1648
++#: git-gui.sh:1835
+msgid "Staged for removal"
+msgstr "Indexé pour suppression"
+
- #: git-gui.sh:1649
++#: git-gui.sh:1836
+msgid "Staged for removal, still present"
+msgstr "Indexé pour suppression, toujours présent"
+
- #: git-gui.sh:1651 git-gui.sh:1652 git-gui.sh:1653 git-gui.sh:1654
++#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841
++#: git-gui.sh:1842 git-gui.sh:1843
+msgid "Requires merge resolution"
+msgstr "Nécessite la résolution d'une fusion"
+
- #: git-gui.sh:1689
++#: git-gui.sh:1878
+msgid "Starting gitk... please wait..."
+msgstr "Lancement de gitk... un instant..."
+
- #: git-gui.sh:1698
++#: git-gui.sh:1887
+msgid "Couldn't find gitk in PATH"
+msgstr "Impossible de trouver gitk dans PATH."
+
- #: git-gui.sh:1948 lib/choose_repository.tcl:36
++#: git-gui.sh:2280 lib/choose_repository.tcl:36
+msgid "Repository"
+msgstr "Dépôt"
+
- #: git-gui.sh:1949
++#: git-gui.sh:2281
+msgid "Edit"
+msgstr "Edition"
+
- #: git-gui.sh:1951 lib/choose_rev.tcl:561
++#: git-gui.sh:2283 lib/choose_rev.tcl:561
+msgid "Branch"
+msgstr "Branche"
+
- #: git-gui.sh:1954 lib/choose_rev.tcl:548
++#: git-gui.sh:2286 lib/choose_rev.tcl:548
+msgid "Commit@@noun"
+msgstr "Commit"
+
- #: git-gui.sh:1957 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
++#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+msgid "Merge"
+msgstr "Fusionner"
+
- #: git-gui.sh:1958 lib/choose_rev.tcl:557
++#: git-gui.sh:2290 lib/choose_rev.tcl:557
+msgid "Remote"
+msgstr "Dépôt distant"
+
- #: git-gui.sh:1967
++#: git-gui.sh:2293
++msgid "Tools"
++msgstr "Outils"
++
++#: git-gui.sh:2302
++msgid "Explore Working Copy"
++msgstr "Explorer la copie de travail"
++
++#: git-gui.sh:2307
+msgid "Browse Current Branch's Files"
+msgstr "Naviguer dans la branche courante"
+
- #: git-gui.sh:1971
++#: git-gui.sh:2311
+msgid "Browse Branch Files..."
+msgstr "Naviguer dans la branche..."
+
- #: git-gui.sh:1976
++#: git-gui.sh:2316
+msgid "Visualize Current Branch's History"
+msgstr "Visualiser historique branche courante"
+
- #: git-gui.sh:1980
++#: git-gui.sh:2320
+msgid "Visualize All Branch History"
+msgstr "Voir l'historique de toutes les branches"
+
- #: git-gui.sh:1987
++#: git-gui.sh:2327
+#, tcl-format
+msgid "Browse %s's Files"
+msgstr "Naviguer l'arborescence de %s"
+
- #: git-gui.sh:1989
++#: git-gui.sh:2329
+#, tcl-format
+msgid "Visualize %s's History"
+msgstr "Voir l'historique de la branche: %s"
+
- #: git-gui.sh:1994 lib/database.tcl:27 lib/database.tcl:67
++#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67
+msgid "Database Statistics"
+msgstr "Statistiques du dépôt"
+
- #: git-gui.sh:1997 lib/database.tcl:34
++#: git-gui.sh:2337 lib/database.tcl:34
+msgid "Compress Database"
+msgstr "Comprimer le dépôt"
+
- #: git-gui.sh:2000
++#: git-gui.sh:2340
+msgid "Verify Database"
+msgstr "Vérifier le dépôt"
+
- #: git-gui.sh:2007 git-gui.sh:2011 git-gui.sh:2015 lib/shortcut.tcl:7
++#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7
+#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
+msgid "Create Desktop Icon"
+msgstr "Créer icône sur bureau"
+
- #: git-gui.sh:2023 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
++#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+msgid "Quit"
+msgstr "Quitter"
+
- #: git-gui.sh:2031
++#: git-gui.sh:2371
+msgid "Undo"
+msgstr "Défaire"
+
- #: git-gui.sh:2034
++#: git-gui.sh:2374
+msgid "Redo"
+msgstr "Refaire"
+
- #: git-gui.sh:2038 git-gui.sh:2545
++#: git-gui.sh:2378 git-gui.sh:2923
+msgid "Cut"
+msgstr "Couper"
+
- #: git-gui.sh:2041 git-gui.sh:2548 git-gui.sh:2622 git-gui.sh:2715
++#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
+#: lib/console.tcl:69
+msgid "Copy"
+msgstr "Copier"
+
- #: git-gui.sh:2044 git-gui.sh:2551
++#: git-gui.sh:2384 git-gui.sh:2929
+msgid "Paste"
+msgstr "Coller"
+
- #: git-gui.sh:2047 git-gui.sh:2554 lib/branch_delete.tcl:26
++#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
+#: lib/remote_branch_delete.tcl:38
+msgid "Delete"
+msgstr "Supprimer"
+
- #: git-gui.sh:2051 git-gui.sh:2558 git-gui.sh:2719 lib/console.tcl:71
++#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
+msgid "Select All"
+msgstr "Tout sélectionner"
+
- #: git-gui.sh:2060
++#: git-gui.sh:2400
+msgid "Create..."
+msgstr "Créer..."
+
- #: git-gui.sh:2066
++#: git-gui.sh:2406
+msgid "Checkout..."
+msgstr "Charger (checkout)..."
+
- #: git-gui.sh:2072
++#: git-gui.sh:2412
+msgid "Rename..."
+msgstr "Renommer..."
+
- #: git-gui.sh:2077 git-gui.sh:2187
++#: git-gui.sh:2417
+msgid "Delete..."
+msgstr "Supprimer..."
+
- #: git-gui.sh:2082
++#: git-gui.sh:2422
+msgid "Reset..."
+msgstr "Réinitialiser..."
+
- #: git-gui.sh:2094 git-gui.sh:2491
++#: git-gui.sh:2432
++msgid "Done"
++msgstr "Effectué"
++
++#: git-gui.sh:2434
++msgid "Commit@@verb"
++msgstr "Commiter@@verb"
++
++#: git-gui.sh:2443 git-gui.sh:2864
+msgid "New Commit"
+msgstr "Nouveau commit"
+
- #: git-gui.sh:2102 git-gui.sh:2498
++#: git-gui.sh:2451 git-gui.sh:2871
+msgid "Amend Last Commit"
+msgstr "Corriger dernier commit"
+
- #: git-gui.sh:2111 git-gui.sh:2458 lib/remote_branch_delete.tcl:99
++#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
+msgid "Rescan"
+msgstr "Recharger modifs."
+
- #: git-gui.sh:2117
++#: git-gui.sh:2467
+msgid "Stage To Commit"
+msgstr "Indexer"
+
- #: git-gui.sh:2123
++#: git-gui.sh:2473
+msgid "Stage Changed Files To Commit"
+msgstr "Indexer toutes modifications"
+
- #: git-gui.sh:2129
++#: git-gui.sh:2479
+msgid "Unstage From Commit"
+msgstr "Désindexer"
+
- #: git-gui.sh:2134 lib/index.tcl:395
++#: git-gui.sh:2484 lib/index.tcl:410
+msgid "Revert Changes"
+msgstr "Annuler les modifications (revert)"
+
- #: git-gui.sh:2141 git-gui.sh:2702
++#: git-gui.sh:2491 git-gui.sh:3069
+msgid "Show Less Context"
+msgstr "Montrer moins de contexte"
+
- #: git-gui.sh:2145 git-gui.sh:2706
++#: git-gui.sh:2495 git-gui.sh:3073
+msgid "Show More Context"
+msgstr "Montrer plus de contexte"
+
- #: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
++#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
+msgid "Sign Off"
+msgstr "Signer"
+
- #: git-gui.sh:2155 git-gui.sh:2474
- msgid "Commit@@verb"
- msgstr "Commiter"
-
- #: git-gui.sh:2166
++#: git-gui.sh:2518
+msgid "Local Merge..."
+msgstr "Fusion locale..."
+
- #: git-gui.sh:2171
++#: git-gui.sh:2523
+msgid "Abort Merge..."
+msgstr "Abandonner fusion..."
+
- #: git-gui.sh:2183
++#: git-gui.sh:2535 git-gui.sh:2575
++msgid "Add..."
++msgstr "Ajouter..."
++
++#: git-gui.sh:2539
+msgid "Push..."
+msgstr "Pousser..."
+
- #: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14
- #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
++#: git-gui.sh:2543
++msgid "Delete Branch..."
++msgstr "Supprimer branche..."
++
++#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14
++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#, tcl-format
+msgid "About %s"
+msgstr "À propos de %s"
+
- #: git-gui.sh:2201
++#: git-gui.sh:2557
+msgid "Preferences..."
+msgstr "Préférences..."
+
- #: git-gui.sh:2209 git-gui.sh:2740
++#: git-gui.sh:2565 git-gui.sh:3115
+msgid "Options..."
+msgstr "Options..."
+
- #: git-gui.sh:2215 lib/choose_repository.tcl:47
++#: git-gui.sh:2576
++msgid "Remove..."
++msgstr "Supprimer..."
++
++#: git-gui.sh:2585 lib/choose_repository.tcl:50
+msgid "Help"
+msgstr "Aide"
+
- #: git-gui.sh:2256
++#: git-gui.sh:2611
+msgid "Online Documentation"
+msgstr "Documentation en ligne"
+
- #: git-gui.sh:2340
++#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
++msgid "Show SSH Key"
++msgstr "Montrer clé SSH"
++
++#: git-gui.sh:2707
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+"erreur fatale : pas d'infos sur le chemin %s : Fichier ou répertoire "
+"inexistant"
+
- #: git-gui.sh:2373
++#: git-gui.sh:2740
+msgid "Current Branch:"
+msgstr "Branche courante :"
+
- #: git-gui.sh:2394
++#: git-gui.sh:2761
+msgid "Staged Changes (Will Commit)"
+msgstr "Modifs. indexées (pour commit)"
+
- #: git-gui.sh:2414
++#: git-gui.sh:2781
+msgid "Unstaged Changes"
+msgstr "Modifs. non indexées"
+
- #: git-gui.sh:2464
++#: git-gui.sh:2831
+msgid "Stage Changed"
+msgstr "Indexer modifs."
+
- #: git-gui.sh:2480 lib/transport.tcl:93 lib/transport.tcl:182
++#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "Pousser"
+
- #: git-gui.sh:2510
++#: git-gui.sh:2885
+msgid "Initial Commit Message:"
+msgstr "Message de commit initial :"
+
- #: git-gui.sh:2511
++#: git-gui.sh:2886
+msgid "Amended Commit Message:"
+msgstr "Message de commit corrigé :"
+
- #: git-gui.sh:2512
++#: git-gui.sh:2887
+msgid "Amended Initial Commit Message:"
+msgstr "Message de commit initial corrigé :"
+
- #: git-gui.sh:2513
++#: git-gui.sh:2888
+msgid "Amended Merge Commit Message:"
+msgstr "Message de commit de fusion corrigé :"
+
- #: git-gui.sh:2514
++#: git-gui.sh:2889
+msgid "Merge Commit Message:"
+msgstr "Message de commit de fusion :"
+
- #: git-gui.sh:2515
++#: git-gui.sh:2890
+msgid "Commit Message:"
+msgstr "Message de commit :"
+
- #: git-gui.sh:2561 git-gui.sh:2723 lib/console.tcl:73
++#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
+msgid "Copy All"
+msgstr "Copier tout"
+
- #: git-gui.sh:2585 lib/blame.tcl:100
++#: git-gui.sh:2963 lib/blame.tcl:104
+msgid "File:"
+msgstr "Fichier :"
+
- #: git-gui.sh:2691
- msgid "Apply/Reverse Hunk"
- msgstr "Appliquer/Inverser section"
-
- #: git-gui.sh:2696
- msgid "Apply/Reverse Line"
- msgstr "Appliquer/Inverser la ligne"
-
- #: git-gui.sh:2711
++#: git-gui.sh:3078
+msgid "Refresh"
+msgstr "Rafraichir"
+
- #: git-gui.sh:2732
++#: git-gui.sh:3099
+msgid "Decrease Font Size"
+msgstr "Diminuer la police"
+
- #: git-gui.sh:2736
++#: git-gui.sh:3103
+msgid "Increase Font Size"
+msgstr "Agrandir la police"
+
- #: git-gui.sh:2747
++#: git-gui.sh:3111 lib/blame.tcl:281
++msgid "Encoding"
++msgstr "Encodage"
++
++#: git-gui.sh:3122
++msgid "Apply/Reverse Hunk"
++msgstr "Appliquer/Inverser section"
++
++#: git-gui.sh:3127
++msgid "Apply/Reverse Line"
++msgstr "Appliquer/Inverser la ligne"
++
++#: git-gui.sh:3137
++msgid "Run Merge Tool"
++msgstr "Lancer outil de merge"
++
++#: git-gui.sh:3142
++msgid "Use Remote Version"
++msgstr "Utiliser la version distante"
++
++#: git-gui.sh:3146
++msgid "Use Local Version"
++msgstr "Utiliser la version locale"
++
++#: git-gui.sh:3150
++msgid "Revert To Base"
++msgstr "Revenir à la version de base"
++
++#: git-gui.sh:3169
+msgid "Unstage Hunk From Commit"
+msgstr "Désindexer la section"
+
- #: git-gui.sh:2748
++#: git-gui.sh:3170
+msgid "Unstage Line From Commit"
+msgstr "Désindexer la ligne"
+
- #: git-gui.sh:2750
++#: git-gui.sh:3172
+msgid "Stage Hunk For Commit"
+msgstr "Indexer la section"
+
- #: git-gui.sh:2751
++#: git-gui.sh:3173
+msgid "Stage Line For Commit"
+msgstr "Indexer la ligne"
+
- #: git-gui.sh:2771
++#: git-gui.sh:3196
+msgid "Initializing..."
+msgstr "Initialisation..."
+
- #: git-gui.sh:2876
++#: git-gui.sh:3301
+#, tcl-format
+msgid ""
+"Possible environment issues exist.\n"
+"\n"
+"The following environment variables are probably\n"
+"going to be ignored by any Git subprocess run\n"
+"by %s:\n"
+"\n"
+msgstr ""
+"Des problèmes d'environnement sont possibles.\n"
+"\n"
+"Les variables d'environnement suivantes seront\n"
+"probablement ignorées par tous les\n"
+"sous-processus de Git lancés par %s\n"
+"\n"
+
- #: git-gui.sh:2906
++#: git-gui.sh:3331
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+"\n"
+"Ceci est du à un problème connu avec\n"
+"le binaire Tcl distribué par Cygwin."
+
- #: git-gui.sh:2911
++#: git-gui.sh:3336
+#, tcl-format
+msgid ""
+"\n"
+"\n"
+"A good replacement for %s\n"
+"is placing values for the user.name and\n"
+"user.email settings into your personal\n"
+"~/.gitconfig file.\n"
+msgstr ""
+"\n"
+"\n"
+"Un bon remplacement pour %s\n"
+"est de mettre les valeurs pour 'user.name' (nom\n"
+"de l'utilisateur) et 'user.email' (addresse email\n"
+"de l'utilisateur) dans votre fichier '~/.gitconfig'.\n"
+
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - une interface graphique utilisateur pour Git"
+
- #: lib/blame.tcl:70
++#: lib/blame.tcl:72
+msgid "File Viewer"
+msgstr "Visionneur de fichier"
+
- #: lib/blame.tcl:74
++#: lib/blame.tcl:78
+msgid "Commit:"
+msgstr "Commit :"
+
- #: lib/blame.tcl:257
++#: lib/blame.tcl:271
+msgid "Copy Commit"
+msgstr "Copier commit"
+
- #: lib/blame.tcl:260
++#: lib/blame.tcl:275
++msgid "Find Text..."
++msgstr "Chercher texte..."
++
++#: lib/blame.tcl:284
+msgid "Do Full Copy Detection"
+msgstr "Lancer la détection approfondie des copies"
+
- #: lib/blame.tcl:388
++#: lib/blame.tcl:288
++msgid "Show History Context"
++msgstr "Montrer l'historique"
++
++#: lib/blame.tcl:291
++msgid "Blame Parent Commit"
++msgstr "Blâmer le commit parent"
++
++#: lib/blame.tcl:450
+#, tcl-format
+msgid "Reading %s..."
+msgstr "Lecture de %s..."
+
- #: lib/blame.tcl:492
++#: lib/blame.tcl:557
+msgid "Loading copy/move tracking annotations..."
+msgstr "Chargement des annotations de suivi des copies/déplacements..."
+
- #: lib/blame.tcl:512
++#: lib/blame.tcl:577
+msgid "lines annotated"
+msgstr "lignes annotées"
+
- #: lib/blame.tcl:704
++#: lib/blame.tcl:769
+msgid "Loading original location annotations..."
+msgstr "Chargement des annotations d'emplacement original"
+
- #: lib/blame.tcl:707
++#: lib/blame.tcl:772
+msgid "Annotation complete."
+msgstr "Annotation terminée."
+
- #: lib/blame.tcl:737
++#: lib/blame.tcl:802
+msgid "Busy"
+msgstr "Occupé"
+
- #: lib/blame.tcl:738
++#: lib/blame.tcl:803
+msgid "Annotation process is already running."
+msgstr "Annotation en cours d'exécution."
+
- #: lib/blame.tcl:777
++#: lib/blame.tcl:842
+msgid "Running thorough copy detection..."
+msgstr "Recherche de copie approfondie en cours..."
+
- #: lib/blame.tcl:827
++#: lib/blame.tcl:910
+msgid "Loading annotation..."
+msgstr "Chargement des annotations..."
+
- #: lib/blame.tcl:883
++#: lib/blame.tcl:964
+msgid "Author:"
+msgstr "Auteur :"
+
- #: lib/blame.tcl:887
++#: lib/blame.tcl:968
+msgid "Committer:"
+msgstr "Commiteur :"
+
- #: lib/blame.tcl:892
++#: lib/blame.tcl:973
+msgid "Original File:"
+msgstr "Fichier original :"
+
- #: lib/blame.tcl:1006
++#: lib/blame.tcl:1021
++msgid "Cannot find HEAD commit:"
++msgstr "Impossible de trouver le commit HEAD:"
++
++#: lib/blame.tcl:1076
++msgid "Cannot find parent commit:"
++msgstr "Impossible de trouver le commit parent:"
++
++#: lib/blame.tcl:1091
++msgid "Unable to display parent"
++msgstr "Impossible d'afficher le parent"
++
++#: lib/blame.tcl:1092 lib/diff.tcl:297
++msgid "Error loading diff:"
++msgstr "Erreur lors du chargement des différences :"
++
++#: lib/blame.tcl:1232
+msgid "Originally By:"
+msgstr "A l'origine par :"
+
- #: lib/blame.tcl:1012
++#: lib/blame.tcl:1238
+msgid "In File:"
+msgstr "Dans le fichier :"
+
- #: lib/blame.tcl:1017
++#: lib/blame.tcl:1243
+msgid "Copied Or Moved Here By:"
+msgstr "Copié ou déplacé ici par :"
+
+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
+msgid "Checkout Branch"
+msgstr "Charger la branche (checkout)"
+
+#: lib/branch_checkout.tcl:23
+msgid "Checkout"
+msgstr "Charger (checkout)"
+
+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
- #: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:171
- #: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
++#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
++#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
++#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
++#: lib/transport.tcl:97
+msgid "Cancel"
+msgstr "Annuler"
+
- #: lib/branch_checkout.tcl:32 lib/browser.tcl:287
++#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
+msgid "Revision"
+msgstr "Révision"
+
- #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:244
++#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
+msgid "Options"
+msgstr "Options"
+
+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
+msgstr "Récupérer la branche de suivi"
+
+#: lib/branch_checkout.tcl:44
+msgid "Detach From Local Branch"
+msgstr "Détacher de la branche locale"
+
+#: lib/branch_create.tcl:22
+msgid "Create Branch"
+msgstr "Créer branche"
+
+#: lib/branch_create.tcl:27
+msgid "Create New Branch"
+msgstr "Créer nouvelle branche"
+
- #: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377
+msgid "Create"
+msgstr "Créer"
+
+#: lib/branch_create.tcl:40
+msgid "Branch Name"
+msgstr "Nom de branche"
+
- #: lib/branch_create.tcl:43
++#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
+msgid "Name:"
+msgstr "Nom :"
+
+#: lib/branch_create.tcl:58
+msgid "Match Tracking Branch Name"
+msgstr "Trouver nom de branche de suivi"
+
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
+msgstr "Révision initiale"
+
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
+msgstr "Mettre à jour branche existante :"
+
+#: lib/branch_create.tcl:75
+msgid "No"
+msgstr "Non"
+
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
+msgstr "Mise-à-jour rectiligne seulement (fast-forward)"
+
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
+msgstr "Charger (checkout) après création"
+
+#: lib/branch_create.tcl:131
+msgid "Please select a tracking branch."
+msgstr "Choisissez une branche de suivi"
+
+#: lib/branch_create.tcl:140
+#, tcl-format
+msgid "Tracking branch %s is not a branch in the remote repository."
+msgstr "La branche de suivi %s n'est pas une branche dans le dépôt distant."
+
+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
+msgid "Please supply a branch name."
+msgstr "Fournissez un nom de branche."
+
+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#, tcl-format
+msgid "'%s' is not an acceptable branch name."
+msgstr "'%s' n'est pas un nom de branche acceptable."
+
+#: lib/branch_delete.tcl:15
+msgid "Delete Branch"
+msgstr "Supprimer branche"
+
+#: lib/branch_delete.tcl:20
+msgid "Delete Local Branch"
+msgstr "Supprimer branche locale"
+
+#: lib/branch_delete.tcl:37
+msgid "Local Branches"
+msgstr "Branches locales"
+
+#: lib/branch_delete.tcl:52
+msgid "Delete Only If Merged Into"
+msgstr "Supprimer seulement si fusionnée dans:"
+
+#: lib/branch_delete.tcl:54
+msgid "Always (Do not perform merge test.)"
+msgstr "Toujours (Ne pas faire de test de fusion.)"
+
+#: lib/branch_delete.tcl:103
+#, tcl-format
+msgid "The following branches are not completely merged into %s:"
+msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :"
+
+#: lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult. \n"
+"\n"
+" Delete the selected branches?"
+msgstr ""
+"Récupérer des branches supprimées est difficile.\n"
+"\n"
+"Supprimer les branches sélectionnées ?"
+
+#: lib/branch_delete.tcl:141
+#, tcl-format
+msgid ""
+"Failed to delete branches:\n"
+"%s"
+msgstr ""
+"La suppression des branches suivantes a échouée :\n"
+"%s"
+
+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
+msgid "Rename Branch"
+msgstr "Renommer branche"
+
+#: lib/branch_rename.tcl:26
+msgid "Rename"
+msgstr "Renommer"
+
+#: lib/branch_rename.tcl:36
+msgid "Branch:"
+msgstr "Branche :"
+
+#: lib/branch_rename.tcl:39
+msgid "New Name:"
+msgstr "Nouveau nom :"
+
+#: lib/branch_rename.tcl:75
+msgid "Please select a branch to rename."
+msgstr "Merci de sélectionner une branche à renommer."
+
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201
+#, tcl-format
+msgid "Branch '%s' already exists."
+msgstr "La branche '%s' existe déjà."
+
+#: lib/branch_rename.tcl:117
+#, tcl-format
+msgid "Failed to rename '%s'."
+msgstr "Échec pour renommer '%s'."
+
+#: lib/browser.tcl:17
+msgid "Starting..."
+msgstr "Lancement..."
+
+#: lib/browser.tcl:26
+msgid "File Browser"
+msgstr "Visionneur de fichier"
+
+#: lib/browser.tcl:126 lib/browser.tcl:143
+#, tcl-format
+msgid "Loading %s..."
+msgstr "Chargement de %s..."
+
+#: lib/browser.tcl:187
+msgid "[Up To Parent]"
+msgstr "[Jusqu'au parent]"
+
+#: lib/browser.tcl:267 lib/browser.tcl:273
+msgid "Browse Branch Files"
+msgstr "Naviguer dans les fichiers de le branche"
+
- #: lib/browser.tcl:278 lib/choose_repository.tcl:387
- #: lib/choose_repository.tcl:472 lib/choose_repository.tcl:482
- #: lib/choose_repository.tcl:985
++#: lib/browser.tcl:278 lib/choose_repository.tcl:394
++#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491
++#: lib/choose_repository.tcl:995
+msgid "Browse"
+msgstr "Naviguer"
+
+#: lib/checkout_op.tcl:84
+#, tcl-format
+msgid "Fetching %s from %s"
+msgstr "Récupération de %s à partir de %s"
+
+#: lib/checkout_op.tcl:132
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr "erreur fatale : Impossible de résoudre %s"
+
+#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
++#: lib/sshkey.tcl:53
+msgid "Close"
+msgstr "Fermer"
+
+#: lib/checkout_op.tcl:174
+#, tcl-format
+msgid "Branch '%s' does not exist."
+msgstr "La branche '%s' n'existe pas."
+
+#: lib/checkout_op.tcl:193
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
+msgstr "Échec de la configuration simplifiée de git-pull pour '%s'."
+
+#: lib/checkout_op.tcl:228
+#, tcl-format
+msgid ""
+"Branch '%s' already exists.\n"
+"\n"
+"It cannot fast-forward to %s.\n"
+"A merge is required."
+msgstr ""
+"La branche '%s' existe déjà.\n"
+"\n"
+"Impossible de faire une avance rapide (fast forward) vers %s.\n"
+"Une fusion est nécessaire."
+
+#: lib/checkout_op.tcl:242
+#, tcl-format
+msgid "Merge strategy '%s' not supported."
+msgstr "La stratégie de fusion '%s' n'est pas supportée."
+
+#: lib/checkout_op.tcl:261
+#, tcl-format
+msgid "Failed to update '%s'."
+msgstr "La mise à jour de '%s' a échouée."
+
+#: lib/checkout_op.tcl:273
+msgid "Staging area (index) is already locked."
+msgstr "L'index (staging area) est déjà vérouillé"
+
+#: lib/checkout_op.tcl:288
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before the current branch can be changed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
+"dépôt\n"
+"\n"
+"Un autre programme Git a modifié ce dépôt depuis la dernière "
+"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir "
+"modifier la branche courante.\n"
+"\n"
+"Cela va être fait tout de suite automatiquement.\n"
+
+#: lib/checkout_op.tcl:344
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "Mise à jour du répertoire courant avec '%s'..."
+
+#: lib/checkout_op.tcl:345
+msgid "files checked out"
+msgstr "fichiers chargés"
+
+#: lib/checkout_op.tcl:375
+#, tcl-format
+msgid "Aborted checkout of '%s' (file level merging is required)."
+msgstr "Chargement de '%s' abandonné (il est nécessaire de fusionner des fichiers)."
+
+#: lib/checkout_op.tcl:376
+msgid "File level merge required."
+msgstr "Il est nécessaire de fusionner des fichiers."
+
+#: lib/checkout_op.tcl:380
+#, tcl-format
+msgid "Staying on branch '%s'."
+msgstr "Le répertoire de travail reste sur la branche '%s'."
+
+#: lib/checkout_op.tcl:451
+msgid ""
+"You are no longer on a local branch.\n"
+"\n"
+"If you wanted to be on a branch, create one now starting from 'This Detached "
+"Checkout'."
+msgstr ""
+"Vous n'êtes plus ur une branche locale.\n"
+"\n"
+"Si vous vouliez être sur une branche, créez en une maintenant en partant de "
+"'Cet emprunt détaché'."
+
+#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
+#, tcl-format
+msgid "Checked out '%s'."
+msgstr "'%s' chargé."
+
+#: lib/checkout_op.tcl:500
+#, tcl-format
+msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgstr "Réinitialiser '%s' à '%s' va faire perdre les commits suivants :"
+
+#: lib/checkout_op.tcl:522
+msgid "Recovering lost commits may not be easy."
+msgstr "Récupérer les commits perdus ne sera peut être pas facile."
+
+#: lib/checkout_op.tcl:527
+#, tcl-format
+msgid "Reset '%s'?"
+msgstr "Réinitialiser '%s' ?"
+
- #: lib/checkout_op.tcl:532 lib/merge.tcl:163
++#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+msgid "Visualize"
+msgstr "Visualiser"
+
+#: lib/checkout_op.tcl:600
+#, tcl-format
+msgid ""
+"Failed to set current branch.\n"
+"\n"
+"This working directory is only partially switched. We successfully updated "
+"your files, but failed to update an internal Git file.\n"
+"\n"
+"This should not have occurred. %s will now close and give up."
+msgstr ""
+"Le changement de la branche courante a échoué.\n"
+"\n"
+"Le répertoire courant n'est que partiellement modifié. Les fichiers ont été "
+"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a "
+"échouée.\n"
+"\n"
+"Cela n'aurait pas du se produire. %s va abandonner et se terminer."
+
+#: lib/choose_font.tcl:39
+msgid "Select"
+msgstr "Sélectionner"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr "Familles de polices"
+
+#: lib/choose_font.tcl:74
+msgid "Font Size"
+msgstr "Taille de police"
+
+#: lib/choose_font.tcl:91
+msgid "Font Example"
+msgstr "Exemple de police"
+
+#: lib/choose_font.tcl:103
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+"C'est un texte d'exemple.\n"
+"Si vous aimez ce texte, vous pouvez choisir cette police"
+
+#: lib/choose_repository.tcl:28
+msgid "Git Gui"
+msgstr "Git Gui"
+
- #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382
+msgid "Create New Repository"
+msgstr "Créer nouveau dépôt"
+
- #: lib/choose_repository.tcl:87
++#: lib/choose_repository.tcl:93
+msgid "New..."
+msgstr "Nouveau..."
+
- #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:458
++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465
+msgid "Clone Existing Repository"
+msgstr "Cloner dépôt existant"
+
- #: lib/choose_repository.tcl:100
++#: lib/choose_repository.tcl:106
+msgid "Clone..."
+msgstr "Cloner..."
+
- #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:974
++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
+msgid "Open Existing Repository"
+msgstr "Ouvrir dépôt existant"
+
- #: lib/choose_repository.tcl:113
++#: lib/choose_repository.tcl:119
+msgid "Open..."
+msgstr "Ouvrir..."
+
- #: lib/choose_repository.tcl:126
++#: lib/choose_repository.tcl:132
+msgid "Recent Repositories"
+msgstr "Dépôt récemment utilisés"
+
- #: lib/choose_repository.tcl:132
++#: lib/choose_repository.tcl:138
+msgid "Open Recent Repository:"
+msgstr "Ouvrir dépôt récent :"
+
- #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
- #: lib/choose_repository.tcl:310
++#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
++#: lib/choose_repository.tcl:316
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "La création du dépôt %s a échouée :"
+
- #: lib/choose_repository.tcl:381 lib/choose_repository.tcl:476
++#: lib/choose_repository.tcl:387
+msgid "Directory:"
+msgstr "Répertoire :"
+
- #: lib/choose_repository.tcl:410 lib/choose_repository.tcl:535
- #: lib/choose_repository.tcl:1007
++#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544
++#: lib/choose_repository.tcl:1017
+msgid "Git Repository"
+msgstr "Dépôt Git"
+
- #: lib/choose_repository.tcl:435
++#: lib/choose_repository.tcl:442
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr "Le répertoire %s existe déjà."
+
- #: lib/choose_repository.tcl:439
++#: lib/choose_repository.tcl:446
+#, tcl-format
+msgid "File %s already exists."
+msgstr "Le fichier %s existe déjà."
+
- #: lib/choose_repository.tcl:453
++#: lib/choose_repository.tcl:460
+msgid "Clone"
+msgstr "Cloner"
+
- #: lib/choose_repository.tcl:466
- msgid "URL:"
- msgstr "URL :"
++#: lib/choose_repository.tcl:473
++msgid "Source Location:"
++msgstr "Emplacement source:"
+
- #: lib/choose_repository.tcl:487
++#: lib/choose_repository.tcl:484
++msgid "Target Directory:"
++msgstr "Répertoire cible:"
++
++#: lib/choose_repository.tcl:496
+msgid "Clone Type:"
+msgstr "Type de clonage :"
+
- #: lib/choose_repository.tcl:493
++#: lib/choose_repository.tcl:502
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr "Standard (rapide, semi-redondant, liens durs)"
+
- #: lib/choose_repository.tcl:499
++#: lib/choose_repository.tcl:508
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr "Copy complète (plus lent, sauvegarde redondante)"
+
- #: lib/choose_repository.tcl:505
++#: lib/choose_repository.tcl:514
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr "Partagé (le plus rapide, non recommandé, pas de sauvegarde)"
+
- #: lib/choose_repository.tcl:541 lib/choose_repository.tcl:588
- #: lib/choose_repository.tcl:734 lib/choose_repository.tcl:804
- #: lib/choose_repository.tcl:1013 lib/choose_repository.tcl:1021
++#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
++#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813
++#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "'%s' n'est pas un dépôt Git."
+
- #: lib/choose_repository.tcl:577
++#: lib/choose_repository.tcl:586
+msgid "Standard only available for local repository."
+msgstr "Standard n'est disponible que pour un dépôt local."
+
- #: lib/choose_repository.tcl:581
++#: lib/choose_repository.tcl:590
+msgid "Shared only available for local repository."
+msgstr "Partagé n'est disponible que pour un dépôt local."
+
- #: lib/choose_repository.tcl:602
++#: lib/choose_repository.tcl:611
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "L'emplacement %s existe déjà."
+
- #: lib/choose_repository.tcl:613
++#: lib/choose_repository.tcl:622
+msgid "Failed to configure origin"
+msgstr "La configuration de l'origine a échouée."
+
- #: lib/choose_repository.tcl:625
++#: lib/choose_repository.tcl:634
+msgid "Counting objects"
+msgstr "Décompte des objets"
+
- #: lib/choose_repository.tcl:626
++#: lib/choose_repository.tcl:635
+msgid "buckets"
+msgstr "paniers"
+
- #: lib/choose_repository.tcl:650
++#: lib/choose_repository.tcl:659
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr "Impossible de copier 'objects/info/alternates' : %s"
+
- #: lib/choose_repository.tcl:686
++#: lib/choose_repository.tcl:695
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "Il n'y a rien à cloner depuis %s."
+
- #: lib/choose_repository.tcl:688 lib/choose_repository.tcl:902
- #: lib/choose_repository.tcl:914
++#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911
++#: lib/choose_repository.tcl:923
+msgid "The 'master' branch has not been initialized."
+msgstr "La branche 'master' n'a pas été initialisée."
+
- #: lib/choose_repository.tcl:701
++#: lib/choose_repository.tcl:710
+msgid "Hardlinks are unavailable. Falling back to copying."
+msgstr "Les liens durs ne sont pas supportés. Une copie sera effectuée à la place."
+
- #: lib/choose_repository.tcl:713
++#: lib/choose_repository.tcl:722
+#, tcl-format
+msgid "Cloning from %s"
+msgstr "Clonage depuis %s"
+
- #: lib/choose_repository.tcl:744
++#: lib/choose_repository.tcl:753
+msgid "Copying objects"
+msgstr "Copie des objets"
+
- #: lib/choose_repository.tcl:745
++#: lib/choose_repository.tcl:754
+msgid "KiB"
+msgstr "KiB"
+
- #: lib/choose_repository.tcl:769
++#: lib/choose_repository.tcl:778
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr "Impossible de copier l'objet : %s"
+
- #: lib/choose_repository.tcl:779
++#: lib/choose_repository.tcl:788
+msgid "Linking objects"
+msgstr "Liaison des objets"
+
- #: lib/choose_repository.tcl:780
++#: lib/choose_repository.tcl:789
+msgid "objects"
+msgstr "objets"
+
- #: lib/choose_repository.tcl:788
++#: lib/choose_repository.tcl:797
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr "Impossible créer un lien dur pour l'objet : %s"
+
- #: lib/choose_repository.tcl:843
++#: lib/choose_repository.tcl:852
+msgid "Cannot fetch branches and objects. See console output for details."
+msgstr ""
+"Impossible de récupérer les branches et objets. Voir la sortie console pour "
+"plus de détails."
+
- #: lib/choose_repository.tcl:854
++#: lib/choose_repository.tcl:863
+msgid "Cannot fetch tags. See console output for details."
+msgstr ""
+"Impossible de récupérer les marques (tags). Voir la sortie console pour plus "
+"de détails."
+
- #: lib/choose_repository.tcl:878
++#: lib/choose_repository.tcl:887
+msgid "Cannot determine HEAD. See console output for details."
+msgstr "Impossible de déterminer HEAD. Voir la sortie console pour plus de détails."
+
- #: lib/choose_repository.tcl:887
++#: lib/choose_repository.tcl:896
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr "Impossible de nettoyer %s"
+
- #: lib/choose_repository.tcl:893
++#: lib/choose_repository.tcl:902
+msgid "Clone failed."
+msgstr "Le clonage a échoué."
+
- #: lib/choose_repository.tcl:900
++#: lib/choose_repository.tcl:909
+msgid "No default branch obtained."
+msgstr "Aucune branche par défaut n'a été obtenue."
+
- #: lib/choose_repository.tcl:911
++#: lib/choose_repository.tcl:920
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr "Impossible de résoudre %s comme commit."
+
- #: lib/choose_repository.tcl:923
++#: lib/choose_repository.tcl:932
+msgid "Creating working directory"
+msgstr "Création du répertoire de travail"
+
- #: lib/choose_repository.tcl:924 lib/index.tcl:65 lib/index.tcl:127
- #: lib/index.tcl:193
++#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128
++#: lib/index.tcl:196
+msgid "files"
+msgstr "fichiers"
+
- #: lib/choose_repository.tcl:953
++#: lib/choose_repository.tcl:962
+msgid "Initial file checkout failed."
+msgstr "Chargement initial du fichier échoué."
+
- #: lib/choose_repository.tcl:969
++#: lib/choose_repository.tcl:978
+msgid "Open"
+msgstr "Ouvrir"
+
- #: lib/choose_repository.tcl:979
++#: lib/choose_repository.tcl:988
+msgid "Repository:"
+msgstr "Dépôt :"
+
- #: lib/choose_repository.tcl:1027
++#: lib/choose_repository.tcl:1037
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "Impossible d'ouvrir le dépôt %s :"
+
+#: lib/choose_rev.tcl:53
+msgid "This Detached Checkout"
+msgstr "Cet emprunt détaché"
+
+#: lib/choose_rev.tcl:60
+msgid "Revision Expression:"
+msgstr "Expression de révision :"
+
+#: lib/choose_rev.tcl:74
+msgid "Local Branch"
+msgstr "Branche locale"
+
+#: lib/choose_rev.tcl:79
+msgid "Tracking Branch"
+msgstr "Branche de suivi"
+
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+msgid "Tag"
+msgstr "Marque (tag)"
+
+#: lib/choose_rev.tcl:317
+#, tcl-format
+msgid "Invalid revision: %s"
+msgstr "Révision invalide : %s"
+
+#: lib/choose_rev.tcl:338
+msgid "No revision selected."
+msgstr "Pas de révision selectionnée."
+
+#: lib/choose_rev.tcl:346
+msgid "Revision expression is empty."
+msgstr "L'expression de révision est vide."
+
+#: lib/choose_rev.tcl:531
+msgid "Updated"
+msgstr "Mise-à-jour:"
+
+#: lib/choose_rev.tcl:559
+msgid "URL"
+msgstr "URL"
+
+#: lib/commit.tcl:9
+msgid ""
+"There is nothing to amend.\n"
+"\n"
+"You are about to create the initial commit. There is no commit before this "
+"to amend.\n"
+msgstr ""
+"Il n'y a rien à corriger.\n"
+"\n"
+"Vous allez créer le commit initial. Il n'y a pas de commit avant celui-ci à "
+"corriger.\n"
+
+#: lib/commit.tcl:18
+msgid ""
+"Cannot amend while merging.\n"
+"\n"
+"You are currently in the middle of a merge that has not been fully "
+"completed. You cannot amend the prior commit unless you first abort the "
+"current merge activity.\n"
+msgstr ""
+"Impossible de corriger pendant une fusion.\n"
+"\n"
+"Vous êtes actuellement au milieu d'une fusion qui n'a pas été completement "
+"terminée. Vous ne pouvez pas corriger le commit précédant sauf si vous "
+"abandonnez la fusion courante.\n"
+
+#: lib/commit.tcl:49
+msgid "Error loading commit data for amend:"
+msgstr "Erreur lors du chargement des données de commit pour correction :"
+
+#: lib/commit.tcl:76
+msgid "Unable to obtain your identity:"
+msgstr "Impossible d'obtenir votre identité :"
+
+#: lib/commit.tcl:81
+msgid "Invalid GIT_COMMITTER_IDENT:"
+msgstr "GIT_COMMITTER_IDENT invalide :"
+
+#: lib/commit.tcl:133
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before another commit can be created.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
+"dépôt.\n"
+"\n"
+"Un autre programme Git a modifié ce dépôt depuis la dernière "
+"synchronisation. Une resynshronisation doit être effectuée avant de pouvoir "
+"créer un nouveau commit.\n"
+"\n"
+"Cela va être fait tout de suite automatiquement.\n"
+
- #: lib/commit.tcl:154
++#: lib/commit.tcl:156
+#, tcl-format
+msgid ""
+"Unmerged files cannot be committed.\n"
+"\n"
+"File %s has merge conflicts. You must resolve them and stage the file "
+"before committing.\n"
+msgstr ""
+"Des fichiers non fusionnés ne peuvent être commités.\n"
+"\n"
+"Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-"
+"commiter le fichier avant de pouvoir commiter.\n"
+
- #: lib/commit.tcl:162
++#: lib/commit.tcl:164
+#, tcl-format
+msgid ""
+"Unknown file state %s detected.\n"
+"\n"
+"File %s cannot be committed by this program.\n"
+msgstr ""
+"Un état de fichier inconnu %s a été détecté.\n"
+"\n"
+"Le fichier %s ne peut pas être commité par ce programme.\n"
+
- #: lib/commit.tcl:170
++#: lib/commit.tcl:172
+msgid ""
+"No changes to commit.\n"
+"\n"
+"You must stage at least 1 file before you can commit.\n"
+msgstr ""
+"Pas de modification à commiter.\n"
+"\n"
+"Vous devez indexer au moins 1 fichier avant de pouvoir commiter.\n"
+
- #: lib/commit.tcl:183
++#: lib/commit.tcl:187
+msgid ""
+"Please supply a commit message.\n"
+"\n"
+"A good commit message has the following format:\n"
+"\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 ""
+"Merci de fournir un message de commit.\n"
+"\n"
+"Un bon message de commit a le format suivant :\n"
+"\n"
+"- Première ligne : décrire en une phrase ce que vous avez fait.\n"
+"- Deuxième ligne : rien.\n"
+"- Lignes suivantes : Décrire pourquoi ces modifications sont bonnes.\n"
+
- #: lib/commit.tcl:207
++#: lib/commit.tcl:211
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "attention : Tcl ne supporte pas l'encodage '%s'."
+
- #: lib/commit.tcl:221
++#: lib/commit.tcl:227
+msgid "Calling pre-commit hook..."
+msgstr "Lancement de l'action d'avant-commit..."
+
- #: lib/commit.tcl:236
++#: lib/commit.tcl:242
+msgid "Commit declined by pre-commit hook."
+msgstr "Commit refusé par l'action d'avant-commit."
+
- #: lib/commit.tcl:259
++#: lib/commit.tcl:265
+msgid "Calling commit-msg hook..."
+msgstr "Lancement de l'action \"message de commit\"..."
+
- #: lib/commit.tcl:274
++#: lib/commit.tcl:280
+msgid "Commit declined by commit-msg hook."
+msgstr "Commit refusé par l'action \"message de commit\"."
+
- #: lib/commit.tcl:287
++#: lib/commit.tcl:293
+msgid "Committing changes..."
+msgstr "Commit des modifications..."
+
- #: lib/commit.tcl:303
++#: lib/commit.tcl:309
+msgid "write-tree failed:"
+msgstr "write-tree a échoué :"
+
- #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
++#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
+msgid "Commit failed."
+msgstr "Le commit a échoué."
+
- #: lib/commit.tcl:321
++#: lib/commit.tcl:327
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr "Le commit %s semble être corrompu"
+
- #: lib/commit.tcl:326
++#: lib/commit.tcl:332
+msgid ""
+"No changes to commit.\n"
+"\n"
+"No files were modified by this commit and it was not a merge commit.\n"
+"\n"
+"A rescan will be automatically started now.\n"
+msgstr ""
+"Pas de modification à commiter.\n"
+"\n"
+"Aucun fichier n'a été modifié par ce commit et il ne s'agit pas d'un commit "
+"de fusion.\n"
+"\n"
+"Une resynchronisation va être lancée tout de suite automatiquement.\n"
+
- #: lib/commit.tcl:333
++#: lib/commit.tcl:339
+msgid "No changes to commit."
+msgstr "Pas de modifications à commiter."
+
- #: lib/commit.tcl:347
++#: lib/commit.tcl:353
+msgid "commit-tree failed:"
+msgstr "commit-tree a échoué :"
+
- #: lib/commit.tcl:367
++#: lib/commit.tcl:373
+msgid "update-ref failed:"
+msgstr "update-ref a échoué"
+
- #: lib/commit.tcl:454
++#: lib/commit.tcl:461
+#, tcl-format
+msgid "Created commit %s: %s"
+msgstr "Commit créé %s : %s"
+
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr "Travail en cours... merci de patienter..."
+
+#: lib/console.tcl:186
+msgid "Success"
+msgstr "Succès"
+
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr "Erreur : échec de la commande"
+
+#: lib/database.tcl:43
+msgid "Number of loose objects"
+msgstr "Nombre d'objets en fichier particulier"
+
+#: lib/database.tcl:44
+msgid "Disk space used by loose objects"
+msgstr "Espace disque utilisé par les fichiers particuliers"
+
+#: lib/database.tcl:45
+msgid "Number of packed objects"
+msgstr "Nombre d'objets empaquetés"
+
+#: lib/database.tcl:46
+msgid "Number of packs"
+msgstr "Nombre de paquets d'objets"
+
+#: lib/database.tcl:47
+msgid "Disk space used by packed objects"
+msgstr "Espace disque utilisé par les objets empaquetés"
+
+#: lib/database.tcl:48
+msgid "Packed objects waiting for pruning"
+msgstr "Objets empaquetés attendant d'être supprimés"
+
+#: lib/database.tcl:49
+msgid "Garbage files"
+msgstr "Fichiers poubelle"
+
+#: lib/database.tcl:72
+msgid "Compressing the object database"
+msgstr "Compression de la base des objets"
+
+#: lib/database.tcl:83
+msgid "Verifying the object database with fsck-objects"
+msgstr "Vérification de la base des objets avec fsck-objects"
+
+#: lib/database.tcl:108
+#, tcl-format
+msgid ""
+"This repository currently has approximately %i loose objects.\n"
+"\n"
+"To maintain optimal performance it is strongly recommended that you compress "
+"the database when more than %i loose objects exist.\n"
+"\n"
+"Compress the database now?"
+msgstr ""
+"Ce dépôt comprend actuellement environ %i objets ayant leur fichier "
+"particulier.\n"
+"\n"
+"Pour conserver une performance optimale, il est fortement recommandé de "
+"comprimer la base quand plus de %i objets ayant leur fichier particulier "
+"existent.\n"
+"\n"
+"Comprimer la base maintenant ?"
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Date invalide de Git : %s"
+
- #: lib/diff.tcl:44
++#: lib/diff.tcl:59
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but "
+"the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have "
+"the same state."
+msgstr ""
+"Aucune différence détectée.\n"
+"\n"
+"%s ne comporte aucune modification.\n"
+"\n"
+"La date de modification de ce fichier a été mise à jour par une autre "
+"application, mais le contenu du fichier n'a pas changé.\n"
+"\n"
+"Une resynchronisation va être lancée automatiquement pour trouver d'autres "
+"fichiers qui pourraient se trouver dans le même état."
+
- #: lib/diff.tcl:83
++#: lib/diff.tcl:99
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Chargement des différences de %s..."
+
- #: lib/diff.tcl:116 lib/diff.tcl:190
++#: lib/diff.tcl:120
++msgid ""
++"LOCAL: deleted\n"
++"REMOTE:\n"
++msgstr ""
++"LOCAL: supprimé\n"
++"DISTANT:\n"
++
++#: lib/diff.tcl:125
++msgid ""
++"REMOTE: deleted\n"
++"LOCAL:\n"
++msgstr ""
++"DISTANT: supprimé\n"
++"LOCAL:\n"
++
++#: lib/diff.tcl:132
++msgid "LOCAL:\n"
++msgstr "LOCAL:\n"
++
++#: lib/diff.tcl:135
++msgid "REMOTE:\n"
++msgstr "DISTANT:\n"
++
++#: lib/diff.tcl:197 lib/diff.tcl:296
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "Impossible d'afficher %s"
+
- #: lib/diff.tcl:117
++#: lib/diff.tcl:198
+msgid "Error loading file:"
+msgstr "Erreur lors du chargement du fichier :"
+
- #: lib/diff.tcl:124
++#: lib/diff.tcl:205
+msgid "Git Repository (subproject)"
+msgstr "Dépôt Git (sous projet)"
+
- #: lib/diff.tcl:136
++#: lib/diff.tcl:217
+msgid "* Binary file (not showing content)."
+msgstr "* Fichier binaire (pas d'apperçu du contenu)."
+
- #: lib/diff.tcl:191
- msgid "Error loading diff:"
- msgstr "Erreur lors du chargement des différences :"
++#: lib/diff.tcl:222
++#, tcl-format
++msgid ""
++"* Untracked file is %d bytes.\n"
++"* Showing only first %d bytes.\n"
++msgstr ""
++"* Le fichier non suivi fait %d octets.\n"
++"* On montre seulement les premiers %d octets.\n"
+
- #: lib/diff.tcl:313
++#: lib/diff.tcl:228
++#, tcl-format
++msgid ""
++"\n"
++"* Untracked file clipped here by %s.\n"
++"* To see the entire file, use an external editor.\n"
++msgstr ""
++"\n"
++"* Fichier suivi raccourcis ici de %s.\n"
++"* Pour voir le fichier entier, utiliser un éditeur externe.\n"
++
++#: lib/diff.tcl:436
+msgid "Failed to unstage selected hunk."
+msgstr "Échec lors de la désindexation de la section sélectionnée."
+
- #: lib/diff.tcl:320
++#: lib/diff.tcl:443
+msgid "Failed to stage selected hunk."
+msgstr "Échec lors de l'indexation de la section."
+
- #: lib/diff.tcl:386
++#: lib/diff.tcl:509
+msgid "Failed to unstage selected line."
+msgstr "Échec lors de la désindexation de la ligne sélectionnée."
+
- #: lib/diff.tcl:394
++#: lib/diff.tcl:517
+msgid "Failed to stage selected line."
+msgstr "Échec lors de l'indexation de la ligne."
+
++#: lib/encoding.tcl:443
++msgid "Default"
++msgstr "Défaut"
++
++#: lib/encoding.tcl:448
++#, tcl-format
++msgid "System (%s)"
++msgstr "Système (%s)"
++
++#: lib/encoding.tcl:459 lib/encoding.tcl:465
++msgid "Other"
++msgstr "Autre"
++
+#: lib/error.tcl:20 lib/error.tcl:114
+msgid "error"
+msgstr "erreur"
+
+#: lib/error.tcl:36
+msgid "warning"
+msgstr "attention"
+
+#: lib/error.tcl:94
+msgid "You must correct the above errors before committing."
+msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter."
+
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
+msgstr "Impossible de dévérouiller l'index."
+
+#: lib/index.tcl:15
+msgid "Index Error"
+msgstr "Erreur de l'index"
+
+#: lib/index.tcl:21
+msgid ""
+"Updating the Git index failed. A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr ""
+"Échec de la mise à jour de l'index. Une resynchronisation va être lancée "
+"automatiquement."
+
+#: lib/index.tcl:27
+msgid "Continue"
+msgstr "Continuer"
+
+#: lib/index.tcl:31
+msgid "Unlock Index"
+msgstr "Déverouiller l'index"
+
- #: lib/index.tcl:282
++#: lib/index.tcl:287
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "Désindexation de: %s"
+
- #: lib/index.tcl:313
++#: lib/index.tcl:326
+msgid "Ready to commit."
+msgstr "Prêt à être commité."
+
- #: lib/index.tcl:326
++#: lib/index.tcl:339
+#, tcl-format
+msgid "Adding %s"
+msgstr "Ajout de %s"
+
- #: lib/index.tcl:381
++#: lib/index.tcl:396
+#, tcl-format
+msgid "Revert changes in file %s?"
+msgstr "Annuler les modifications dans le fichier %s ? "
+
- #: lib/index.tcl:383
++#: lib/index.tcl:398
+#, tcl-format
+msgid "Revert changes in these %i files?"
+msgstr "Annuler les modifications dans ces %i fichiers ?"
+
- #: lib/index.tcl:391
++#: lib/index.tcl:406
+msgid "Any unstaged changes will be permanently lost by the revert."
+msgstr ""
+"Toutes les modifications non-indexées seront définitivement perdues par "
+"l'annulation."
+
- #: lib/index.tcl:394
++#: lib/index.tcl:409
+msgid "Do Nothing"
+msgstr "Ne rien faire"
+
++#: lib/index.tcl:427
++msgid "Reverting selected files"
++msgstr "Annuler modifications dans fichiers selectionnés"
++
++#: lib/index.tcl:431
++#, tcl-format
++msgid "Reverting %s"
++msgstr "Annulation des modifications dans %s"
++
+#: lib/merge.tcl:13
+msgid ""
+"Cannot merge while amending.\n"
+"\n"
+"You must finish amending this commit before starting any type of merge.\n"
+msgstr ""
+"Impossible de fusionner pendant une correction.\n"
+"\n"
+"Vous devez finir de corriger ce commit avant de lancer une quelconque "
+"fusion.\n"
+
+#: lib/merge.tcl:27
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before a merge can be performed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
+"dépôt.\n"
+"\n"
+"Un autre programme Git a modifié ce dépôt depuis la dernière "
+"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir "
+"fusionner de nouveau.\n"
+"\n"
+"Cela va être fait tout de suite automatiquement\n"
+
- #: lib/merge.tcl:44
++#: lib/merge.tcl:45
+#, tcl-format
+msgid ""
+"You are in the middle of a conflicted merge.\n"
+"\n"
+"File %s has merge conflicts.\n"
+"\n"
+"You must resolve them, stage the file, and commit to complete the current "
+"merge. Only then can you begin another merge.\n"
+msgstr ""
+"Vous êtes au milieu d'une fusion conflictuelle.\n"
+"\n"
+"Le fichier %s a des conflicts de fusion.\n"
+"\n"
+"Vous devez les résoudre, puis indexer le fichier, et enfin commiter pour "
+"terminer la fusion courante. Seulement à ce moment là sera-t-il possible "
+"d'effectuer une nouvelle fusion.\n"
+
- #: lib/merge.tcl:54
++#: lib/merge.tcl:55
+#, tcl-format
+msgid ""
+"You are in the middle of a change.\n"
+"\n"
+"File %s is modified.\n"
+"\n"
+"You should complete the current commit before starting a merge. Doing so "
+"will help you abort a failed merge, should the need arise.\n"
+msgstr ""
+"Vous êtes au milieu d'une modification.\n"
+"\n"
+"Le fichier %s est modifié.\n"
+"\n"
+"Vous devriez terminer le commit courant avant de lancer une fusion. En "
+"faisait comme cela, vous éviterez de devoir éventuellement abandonner une "
+"fusion ayant échouée.\n"
+
- #: lib/merge.tcl:106
++#: lib/merge.tcl:107
+#, tcl-format
+msgid "%s of %s"
+msgstr "%s de %s"
+
- #: lib/merge.tcl:119
++#: lib/merge.tcl:120
+#, tcl-format
+msgid "Merging %s and %s..."
+msgstr "Fusion de %s et %s..."
+
- #: lib/merge.tcl:130
++#: lib/merge.tcl:131
+msgid "Merge completed successfully."
+msgstr "La fusion s'est faite avec succès."
+
- #: lib/merge.tcl:132
++#: lib/merge.tcl:133
+msgid "Merge failed. Conflict resolution is required."
+msgstr "La fusion a echouée. Il est nécessaire de résoudre les conflicts."
+
- #: lib/merge.tcl:157
++#: lib/merge.tcl:158
+#, tcl-format
+msgid "Merge Into %s"
+msgstr "Fusion dans %s"
+
- #: lib/merge.tcl:176
++#: lib/merge.tcl:177
+msgid "Revision To Merge"
+msgstr "Révision à fusionner"
+
- #: lib/merge.tcl:211
++#: lib/merge.tcl:212
+msgid ""
+"Cannot abort while amending.\n"
+"\n"
+"You must finish amending this commit.\n"
+msgstr ""
+"Impossible d'abandonner en cours de correction.\n"
+"\n"
+"Vous devez finir de corriger ce commit.\n"
+
- #: lib/merge.tcl:221
++#: lib/merge.tcl:222
+msgid ""
+"Abort merge?\n"
+"\n"
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with aborting the current merge?"
+msgstr ""
+"Abandonner la fusion ?\n"
+"\n"
+"Abandonner la fusion courante entrainera la perte de TOUTES les "
+"modifications non commitées.\n"
+"\n"
+"Abandonner quand même la fusion courante ?"
+
- #: lib/merge.tcl:227
++#: lib/merge.tcl:228
+msgid ""
+"Reset changes?\n"
+"\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with resetting the current changes?"
+msgstr ""
+"Réinitialiser les modifications ?\n"
+"\n"
+"Réinitialiser les modifications va faire perdre TOUTES les modifications non "
+"commitées.\n"
+"\n"
+"Réinitialiser quand même les modifications courantes ?"
+
- #: lib/merge.tcl:238
++#: lib/merge.tcl:239
+msgid "Aborting"
+msgstr "Abandon"
+
- #: lib/merge.tcl:238
++#: lib/merge.tcl:239
+msgid "files reset"
+msgstr "fichiers réinitialisés"
+
- #: lib/merge.tcl:266
++#: lib/merge.tcl:267
+msgid "Abort failed."
+msgstr "L'abandon a échoué."
+
- #: lib/merge.tcl:268
++#: lib/merge.tcl:269
+msgid "Abort completed. Ready."
+msgstr "Abandon teminé. Prêt."
+
- #: lib/option.tcl:95
++#: lib/mergetool.tcl:8
++msgid "Force resolution to the base version?"
++msgstr "Forcer la résolution à la version de base ?"
++
++#: lib/mergetool.tcl:9
++msgid "Force resolution to this branch?"
++msgstr "Forcer la résolution à cette branche ?"
++
++#: lib/mergetool.tcl:10
++msgid "Force resolution to the other branch?"
++msgstr "Forcer la résolution à l'autre branche ?"
++
++#: lib/mergetool.tcl:14
++#, tcl-format
++msgid ""
++"Note that the diff shows only conflicting changes.\n"
++"\n"
++"%s will be overwritten.\n"
++"\n"
++"This operation can be undone only by restarting the merge."
++msgstr ""
++"Noter que le diff ne montre que les modifications en conflict.\n"
++"\n"
++"%s sera écrasé.\n"
++"\n"
++"Cette opération ne peut être défaite qu'en relançant la fusion."
++
++#: lib/mergetool.tcl:45
++#, tcl-format
++msgid "File %s seems to have unresolved conflicts, still stage?"
++msgstr "Le fichier %s semble avoir des conflicts non résolus, indéxer quand même ?"
++
++#: lib/mergetool.tcl:60
++#, tcl-format
++msgid "Adding resolution for %s"
++msgstr "Ajouter une résolution pour %s"
++
++#: lib/mergetool.tcl:141
++msgid "Cannot resolve deletion or link conflicts using a tool"
++msgstr "Impossible de résoudre la suppression ou de relier des conflicts en utilisant un outil"
++
++#: lib/mergetool.tcl:146
++msgid "Conflict file does not exist"
++msgstr "Le fichier en conflict n'existe pas."
++
++#: lib/mergetool.tcl:264
++#, tcl-format
++msgid "Not a GUI merge tool: '%s'"
++msgstr "'%s' n'est pas un outil graphique pour fusionner des fichiers."
++
++#: lib/mergetool.tcl:268
++#, tcl-format
++msgid "Unsupported merge tool '%s'"
++msgstr "Outil de fusion '%s' non supporté"
++
++#: lib/mergetool.tcl:303
++msgid "Merge tool is already running, terminate it?"
++msgstr "L'outil de fusion tourne déjà, faut-il le terminer ?"
++
++#: lib/mergetool.tcl:323
++#, tcl-format
++msgid ""
++"Error retrieving versions:\n"
++"%s"
++msgstr ""
++"Erreur lors de la récupération des versions:\n"
++"%s"
++
++#: lib/mergetool.tcl:343
++#, tcl-format
++msgid ""
++"Could not start the merge tool:\n"
++"\n"
++"%s"
++msgstr ""
++"Impossible de lancer l'outil de fusion:\n"
++"\n"
++"%s"
++
++#: lib/mergetool.tcl:347
++msgid "Running merge tool..."
++msgstr "Lancement de l'outil de fusion..."
++
++#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
++msgid "Merge tool failed."
++msgstr "L'outil de fusion a échoué."
++
++#: lib/option.tcl:11
++#, tcl-format
++msgid "Invalid global encoding '%s'"
++msgstr "Encodage global invalide '%s'"
++
++#: lib/option.tcl:19
++#, tcl-format
++msgid "Invalid repo encoding '%s'"
++msgstr "Encodage de dépôt invalide '%s'"
++
++#: lib/option.tcl:117
+msgid "Restore Defaults"
+msgstr "Remettre les valeurs par défaut"
+
- #: lib/option.tcl:99
++#: lib/option.tcl:121
+msgid "Save"
+msgstr "Sauvegarder"
+
- #: lib/option.tcl:109
++#: lib/option.tcl:131
+#, tcl-format
+msgid "%s Repository"
+msgstr "Dépôt: %s"
+
- #: lib/option.tcl:110
++#: lib/option.tcl:132
+msgid "Global (All Repositories)"
+msgstr "Globales (tous les dépôts)"
+
- #: lib/option.tcl:116
++#: lib/option.tcl:138
+msgid "User Name"
+msgstr "Nom d'utilisateur"
+
- #: lib/option.tcl:117
++#: lib/option.tcl:139
+msgid "Email Address"
+msgstr "Adresse email"
+
- #: lib/option.tcl:119
++#: lib/option.tcl:141
+msgid "Summarize Merge Commits"
+msgstr "Résumer les commits de fusion"
+
- #: lib/option.tcl:120
++#: lib/option.tcl:142
+msgid "Merge Verbosity"
+msgstr "Fusion bavarde"
+
- #: lib/option.tcl:121
++#: lib/option.tcl:143
+msgid "Show Diffstat After Merge"
+msgstr "Montrer statistiques de diff après fusion"
+
- #: lib/option.tcl:123
++#: lib/option.tcl:144
++msgid "Use Merge Tool"
++msgstr "Utiliser outil de fusion"
++
++#: lib/option.tcl:146
+msgid "Trust File Modification Timestamps"
+msgstr "Faire confiance aux dates de modification de fichiers "
+
- #: lib/option.tcl:124
++#: lib/option.tcl:147
+msgid "Prune Tracking Branches During Fetch"
+msgstr "Purger les branches de suivi pendant la récupération"
+
- #: lib/option.tcl:125
++#: lib/option.tcl:148
+msgid "Match Tracking Branches"
+msgstr "Faire correspondre les branches de suivi"
+
- #: lib/option.tcl:126
++#: lib/option.tcl:149
+msgid "Blame Copy Only On Changed Files"
+msgstr "Annoter les copies seulement sur fichiers modifiés"
+
- #: lib/option.tcl:127
++#: lib/option.tcl:150
+msgid "Minimum Letters To Blame Copy On"
+msgstr "Minimum de caratères pour annoter une copie"
+
- #: lib/option.tcl:128
++#: lib/option.tcl:151
++msgid "Blame History Context Radius (days)"
++msgstr "Distance de blâme dans l'historique (jours)"
++
++#: lib/option.tcl:152
+msgid "Number of Diff Context Lines"
+msgstr "Nombre de lignes de contexte dans les diffs"
+
- #: lib/option.tcl:129
++#: lib/option.tcl:153
+msgid "Commit Message Text Width"
+msgstr "Largeur du texte de message de commit"
+
- #: lib/option.tcl:130
++#: lib/option.tcl:154
+msgid "New Branch Name Template"
+msgstr "Nouveau modèle de nom de branche"
+
- #: lib/option.tcl:194
++#: lib/option.tcl:155
++msgid "Default File Contents Encoding"
++msgstr "Encodage du contenu des fichiers par défaut"
++
++#: lib/option.tcl:203
++msgid "Change"
++msgstr "Modifier"
++
++#: lib/option.tcl:230
+msgid "Spelling Dictionary:"
+msgstr "Dictionnaire d'orthographe :"
+
- #: lib/option.tcl:218
++#: lib/option.tcl:254
+msgid "Change Font"
+msgstr "Modifier les polices"
+
- #: lib/option.tcl:222
++#: lib/option.tcl:258
+#, tcl-format
+msgid "Choose %s"
+msgstr "Choisir %s"
+
- #: lib/option.tcl:228
++#: lib/option.tcl:264
+msgid "pt."
+msgstr "pt."
+
- #: lib/option.tcl:242
++#: lib/option.tcl:278
+msgid "Preferences"
+msgstr "Préférences"
+
- #: lib/option.tcl:277
++#: lib/option.tcl:314
+msgid "Failed to completely save options:"
+msgstr "La sauvegarde complète des options a échouée :"
+
- #: lib/remote.tcl:165
++#: lib/remote.tcl:163
++msgid "Remove Remote"
++msgstr "Supprimer dépôt distant"
++
++#: lib/remote.tcl:168
+msgid "Prune from"
+msgstr "Purger de"
+
- #: lib/remote.tcl:170
++#: lib/remote.tcl:173
+msgid "Fetch from"
+msgstr "Récupérer de"
+
- #: lib/remote.tcl:213
++#: lib/remote.tcl:215
+msgid "Push to"
+msgstr "Pousser vers"
+
++#: lib/remote_add.tcl:19
++msgid "Add Remote"
++msgstr "Ajouter dépôt distant"
++
++#: lib/remote_add.tcl:24
++msgid "Add New Remote"
++msgstr "Ajouter nouveau dépôt distant"
++
++#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
++msgid "Add"
++msgstr "Ajouter"
++
++#: lib/remote_add.tcl:37
++msgid "Remote Details"
++msgstr "Détails des dépôts distants"
++
++#: lib/remote_add.tcl:50
++msgid "Location:"
++msgstr "Emplacement:"
++
++#: lib/remote_add.tcl:62
++msgid "Further Action"
++msgstr "Action supplémentaire"
++
++#: lib/remote_add.tcl:65
++msgid "Fetch Immediately"
++msgstr "Récupérer immédiatement"
++
++#: lib/remote_add.tcl:71
++msgid "Initialize Remote Repository and Push"
++msgstr "Initialiser dépôt distant et pousser"
++
++#: lib/remote_add.tcl:77
++msgid "Do Nothing Else Now"
++msgstr "Ne rien faire d'autre maintenant"
++
++#: lib/remote_add.tcl:101
++msgid "Please supply a remote name."
++msgstr "Merci de fournir un nom de dépôt distant."
++
++#: lib/remote_add.tcl:114
++#, tcl-format
++msgid "'%s' is not an acceptable remote name."
++msgstr "'%s' n'est pas un nom de dépôt distant acceptable."
++
++#: lib/remote_add.tcl:125
++#, tcl-format
++msgid "Failed to add remote '%s' of location '%s'."
++msgstr "Échec de l'ajout du dépôt distant '%s' à l'emplacement '%s'."
++
++#: lib/remote_add.tcl:133 lib/transport.tcl:6
++#, tcl-format
++msgid "fetch %s"
++msgstr "récupérer %s"
++
++#: lib/remote_add.tcl:134
++#, tcl-format
++msgid "Fetching the %s"
++msgstr "Récupération de %s"
++
++#: lib/remote_add.tcl:157
++#, tcl-format
++msgid "Do not know how to initialize repository at location '%s'."
++msgstr "Pas de méthode connue pour initialiser le dépôt à l'emplacement '%s'."
++
++#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
++#, tcl-format
++msgid "push %s"
++msgstr "pousser %s"
++
++#: lib/remote_add.tcl:164
++#, tcl-format
++msgid "Setting up the %s (at %s)"
++msgstr "Mise en place de %s (à %s)"
++
+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
- msgid "Delete Remote Branch"
- msgstr "Supprimer branche distante"
++msgid "Delete Branch Remotely"
++msgstr "Supprimer branche à distance"
+
+#: lib/remote_branch_delete.tcl:47
+msgid "From Repository"
+msgstr "Dépôt source"
+
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
+msgid "Remote:"
+msgstr "Branche distante :"
+
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
- msgid "Arbitrary URL:"
- msgstr "URL arbitraire :"
++msgid "Arbitrary Location:"
++msgstr "Emplacement arbitraire :"
+
+#: lib/remote_branch_delete.tcl:84
+msgid "Branches"
+msgstr "Branches"
+
+#: lib/remote_branch_delete.tcl:109
+msgid "Delete Only If"
+msgstr "Supprimer seulement si"
+
+#: lib/remote_branch_delete.tcl:111
+msgid "Merged Into:"
+msgstr "Fusionné dans :"
+
+#: lib/remote_branch_delete.tcl:119
+msgid "Always (Do not perform merge checks)"
+msgstr "Toujours (ne pas vérifier les fusions)"
+
+#: lib/remote_branch_delete.tcl:152
+msgid "A branch is required for 'Merged Into'."
+msgstr "Une branche est nécessaire pour 'Fusionné dans'."
+
+#: lib/remote_branch_delete.tcl:184
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+"Les branches suivantes ne sont pas complètement fusionnées dans %s :\n"
+"\n"
+" - %s"
+
+#: lib/remote_branch_delete.tcl:189
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits. Try fetching from %s first."
+msgstr ""
+"Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez pas "
+"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord."
+
+#: lib/remote_branch_delete.tcl:207
+msgid "Please select one or more branches to delete."
+msgstr "Merci de sélectionner une ou plusieurs branches à supprimer."
+
+#: lib/remote_branch_delete.tcl:216
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+"Récupérer des branches supprimées est difficile.\n"
+"\n"
+"Souhaitez vous supprimer les branches sélectionnées ?"
+
+#: lib/remote_branch_delete.tcl:226
+#, tcl-format
+msgid "Deleting branches from %s"
+msgstr "Supprimer les branches de %s"
+
+#: lib/remote_branch_delete.tcl:286
+msgid "No repository selected."
+msgstr "Aucun dépôt n'est sélectionné."
+
+#: lib/remote_branch_delete.tcl:291
+#, tcl-format
+msgid "Scanning %s..."
+msgstr "Synchronisation de %s..."
+
++#: lib/search.tcl:21
++msgid "Find:"
++msgstr "Chercher :"
++
++#: lib/search.tcl:23
++msgid "Next"
++msgstr "Suivant"
++
++#: lib/search.tcl:24
++msgid "Prev"
++msgstr "Précédant"
++
++#: lib/search.tcl:25
++msgid "Case-Sensitive"
++msgstr "Sensible à la casse"
++
+#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
+msgid "Cannot write shortcut:"
+msgstr "Impossible d'écrire le raccourcis :"
+
+#: lib/shortcut.tcl:136
+msgid "Cannot write icon:"
+msgstr "Impossible d'écrire l'icône :"
+
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "Vérificateur d'orthographe non supporté"
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "La vérification d'orthographe n'est pas disponible"
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "Configuration de vérification d'orthographe invalide"
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr "Réinitialisation du dictionnaire à %s."
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "La vérification d'orthographe a échouée silentieusement au démarrage"
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "Vérificateur d'orthographe non reconnu"
+
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr "Aucune suggestion"
+
- #: lib/spellcheck.tcl:387
++#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr "EOF inattendue envoyée par le vérificateur d'orthographe"
+
- #: lib/spellcheck.tcl:391
++#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr "Le vérificateur d'orthographe a échoué"
+
++#: lib/sshkey.tcl:31
++msgid "No keys found."
++msgstr "Aucune clé trouvée."
++
++#: lib/sshkey.tcl:34
++#, tcl-format
++msgid "Found a public key in: %s"
++msgstr "Clé publique trouvée dans : %s"
++
++#: lib/sshkey.tcl:40
++msgid "Generate Key"
++msgstr "Générer une clé"
++
++#: lib/sshkey.tcl:56
++msgid "Copy To Clipboard"
++msgstr "Copier dans le presse papier"
++
++#: lib/sshkey.tcl:70
++msgid "Your OpenSSH Public Key"
++msgstr "Votre clé publique Open SSH"
++
++#: lib/sshkey.tcl:78
++msgid "Generating..."
++msgstr "Génération..."
++
++#: lib/sshkey.tcl:84
++#, tcl-format
++msgid ""
++"Could not start ssh-keygen:\n"
++"\n"
++"%s"
++msgstr ""
++"Impossible de lancer ssh-keygen:\n"
++"\n"
++"%s"
++
++#: lib/sshkey.tcl:111
++msgid "Generation failed."
++msgstr "La génération a échoué."
++
++#: lib/sshkey.tcl:118
++msgid "Generation succeded, but no keys found."
++msgstr "La génération a réussi, mais aucune clé n'a été trouvée."
++
++#: lib/sshkey.tcl:121
++#, tcl-format
++msgid "Your key is in: %s"
++msgstr "Votre clé est dans : %s"
++
+#: lib/status_bar.tcl:83
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
+msgstr "%s ... %*i de %*i %s (%3i%%)"
+
- #: lib/transport.tcl:6
++#: lib/tools.tcl:75
+#, tcl-format
- msgid "fetch %s"
- msgstr "récupérer %s"
++msgid "Running %s requires a selected file."
++msgstr "Lancer %s nécessite qu'un fichier soit sélectionné."
++
++#: lib/tools.tcl:90
++#, tcl-format
++msgid "Are you sure you want to run %s?"
++msgstr "Êtes vous sûr de vouloir lancer %s ?"
++
++#: lib/tools.tcl:110
++#, tcl-format
++msgid "Tool: %s"
++msgstr "Outil : %s"
++
++#: lib/tools.tcl:111
++#, tcl-format
++msgid "Running: %s"
++msgstr "Lancement de : %s"
++
++#: lib/tools.tcl:149
++#, tcl-format
++msgid "Tool completed succesfully: %s"
++msgstr "L'outil a terminé avec succès : %s"
++
++#: lib/tools.tcl:151
++#, tcl-format
++msgid "Tool failed: %s"
++msgstr "L'outil a échoué : %s"
++
++#: lib/tools_dlg.tcl:22
++msgid "Add Tool"
++msgstr "Ajouter outil"
++
++#: lib/tools_dlg.tcl:28
++msgid "Add New Tool Command"
++msgstr "Ajouter nouvelle commande d'outil"
++
++#: lib/tools_dlg.tcl:33
++msgid "Add globally"
++msgstr "Ajouter globalement"
++
++#: lib/tools_dlg.tcl:45
++msgid "Tool Details"
++msgstr "Détails sur l'outil"
++
++#: lib/tools_dlg.tcl:48
++msgid "Use '/' separators to create a submenu tree:"
++msgstr "Utiliser les séparateurs '/' pour créer un arbre de sous menus :"
++
++#: lib/tools_dlg.tcl:61
++msgid "Command:"
++msgstr "Commande :"
++
++#: lib/tools_dlg.tcl:74
++msgid "Show a dialog before running"
++msgstr "Montrer une boîte de dialogue avant le lancement"
++
++#: lib/tools_dlg.tcl:80
++msgid "Ask the user to select a revision (sets $REVISION)"
++msgstr "Demander à l'utilisateur de sélectionner une révision (change $REVISION)"
++
++#: lib/tools_dlg.tcl:85
++msgid "Ask the user for additional arguments (sets $ARGS)"
++msgstr "Demander à l'utilisateur des arguments supplémentaires (change $ARGS)"
++
++#: lib/tools_dlg.tcl:92
++msgid "Don't show the command output window"
++msgstr "Ne pas montrer la fenêtre de sortie des commandes"
++
++#: lib/tools_dlg.tcl:97
++msgid "Run only if a diff is selected ($FILENAME not empty)"
++msgstr "Lancer seulement si un diff est selectionné ($FILENAME non vide)"
++
++#: lib/tools_dlg.tcl:121
++msgid "Please supply a name for the tool."
++msgstr "Merci de fournir un nom pour l'outil."
++
++#: lib/tools_dlg.tcl:129
++#, tcl-format
++msgid "Tool '%s' already exists."
++msgstr "L'outil '%s' existe déjà."
++
++#: lib/tools_dlg.tcl:151
++#, tcl-format
++msgid ""
++"Could not add tool:\n"
++"%s"
++msgstr ""
++"Impossible d'ajouter l'outil:\n"
++"%s"
++
++#: lib/tools_dlg.tcl:190
++msgid "Remove Tool"
++msgstr "Supprimer l'outil"
++
++#: lib/tools_dlg.tcl:196
++msgid "Remove Tool Commands"
++msgstr "Supprimer des commandes d'outil"
++
++#: lib/tools_dlg.tcl:200
++msgid "Remove"
++msgstr "Supprimer"
++
++#: lib/tools_dlg.tcl:236
++msgid "(Blue denotes repository-local tools)"
++msgstr "(Le bleu indique des outils locaux au dépôt)"
++
++#: lib/tools_dlg.tcl:297
++#, tcl-format
++msgid "Run Command: %s"
++msgstr "Lancer commande : %s"
++
++#: lib/tools_dlg.tcl:311
++msgid "Arguments"
++msgstr "Arguments"
++
++#: lib/tools_dlg.tcl:348
++msgid "OK"
++msgstr "OK"
+
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
+msgstr "Récupération des dernières modifications de %s"
+
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr "purger à distance %s"
+
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
+msgstr "Nettoyer les branches de suivi supprimées de %s"
+
- #: lib/transport.tcl:25 lib/transport.tcl:71
- #, tcl-format
- msgid "push %s"
- msgstr "pousser %s"
-
+#: lib/transport.tcl:26
+#, tcl-format
+msgid "Pushing changes to %s"
+msgstr "Les modifications sont poussées vers %s"
+
+#: lib/transport.tcl:72
+#, tcl-format
+msgid "Pushing %s %s to %s"
+msgstr "Pousse %s %s vers %s"
+
+#: lib/transport.tcl:89
+msgid "Push Branches"
+msgstr "Pousser branches"
+
+#: lib/transport.tcl:103
+msgid "Source Branches"
+msgstr "Branches source"
+
+#: lib/transport.tcl:120
+msgid "Destination Repository"
+msgstr "Dépôt de destination"
+
+#: lib/transport.tcl:158
+msgid "Transfer Options"
+msgstr "Options de transfert"
+
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+"Forcer l'écrasement d'une branche existante (peut supprimer des "
+"modifications)"
+
+#: lib/transport.tcl:164
+msgid "Use thin pack (for slow network connections)"
+msgstr "Utiliser des petits paquets (pour les connexions lentes)"
+
+#: lib/transport.tcl:168
+msgid "Include tags"
+msgstr "Inclure les marques (tags)"
+
diff --cc git-gui/po/hu.po
index 28760ed97838d39effd035ab4f1159c0085221f8,0000000000000000000000000000000000000000..8ec43392d452d39b9e20c4c7d42e00bab4adf089
mode 100644,000000..100644
mode 100644,000000..100644
--- 1/git-gui/po/hu.po
--- /dev/null
+++ b/git-gui/po/hu.po
- "POT-Creation-Date: 2008-03-14 07:18+0100\n"
- "PO-Revision-Date: 2008-03-14 17:24+0100\n"
+# Hungarian translations for git-gui-i package.
+# Copyright (C) 2007 THE git-gui-i'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the git-gui-i package.
+# Miklos Vajna <vmiklos@frugalware.org>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: git-gui-i 18n\n"
+"Report-Msgid-Bugs-To: \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
++"POT-Creation-Date: 2008-11-16 13:56-0800\n"
++"PO-Revision-Date: 2008-11-17 23:03+0100\n"
+"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
+"Language-Team: Hungarian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
- #: git-gui.sh:593
++#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847
++#: git-gui.sh:866
+msgid "git-gui: fatal error"
+msgstr "git-gui: végzetes hiba"
+
- #: git-gui.sh:620
++#: git-gui.sh:689
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "Érvénytelen font lett megadva itt: %s:"
+
- #: git-gui.sh:621
++#: git-gui.sh:723
+msgid "Main Font"
+msgstr "Fő betűtípus"
+
- #: git-gui.sh:635
++#: git-gui.sh:724
+msgid "Diff/Console Font"
+msgstr "Diff/konzol betűtípus"
+
- #: git-gui.sh:662
++#: git-gui.sh:738
+msgid "Cannot find git in PATH."
+msgstr "A git nem található a PATH-ban."
+
- #: git-gui.sh:680
++#: git-gui.sh:765
+msgid "Cannot parse Git version string:"
+msgstr "Nem értelmezhető a Git verzió sztring:"
+
- #: git-gui.sh:918
++#: git-gui.sh:783
+#, tcl-format
+msgid ""
+"Git version cannot be determined.\n"
+"\n"
+"%s claims it is version '%s'.\n"
+"\n"
+"%s requires at least Git 1.5.0 or later.\n"
+"\n"
+"Assume '%s' is version 1.5.0?\n"
+msgstr ""
+"Nem állípítható meg a Git verziója.\n"
+"\n"
+"A(z) %s szerint a verzió '%s'.\n"
+"\n"
+"A(z) %s a Git 1.5.0 vagy későbbi verzióját igényli.\n"
+"\n"
+"Feltételezhetjük, hogy a(z) '%s' verziója legalább 1.5.0?\n"
+
- #: git-gui.sh:925
++#: git-gui.sh:1062
+msgid "Git directory not found:"
+msgstr "A Git könyvtár nem található:"
+
- #: git-gui.sh:932
++#: git-gui.sh:1069
+msgid "Cannot move to top of working directory:"
+msgstr "Nem lehet a munkakönyvtár tetejére lépni:"
+
- #: git-gui.sh:937
++#: git-gui.sh:1076
+msgid "Cannot use funny .git directory:"
+msgstr "Nem használható vicces .git könyvtár:"
+
- #: git-gui.sh:1084 lib/checkout_op.tcl:283
++#: git-gui.sh:1081
+msgid "No working directory"
+msgstr "Nincs munkakönyvtár"
+
- #: git-gui.sh:1149
++#: git-gui.sh:1247 lib/checkout_op.tcl:305
+msgid "Refreshing file status..."
+msgstr "A fájlok státuszának frissítése..."
+
- #: git-gui.sh:1324 lib/browser.tcl:246
++#: git-gui.sh:1303
+msgid "Scanning for modified files ..."
+msgstr "Módosított fájlok keresése ..."
+
- #: git-gui.sh:1590
++#: git-gui.sh:1367
++msgid "Calling prepare-commit-msg hook..."
++msgstr "A prepare-commit-msg hurok meghívása..."
++
++#: git-gui.sh:1384
++msgid "Commit declined by prepare-commit-msg hook."
++msgstr "A commitot megakadályozta a prepare-commit-msg hurok."
++
++#: git-gui.sh:1542 lib/browser.tcl:246
+msgid "Ready."
+msgstr "Kész."
+
- #: git-gui.sh:1592
++#: git-gui.sh:1819
+msgid "Unmodified"
+msgstr "Nem módosított"
+
- #: git-gui.sh:1593 git-gui.sh:1598
++#: git-gui.sh:1821
+msgid "Modified, not staged"
+msgstr "Módosított, de nem kiválasztott"
+
- #: git-gui.sh:1594 git-gui.sh:1599
++#: git-gui.sh:1822 git-gui.sh:1830
+msgid "Staged for commit"
+msgstr "Kiválasztva commitolásra"
+
- #: git-gui.sh:1595 git-gui.sh:1600
++#: git-gui.sh:1823 git-gui.sh:1831
+msgid "Portions staged for commit"
+msgstr "Részek kiválasztva commitolásra"
+
- #: git-gui.sh:1597
++#: git-gui.sh:1824 git-gui.sh:1832
+msgid "Staged for commit, missing"
+msgstr "Kiválasztva commitolásra, hiányzó"
+
- #: git-gui.sh:1602
++#: git-gui.sh:1826
++msgid "File type changed, not staged"
++msgstr "Fájl típus megváltozott, nem kiválasztott"
++
++#: git-gui.sh:1827
++msgid "File type changed, staged"
++msgstr "A fájltípus megváltozott, kiválasztott"
++
++#: git-gui.sh:1829
+msgid "Untracked, not staged"
+msgstr "Nem követett, nem kiválasztott"
+
- #: git-gui.sh:1603
++#: git-gui.sh:1834
+msgid "Missing"
+msgstr "Hiányzó"
+
- #: git-gui.sh:1604
++#: git-gui.sh:1835
+msgid "Staged for removal"
+msgstr "Kiválasztva eltávolításra"
+
- #: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
++#: git-gui.sh:1836
+msgid "Staged for removal, still present"
+msgstr "Kiválasztva eltávolításra, jelenleg is elérhető"
+
- #: git-gui.sh:1644
++#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841
++#: git-gui.sh:1842 git-gui.sh:1843
+msgid "Requires merge resolution"
+msgstr "Merge feloldás szükséges"
+
- #: git-gui.sh:1653
- #, tcl-format
- msgid ""
- "Unable to start gitk:\n"
- "\n"
- "%s does not exist"
- msgstr ""
- "A gitk indítása sikertelen:\n"
- "\n"
- "A(z) %s nem létezik"
++#: git-gui.sh:1878
+msgid "Starting gitk... please wait..."
+msgstr "A gitk indítása... várjunk..."
+
- #: git-gui.sh:1860 lib/choose_repository.tcl:36
++#: git-gui.sh:1887
++msgid "Couldn't find gitk in PATH"
++msgstr "A gitk nem található a PATH-ban."
+
- #: git-gui.sh:1861
++#: git-gui.sh:2280 lib/choose_repository.tcl:36
+msgid "Repository"
+msgstr "Repó"
+
- #: git-gui.sh:1863 lib/choose_rev.tcl:561
++#: git-gui.sh:2281
+msgid "Edit"
+msgstr "Szerkesztés"
+
- #: git-gui.sh:1866 lib/choose_rev.tcl:548
++#: git-gui.sh:2283 lib/choose_rev.tcl:561
+msgid "Branch"
+msgstr "Branch"
+
- #: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
++#: git-gui.sh:2286 lib/choose_rev.tcl:548
+msgid "Commit@@noun"
+msgstr "Commit@@főnév"
+
- #: git-gui.sh:1870 lib/choose_rev.tcl:557
++#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+msgid "Merge"
+msgstr "Merge"
+
- #: git-gui.sh:1879
++#: git-gui.sh:2290 lib/choose_rev.tcl:557
+msgid "Remote"
+msgstr "Távoli"
+
- #: git-gui.sh:1883
++#: git-gui.sh:2293
++msgid "Tools"
++msgstr "Eszközök"
++
++#: git-gui.sh:2302
++msgid "Explore Working Copy"
++msgstr "Munkamásolat felfedezése"
++
++#: git-gui.sh:2307
+msgid "Browse Current Branch's Files"
+msgstr "A jelenlegi branch fájljainak böngészése"
+
- #: git-gui.sh:1888
++#: git-gui.sh:2311
+msgid "Browse Branch Files..."
+msgstr "A branch fájljainak böngészése..."
+
- #: git-gui.sh:1892
++#: git-gui.sh:2316
+msgid "Visualize Current Branch's History"
+msgstr "A jelenlegi branch történetének vizualizálása"
+
- #: git-gui.sh:1899
++#: git-gui.sh:2320
+msgid "Visualize All Branch History"
+msgstr "Az összes branch történetének vizualizálása"
+
- #: git-gui.sh:1901
++#: git-gui.sh:2327
+#, tcl-format
+msgid "Browse %s's Files"
+msgstr "A(z) %s branch fájljainak böngészése"
+
- #: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
++#: git-gui.sh:2329
+#, tcl-format
+msgid "Visualize %s's History"
+msgstr "A(z) %s branch történetének vizualizálása"
+
- #: git-gui.sh:1909 lib/database.tcl:34
++#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67
+msgid "Database Statistics"
+msgstr "Adatbázis statisztikák"
+
- #: git-gui.sh:1912
++#: git-gui.sh:2337 lib/database.tcl:34
+msgid "Compress Database"
+msgstr "Adatbázis tömörítése"
+
- #: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
++#: git-gui.sh:2340
+msgid "Verify Database"
+msgstr "Adatbázis ellenőrzése"
+
- #: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
++#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 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:1939
++#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+msgid "Quit"
+msgstr "Kilépés"
+
- #: git-gui.sh:1942
++#: git-gui.sh:2371
+msgid "Undo"
+msgstr "Visszavonás"
+
- #: git-gui.sh:1946 git-gui.sh:2443
++#: git-gui.sh:2374
+msgid "Redo"
+msgstr "Mégis"
+
- #: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
++#: git-gui.sh:2378 git-gui.sh:2923
+msgid "Cut"
+msgstr "Kivágás"
+
- #: git-gui.sh:1952 git-gui.sh:2449
++#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
+#: lib/console.tcl:69
+msgid "Copy"
+msgstr "Másolás"
+
- #: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
++#: git-gui.sh:2384 git-gui.sh:2929
+msgid "Paste"
+msgstr "Beillesztés"
+
- #: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
++#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
+#: lib/remote_branch_delete.tcl:38
+msgid "Delete"
+msgstr "Törlés"
+
- #: git-gui.sh:1968
++#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
+msgid "Select All"
+msgstr "Mindent kiválaszt"
+
- #: git-gui.sh:1974
++#: git-gui.sh:2400
+msgid "Create..."
+msgstr "Létrehozás..."
+
- #: git-gui.sh:1980
++#: git-gui.sh:2406
+msgid "Checkout..."
+msgstr "Checkout..."
+
- #: git-gui.sh:1985 git-gui.sh:2085
++#: git-gui.sh:2412
+msgid "Rename..."
+msgstr "Átnevezés..."
+
- #: git-gui.sh:1990
++#: git-gui.sh:2417
+msgid "Delete..."
+msgstr "Törlés..."
+
- #: git-gui.sh:2002 git-gui.sh:2389
++#: git-gui.sh:2422
+msgid "Reset..."
+msgstr "Visszaállítás..."
+
- #: git-gui.sh:2010 git-gui.sh:2396
++#: git-gui.sh:2432
++msgid "Done"
++msgstr "Kész"
++
++#: git-gui.sh:2434
++msgid "Commit@@verb"
++msgstr "Commit@@ige"
++
++#: git-gui.sh:2443 git-gui.sh:2864
+msgid "New Commit"
+msgstr "Új commit"
+
- #: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
++#: git-gui.sh:2451 git-gui.sh:2871
+msgid "Amend Last Commit"
+msgstr "Utolsó commit javítása"
+
- #: git-gui.sh:2025
++#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
+msgid "Rescan"
+msgstr "Keresés újra"
+
- #: git-gui.sh:2031
++#: git-gui.sh:2467
+msgid "Stage To Commit"
+msgstr "Kiválasztás commitolásra"
+
- #: git-gui.sh:2037
++#: git-gui.sh:2473
+msgid "Stage Changed Files To Commit"
+msgstr "Módosított fájlok kiválasztása commitolásra"
+
- #: git-gui.sh:2042 lib/index.tcl:395
++#: git-gui.sh:2479
+msgid "Unstage From Commit"
+msgstr "Commitba való kiválasztás visszavonása"
+
- #: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
++#: git-gui.sh:2484 lib/index.tcl:410
+msgid "Revert Changes"
+msgstr "Változtatások visszaállítása"
+
- #: git-gui.sh:2053 git-gui.sh:2372
- msgid "Commit@@verb"
- msgstr "Commit@@ige"
-
- #: git-gui.sh:2064
++#: git-gui.sh:2491 git-gui.sh:3069
++msgid "Show Less Context"
++msgstr "Kevesebb környezet mutatása"
++
++#: git-gui.sh:2495 git-gui.sh:3073
++msgid "Show More Context"
++msgstr "Több környezet mutatása"
++
++#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
+msgid "Sign Off"
+msgstr "Aláír"
+
- #: git-gui.sh:2069
++#: git-gui.sh:2518
+msgid "Local Merge..."
+msgstr "Helyi merge..."
+
- #: git-gui.sh:2081
++#: git-gui.sh:2523
+msgid "Abort Merge..."
+msgstr "Merge megszakítása..."
+
- #: git-gui.sh:2092 lib/choose_repository.tcl:41
- msgid "Apple"
- msgstr "Apple"
++#: git-gui.sh:2535 git-gui.sh:2575
++msgid "Add..."
++msgstr "Hozzáadás..."
++
++#: git-gui.sh:2539
+msgid "Push..."
+msgstr "Push..."
+
- #: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
- #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
++#: git-gui.sh:2543
++msgid "Delete Branch..."
++msgstr "Branch törlése..."
+
- #: git-gui.sh:2099
++#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14
++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#, tcl-format
+msgid "About %s"
+msgstr "Névjegy: %s"
+
- #: git-gui.sh:2107 git-gui.sh:2639
++#: git-gui.sh:2557
+msgid "Preferences..."
+msgstr "Beállítások..."
+
- #: git-gui.sh:2113 lib/choose_repository.tcl:47
++#: git-gui.sh:2565 git-gui.sh:3115
+msgid "Options..."
+msgstr "Opciók..."
+
- #: git-gui.sh:2154
++#: git-gui.sh:2576
++msgid "Remove..."
++msgstr "Eltávolítás..."
++
++#: git-gui.sh:2585 lib/choose_repository.tcl:50
+msgid "Help"
+msgstr "Segítség"
+
- #: git-gui.sh:2238
++#: git-gui.sh:2611
+msgid "Online Documentation"
+msgstr "Online dokumentáció"
+
- #: git-gui.sh:2271
++#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
++msgid "Show SSH Key"
++msgstr "SSH kulcs mutatása"
++
++#: git-gui.sh:2707
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+"végzetes hiba: nem érhető el a(z) %s útvonal: Nincs ilyen fájl vagy könyvtár"
+
- #: git-gui.sh:2292
++#: git-gui.sh:2740
+msgid "Current Branch:"
+msgstr "Jelenlegi branch:"
+
- #: git-gui.sh:2312
++#: git-gui.sh:2761
+msgid "Staged Changes (Will Commit)"
+msgstr "Kiválasztott változtatások (commitolva lesz)"
+
- #: git-gui.sh:2362
++#: git-gui.sh:2781
+msgid "Unstaged Changes"
+msgstr "Kiválasztatlan változtatások"
+
- #: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
++#: git-gui.sh:2831
+msgid "Stage Changed"
+msgstr "Változtatások kiválasztása"
+
- #: git-gui.sh:2408
++#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "Push"
+
- #: git-gui.sh:2409
++#: git-gui.sh:2885
+msgid "Initial Commit Message:"
+msgstr "Kezdeti commit üzenet:"
+
- #: git-gui.sh:2410
++#: git-gui.sh:2886
+msgid "Amended Commit Message:"
+msgstr "Javító commit üzenet:"
+
- #: git-gui.sh:2411
++#: git-gui.sh:2887
+msgid "Amended Initial Commit Message:"
+msgstr "Kezdeti javító commit üzenet:"
+
- #: git-gui.sh:2412
++#: git-gui.sh:2888
+msgid "Amended Merge Commit Message:"
+msgstr "Javító merge commit üzenet:"
+
- #: git-gui.sh:2413
++#: git-gui.sh:2889
+msgid "Merge Commit Message:"
+msgstr "Merge commit üzenet:"
+
- #: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
++#: git-gui.sh:2890
+msgid "Commit Message:"
+msgstr "Commit üzenet:"
+
- #: git-gui.sh:2483 lib/blame.tcl:107
++#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
+msgid "Copy All"
+msgstr "Összes másolása"
+
- #: git-gui.sh:2589
- msgid "Apply/Reverse Hunk"
- msgstr "Hunk alkalmazása/visszaállítása"
-
- #: git-gui.sh:2595
- msgid "Show Less Context"
- msgstr "Kevesebb környezet mutatása"
-
- #: git-gui.sh:2602
- msgid "Show More Context"
- msgstr "Több környezet mutatása"
-
- #: git-gui.sh:2610
++#: git-gui.sh:2963 lib/blame.tcl:104
+msgid "File:"
+msgstr "Fájl:"
+
- #: git-gui.sh:2631
++#: git-gui.sh:3078
+msgid "Refresh"
+msgstr "Frissítés"
+
- #: git-gui.sh:2635
++#: git-gui.sh:3099
+msgid "Decrease Font Size"
+msgstr "Font méret csökkentése"
+
- #: git-gui.sh:2646
++#: git-gui.sh:3103
+msgid "Increase Font Size"
+msgstr "Fönt méret növelése"
+
- #: git-gui.sh:2648
++#: git-gui.sh:3111 lib/blame.tcl:281
++msgid "Encoding"
++msgstr "Kódolás"
++
++#: git-gui.sh:3122
++msgid "Apply/Reverse Hunk"
++msgstr "Hunk alkalmazása/visszaállítása"
++
++#: git-gui.sh:3127
++msgid "Apply/Reverse Line"
++msgstr "Sor alkalmazása/visszaállítása"
++
++#: git-gui.sh:3137
++msgid "Run Merge Tool"
++msgstr "Merge eszköz futtatása"
++
++#: git-gui.sh:3142
++msgid "Use Remote Version"
++msgstr "Távoli verzió használata"
++
++#: git-gui.sh:3146
++msgid "Use Local Version"
++msgstr "Helyi verzió használata"
++
++#: git-gui.sh:3150
++msgid "Revert To Base"
++msgstr "Visszaállítás az alaphoz"
++
++#: git-gui.sh:3169
+msgid "Unstage Hunk From Commit"
+msgstr "Hunk törlése commitból"
+
- #: git-gui.sh:2667
++#: git-gui.sh:3170
++msgid "Unstage Line From Commit"
++msgstr "A sor kiválasztásának törlése"
++
++#: git-gui.sh:3172
+msgid "Stage Hunk For Commit"
+msgstr "Hunk kiválasztása commitba"
+
- #: git-gui.sh:2762
++#: git-gui.sh:3173
++msgid "Stage Line For Commit"
++msgstr "Sor kiválasztása commitba"
++
++#: git-gui.sh:3196
+msgid "Initializing..."
+msgstr "Inicializálás..."
+
- #: git-gui.sh:2792
++#: git-gui.sh:3301
+#, tcl-format
+msgid ""
+"Possible environment issues exist.\n"
+"\n"
+"The following environment variables are probably\n"
+"going to be ignored by any Git subprocess run\n"
+"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:2797
++#: git-gui.sh:3331
+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."
+
- #: lib/blame.tcl:77
++#: git-gui.sh:3336
+#, tcl-format
+msgid ""
+"\n"
+"\n"
+"A good replacement for %s\n"
+"is placing values for the user.name and\n"
+"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:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - egy grafikus felület a Githez."
+
- #: lib/blame.tcl:81
++#: lib/blame.tcl:72
+msgid "File Viewer"
+msgstr "Fájl néző"
+
- #: lib/blame.tcl:264
++#: lib/blame.tcl:78
+msgid "Commit:"
+msgstr "Commit:"
+
- #: lib/blame.tcl:384
++#: lib/blame.tcl:271
+msgid "Copy Commit"
+msgstr "Commit másolása"
+
- #: lib/blame.tcl:488
++#: lib/blame.tcl:275
++msgid "Find Text..."
++msgstr "Szöveg keresése..."
++
++#: lib/blame.tcl:284
++msgid "Do Full Copy Detection"
++msgstr "Teljes másolat-érzékelés bekapcsolása"
++
++#: lib/blame.tcl:288
++msgid "Show History Context"
++msgstr "Történeti környezet mutatása"
++
++#: lib/blame.tcl:291
++msgid "Blame Parent Commit"
++msgstr "Szülő commit vizsgálata"
++
++#: lib/blame.tcl:450
+#, tcl-format
+msgid "Reading %s..."
+msgstr "A(z) %s olvasása..."
+
- #: lib/blame.tcl:508
++#: lib/blame.tcl:557
+msgid "Loading copy/move tracking annotations..."
+msgstr "A másolást/átnevezést követő annotációk betöltése..."
+
- #: lib/blame.tcl:689
++#: lib/blame.tcl:577
+msgid "lines annotated"
+msgstr "sor annotálva"
+
- #: lib/blame.tcl:692
++#: lib/blame.tcl:769
+msgid "Loading original location annotations..."
+msgstr "Az eredeti hely annotációk betöltése..."
+
- #: lib/blame.tcl:746
++#: lib/blame.tcl:772
+msgid "Annotation complete."
+msgstr "Az annotáció kész."
+
- #: lib/blame.tcl:802
++#: lib/blame.tcl:802
++msgid "Busy"
++msgstr "Elfoglalt"
++
++#: lib/blame.tcl:803
++msgid "Annotation process is already running."
++msgstr "Az annotációs folyamat már fut."
++
++#: lib/blame.tcl:842
++msgid "Running thorough copy detection..."
++msgstr "Futtatás másolás-érzékelésen keresztül..."
++
++#: lib/blame.tcl:910
+msgid "Loading annotation..."
+msgstr "Az annotáció betöltése..."
+
- #: lib/blame.tcl:806
++#: lib/blame.tcl:964
+msgid "Author:"
+msgstr "Szerző:"
+
- #: lib/blame.tcl:811
++#: lib/blame.tcl:968
+msgid "Committer:"
+msgstr "Commiter:"
+
- #: lib/blame.tcl:925
++#: lib/blame.tcl:973
+msgid "Original File:"
+msgstr "Eredeti fájl:"
+
- #: lib/blame.tcl:931
++#: lib/blame.tcl:1021
++msgid "Cannot find HEAD commit:"
++msgstr "Nem található a HEAD commit:"
++
++#: lib/blame.tcl:1076
++msgid "Cannot find parent commit:"
++msgstr "Nem található a szülő commit:"
++
++#: lib/blame.tcl:1091
++msgid "Unable to display parent"
++msgstr "Nem lehet megjeleníteni a szülőt"
++
++#: lib/blame.tcl:1092 lib/diff.tcl:297
++msgid "Error loading diff:"
++msgstr "Hiba a diff betöltése közben:"
++
++#: lib/blame.tcl:1232
+msgid "Originally By:"
+msgstr "Eredeti szerző:"
+
- #: lib/blame.tcl:936
++#: lib/blame.tcl:1238
+msgid "In File:"
+msgstr "Ebben a fájlban:"
+
- #: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
- #: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
++#: lib/blame.tcl:1243
+msgid "Copied Or Moved Here By:"
+msgstr "Ide másolta vagy helyezte:"
+
+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
+msgid "Checkout Branch"
+msgstr "Branch checkoutolása"
+
+#: lib/branch_checkout.tcl:23
+msgid "Checkout"
+msgstr "Checkout"
+
+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
- #: lib/branch_checkout.tcl:32 lib/browser.tcl:287
++#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
++#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
++#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
++#: lib/transport.tcl:97
+msgid "Cancel"
+msgstr "Mégsem"
+
- #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
++#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
+msgid "Revision"
+msgstr "Revízió"
+
- #: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
++#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
+msgid "Options"
+msgstr "Opciók"
+
+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
+msgstr "Követő branch letöltése"
+
+#: lib/branch_checkout.tcl:44
+msgid "Detach From Local Branch"
+msgstr "Helyi branch leválasztása"
+
+#: lib/branch_create.tcl:22
+msgid "Create Branch"
+msgstr "Branch létrehozása"
+
+#: lib/branch_create.tcl:27
+msgid "Create New Branch"
+msgstr "Új branch létrehozása"
+
- #: lib/branch_create.tcl:43
++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377
+msgid "Create"
+msgstr "Létrehozás"
+
+#: lib/branch_create.tcl:40
+msgid "Branch Name"
+msgstr "Branch neve"
+
- #: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
++#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
+msgid "Name:"
+msgstr "Név:"
+
+#: lib/branch_create.tcl:58
+msgid "Match Tracking Branch Name"
+msgstr "Egyeztetendő követési branch név"
+
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
+msgstr "A következő revíziótól"
+
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
+msgstr "Létező branch frissítése"
+
+#: lib/branch_create.tcl:75
+msgid "No"
+msgstr "Nem"
+
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
+msgstr "Csak fast forward"
+
- #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
++#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
+msgid "Reset"
+msgstr "Visszaállítás"
+
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
+msgstr "Checkout létrehozás után"
+
+#: lib/branch_create.tcl:131
+msgid "Please select a tracking branch."
+msgstr "Válasszunk ki egy követő branchet."
+
+#: lib/branch_create.tcl:140
+#, tcl-format
+msgid "Tracking branch %s is not a branch in the remote repository."
+msgstr "A(z) %s követő branch nem branch a távoli repóban."
+
+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
+msgid "Please supply a branch name."
+msgstr "Adjunk megy egy branch nevet."
+
+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#, tcl-format
+msgid "'%s' is not an acceptable branch name."
+msgstr "A(z) '%s' nem egy elfogadható branch név."
+
+#: lib/branch_delete.tcl:15
+msgid "Delete Branch"
+msgstr "Branch törlése"
+
+#: lib/branch_delete.tcl:20
+msgid "Delete Local Branch"
+msgstr "Helyi branch törlése"
+
+#: lib/branch_delete.tcl:37
+msgid "Local Branches"
+msgstr "Helyi branchek"
+
+#: lib/branch_delete.tcl:52
+msgid "Delete Only If Merged Into"
+msgstr "Csak már merge-ölt törlése"
+
+#: lib/branch_delete.tcl:54
+msgid "Always (Do not perform merge test.)"
+msgstr "Mindig (Ne legyen merge teszt.)"
+
+#: lib/branch_delete.tcl:103
+#, tcl-format
+msgid "The following branches are not completely merged into %s:"
+msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:"
+
+#: lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult. \n"
+"\n"
+" Delete the selected branches?"
+msgstr ""
+"A törölt branchek visszaállítása bonyolult. \n"
+"\n"
+" Biztosan törli a kiválasztott brancheket?"
+
+#: lib/branch_delete.tcl:141
+#, tcl-format
+msgid ""
+"Failed to delete branches:\n"
+"%s"
+msgstr ""
+"Nem sikerült törölni a következő brancheket:\n"
+"%s"
+
+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
+msgid "Rename Branch"
+msgstr "Branch átnevezése"
+
+#: lib/branch_rename.tcl:26
+msgid "Rename"
+msgstr "Átnevezés"
+
+#: lib/branch_rename.tcl:36
+msgid "Branch:"
+msgstr "Branch:"
+
+#: lib/branch_rename.tcl:39
+msgid "New Name:"
+msgstr "Új név:"
+
+#: lib/branch_rename.tcl:75
+msgid "Please select a branch to rename."
+msgstr "Válasszunk ki egy átnevezendő branchet."
+
- #: lib/browser.tcl:278 lib/choose_repository.tcl:387
- #: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
- #: lib/choose_repository.tcl:987
++#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201
+#, tcl-format
+msgid "Branch '%s' already exists."
+msgstr "A(z) '%s' branch már létezik."
+
+#: lib/branch_rename.tcl:117
+#, tcl-format
+msgid "Failed to rename '%s'."
+msgstr "Nem sikerült átnevezni: '%s'."
+
+#: lib/browser.tcl:17
+msgid "Starting..."
+msgstr "Indítás..."
+
+#: lib/browser.tcl:26
+msgid "File Browser"
+msgstr "Fájl böngésző"
+
+#: lib/browser.tcl:126 lib/browser.tcl:143
+#, tcl-format
+msgid "Loading %s..."
+msgstr "A(z) %s betöltése..."
+
+#: lib/browser.tcl:187
+msgid "[Up To Parent]"
+msgstr "[Fel a szülőhöz]"
+
+#: lib/browser.tcl:267 lib/browser.tcl:273
+msgid "Browse Branch Files"
+msgstr "A branch fájljainak böngészése"
+
- #: lib/checkout_op.tcl:79
++#: lib/browser.tcl:278 lib/choose_repository.tcl:394
++#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491
++#: lib/choose_repository.tcl:995
+msgid "Browse"
+msgstr "Böngészés"
+
- #: lib/checkout_op.tcl:127
++#: lib/checkout_op.tcl:84
+#, tcl-format
+msgid "Fetching %s from %s"
+msgstr "A(z) %s letöltése innen: %s"
+
- #: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
++#: lib/checkout_op.tcl:132
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr "végzetes: Nem lehet feloldani a következőt: %s"
+
- #: lib/checkout_op.tcl:169
++#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
++#: lib/sshkey.tcl:53
+msgid "Close"
+msgstr "Bezárás"
+
- #: lib/checkout_op.tcl:206
++#: lib/checkout_op.tcl:174
+#, tcl-format
+msgid "Branch '%s' does not exist."
+msgstr "A(z) '%s' branch nem létezik."
+
- #: lib/checkout_op.tcl:220
++#: lib/checkout_op.tcl:193
++#, tcl-format
++msgid "Failed to configure simplified git-pull for '%s'."
++msgstr ""
++"Nem sikerült beállítani az egyszerűsített git-pull-t a(z) '%s' számára."
++
++#: lib/checkout_op.tcl:228
+#, tcl-format
+msgid ""
+"Branch '%s' already exists.\n"
+"\n"
+"It cannot fast-forward to %s.\n"
+"A merge is required."
+msgstr ""
+"A(z) '%s' branch már létezik.\n"
+"\n"
+"Nem lehet fast-forwardolni a következőhöz: %s.\n"
+"Egy merge szükséges."
+
- #: lib/checkout_op.tcl:239
++#: lib/checkout_op.tcl:242
+#, tcl-format
+msgid "Merge strategy '%s' not supported."
+msgstr "A(z) '%s' merge strategy nem támogatott."
+
- #: lib/checkout_op.tcl:251
++#: lib/checkout_op.tcl:261
+#, tcl-format
+msgid "Failed to update '%s'."
+msgstr "Nem sikerült frissíteni a következőt: '%s'."
+
- #: lib/checkout_op.tcl:266
++#: lib/checkout_op.tcl:273
+msgid "Staging area (index) is already locked."
+msgstr "A kiválasztási terület (index) már zárolva van."
+
- #: lib/checkout_op.tcl:322
++#: lib/checkout_op.tcl:288
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before the current branch can be changed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"Az utolsó keresési állapot nem egyezik meg a repó állpotával.\n"
+"\n"
+"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy "
+"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani "
+"lehetne.\n"
+"\n"
+"Az újrakeresés most automatikusan el fog indulni.\n"
+
- #: lib/checkout_op.tcl:323
++#: lib/checkout_op.tcl:344
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "A munkkönyvtár frissiítése a következőre: '%s'..."
+
- #: lib/checkout_op.tcl:353
++#: lib/checkout_op.tcl:345
+msgid "files checked out"
+msgstr "fájl frissítve"
+
- #: lib/checkout_op.tcl:354
++#: lib/checkout_op.tcl:375
+#, tcl-format
+msgid "Aborted checkout of '%s' (file level merging is required)."
+msgstr "A(z) '%s' checkoutja megszakítva (fájlszintű merge-ölés szükséges)."
+
- #: lib/checkout_op.tcl:358
++#: lib/checkout_op.tcl:376
+msgid "File level merge required."
+msgstr "Fájlszintű merge-ölés szükséges."
+
- #: lib/checkout_op.tcl:429
++#: lib/checkout_op.tcl:380
+#, tcl-format
+msgid "Staying on branch '%s'."
+msgstr "Jelenleg a(z) '%s' branchen."
+
- #: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
++#: lib/checkout_op.tcl:451
+msgid ""
+"You are no longer on a local branch.\n"
+"\n"
+"If you wanted to be on a branch, create one now starting from 'This Detached "
+"Checkout'."
+msgstr ""
+"Már nem egy helyi branchen vagyunk.\n"
+"\n"
+"Ha egy branchen szeretnénk lenni, hozzunk létre egyet az 'Ez a leválasztott "
+"checkout'-ból."
+
- #: lib/checkout_op.tcl:478
++#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
+#, tcl-format
+msgid "Checked out '%s'."
+msgstr "'%s' kifejtve."
+
- #: lib/checkout_op.tcl:500
++#: lib/checkout_op.tcl:500
+#, tcl-format
+msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgstr ""
+"A(z) '%s' -> '%s' visszaállítás a következő commitok elvesztését jelenti:"
+
- #: lib/checkout_op.tcl:505
++#: lib/checkout_op.tcl:522
+msgid "Recovering lost commits may not be easy."
+msgstr "Az elveszett commitok helyreállítása nem biztos, hogy egyszerű."
+
- #: lib/checkout_op.tcl:510 lib/merge.tcl:163
++#: lib/checkout_op.tcl:527
+#, tcl-format
+msgid "Reset '%s'?"
+msgstr "Visszaállítjuk a következőt: '%s'?"
+
- #: lib/checkout_op.tcl:578
++#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+msgid "Visualize"
+msgstr "Vizualizálás"
+
- #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
++#: lib/checkout_op.tcl:600
+#, tcl-format
+msgid ""
+"Failed to set current branch.\n"
+"\n"
+"This working directory is only partially switched. We successfully updated "
+"your files, but failed to update an internal Git file.\n"
+"\n"
+"This should not have occurred. %s will now close and give up."
+msgstr ""
+"Nem sikerült beállítani a jelenlegi branchet.\n"
+"\n"
+"A munkakönyvtár csak részben váltott át. A fájlok sikeresen frissítve "
+"lettek, de nem sikerült frissíteni egy belső Git fájlt.\n"
+"\n"
+"Ennek nem szabad megtörténnie. A(z) %s most kilép és feladja."
+
+#: lib/choose_font.tcl:39
+msgid "Select"
+msgstr "Kiválaszt"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr "Font család"
+
+#: lib/choose_font.tcl:74
+msgid "Font Size"
+msgstr "Font méret"
+
+#: lib/choose_font.tcl:91
+msgid "Font Example"
+msgstr "Font példa"
+
+#: lib/choose_font.tcl:103
+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:28
+msgid "Git Gui"
+msgstr "Git Gui"
+
- #: lib/choose_repository.tcl:87
++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382
+msgid "Create New Repository"
+msgstr "Új repó létrehozása"
+
- #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
++#: lib/choose_repository.tcl:93
+msgid "New..."
+msgstr "Új..."
+
- #: lib/choose_repository.tcl:100
++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465
+msgid "Clone Existing Repository"
+msgstr "Létező repó másolása"
+
- #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
++#: lib/choose_repository.tcl:106
+msgid "Clone..."
+msgstr "Másolás..."
+
- #: lib/choose_repository.tcl:113
++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
+msgid "Open Existing Repository"
+msgstr "Létező könyvtár megnyitása"
+
- #: lib/choose_repository.tcl:126
++#: lib/choose_repository.tcl:119
+msgid "Open..."
+msgstr "Meggyitás..."
+
- #: lib/choose_repository.tcl:132
++#: lib/choose_repository.tcl:132
+msgid "Recent Repositories"
+msgstr "Legutóbbi repók"
+
- #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
- #: lib/choose_repository.tcl:310
++#: lib/choose_repository.tcl:138
+msgid "Open Recent Repository:"
+msgstr "Legutóbbi repók megnyitása:"
+
- #: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
++#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
++#: lib/choose_repository.tcl:316
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "Nem sikerült letrehozni a(z) %s repót:"
+
- #: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
- #: lib/choose_repository.tcl:1011
++#: lib/choose_repository.tcl:387
+msgid "Directory:"
+msgstr "Könyvtár:"
+
- #: lib/choose_repository.tcl:437
++#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544
++#: lib/choose_repository.tcl:1017
+msgid "Git Repository"
+msgstr "Git repó"
+
- #: lib/choose_repository.tcl:441
++#: lib/choose_repository.tcl:442
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr "A(z) '%s' könyvtár már létezik."
+
- #: lib/choose_repository.tcl:455
++#: lib/choose_repository.tcl:446
+#, tcl-format
+msgid "File %s already exists."
+msgstr "A(z) '%s' fájl már létezik."
+
- #: lib/choose_repository.tcl:468
- msgid "URL:"
- msgstr "URL:"
++#: lib/choose_repository.tcl:460
+msgid "Clone"
+msgstr "Bezárás"
+
- #: lib/choose_repository.tcl:489
++#: lib/choose_repository.tcl:473
++msgid "Source Location:"
++msgstr "Forrás helye:"
+
- #: lib/choose_repository.tcl:495
++#: lib/choose_repository.tcl:484
++msgid "Target Directory:"
++msgstr "Cél könyvtár:"
++
++#: lib/choose_repository.tcl:496
+msgid "Clone Type:"
+msgstr "Másolás típusa:"
+
- #: lib/choose_repository.tcl:501
++#: lib/choose_repository.tcl:502
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr "Általános (Gyors, félig-redundáns, hardlinkek)"
+
- #: lib/choose_repository.tcl:507
++#: lib/choose_repository.tcl:508
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr "Teljes másolás (Lassabb, redundáns biztonsági mentés)"
+
- #: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
- #: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
- #: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
++#: lib/choose_repository.tcl:514
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr "Megosztott (Leggyorsabb, nem ajánlott, nincs mentés)"
+
- #: lib/choose_repository.tcl:579
++#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
++#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813
++#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "Nem Git repó: %s"
+
- #: lib/choose_repository.tcl:583
++#: lib/choose_repository.tcl:586
+msgid "Standard only available for local repository."
+msgstr "A standard csak helyi repókra érhető el."
+
- #: lib/choose_repository.tcl:604
++#: lib/choose_repository.tcl:590
+msgid "Shared only available for local repository."
+msgstr "A megosztott csak helyi repókra érhető el."
+
- #: lib/choose_repository.tcl:615
++#: lib/choose_repository.tcl:611
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "A(z) '%s' hely már létezik."
+
- #: lib/choose_repository.tcl:627
++#: lib/choose_repository.tcl:622
+msgid "Failed to configure origin"
+msgstr "Nem sikerült beállítani az origint"
+
- #: lib/choose_repository.tcl:628
++#: lib/choose_repository.tcl:634
+msgid "Counting objects"
+msgstr "Objektumok számolása"
+
- #: lib/choose_repository.tcl:652
++#: lib/choose_repository.tcl:635
+msgid "buckets"
+msgstr "vödrök"
+
- #: lib/choose_repository.tcl:688
++#: lib/choose_repository.tcl:659
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr "Nem sikerült másolni az objects/info/alternates-t: %s"
+
- #: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
- #: lib/choose_repository.tcl:916
++#: lib/choose_repository.tcl:695
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "Semmi másolni való nincs innen: %s"
+
- #: lib/choose_repository.tcl:703
++#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911
++#: lib/choose_repository.tcl:923
+msgid "The 'master' branch has not been initialized."
+msgstr "A 'master' branch nincs inicializálva."
+
- #: lib/choose_repository.tcl:715
++#: lib/choose_repository.tcl:710
+msgid "Hardlinks are unavailable. Falling back to copying."
+msgstr "Nem érhetőek el hardlinkek. Másolás használata."
+
- #: lib/choose_repository.tcl:746
++#: lib/choose_repository.tcl:722
+#, tcl-format
+msgid "Cloning from %s"
+msgstr "Másolás innen: %s"
+
- #: lib/choose_repository.tcl:747
++#: lib/choose_repository.tcl:753
+msgid "Copying objects"
+msgstr "Objektumok másolása"
+
- #: lib/choose_repository.tcl:771
++#: lib/choose_repository.tcl:754
+msgid "KiB"
+msgstr "KiB"
+
- #: lib/choose_repository.tcl:781
++#: lib/choose_repository.tcl:778
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr "Nem sikerült másolni az objektumot: %s"
+
- #: lib/choose_repository.tcl:782
++#: lib/choose_repository.tcl:788
+msgid "Linking objects"
+msgstr "Objektumok összefűzése"
+
- #: lib/choose_repository.tcl:790
++#: lib/choose_repository.tcl:789
+msgid "objects"
+msgstr "objektum"
+
- #: lib/choose_repository.tcl:845
++#: lib/choose_repository.tcl:797
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr "Nem sikerült hardlinkelni az objektumot: %s"
+
- #: lib/choose_repository.tcl:856
++#: lib/choose_repository.tcl:852
+msgid "Cannot fetch branches and objects. See console output for details."
+msgstr ""
+"Nem sikerült letölteni a branch-eket és az objektumokat. Bővebben a "
+"konzolos kimenetben."
+
- #: lib/choose_repository.tcl:880
++#: lib/choose_repository.tcl:863
+msgid "Cannot fetch tags. See console output for details."
+msgstr "Nem sikerült letölteni a tageket. Bővebben a konzolos kimenetben."
+
- #: lib/choose_repository.tcl:889
++#: lib/choose_repository.tcl:887
+msgid "Cannot determine HEAD. See console output for details."
+msgstr "Nem sikerült megállapítani a HEAD-et. Bővebben a konzolos kimenetben."
+
- #: lib/choose_repository.tcl:895
++#: lib/choose_repository.tcl:896
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr "Nem sikerült tiszítani: %s."
+
- #: lib/choose_repository.tcl:902
++#: lib/choose_repository.tcl:902
+msgid "Clone failed."
+msgstr "A másolás nem sikerült."
+
- #: lib/choose_repository.tcl:913
++#: lib/choose_repository.tcl:909
+msgid "No default branch obtained."
+msgstr "Nincs alapértelmezett branch."
+
- #: lib/choose_repository.tcl:925
++#: lib/choose_repository.tcl:920
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr "Nem sikerült felöldani a(z) %s objektumot commitként."
+
- #: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
- #: lib/index.tcl:193
++#: lib/choose_repository.tcl:932
+msgid "Creating working directory"
+msgstr "Munkakönyvtár létrehozása"
+
- #: lib/choose_repository.tcl:955
++#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128
++#: lib/index.tcl:196
+msgid "files"
+msgstr "fájl"
+
- #: lib/choose_repository.tcl:971
++#: lib/choose_repository.tcl:962
+msgid "Initial file checkout failed."
+msgstr "A kezdeti fájl-kibontás sikertelen."
+
- #: lib/choose_repository.tcl:981
++#: lib/choose_repository.tcl:978
+msgid "Open"
+msgstr "Megnyitás"
+
- #: lib/choose_repository.tcl:1031
++#: lib/choose_repository.tcl:988
+msgid "Repository:"
+msgstr "Repó:"
+
- #: lib/commit.tcl:154
++#: lib/choose_repository.tcl:1037
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "Nem sikerült megnyitni a(z) %s repót:"
+
+#: lib/choose_rev.tcl:53
+msgid "This Detached Checkout"
+msgstr "Ez a leválasztott checkout"
+
+#: lib/choose_rev.tcl:60
+msgid "Revision Expression:"
+msgstr "Revízió kifejezés:"
+
+#: lib/choose_rev.tcl:74
+msgid "Local Branch"
+msgstr "Helyi branch"
+
+#: lib/choose_rev.tcl:79
+msgid "Tracking Branch"
+msgstr "Követő branch"
+
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+msgid "Tag"
+msgstr "Tag"
+
+#: lib/choose_rev.tcl:317
+#, tcl-format
+msgid "Invalid revision: %s"
+msgstr "Érvénytelen revízió: %s"
+
+#: lib/choose_rev.tcl:338
+msgid "No revision selected."
+msgstr "Nincs kiválasztva revízió."
+
+#: lib/choose_rev.tcl:346
+msgid "Revision expression is empty."
+msgstr "A revízió kifejezés üres."
+
+#: lib/choose_rev.tcl:531
+msgid "Updated"
+msgstr "Frissítve"
+
+#: lib/choose_rev.tcl:559
+msgid "URL"
+msgstr "URL"
+
+#: lib/commit.tcl:9
+msgid ""
+"There is nothing to amend.\n"
+"\n"
+"You are about to create the initial commit. There is no commit before this "
+"to amend.\n"
+msgstr ""
+"Nincs semmi javítanivaló.\n"
+"\n"
+"Az első commit létrehozása előtt nincs semmilyen commit amit javitani "
+"lehetne.\n"
+
+#: lib/commit.tcl:18
+msgid ""
+"Cannot amend while merging.\n"
+"\n"
+"You are currently in the middle of a merge that has not been fully "
+"completed. You cannot amend the prior commit unless you first abort the "
+"current merge activity.\n"
+msgstr ""
+"Nem lehet javítani merge alatt.\n"
+"\n"
+"A jelenlegi merge még nem teljesen fejeződött be. Csak akkor javíthat egy "
+"előbbi commitot, hogyha megszakítja a jelenlegi merge folyamatot.\n"
+
+#: lib/commit.tcl:49
+msgid "Error loading commit data for amend:"
+msgstr "Hiba a javítandó commit adat betöltése közben:"
+
+#: lib/commit.tcl:76
+msgid "Unable to obtain your identity:"
+msgstr "Nem sikerült megállapítani az azonosítót:"
+
+#: lib/commit.tcl:81
+msgid "Invalid GIT_COMMITTER_IDENT:"
+msgstr "Érvénytelen GIT_COMMITTER_IDENT:"
+
+#: lib/commit.tcl:133
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before another commit can be created.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"Az utolsó keresési állapot nem egyezik meg a repó állapotával.\n"
+"\n"
+"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy "
+"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani "
+"lehetne.\n"
+"\n"
+"Az újrakeresés most automatikusan el fog indulni.\n"
+
- #: lib/commit.tcl:162
++#: lib/commit.tcl:156
+#, tcl-format
+msgid ""
+"Unmerged files cannot be committed.\n"
+"\n"
+"File %s has merge conflicts. You must resolve them and stage the file "
+"before committing.\n"
+msgstr ""
+"Nem commitolhatunk fájlokat merge előtt.\n"
+"\n"
+"A(z) %s fájlban ütközések vannak. Egyszer azokat ki kell javítani, majd "
+"hozzá ki kell választani a fájlt mielőtt commitolni lehetne.\n"
+
- #: lib/commit.tcl:170
++#: lib/commit.tcl:164
+#, tcl-format
+msgid ""
+"Unknown file state %s detected.\n"
+"\n"
+"File %s cannot be committed by this program.\n"
+msgstr ""
+"Ismeretlen fájl típus %s érzékelve.\n"
+"\n"
+"A(z) %s fájlt nem tudja ez a program commitolni.\n"
+
- #: lib/commit.tcl:183
++#: lib/commit.tcl:172
+msgid ""
+"No changes to commit.\n"
+"\n"
+"You must stage at least 1 file before you can commit.\n"
+msgstr ""
+"Nincs commitolandó változtatás.\n"
+"\n"
+"Legalább egy fájl ki kell választani, hogy commitolni lehessen.\n"
+
- #: lib/commit.tcl:207
++#: lib/commit.tcl:187
+msgid ""
+"Please supply a commit message.\n"
+"\n"
+"A good commit message has the following format:\n"
+"\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 ""
+"Adjunk megy egy commit üzenetet.\n"
+"\n"
+"Egy jó commit üzenetnek a következő a formátuma:\n"
+"\n"
+"- Első sor: Egy mondatban leírja, hogy mit csináltunk.\n"
+"- Második sor: Üres\n"
+"- A többi sor: Leírja, hogy miért jó ez a változtatás.\n"
+
- #: lib/commit.tcl:221
++#: lib/commit.tcl:211
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "figyelmeztetés: a Tcl nem támogatja a(z) '%s' kódolást."
+
- #: lib/commit.tcl:236
++#: lib/commit.tcl:227
+msgid "Calling pre-commit hook..."
+msgstr "A pre-commit hurok meghívása..."
+
- #: lib/commit.tcl:259
++#: lib/commit.tcl:242
+msgid "Commit declined by pre-commit hook."
+msgstr "A commitot megakadályozta a pre-commit hurok. "
+
- #: lib/commit.tcl:274
++#: lib/commit.tcl:265
+msgid "Calling commit-msg hook..."
+msgstr "A commit-msg hurok meghívása..."
+
- #: lib/commit.tcl:287
++#: lib/commit.tcl:280
+msgid "Commit declined by commit-msg hook."
+msgstr "A commiot megakadályozta a commit-msg hurok."
+
- #: lib/commit.tcl:303
++#: lib/commit.tcl:293
+msgid "Committing changes..."
+msgstr "A változtatások commitolása..."
+
- #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
++#: lib/commit.tcl:309
+msgid "write-tree failed:"
+msgstr "a write-tree sikertelen:"
+
- #: lib/commit.tcl:321
++#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
+msgid "Commit failed."
+msgstr "A commit nem sikerült."
+
- #: lib/commit.tcl:326
++#: lib/commit.tcl:327
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr "A(z) %s commit sérültnek tűnik"
+
- #: lib/commit.tcl:333
++#: lib/commit.tcl:332
+msgid ""
+"No changes to commit.\n"
+"\n"
+"No files were modified by this commit and it was not a merge commit.\n"
+"\n"
+"A rescan will be automatically started now.\n"
+msgstr ""
+"Nincs commitolandó változtatás.\n"
+"\n"
+"Egyetlen fájlt se módosított ez a commit és merge commit se volt.\n"
+"\n"
+"Az újrakeresés most automatikusan el fog indulni.\n"
+
- #: lib/commit.tcl:347
++#: lib/commit.tcl:339
+msgid "No changes to commit."
+msgstr "Nincs commitolandó változtatás."
+
- #: lib/commit.tcl:367
++#: lib/commit.tcl:353
+msgid "commit-tree failed:"
+msgstr "a commit-tree sikertelen:"
+
- #: lib/commit.tcl:454
++#: lib/commit.tcl:373
+msgid "update-ref failed:"
+msgstr "az update-ref sikertelen:"
+
- #: lib/diff.tcl:42
++#: lib/commit.tcl:461
+#, tcl-format
+msgid "Created commit %s: %s"
+msgstr "Létrejött a %s commit: %s"
+
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr "Munka folyamatban.. Várjunk..."
+
+#: lib/console.tcl:186
+msgid "Success"
+msgstr "Siker"
+
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr "Hiba: a parancs sikertelen"
+
+#: lib/database.tcl:43
+msgid "Number of loose objects"
+msgstr "Elvesztett objektumok száma"
+
+#: lib/database.tcl:44
+msgid "Disk space used by loose objects"
+msgstr "Elveszett objektumok által elfoglalt lemezterület"
+
+#: lib/database.tcl:45
+msgid "Number of packed objects"
+msgstr "Csomagolt objektumok számra"
+
+#: lib/database.tcl:46
+msgid "Number of packs"
+msgstr "Csomagok száma"
+
+#: lib/database.tcl:47
+msgid "Disk space used by packed objects"
+msgstr "A csomagolt objektumok által használt lemezterület"
+
+#: lib/database.tcl:48
+msgid "Packed objects waiting for pruning"
+msgstr "Eltávolításra váró csomagolt objektumok számra"
+
+#: lib/database.tcl:49
+msgid "Garbage files"
+msgstr "Hulladék fájlok"
+
+#: lib/database.tcl:72
+msgid "Compressing the object database"
+msgstr "Az objektum adatbázis tömörítése"
+
+#: lib/database.tcl:83
+msgid "Verifying the object database with fsck-objects"
+msgstr "Az objektum adatbázis ellenőrzése az fsck-objects használatával"
+
+#: lib/database.tcl:108
+#, tcl-format
+msgid ""
+"This repository currently has approximately %i loose objects.\n"
+"\n"
+"To maintain optimal performance it is strongly recommended that you compress "
+"the database when more than %i loose objects exist.\n"
+"\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
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Érvénytelen dátum a Git-től: %s"
+
- #: lib/diff.tcl:81
++#: lib/diff.tcl:59
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but "
+"the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have "
+"the same state."
+msgstr ""
+"Nincsenek változások.\n"
+"\n"
+"A(z) %s módosítatlan.\n"
+"\n"
+"A fájl módosítási dátumát frissítette egy másik alkalmazás, de a fájl "
+"tartalma változatlan.\n"
+"\n"
+"Egy újrakeresés fog indulni a hasonló állapotú fájlok megtalálása érdekében."
+
- #: lib/diff.tcl:114 lib/diff.tcl:184
++#: lib/diff.tcl:99
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "A(z) %s diff-jének betöltése..."
+
- #: lib/diff.tcl:115
++#: lib/diff.tcl:120
++msgid ""
++"LOCAL: deleted\n"
++"REMOTE:\n"
++msgstr ""
++"HELYI: törölve\n"
++"TÁVOLI:\n"
++
++#: lib/diff.tcl:125
++msgid ""
++"REMOTE: deleted\n"
++"LOCAL:\n"
++msgstr ""
++"TÁVOLI: törölve\n"
++"HELYI:\n"
++
++#: lib/diff.tcl:132
++msgid "LOCAL:\n"
++msgstr "HELYI:\n"
++
++#: lib/diff.tcl:135
++msgid "REMOTE:\n"
++msgstr "TÁVOLI:\n"
++
++#: lib/diff.tcl:197 lib/diff.tcl:296
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "Nem lehet megjeleníteni a következőt: %s"
+
- #: lib/diff.tcl:122
++#: lib/diff.tcl:198
+msgid "Error loading file:"
+msgstr "Hiba a fájl betöltése közben:"
+
- #: lib/diff.tcl:134
++#: lib/diff.tcl:205
+msgid "Git Repository (subproject)"
+msgstr "Git repó (alprojekt)"
+
- #: lib/diff.tcl:185
- msgid "Error loading diff:"
- msgstr "Hiba a diff betöltése közben:"
++#: lib/diff.tcl:217
+msgid "* Binary file (not showing content)."
+msgstr "* Bináris fájl (tartalom elrejtése)."
+
- #: lib/diff.tcl:303
++#: lib/diff.tcl:222
++#, tcl-format
++msgid ""
++"* Untracked file is %d bytes.\n"
++"* Showing only first %d bytes.\n"
++msgstr ""
++"* Nem követett fájl %d bájttal.\n"
++"* Csak az első %d bájt mutatása.\n"
+
- #: lib/diff.tcl:310
++#: lib/diff.tcl:228
++#, tcl-format
++msgid ""
++"\n"
++"* Untracked file clipped here by %s.\n"
++"* To see the entire file, use an external editor.\n"
++msgstr ""
++"\n"
++"* Nem követett fájlt levágta a(z) %s.\n"
++"* A teljes tartalom megjelenítéséhez használjunk külső szövegszerkesztőt.\n"
++
++#: lib/diff.tcl:436
+msgid "Failed to unstage selected hunk."
+msgstr "Nem visszavonni a hunk kiválasztását."
+
- #: lib/index.tcl:282
++#: lib/diff.tcl:443
+msgid "Failed to stage selected hunk."
+msgstr "Nem sikerült kiválasztani a hunkot."
+
++#: lib/diff.tcl:509
++msgid "Failed to unstage selected line."
++msgstr "Nem sikerült visszavonni a sor kiválasztását."
++
++#: lib/diff.tcl:517
++msgid "Failed to stage selected line."
++msgstr "Nem sikerült kiválasztani a sort."
++
++#: lib/encoding.tcl:443
++msgid "Default"
++msgstr "Alapértelmezés"
++
++#: lib/encoding.tcl:448
++#, tcl-format
++msgid "System (%s)"
++msgstr "Rendszer (%s)"
++
++#: lib/encoding.tcl:459 lib/encoding.tcl:465
++msgid "Other"
++msgstr "Más"
++
+#: lib/error.tcl:20 lib/error.tcl:114
+msgid "error"
+msgstr "hiba"
+
+#: lib/error.tcl:36
+msgid "warning"
+msgstr "figyelmeztetés"
+
+#: lib/error.tcl:94
+msgid "You must correct the above errors before committing."
+msgstr "Ki kell javítanunk a fenti hibákat commit előtt."
+
+#: 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:313
++#: lib/index.tcl:287
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "A(z) %s commitba való kiválasztásának visszavonása"
+
- #: lib/index.tcl:326
++#: lib/index.tcl:326
+msgid "Ready to commit."
+msgstr "Commitolásra kész."
+
- #: lib/index.tcl:381
++#: lib/index.tcl:339
+#, tcl-format
+msgid "Adding %s"
+msgstr "A(z) %s hozzáadása..."
+
- #: lib/index.tcl:383
++#: lib/index.tcl:396
+#, tcl-format
+msgid "Revert changes in file %s?"
+msgstr "Visszaállítja a változtatásokat a(z) %s fájlban?"
+
- #: lib/index.tcl:391
++#: lib/index.tcl:398
+#, 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:394
++#: lib/index.tcl:406
+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/merge.tcl:44
++#: lib/index.tcl:409
+msgid "Do Nothing"
+msgstr "Ne csináljunk semmit"
+
++#: lib/index.tcl:427
++msgid "Reverting selected files"
++msgstr "A kiválasztott fájlok visszaállítása"
++
++#: lib/index.tcl:431
++#, tcl-format
++msgid "Reverting %s"
++msgstr "%s visszaállítása"
++
+#: lib/merge.tcl:13
+msgid ""
+"Cannot merge while amending.\n"
+"\n"
+"You must finish amending this commit before starting any type of merge.\n"
+msgstr ""
+"Javítás közben nem lehetséges a merge.\n"
+"\n"
+"Egyszer be kell fejezni ennek a commitnak a javítását, majd kezdődhet egy "
+"merge.\n"
+
+#: lib/merge.tcl:27
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before a merge can be performed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"Az utolsó keresési állapot nem egyezik meg a repó állapotával.\n"
+"\n"
+"Egy másik Git program módosította ezt a repót az utolsó keresés óta. Egy "
+"újrakeresés mindenképpen szükséges mielőtt a jelenlegi branchet módosítani "
+"lehetne.\n"
+"\n"
+"Az újrakeresés most automatikusan el fog indulni.\n"
+
- #: lib/merge.tcl:54
++#: lib/merge.tcl:45
+#, tcl-format
+msgid ""
+"You are in the middle of a conflicted merge.\n"
+"\n"
+"File %s has merge conflicts.\n"
+"\n"
+"You must resolve them, stage the file, and commit to complete the current "
+"merge. Only then can you begin another merge.\n"
+msgstr ""
+"Jelenleg egy ütközés feloldása közben vagyunk.\n"
+"\n"
+"A(z) %s fájlban ütközések vannak.\n"
+"\n"
+"Fel kell oldanunk őket, kiválasztani a fájlt, és commitolni hogy befejezzük "
+"a jelenlegi merge-t. Csak ezután kezdhetünk el egy újabbat.\n"
+
- #: lib/merge.tcl:106
++#: lib/merge.tcl:55
+#, tcl-format
+msgid ""
+"You are in the middle of a change.\n"
+"\n"
+"File %s is modified.\n"
+"\n"
+"You should complete the current commit before starting a merge. Doing so "
+"will help you abort a failed merge, should the need arise.\n"
+msgstr ""
+"Jelenleg egy változtatás közben vagyunk.\n"
+"\n"
+"A(z) %s fájl megváltozott.\n"
+"\n"
+"Először be kell fejeznünk a jelenlegi commitot, hogy elkezdhessünk egy merge-"
+"t. Ez segíteni fog, hogy félbeszakíthassunk egy merge-t.\n"
+
- #: lib/merge.tcl:119
++#: lib/merge.tcl:107
+#, tcl-format
+msgid "%s of %s"
+msgstr "%s / %s"
+
- #: lib/merge.tcl:130
++#: lib/merge.tcl:120
+#, tcl-format
+msgid "Merging %s and %s..."
+msgstr "A(z) %s és a(z) %s merge-ölése..."
+
- #: lib/merge.tcl:132
++#: lib/merge.tcl:131
+msgid "Merge completed successfully."
+msgstr "A merge sikeresen befejeződött."
+
- #: lib/merge.tcl:157
++#: lib/merge.tcl:133
+msgid "Merge failed. Conflict resolution is required."
+msgstr "A merge sikertelen. Fel kell oldanunk az ütközéseket."
+
- #: lib/merge.tcl:176
++#: lib/merge.tcl:158
+#, tcl-format
+msgid "Merge Into %s"
+msgstr "Merge-ölés a következőbe: %s"
+
- #: lib/merge.tcl:211
++#: lib/merge.tcl:177
+msgid "Revision To Merge"
+msgstr "Merge-ölni szándékozott revízió"
+
- #: lib/merge.tcl:221
++#: lib/merge.tcl:212
+msgid ""
+"Cannot abort while amending.\n"
+"\n"
+"You must finish amending this commit.\n"
+msgstr ""
+"A commit javítás közben megszakítva.\n"
+"\n"
+"Be kell fejeznünk ennek a commitnak a javítását.\n"
+
- #: lib/merge.tcl:227
++#: lib/merge.tcl:222
+msgid ""
+"Abort merge?\n"
+"\n"
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with aborting the current merge?"
+msgstr ""
+"Megszakítjuk a merge-t?\n"
+"\n"
+"A jelenlegi merge megszakítása *MINDEN* nem commitolt változtatás "
+"elvesztését jelenti.\n"
+"\n"
+"Folytatjuk a jelenlegi merge megszakítását?"
+
- #: lib/merge.tcl:238
++#: lib/merge.tcl:228
+msgid ""
+"Reset changes?\n"
+"\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with resetting the current changes?"
+msgstr ""
+"Visszavonjuk a módosításokat?\n"
+"\n"
+"A módosítások visszavonása *MINDEN* nem commitolt változtatás elvesztését "
+"jelenti.\n"
+"\n"
+"Folytatjuk a jelenlegi módosítások visszavonását?"
+
- #: lib/merge.tcl:238
++#: lib/merge.tcl:239
+msgid "Aborting"
+msgstr "Félbeszakítás"
+
- #: lib/merge.tcl:265
++#: lib/merge.tcl:239
+msgid "files reset"
+msgstr "fájl visszaállítva"
+
- #: lib/merge.tcl:267
++#: lib/merge.tcl:267
+msgid "Abort failed."
+msgstr "A félbeszakítás nem sikerült."
+
- #: lib/option.tcl:95
++#: lib/merge.tcl:269
+msgid "Abort completed. Ready."
+msgstr "A megkeszakítás befejeződött. Kész."
+
- #: lib/option.tcl:99
++#: lib/mergetool.tcl:8
++msgid "Force resolution to the base version?"
++msgstr "Feloldás erőltetése az alap verzióhoz?"
++
++#: lib/mergetool.tcl:9
++msgid "Force resolution to this branch?"
++msgstr "Feloldás erőltetése ehhez a branch-hez?"
++
++#: lib/mergetool.tcl:10
++msgid "Force resolution to the other branch?"
++msgstr "Feloldás erőltetése a másik branch-hez?"
++
++#: lib/mergetool.tcl:14
++#, tcl-format
++msgid ""
++"Note that the diff shows only conflicting changes.\n"
++"\n"
++"%s will be overwritten.\n"
++"\n"
++"This operation can be undone only by restarting the merge."
++msgstr ""
++"Megjegyzés: csak az ütköző különbségek látszanak.\n"
++"\n"
++"A(z) %s felül lesz írva.\n"
++"\n"
++"Ez a művelet csak a merge újraindításával lesz visszavonható."
++
++#: lib/mergetool.tcl:45
++#, tcl-format
++msgid "File %s seems to have unresolved conflicts, still stage?"
++msgstr ""
++"A(z) %s fájl nem feloldott ütközéseket tartalmaz, mégis legyen kiválasztva?"
++
++#: lib/mergetool.tcl:60
++#, tcl-format
++msgid "Adding resolution for %s"
++msgstr "Feloldás hozzáadása a(z) %s számára"
++
++#: lib/mergetool.tcl:141
++msgid "Cannot resolve deletion or link conflicts using a tool"
++msgstr "Nem lehet feloldani törlési vagy link ütközést egy eszközzel"
++
++#: lib/mergetool.tcl:146
++msgid "Conflict file does not exist"
++msgstr "A konfiklus-fájl nem létezik."
++
++#: lib/mergetool.tcl:264
++#, tcl-format
++msgid "Not a GUI merge tool: '%s'"
++msgstr "Nem GUI merge eszköz: %s"
++
++#: lib/mergetool.tcl:268
++#, tcl-format
++msgid "Unsupported merge tool '%s'"
++msgstr "A(z) '%s' merge eszköz nem támogatott"
++
++#: lib/mergetool.tcl:303
++msgid "Merge tool is already running, terminate it?"
++msgstr "A merge eszköz már fut, le legyen állítva?"
++
++#: lib/mergetool.tcl:323
++#, tcl-format
++msgid ""
++"Error retrieving versions:\n"
++"%s"
++msgstr ""
++"Hiba a verziók kinyerése közben:\n"
++"%s"
++
++#: lib/mergetool.tcl:343
++#, tcl-format
++msgid ""
++"Could not start the merge tool:\n"
++"\n"
++"%s"
++msgstr ""
++"A merge eszköz indítása sikertelen:\n"
++"\n"
++"%s"
++
++#: lib/mergetool.tcl:347
++msgid "Running merge tool..."
++msgstr "A merge eszköz futtatása..."
++
++#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
++msgid "Merge tool failed."
++msgstr "A merge eszköz nem sikerült."
++
++#: lib/option.tcl:11
++#, tcl-format
++msgid "Invalid global encoding '%s'"
++msgstr "Érvénytelen globális kódolás '%s'"
++
++#: lib/option.tcl:19
++#, tcl-format
++msgid "Invalid repo encoding '%s'"
++msgstr "Érvénytelen repó kódolás '%s'"
++
++#: lib/option.tcl:117
+msgid "Restore Defaults"
+msgstr "Alapértelmezés visszaállítása"
+
- #: lib/option.tcl:109
++#: lib/option.tcl:121
+msgid "Save"
+msgstr "Mentés"
+
- #: lib/option.tcl:110
++#: lib/option.tcl:131
+#, tcl-format
+msgid "%s Repository"
+msgstr "%s Repó"
+
- #: lib/option.tcl:116
++#: lib/option.tcl:132
+msgid "Global (All Repositories)"
+msgstr "Globális (minden repó)"
+
- #: lib/option.tcl:117
++#: lib/option.tcl:138
+msgid "User Name"
+msgstr "Felhasználónév"
+
- #: lib/option.tcl:119
++#: lib/option.tcl:139
+msgid "Email Address"
+msgstr "Email cím"
+
- #: lib/option.tcl:120
++#: lib/option.tcl:141
+msgid "Summarize Merge Commits"
+msgstr "A merge commitok összegzése"
+
- #: lib/option.tcl:121
++#: lib/option.tcl:142
+msgid "Merge Verbosity"
+msgstr "Merge beszédesség"
+
- #: lib/option.tcl:123
++#: lib/option.tcl:143
+msgid "Show Diffstat After Merge"
+msgstr "Diffstat mutatása merge után"
+
- #: lib/option.tcl:124
++#: lib/option.tcl:144
++msgid "Use Merge Tool"
++msgstr "Merge eszköz használata"
++
++#: lib/option.tcl:146
+msgid "Trust File Modification Timestamps"
+msgstr "A fájl módosítási dátumok megbízhatóak"
+
- #: lib/option.tcl:125
++#: lib/option.tcl:147
+msgid "Prune Tracking Branches During Fetch"
+msgstr "A követő branchek eltávolítása letöltés alatt"
+
- #: lib/option.tcl:126
++#: lib/option.tcl:148
+msgid "Match Tracking Branches"
+msgstr "A követő branchek egyeztetése"
+
- #: lib/option.tcl:127
++#: lib/option.tcl:149
++msgid "Blame Copy Only On Changed Files"
++msgstr "A blame másolás bekapcsolása csak megváltozott fájlokra"
++
++#: lib/option.tcl:150
++msgid "Minimum Letters To Blame Copy On"
++msgstr "Minimum betűszám blame másolás-érzékeléshez"
++
++#: lib/option.tcl:151
++msgid "Blame History Context Radius (days)"
++msgstr "Blame történet környezet sugár (napokban)"
++
++#: lib/option.tcl:152
+msgid "Number of Diff Context Lines"
+msgstr "A diff környezeti sorok száma"
+
- #: lib/option.tcl:128
++#: lib/option.tcl:153
+msgid "Commit Message Text Width"
+msgstr "Commit üzenet szövegének szélessége"
+
- #: lib/option.tcl:192
++#: lib/option.tcl:154
+msgid "New Branch Name Template"
+msgstr "Új branch név sablon"
+
- #: lib/option.tcl:216
++#: lib/option.tcl:155
++msgid "Default File Contents Encoding"
++msgstr "Alapértelmezett fájltartalom-kódolás"
++
++#: lib/option.tcl:203
++msgid "Change"
++msgstr "Megváltoztatás"
++
++#: lib/option.tcl:230
+msgid "Spelling Dictionary:"
+msgstr "Helyesírás-ellenőrző szótár:"
+
- #: lib/option.tcl:220
++#: lib/option.tcl:254
+msgid "Change Font"
+msgstr "Betűtípus megváltoztatása"
+
- #: lib/option.tcl:226
++#: lib/option.tcl:258
+#, tcl-format
+msgid "Choose %s"
+msgstr "%s választása"
+
- #: lib/option.tcl:240
++#: lib/option.tcl:264
+msgid "pt."
+msgstr "pt."
+
- #: lib/option.tcl:275
++#: lib/option.tcl:278
+msgid "Preferences"
+msgstr "Beállítások"
+
- msgid "Delete Remote Branch"
- msgstr "Távoli branch törlése"
++#: lib/option.tcl:314
+msgid "Failed to completely save options:"
+msgstr "Nem sikerült teljesen elmenteni a beállításokat:"
+
++#: lib/remote.tcl:163
++msgid "Remove Remote"
++msgstr "Remote eltávolítása"
++
++#: lib/remote.tcl:168
++msgid "Prune from"
++msgstr "Törlés innen"
++
++# tcl-format
++#: lib/remote.tcl:173
++msgid "Fetch from"
++msgstr "Letöltés innen"
++
++#: lib/remote.tcl:215
++msgid "Push to"
++msgstr "Push ide"
++
++#: lib/remote_add.tcl:19
++msgid "Add Remote"
++msgstr "Remote hozzáadása"
++
++#: lib/remote_add.tcl:24
++msgid "Add New Remote"
++msgstr "Új remote hozzáadása"
++
++#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
++msgid "Add"
++msgstr "Hozzáadás"
++
++#: lib/remote_add.tcl:37
++msgid "Remote Details"
++msgstr "Remote részletei"
++
++#: lib/remote_add.tcl:50
++msgid "Location:"
++msgstr "Hely:"
++
++#: lib/remote_add.tcl:62
++msgid "Further Action"
++msgstr "Következő művelet"
++
++#: lib/remote_add.tcl:65
++msgid "Fetch Immediately"
++msgstr "Letöltés most"
++
++#: lib/remote_add.tcl:71
++msgid "Initialize Remote Repository and Push"
++msgstr "Távoli repó inicializálása és push"
++
++#: lib/remote_add.tcl:77
++msgid "Do Nothing Else Now"
++msgstr "Ne csináljunk semmit"
++
++#: lib/remote_add.tcl:101
++msgid "Please supply a remote name."
++msgstr "Adjunk megy egy remote nevet."
++
++#: lib/remote_add.tcl:114
++#, tcl-format
++msgid "'%s' is not an acceptable remote name."
++msgstr "A(z) '%s' nem egy elfogadható remote név."
++
++#: lib/remote_add.tcl:125
++#, tcl-format
++msgid "Failed to add remote '%s' of location '%s'."
++msgstr "Nem sikerült a(t) '%s' remote hozzáadása innen: '%s'."
++
++#: lib/remote_add.tcl:133 lib/transport.tcl:6
++#, tcl-format
++msgid "fetch %s"
++msgstr "a(z) %s letöltése"
++
++#: lib/remote_add.tcl:134
++#, tcl-format
++msgid "Fetching the %s"
++msgstr "A(z) %s letöltése"
++
++#: lib/remote_add.tcl:157
++#, tcl-format
++msgid "Do not know how to initialize repository at location '%s'."
++msgstr "Nem tudni, hogy hogy kell a(z) '%s' helyen repót inicializálni."
++
++#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
++#, tcl-format
++msgid "push %s"
++msgstr "%s push-olása"
++
++#: lib/remote_add.tcl:164
++#, tcl-format
++msgid "Setting up the %s (at %s)"
++msgstr "A(z) %s beállítása itt: %s"
++
+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
- msgid "Arbitrary URL:"
- msgstr "Tetszőleges URL:"
++msgid "Delete Branch Remotely"
++msgstr "Távoli Branch törlése"
+
+#: lib/remote_branch_delete.tcl:47
+msgid "From Repository"
+msgstr "Forrás repó"
+
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
+msgid "Remote:"
+msgstr "Távoli:"
+
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
- #: lib/remote.tcl:165
- msgid "Prune from"
- msgstr "Törlés innen"
++msgid "Arbitrary Location:"
++msgstr "Önkényes hely:"
+
+#: lib/remote_branch_delete.tcl:84
+msgid "Branches"
+msgstr "Branchek"
+
+#: lib/remote_branch_delete.tcl:109
+msgid "Delete Only If"
+msgstr "Törlés csak akkor ha"
+
+#: lib/remote_branch_delete.tcl:111
+msgid "Merged Into:"
+msgstr "Merge-ölt a következőbe:"
+
+#: lib/remote_branch_delete.tcl:119
+msgid "Always (Do not perform merge checks)"
+msgstr "Mindig (Ne végezzen merge vizsgálatokat)"
+
+#: lib/remote_branch_delete.tcl:152
+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
+#, 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:\n"
+" - %s"
+
+#: lib/remote_branch_delete.tcl:189
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits. Try fetching from %s first."
+msgstr ""
+"Egy vagy több merge teszt hibát jelzett, mivel nem töltöttük le a megfelelő "
+"commitokat. Próbáljunk meg letölteni a következőből: %s először."
+
+#: lib/remote_branch_delete.tcl:207
+msgid "Please select one or more branches to delete."
+msgstr "Válasszunk ki egy vagy több branchet törlésre."
+
+#: lib/remote_branch_delete.tcl:216
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+"A törölt branchek visszaállítása nehéz.\n"
+"\n"
+"Töröljük a kiválasztott brancheket?"
+
+#: lib/remote_branch_delete.tcl:226
+#, tcl-format
+msgid "Deleting branches from %s"
+msgstr "Brancek törlése innen: %s"
+
+#: lib/remote_branch_delete.tcl:286
+msgid "No repository selected."
+msgstr "Nincs kiválasztott repó."
+
+#: lib/remote_branch_delete.tcl:291
+#, tcl-format
+msgid "Scanning %s..."
+msgstr "Keresés itt: %s..."
+
- # tcl-format
- #: lib/remote.tcl:170
- msgid "Fetch from"
- msgstr "Letöltés innen"
++#: lib/search.tcl:21
++msgid "Find:"
++msgstr "Keresés:"
+
- #: lib/remote.tcl:213
- msgid "Push to"
- msgstr "Push ide"
++#: lib/search.tcl:23
++msgid "Next"
++msgstr "Következő"
+
- #: lib/spellcheck.tcl:180
++#: lib/search.tcl:24
++msgid "Prev"
++msgstr "Előző"
++
++#: lib/search.tcl:25
++msgid "Case-Sensitive"
++msgstr "Kisbetű-nagybetű számít"
+
+#: 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:"
+
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "Nem támogatott helyesírás-ellenőrző"
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "A helyesírás-ellenőrzés nem elérhető"
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "Érvénytelen a helyesírás-ellenőrző beállítása"
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr "Szótár visszaállítása a következőre: %s."
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "A helyesírás-ellenőrő indítása sikertelen"
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "Ismeretlen helyesírás-ellenőrző"
+
- #: lib/spellcheck.tcl:381
++#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr "Nincs javaslat"
+
- #: lib/spellcheck.tcl:385
++#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr "Nem várt EOF a helyesírás-ellenőrzőtől"
+
- #: lib/transport.tcl:6
++#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr "A helyesírás-ellenőrzés sikertelen"
+
++#: lib/sshkey.tcl:31
++msgid "No keys found."
++msgstr "Nincsenek kulcsok."
++
++#: lib/sshkey.tcl:34
++#, tcl-format
++msgid "Found a public key in: %s"
++msgstr "Nyilvános kulcs található ebben: %s"
++
++#: lib/sshkey.tcl:40
++msgid "Generate Key"
++msgstr "Kulcs generálása"
++
++#: lib/sshkey.tcl:56
++msgid "Copy To Clipboard"
++msgstr "Másolás vágólapra"
++
++#: lib/sshkey.tcl:70
++msgid "Your OpenSSH Public Key"
++msgstr "Az OpenSSH publikus kulcsunk"
++
++#: lib/sshkey.tcl:78
++msgid "Generating..."
++msgstr "Generálás..."
++
++#: lib/sshkey.tcl:84
++#, tcl-format
++msgid ""
++"Could not start ssh-keygen:\n"
++"\n"
++"%s"
++msgstr ""
++"Az ssh-keygen indítása sikertelen:\n"
++"\n"
++"%s"
++
++#: lib/sshkey.tcl:111
++msgid "Generation failed."
++msgstr "A generálás nem sikerült."
++
++#: lib/sshkey.tcl:118
++msgid "Generation succeded, but no keys found."
++msgstr "A generálás sikeres, de egy kulcs se található."
++
++#: lib/sshkey.tcl:121
++#, tcl-format
++msgid "Your key is in: %s"
++msgstr "A kulcsunk itt van: %s"
++
+#: lib/status_bar.tcl:83
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
+msgstr "%s ... %*i / %*i %s (%3i%%)"
+
- msgid "fetch %s"
- msgstr "a(z) %s letöltése"
++#: lib/tools.tcl:75
+#, tcl-format
- #: lib/transport.tcl:25 lib/transport.tcl:71
- #, tcl-format
- msgid "push %s"
- msgstr "%s push-olása"
-
++msgid "Running %s requires a selected file."
++msgstr "A(z) %s futtatása egy kiválasztott fájlt igényel."
++
++#: lib/tools.tcl:90
++#, tcl-format
++msgid "Are you sure you want to run %s?"
++msgstr "Biztos benne, hogy futtatni kívánja: %s?"
++
++#: lib/tools.tcl:110
++#, tcl-format
++msgid "Tool: %s"
++msgstr "Eszköz: %s"
++
++#: lib/tools.tcl:111
++#, tcl-format
++msgid "Running: %s"
++msgstr "Futtatás: %s..."
++
++#: lib/tools.tcl:149
++#, tcl-format
++msgid "Tool completed succesfully: %s"
++msgstr "Az eszköz sikeresen befejeződött: %s"
++
++#: lib/tools.tcl:151
++#, tcl-format
++msgid "Tool failed: %s"
++msgstr "Az eszköz sikertelen: %s"
++
++#: lib/tools_dlg.tcl:22
++msgid "Add Tool"
++msgstr "Eszköz hozzáadása"
++
++#: lib/tools_dlg.tcl:28
++msgid "Add New Tool Command"
++msgstr "Új eszköz-parancs hozzáadása"
++
++#: lib/tools_dlg.tcl:33
++msgid "Add globally"
++msgstr "Globális hozzáadás"
++
++#: lib/tools_dlg.tcl:45
++msgid "Tool Details"
++msgstr "Eszköz részletei"
++
++#: lib/tools_dlg.tcl:48
++msgid "Use '/' separators to create a submenu tree:"
++msgstr "Használjunk '/' szeparátorokat almenü-fa létrehozásához:"
++
++#: lib/tools_dlg.tcl:61
++msgid "Command:"
++msgstr "Parancs:"
++
++#: lib/tools_dlg.tcl:74
++msgid "Show a dialog before running"
++msgstr "Parancsablak mutatása futtatás előtt"
++
++#: lib/tools_dlg.tcl:80
++msgid "Ask the user to select a revision (sets $REVISION)"
++msgstr ""
++"Megkéri a felhasználót, hogy válasszon ki egy revíziót (a $REVISION-t "
++"állítja)"
++
++#: lib/tools_dlg.tcl:85
++msgid "Ask the user for additional arguments (sets $ARGS)"
++msgstr "Megkérdezi a felhasználót további argumentumokért (a $ARGS-ot állítja)"
++
++#: lib/tools_dlg.tcl:92
++msgid "Don't show the command output window"
++msgstr "Ne mutassa a parancs kimeneti ablakát"
++
++#: lib/tools_dlg.tcl:97
++msgid "Run only if a diff is selected ($FILENAME not empty)"
++msgstr "Futtatás csak ha egy diff ki van választva (a $FILENAME nem üres)"
++
++#: lib/tools_dlg.tcl:121
++msgid "Please supply a name for the tool."
++msgstr "Adjunk meg egy eszköz nevet."
++
++#: lib/tools_dlg.tcl:129
++#, tcl-format
++msgid "Tool '%s' already exists."
++msgstr "A(z) '%s' eszköz már létezik."
++
++#: lib/tools_dlg.tcl:151
++#, tcl-format
++msgid ""
++"Could not add tool:\n"
++"%s"
++msgstr ""
++"Az eszköz nem hozzáadható:\n"
++"%s"
++
++#: lib/tools_dlg.tcl:190
++msgid "Remove Tool"
++msgstr "Eszköz eltávolítása"
++
++#: lib/tools_dlg.tcl:196
++msgid "Remove Tool Commands"
++msgstr "Eszköz parancsok eltávolítása"
++
++#: lib/tools_dlg.tcl:200
++msgid "Remove"
++msgstr "Eltávolítás"
++
++#: lib/tools_dlg.tcl:236
++msgid "(Blue denotes repository-local tools)"
++msgstr "(Kék jelzi a repó-specifikus eszközöket)"
++
++#: lib/tools_dlg.tcl:297
++#, tcl-format
++msgid "Run Command: %s"
++msgstr "Parancs futtatása: %s"
++
++#: lib/tools_dlg.tcl:311
++msgid "Arguments"
++msgstr "Argumentumok"
++
++#: lib/tools_dlg.tcl:348
++msgid "OK"
++msgstr "OK"
+
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
+msgstr "Új változások letöltése innen: %s"
+
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr "a(z) %s távoli törlése"
+
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
+msgstr "A %s repóból törölt követő branchek törlése"
+
- #~ msgid "Cannot find the git directory:"
- #~ msgstr "Nem található a git könyvtár:"
-
+#: lib/transport.tcl:26
+#, tcl-format
+msgid "Pushing changes to %s"
+msgstr "Változások pusholása ide: %s"
+
+#: lib/transport.tcl:72
+#, tcl-format
+msgid "Pushing %s %s to %s"
+msgstr "Pusholás: %s %s, ide: %s"
+
+#: lib/transport.tcl:89
+msgid "Push Branches"
+msgstr "Branchek pusholása"
+
+#: lib/transport.tcl:103
+msgid "Source Branches"
+msgstr "Forrás branchek"
+
+#: lib/transport.tcl:120
+msgid "Destination Repository"
+msgstr "Cél repó"
+
+#: lib/transport.tcl:158
+msgid "Transfer Options"
+msgstr "Átviteli opciók"
+
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+"Létező branch felülírásának erőltetése (lehet, hogy el fog dobni "
+"változtatásokat)"
+
+#: lib/transport.tcl:164
+msgid "Use thin pack (for slow network connections)"
+msgstr "Vékony csomagok használata (lassú hálózati kapcsolatok számára)"
+
+#: lib/transport.tcl:168
+msgid "Include tags"
+msgstr "Tageket is"
+
++#~ msgid ""
++#~ "Unable to start gitk:\n"
++#~ "\n"
++#~ "%s does not exist"
++#~ msgstr ""
++#~ "A gitk indítása sikertelen:\n"
++#~ "\n"
++#~ "A(z) %s nem létezik"
++
++#~ msgid "Apple"
++#~ msgstr "Apple"
++
++#~ msgid "URL:"
++#~ msgstr "URL:"
++
++#~ msgid "Delete Remote Branch"
++#~ msgstr "Távoli branch törlése"
++
+#~ msgid "Not connected to aspell"
+#~ msgstr "Nincs kapcsolat az aspellhez"
+
- #~ msgid "Add To Commit"
- #~ msgstr "Hozzáadás a commithoz"
-
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
+#~ msgstr "Nem kiválasztott változtatások (nem lesz commitolva)"
+
+#~ msgid "Push to %s..."
+#~ msgstr "Pusholás ide: %s..."
+
- #~ msgid "Running miga..."
- #~ msgstr "A miga futtatása..."
-
+#~ msgid "Add Existing To Commit"
+#~ msgstr "Hozzáadás létező commithoz"
+
+#~ msgid "Add Existing"
+#~ msgstr "Létező hozzáadása"
+
+#~ msgid ""
+#~ "Abort commit?\n"
+#~ "\n"
+#~ "Aborting the current commit will cause *ALL* uncommitted changes to be "
+#~ "lost.\n"
+#~ "\n"
+#~ "Continue with aborting the current commit?"
+#~ msgstr ""
+#~ "Megszakítjuk a commitot?\n"
+#~ "\n"
+#~ "A jelenlegi commit megszakítása *MINDEN* nem commitolt változtatás "
+#~ "elvesztését jelenti.\n"
+#~ "\n"
+#~ "Folytatjuk a jelenlegi commit megszakítását?"
+
+#~ msgid "Aborting... please wait..."
+#~ msgstr "Megszakítás... várjunk..."
diff --cc git-gui/po/it.po
index 3db4fb68c526e522019e2edd302014652c306eb7,0000000000000000000000000000000000000000..2ee30844f8c4cfc0176e051ee27d40c5db52982d
mode 100644,000000..100644
mode 100644,000000..100644
--- 1/git-gui/po/it.po
--- /dev/null
+++ b/git-gui/po/it.po
- "POT-Creation-Date: 2008-08-02 14:45-0700\n"
- "PO-Revision-Date: 2008-08-03 16:04+0200\n"
+# Translation of git-gui to Italian
+# Copyright (C) 2007 Shawn Pearce
+# This file is distributed under the same license as the git-gui package.
+# Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>, 2007
+# Michele Ballabio <barra_cuda@katamail.com>, 2007.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: git-gui\n"
+"Report-Msgid-Bugs-To: \n"
- #: git-gui.sh:41 git-gui.sh:688 git-gui.sh:702 git-gui.sh:715 git-gui.sh:798
- #: git-gui.sh:817
++"POT-Creation-Date: 2008-11-16 13:56-0800\n"
++"PO-Revision-Date: 2008-11-17 16:04+0100\n"
+"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
- #: git-gui.sh:644
++#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847
++#: git-gui.sh:866
+msgid "git-gui: fatal error"
+msgstr "git-gui: errore grave"
+
- #: git-gui.sh:674
++#: git-gui.sh:689
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "Caratteri non validi specificati in %s:"
+
- #: git-gui.sh:675
++#: git-gui.sh:723
+msgid "Main Font"
+msgstr "Caratteri principali"
+
- #: git-gui.sh:689
++#: git-gui.sh:724
+msgid "Diff/Console Font"
+msgstr "Caratteri per confronti e terminale"
+
- #: git-gui.sh:716
++#: git-gui.sh:738
+msgid "Cannot find git in PATH."
+msgstr "Impossibile trovare git nel PATH"
+
- #: git-gui.sh:734
++#: git-gui.sh:765
+msgid "Cannot parse Git version string:"
+msgstr "Impossibile determinare la versione di Git:"
+
- #: git-gui.sh:972
++#: git-gui.sh:783
+#, tcl-format
+msgid ""
+"Git version cannot be determined.\n"
+"\n"
+"%s claims it is version '%s'.\n"
+"\n"
+"%s requires at least Git 1.5.0 or later.\n"
+"\n"
+"Assume '%s' is version 1.5.0?\n"
+msgstr ""
+"La versione di Git non può essere determinata.\n"
+"\n"
+"%s riporta che la versione è '%s'.\n"
+"\n"
+"%s richiede almeno Git 1.5.0 o superiore.\n"
+"\n"
+"Assumere che '%s' sia alla versione 1.5.0?\n"
+
- #: git-gui.sh:979
++#: git-gui.sh:1062
+msgid "Git directory not found:"
+msgstr "Non trovo la directory di git: "
+
- #: git-gui.sh:986
++#: git-gui.sh:1069
+msgid "Cannot move to top of working directory:"
+msgstr "Impossibile spostarsi sulla directory principale del progetto:"
+
- #: git-gui.sh:991
++#: git-gui.sh:1076
+msgid "Cannot use funny .git directory:"
+msgstr "Impossibile usare una .git directory strana:"
+
- #: git-gui.sh:1138 lib/checkout_op.tcl:305
++#: git-gui.sh:1081
+msgid "No working directory"
+msgstr "Nessuna directory di lavoro"
+
- #: git-gui.sh:1194
++#: git-gui.sh:1247 lib/checkout_op.tcl:305
+msgid "Refreshing file status..."
+msgstr "Controllo dello stato dei file in corso..."
+
- #: git-gui.sh:1369 lib/browser.tcl:246
++#: git-gui.sh:1303
+msgid "Scanning for modified files ..."
+msgstr "Ricerca di file modificati in corso..."
+
- #: git-gui.sh:1635
++#: git-gui.sh:1367
++msgid "Calling prepare-commit-msg hook..."
++msgstr "Avvio prepare-commit-msg hook..."
++
++#: git-gui.sh:1384
++msgid "Commit declined by prepare-commit-msg hook."
++msgstr "Revisione rifiutata dal prepare-commit-msg hook."
++
++#: git-gui.sh:1542 lib/browser.tcl:246
+msgid "Ready."
+msgstr "Pronto."
+
- #: git-gui.sh:1637
++#: git-gui.sh:1819
+msgid "Unmodified"
+msgstr "Non modificato"
+
- #: git-gui.sh:1638 git-gui.sh:1643
++#: git-gui.sh:1821
+msgid "Modified, not staged"
+msgstr "Modificato, non preparato per una nuova revisione"
+
- #: git-gui.sh:1639 git-gui.sh:1644
++#: git-gui.sh:1822 git-gui.sh:1830
+msgid "Staged for commit"
+msgstr "Preparato per una nuova revisione"
+
- #: git-gui.sh:1640 git-gui.sh:1645
++#: git-gui.sh:1823 git-gui.sh:1831
+msgid "Portions staged for commit"
+msgstr "Parti preparate per una nuova revisione"
+
- #: git-gui.sh:1642
++#: git-gui.sh:1824 git-gui.sh:1832
+msgid "Staged for commit, missing"
+msgstr "Preparato per una nuova revisione, mancante"
+
- #: git-gui.sh:1647
++#: git-gui.sh:1826
++msgid "File type changed, not staged"
++msgstr "Tipo di file modificato, non preparato per una nuova revisione"
++
++#: git-gui.sh:1827
++msgid "File type changed, staged"
++msgstr "Tipo di file modificato, preparato per una nuova revisione"
++
++#: git-gui.sh:1829
+msgid "Untracked, not staged"
+msgstr "Non tracciato, non preparato per una nuova revisione"
+
- #: git-gui.sh:1648
++#: git-gui.sh:1834
+msgid "Missing"
+msgstr "Mancante"
+
- #: git-gui.sh:1649
++#: git-gui.sh:1835
+msgid "Staged for removal"
+msgstr "Preparato per la rimozione"
+
- #: git-gui.sh:1651 git-gui.sh:1652 git-gui.sh:1653 git-gui.sh:1654
++#: git-gui.sh:1836
+msgid "Staged for removal, still present"
+msgstr "Preparato alla rimozione, ancora presente"
+
- #: git-gui.sh:1689
++#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841
++#: git-gui.sh:1842 git-gui.sh:1843
+msgid "Requires merge resolution"
+msgstr "Richiede risoluzione dei conflitti"
+
- #: git-gui.sh:1698
++#: git-gui.sh:1878
+msgid "Starting gitk... please wait..."
+msgstr "Avvio di gitk... attendere..."
+
- #: git-gui.sh:1948 lib/choose_repository.tcl:36
++#: git-gui.sh:1887
+msgid "Couldn't find gitk in PATH"
+msgstr "Impossibile trovare gitk nel PATH"
+
- #: git-gui.sh:1949
++#: git-gui.sh:2280 lib/choose_repository.tcl:36
+msgid "Repository"
+msgstr "Archivio"
+
- #: git-gui.sh:1951 lib/choose_rev.tcl:561
++#: git-gui.sh:2281
+msgid "Edit"
+msgstr "Modifica"
+
- #: git-gui.sh:1954 lib/choose_rev.tcl:548
++#: git-gui.sh:2283 lib/choose_rev.tcl:561
+msgid "Branch"
+msgstr "Ramo"
+
- #: git-gui.sh:1957 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
++#: git-gui.sh:2286 lib/choose_rev.tcl:548
+msgid "Commit@@noun"
+msgstr "Revisione"
+
- #: git-gui.sh:1958 lib/choose_rev.tcl:557
++#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+msgid "Merge"
+msgstr "Fusione (Merge)"
+
- #: git-gui.sh:1967
++#: git-gui.sh:2290 lib/choose_rev.tcl:557
+msgid "Remote"
+msgstr "Remoto"
+
- #: git-gui.sh:1971
++#: git-gui.sh:2293
++msgid "Tools"
++msgstr "Strumenti"
++
++#: git-gui.sh:2302
++msgid "Explore Working Copy"
++msgstr "Esplora copia di lavoro"
++
++#: git-gui.sh:2307
+msgid "Browse Current Branch's Files"
+msgstr "Esplora i file del ramo attuale"
+
- #: git-gui.sh:1976
++#: git-gui.sh:2311
+msgid "Browse Branch Files..."
+msgstr "Esplora i file del ramo..."
+
- #: git-gui.sh:1980
++#: git-gui.sh:2316
+msgid "Visualize Current Branch's History"
+msgstr "Visualizza la cronologia del ramo attuale"
+
- #: git-gui.sh:1987
++#: git-gui.sh:2320
+msgid "Visualize All Branch History"
+msgstr "Visualizza la cronologia di tutti i rami"
+
- #: git-gui.sh:1989
++#: git-gui.sh:2327
+#, tcl-format
+msgid "Browse %s's Files"
+msgstr "Esplora i file di %s"
+
- #: git-gui.sh:1994 lib/database.tcl:27 lib/database.tcl:67
++#: git-gui.sh:2329
+#, tcl-format
+msgid "Visualize %s's History"
+msgstr "Visualizza la cronologia di %s"
+
- #: git-gui.sh:1997 lib/database.tcl:34
++#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67
+msgid "Database Statistics"
+msgstr "Statistiche dell'archivio"
+
- #: git-gui.sh:2000
++#: git-gui.sh:2337 lib/database.tcl:34
+msgid "Compress Database"
+msgstr "Comprimi l'archivio"
+
- #: git-gui.sh:2007 git-gui.sh:2011 git-gui.sh:2015 lib/shortcut.tcl:7
++#: git-gui.sh:2340
+msgid "Verify Database"
+msgstr "Verifica l'archivio"
+
- #: git-gui.sh:2023 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
++#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7
+#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
+msgid "Create Desktop Icon"
+msgstr "Crea icona desktop"
+
- #: git-gui.sh:2031
++#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+msgid "Quit"
+msgstr "Esci"
+
- #: git-gui.sh:2034
++#: git-gui.sh:2371
+msgid "Undo"
+msgstr "Annulla"
+
- #: git-gui.sh:2038 git-gui.sh:2545
++#: git-gui.sh:2374
+msgid "Redo"
+msgstr "Ripeti"
+
- #: git-gui.sh:2041 git-gui.sh:2548 git-gui.sh:2622 git-gui.sh:2715
++#: git-gui.sh:2378 git-gui.sh:2923
+msgid "Cut"
+msgstr "Taglia"
+
- #: git-gui.sh:2044 git-gui.sh:2551
++#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
+#: lib/console.tcl:69
+msgid "Copy"
+msgstr "Copia"
+
- #: git-gui.sh:2047 git-gui.sh:2554 lib/branch_delete.tcl:26
++#: git-gui.sh:2384 git-gui.sh:2929
+msgid "Paste"
+msgstr "Incolla"
+
- #: git-gui.sh:2051 git-gui.sh:2558 git-gui.sh:2719 lib/console.tcl:71
++#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
+#: lib/remote_branch_delete.tcl:38
+msgid "Delete"
+msgstr "Elimina"
+
- #: git-gui.sh:2060
++#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
+msgid "Select All"
+msgstr "Seleziona tutto"
+
- #: git-gui.sh:2066
++#: git-gui.sh:2400
+msgid "Create..."
+msgstr "Crea..."
+
- #: git-gui.sh:2072
++#: git-gui.sh:2406
+msgid "Checkout..."
+msgstr "Attiva..."
+
- #: git-gui.sh:2077 git-gui.sh:2187
++#: git-gui.sh:2412
+msgid "Rename..."
+msgstr "Rinomina"
+
- #: git-gui.sh:2082
++#: git-gui.sh:2417
+msgid "Delete..."
+msgstr "Elimina..."
+
- #: git-gui.sh:2094 git-gui.sh:2491
++#: git-gui.sh:2422
+msgid "Reset..."
+msgstr "Ripristina..."
+
- #: git-gui.sh:2102 git-gui.sh:2498
++#: git-gui.sh:2432
++msgid "Done"
++msgstr "Fatto"
++
++#: git-gui.sh:2434
++msgid "Commit@@verb"
++msgstr "Nuova revisione"
++
++#: git-gui.sh:2443 git-gui.sh:2864
+msgid "New Commit"
+msgstr "Nuova revisione"
+
- #: git-gui.sh:2111 git-gui.sh:2458 lib/remote_branch_delete.tcl:99
++#: git-gui.sh:2451 git-gui.sh:2871
+msgid "Amend Last Commit"
+msgstr "Correggi l'ultima revisione"
+
- #: git-gui.sh:2117
++#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
+msgid "Rescan"
+msgstr "Analizza nuovamente"
+
- #: git-gui.sh:2123
++#: git-gui.sh:2467
+msgid "Stage To Commit"
+msgstr "Prepara per una nuova revisione"
+
- #: git-gui.sh:2129
++#: git-gui.sh:2473
+msgid "Stage Changed Files To Commit"
+msgstr "Prepara i file modificati per una nuova revisione"
+
- #: git-gui.sh:2134 lib/index.tcl:395
++#: git-gui.sh:2479
+msgid "Unstage From Commit"
+msgstr "Annulla preparazione"
+
- #: git-gui.sh:2141 git-gui.sh:2702
++#: git-gui.sh:2484 lib/index.tcl:410
+msgid "Revert Changes"
+msgstr "Annulla modifiche"
+
- #: git-gui.sh:2145 git-gui.sh:2706
++#: git-gui.sh:2491 git-gui.sh:3069
+msgid "Show Less Context"
+msgstr "Mostra meno contesto"
+
- #: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
++#: git-gui.sh:2495 git-gui.sh:3073
+msgid "Show More Context"
+msgstr "Mostra più contesto"
+
- #: git-gui.sh:2155 git-gui.sh:2474
- msgid "Commit@@verb"
- msgstr "Nuova revisione"
-
- #: git-gui.sh:2166
++#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
+msgid "Sign Off"
+msgstr "Sign Off"
+
- #: git-gui.sh:2171
++#: git-gui.sh:2518
+msgid "Local Merge..."
+msgstr "Fusione locale..."
+
- #: git-gui.sh:2183
++#: git-gui.sh:2523
+msgid "Abort Merge..."
+msgstr "Interrompi fusione..."
+
- #: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14
- #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
++#: git-gui.sh:2535 git-gui.sh:2575
++msgid "Add..."
++msgstr "Aggiungi..."
++
++#: git-gui.sh:2539
+msgid "Push..."
+msgstr "Propaga..."
+
- #: git-gui.sh:2201
++#: git-gui.sh:2543
++msgid "Delete Branch..."
++msgstr "Elimina ramo..."
++
++#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14
++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#, tcl-format
+msgid "About %s"
+msgstr "Informazioni su %s"
+
- #: git-gui.sh:2209 git-gui.sh:2740
++#: git-gui.sh:2557
+msgid "Preferences..."
+msgstr "Preferenze..."
+
- #: git-gui.sh:2215 lib/choose_repository.tcl:47
++#: git-gui.sh:2565 git-gui.sh:3115
+msgid "Options..."
+msgstr "Opzioni..."
+
- #: git-gui.sh:2256
++#: git-gui.sh:2576
++msgid "Remove..."
++msgstr "Rimuovi..."
++
++#: git-gui.sh:2585 lib/choose_repository.tcl:50
+msgid "Help"
+msgstr "Aiuto"
+
- #: git-gui.sh:2340
++#: git-gui.sh:2611
+msgid "Online Documentation"
+msgstr "Documentazione sul web"
+
- #: git-gui.sh:2373
++#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
++msgid "Show SSH Key"
++msgstr "Mostra chave SSH"
++
++#: git-gui.sh:2707
+#, 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:2394
++#: git-gui.sh:2740
+msgid "Current Branch:"
+msgstr "Ramo attuale:"
+
- #: git-gui.sh:2414
++#: git-gui.sh:2761
+msgid "Staged Changes (Will Commit)"
+msgstr "Modifiche preparate (saranno nella nuova revisione)"
+
- #: git-gui.sh:2464
++#: git-gui.sh:2781
+msgid "Unstaged Changes"
+msgstr "Modifiche non preparate"
+
- #: git-gui.sh:2480 lib/transport.tcl:93 lib/transport.tcl:182
++#: git-gui.sh:2831
+msgid "Stage Changed"
+msgstr "Prepara modificati"
+
- #: git-gui.sh:2510
++#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "Propaga (Push)"
+
- #: git-gui.sh:2511
++#: git-gui.sh:2885
+msgid "Initial Commit Message:"
+msgstr "Messaggio di revisione iniziale:"
+
- #: git-gui.sh:2512
++#: git-gui.sh:2886
+msgid "Amended Commit Message:"
+msgstr "Messaggio di revisione corretto:"
+
- #: git-gui.sh:2513
++#: git-gui.sh:2887
+msgid "Amended Initial Commit Message:"
+msgstr "Messaggio iniziale di revisione corretto:"
+
- #: git-gui.sh:2514
++#: git-gui.sh:2888
+msgid "Amended Merge Commit Message:"
+msgstr "Messaggio di fusione corretto:"
+
- #: git-gui.sh:2515
++#: git-gui.sh:2889
+msgid "Merge Commit Message:"
+msgstr "Messaggio di fusione:"
+
- #: git-gui.sh:2561 git-gui.sh:2723 lib/console.tcl:73
++#: git-gui.sh:2890
+msgid "Commit Message:"
+msgstr "Messaggio di revisione:"
+
- #: git-gui.sh:2585 lib/blame.tcl:100
++#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
+msgid "Copy All"
+msgstr "Copia tutto"
+
- #: git-gui.sh:2691
- msgid "Apply/Reverse Hunk"
- msgstr "Applica/Inverti sezione"
-
- #: git-gui.sh:2696
- msgid "Apply/Reverse Line"
- msgstr "Applica/Inverti riga"
-
- #: git-gui.sh:2711
++#: git-gui.sh:2963 lib/blame.tcl:104
+msgid "File:"
+msgstr "File:"
+
- #: git-gui.sh:2732
++#: git-gui.sh:3078
+msgid "Refresh"
+msgstr "Rinfresca"
+
- #: git-gui.sh:2736
++#: git-gui.sh:3099
+msgid "Decrease Font Size"
+msgstr "Diminuisci dimensione caratteri"
+
- #: git-gui.sh:2747
++#: git-gui.sh:3103
+msgid "Increase Font Size"
+msgstr "Aumenta dimensione caratteri"
+
- #: git-gui.sh:2748
++#: git-gui.sh:3111 lib/blame.tcl:281
++msgid "Encoding"
++msgstr "Codifica"
++
++#: git-gui.sh:3122
++msgid "Apply/Reverse Hunk"
++msgstr "Applica/Inverti sezione"
++
++#: git-gui.sh:3127
++msgid "Apply/Reverse Line"
++msgstr "Applica/Inverti riga"
++
++#: git-gui.sh:3137
++msgid "Run Merge Tool"
++msgstr "Avvia programma esterno per la risoluzione dei conflitti"
++
++#: git-gui.sh:3142
++msgid "Use Remote Version"
++msgstr "Usa versione remota"
++
++#: git-gui.sh:3146
++msgid "Use Local Version"
++msgstr "Usa versione locale"
++
++#: git-gui.sh:3150
++msgid "Revert To Base"
++msgstr "Ritorna alla revisione comune"
++
++#: git-gui.sh:3169
+msgid "Unstage Hunk From Commit"
+msgstr "Annulla preparazione della sezione per una nuova revisione"
+
- #: git-gui.sh:2750
++#: git-gui.sh:3170
+msgid "Unstage Line From Commit"
+msgstr "Annulla preparazione della linea per una nuova revisione"
+
- #: git-gui.sh:2751
++#: git-gui.sh:3172
+msgid "Stage Hunk For Commit"
+msgstr "Prepara sezione per una nuova revisione"
+
- #: git-gui.sh:2771
++#: git-gui.sh:3173
+msgid "Stage Line For Commit"
+msgstr "Prepara linea per una nuova revisione"
+
- #: git-gui.sh:2876
++#: git-gui.sh:3196
+msgid "Initializing..."
+msgstr "Inizializzazione..."
+
- #: git-gui.sh:2906
++#: git-gui.sh:3301
+#, tcl-format
+msgid ""
+"Possible environment issues exist.\n"
+"\n"
+"The following environment variables are probably\n"
+"going to be ignored by any Git subprocess run\n"
+"by %s:\n"
+"\n"
+msgstr ""
+"Possibili problemi con le variabili d'ambiente.\n"
+"\n"
+"Le seguenti variabili d'ambiente saranno probabilmente\n"
+"ignorate da tutti i sottoprocessi di Git avviati\n"
+"da %s:\n"
+"\n"
+
- #: git-gui.sh:2911
++#: git-gui.sh:3331
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+"\n"
+"Ciò è dovuto a un problema conosciuto\n"
+"causato dall'eseguibile Tcl distribuito da Cygwin."
+
- #: lib/blame.tcl:70
++#: git-gui.sh:3336
+#, tcl-format
+msgid ""
+"\n"
+"\n"
+"A good replacement for %s\n"
+"is placing values for the user.name and\n"
+"user.email settings into your personal\n"
+"~/.gitconfig file.\n"
+msgstr ""
+"\n"
+"\n"
+"Una buona alternativa a %s\n"
+"consiste nell'assegnare valori alle variabili di configurazione\n"
+"user.name e user.email nel tuo file ~/.gitconfig personale.\n"
+
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - un'interfaccia grafica per Git."
+
- #: lib/blame.tcl:74
++#: lib/blame.tcl:72
+msgid "File Viewer"
+msgstr "Mostra file"
+
- #: lib/blame.tcl:257
++#: lib/blame.tcl:78
+msgid "Commit:"
+msgstr "Revisione:"
+
- #: lib/blame.tcl:260
++#: lib/blame.tcl:271
+msgid "Copy Commit"
+msgstr "Copia revisione"
+
- #: lib/blame.tcl:388
++#: lib/blame.tcl:275
++msgid "Find Text..."
++msgstr "Trova testo..."
++
++#: lib/blame.tcl:284
+msgid "Do Full Copy Detection"
+msgstr "Ricerca accurata delle copie"
+
- #: lib/blame.tcl:492
++#: lib/blame.tcl:288
++msgid "Show History Context"
++msgstr "Mostra contesto nella cronologia"
++
++#: lib/blame.tcl:291
++msgid "Blame Parent Commit"
++msgstr "Annota la revisione precedente"
++
++#: lib/blame.tcl:450
+#, tcl-format
+msgid "Reading %s..."
+msgstr "Lettura di %s..."
+
- #: lib/blame.tcl:512
++#: lib/blame.tcl:557
+msgid "Loading copy/move tracking annotations..."
+msgstr "Caricamento annotazioni per copie/spostamenti..."
+
- #: lib/blame.tcl:704
++#: lib/blame.tcl:577
+msgid "lines annotated"
+msgstr "linee annotate"
+
- #: lib/blame.tcl:707
++#: lib/blame.tcl:769
+msgid "Loading original location annotations..."
+msgstr "Caricamento annotazioni per posizione originaria..."
+
- #: lib/blame.tcl:737
++#: lib/blame.tcl:772
+msgid "Annotation complete."
+msgstr "Annotazione completata."
+
- #: lib/blame.tcl:738
++#: lib/blame.tcl:802
+msgid "Busy"
+msgstr "Occupato"
+
- #: lib/blame.tcl:777
++#: lib/blame.tcl:803
+msgid "Annotation process is already running."
+msgstr "Il processo di annotazione è già in corso."
+
- #: lib/blame.tcl:827
++#: lib/blame.tcl:842
+msgid "Running thorough copy detection..."
+msgstr "Ricerca accurata delle copie in corso..."
+
- #: lib/blame.tcl:883
++#: lib/blame.tcl:910
+msgid "Loading annotation..."
+msgstr "Caricamento annotazioni..."
+
- #: lib/blame.tcl:887
++#: lib/blame.tcl:964
+msgid "Author:"
+msgstr "Autore:"
+
- #: lib/blame.tcl:892
++#: lib/blame.tcl:968
+msgid "Committer:"
+msgstr "Revisione creata da:"
+
- #: lib/blame.tcl:1006
++#: lib/blame.tcl:973
+msgid "Original File:"
+msgstr "File originario:"
+
- #: lib/blame.tcl:1012
++#: lib/blame.tcl:1021
++msgid "Cannot find HEAD commit:"
++msgstr "Impossibile trovare la revisione HEAD:"
++
++#: lib/blame.tcl:1076
++msgid "Cannot find parent commit:"
++msgstr "Impossibile trovare la revisione precedente:"
++
++#: lib/blame.tcl:1091
++msgid "Unable to display parent"
++msgstr "Impossibile visualizzare la revisione precedente"
++
++#: lib/blame.tcl:1092 lib/diff.tcl:297
++msgid "Error loading diff:"
++msgstr "Errore nel caricamento delle differenze:"
++
++#: lib/blame.tcl:1232
+msgid "Originally By:"
+msgstr "In origine da:"
+
- #: lib/blame.tcl:1017
++#: lib/blame.tcl:1238
+msgid "In File:"
+msgstr "Nel file:"
+
- #: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:171
- #: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
++#: lib/blame.tcl:1243
+msgid "Copied Or Moved Here By:"
+msgstr "Copiato o spostato qui da:"
+
+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
+msgid "Checkout Branch"
+msgstr "Attiva ramo"
+
+#: lib/branch_checkout.tcl:23
+msgid "Checkout"
+msgstr "Attiva"
+
+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
- #: lib/branch_checkout.tcl:32 lib/browser.tcl:287
++#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
++#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
++#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
++#: lib/transport.tcl:97
+msgid "Cancel"
+msgstr "Annulla"
+
- #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:244
++#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
+msgid "Revision"
+msgstr "Revisione"
+
- #: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
++#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
+msgid "Options"
+msgstr "Opzioni"
+
+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
+msgstr "Recupera duplicato locale di ramo remoto"
+
+#: lib/branch_checkout.tcl:44
+msgid "Detach From Local Branch"
+msgstr "Stacca da ramo locale"
+
+#: lib/branch_create.tcl:22
+msgid "Create Branch"
+msgstr "Crea ramo"
+
+#: lib/branch_create.tcl:27
+msgid "Create New Branch"
+msgstr "Crea nuovo ramo"
+
- #: lib/branch_create.tcl:43
++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377
+msgid "Create"
+msgstr "Crea"
+
+#: lib/branch_create.tcl:40
+msgid "Branch Name"
+msgstr "Nome del ramo"
+
- #: lib/browser.tcl:278 lib/choose_repository.tcl:387
- #: lib/choose_repository.tcl:472 lib/choose_repository.tcl:482
- #: lib/choose_repository.tcl:985
++#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
+msgid "Name:"
+msgstr "Nome:"
+
+#: lib/branch_create.tcl:58
+msgid "Match Tracking Branch Name"
+msgstr "Appaia nome del duplicato locale di ramo remoto"
+
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
+msgstr "Revisione iniziale"
+
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
+msgstr "Aggiorna ramo esistente:"
+
+#: lib/branch_create.tcl:75
+msgid "No"
+msgstr "No"
+
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
+msgstr "Solo fast forward"
+
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
+msgid "Reset"
+msgstr "Ripristina"
+
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
+msgstr "Attiva dopo la creazione"
+
+#: lib/branch_create.tcl:131
+msgid "Please select a tracking branch."
+msgstr "Scegliere un duplicato locale di ramo remoto"
+
+#: lib/branch_create.tcl:140
+#, tcl-format
+msgid "Tracking branch %s is not a branch in the remote repository."
+msgstr ""
+"Il duplicato locale del ramo remoto %s non è un ramo nell'archivio remoto."
+
+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
+msgid "Please supply a branch name."
+msgstr "Inserire un nome per il ramo."
+
+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#, tcl-format
+msgid "'%s' is not an acceptable branch name."
+msgstr "'%s' non è utilizzabile come nome di ramo."
+
+#: lib/branch_delete.tcl:15
+msgid "Delete Branch"
+msgstr "Elimina ramo"
+
+#: lib/branch_delete.tcl:20
+msgid "Delete Local Branch"
+msgstr "Elimina ramo locale"
+
+#: lib/branch_delete.tcl:37
+msgid "Local Branches"
+msgstr "Rami locali"
+
+#: lib/branch_delete.tcl:52
+msgid "Delete Only If Merged Into"
+msgstr "Cancella solo se fuso con un altro ramo"
+
+#: lib/branch_delete.tcl:54
+msgid "Always (Do not perform merge test.)"
+msgstr "Sempre (Non effettuare verifiche di fusione)."
+
+#: lib/branch_delete.tcl:103
+#, tcl-format
+msgid "The following branches are not completely merged into %s:"
+msgstr "I rami seguenti non sono stati fusi completamente in %s:"
+
+#: lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult. \n"
+"\n"
+" Delete the selected branches?"
+msgstr ""
+"Ricomporre rami cancellati può essere complicato. \n"
+"\n"
+" Eliminare i rami selezionati?"
+
+#: lib/branch_delete.tcl:141
+#, tcl-format
+msgid ""
+"Failed to delete branches:\n"
+"%s"
+msgstr ""
+"Impossibile cancellare i rami:\n"
+"%s"
+
+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
+msgid "Rename Branch"
+msgstr "Rinomina ramo"
+
+#: lib/branch_rename.tcl:26
+msgid "Rename"
+msgstr "Rinomina"
+
+#: lib/branch_rename.tcl:36
+msgid "Branch:"
+msgstr "Ramo:"
+
+#: lib/branch_rename.tcl:39
+msgid "New Name:"
+msgstr "Nuovo Nome:"
+
+#: lib/branch_rename.tcl:75
+msgid "Please select a branch to rename."
+msgstr "Scegliere un ramo da rinominare."
+
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201
+#, tcl-format
+msgid "Branch '%s' already exists."
+msgstr "Il ramo '%s' esiste già."
+
+#: lib/branch_rename.tcl:117
+#, tcl-format
+msgid "Failed to rename '%s'."
+msgstr "Impossibile rinominare '%s'."
+
+#: lib/browser.tcl:17
+msgid "Starting..."
+msgstr "Avvio in corso..."
+
+#: lib/browser.tcl:26
+msgid "File Browser"
+msgstr "File browser"
+
+#: lib/browser.tcl:126 lib/browser.tcl:143
+#, tcl-format
+msgid "Loading %s..."
+msgstr "Caricamento %s..."
+
+#: lib/browser.tcl:187
+msgid "[Up To Parent]"
+msgstr "[Directory superiore]"
+
+#: lib/browser.tcl:267 lib/browser.tcl:273
+msgid "Browse Branch Files"
+msgstr "Esplora i file del ramo"
+
- #: lib/checkout_op.tcl:532 lib/merge.tcl:163
++#: lib/browser.tcl:278 lib/choose_repository.tcl:394
++#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491
++#: lib/choose_repository.tcl:995
+msgid "Browse"
+msgstr "Esplora"
+
+#: lib/checkout_op.tcl:84
+#, tcl-format
+msgid "Fetching %s from %s"
+msgstr "Recupero %s da %s"
+
+#: lib/checkout_op.tcl:132
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr "errore grave: impossibile risolvere %s"
+
+#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
++#: lib/sshkey.tcl:53
+msgid "Close"
+msgstr "Chiudi"
+
+#: lib/checkout_op.tcl:174
+#, tcl-format
+msgid "Branch '%s' does not exist."
+msgstr "Il ramo '%s' non esiste."
+
+#: lib/checkout_op.tcl:193
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
+msgstr "Impossibile configurare git-pull semplificato per '%s'."
+
+#: lib/checkout_op.tcl:228
+#, tcl-format
+msgid ""
+"Branch '%s' already exists.\n"
+"\n"
+"It cannot fast-forward to %s.\n"
+"A merge is required."
+msgstr ""
+"Il ramo '%s' esiste già.\n"
+"\n"
+"Non può effettuare un 'fast-forward' a %s.\n"
+"E' necessaria una fusione."
+
+#: lib/checkout_op.tcl:242
+#, tcl-format
+msgid "Merge strategy '%s' not supported."
+msgstr "La strategia di fusione '%s' non è supportata."
+
+#: lib/checkout_op.tcl:261
+#, tcl-format
+msgid "Failed to update '%s'."
+msgstr "Impossibile aggiornare '%s'."
+
+#: lib/checkout_op.tcl:273
+msgid "Staging area (index) is already locked."
+msgstr ""
+"L'area di preparazione per una nuova revisione (indice) è già bloccata."
+
+#: lib/checkout_op.tcl:288
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before the current branch can be changed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n"
+"\n"
+"Un altro programma Git ha modificato questo archivio dall'ultima analisi. "
+"Bisogna effettuare una nuova analisi prima di poter cambiare il ramo "
+"attuale.\n"
+"\n"
+"La nuova analisi comincerà ora.\n"
+
+#: lib/checkout_op.tcl:344
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "Aggiornamento della directory di lavoro a '%s' in corso..."
+
+#: lib/checkout_op.tcl:345
+msgid "files checked out"
+msgstr "file presenti nella directory di lavoro"
+
+#: lib/checkout_op.tcl:375
+#, tcl-format
+msgid "Aborted checkout of '%s' (file level merging is required)."
+msgstr "Attivazione di '%s' fallita (richiesta una fusione a livello file)."
+
+#: lib/checkout_op.tcl:376
+msgid "File level merge required."
+msgstr "E' richiesta una fusione a livello file."
+
+#: lib/checkout_op.tcl:380
+#, tcl-format
+msgid "Staying on branch '%s'."
+msgstr "Si rimarrà sul ramo '%s'."
+
+#: lib/checkout_op.tcl:451
+msgid ""
+"You are no longer on a local branch.\n"
+"\n"
+"If you wanted to be on a branch, create one now starting from 'This Detached "
+"Checkout'."
+msgstr ""
+"Non si è più su un ramo locale\n"
+"\n"
+"Se si vuole rimanere su un ramo, crearne uno ora a partire da 'Questa "
+"revisione attiva staccata'."
+
+#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
+#, tcl-format
+msgid "Checked out '%s'."
+msgstr "Attivazione di '%s' completata."
+
+#: lib/checkout_op.tcl:500
+#, tcl-format
+msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgstr ""
+"Ripristinare '%s' a '%s' comporterà la perdita delle seguenti revisioni:"
+
+#: lib/checkout_op.tcl:522
+msgid "Recovering lost commits may not be easy."
+msgstr "Ricomporre le revisioni perdute potrebbe non essere semplice."
+
+#: lib/checkout_op.tcl:527
+#, tcl-format
+msgid "Reset '%s'?"
+msgstr "Ripristinare '%s'?"
+
- #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
++#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+msgid "Visualize"
+msgstr "Visualizza"
+
+#: lib/checkout_op.tcl:600
+#, tcl-format
+msgid ""
+"Failed to set current branch.\n"
+"\n"
+"This working directory is only partially switched. We successfully updated "
+"your files, but failed to update an internal Git file.\n"
+"\n"
+"This should not have occurred. %s will now close and give up."
+msgstr ""
+"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 "
+"prodotto degli errori.\n"
+"\n"
+"Questo non sarebbe dovuto succedere. %s ora terminerà senza altre azioni."
+
+#: lib/choose_font.tcl:39
+msgid "Select"
+msgstr "Seleziona"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr "Famiglia di caratteri"
+
+#: lib/choose_font.tcl:74
+msgid "Font Size"
+msgstr "Dimensione caratteri"
+
+#: lib/choose_font.tcl:91
+msgid "Font Example"
+msgstr "Esempio caratteri"
+
+#: lib/choose_font.tcl:103
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+"Questo è un testo d'esempio.\n"
+"Se ti piace questo testo, scegli questo carattere."
+
+#: lib/choose_repository.tcl:28
+msgid "Git Gui"
+msgstr "Git Gui"
+
- #: lib/choose_repository.tcl:87
++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382
+msgid "Create New Repository"
+msgstr "Crea nuovo archivio"
+
- #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:458
++#: lib/choose_repository.tcl:93
+msgid "New..."
+msgstr "Nuovo..."
+
- #: lib/choose_repository.tcl:100
++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465
+msgid "Clone Existing Repository"
+msgstr "Clona archivio esistente"
+
- #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:974
++#: lib/choose_repository.tcl:106
+msgid "Clone..."
+msgstr "Clona..."
+
- #: lib/choose_repository.tcl:113
++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
+msgid "Open Existing Repository"
+msgstr "Apri archivio esistente"
+
- #: lib/choose_repository.tcl:126
++#: lib/choose_repository.tcl:119
+msgid "Open..."
+msgstr "Apri..."
+
- #: lib/choose_repository.tcl:132
++#: lib/choose_repository.tcl:132
+msgid "Recent Repositories"
+msgstr "Archivi recenti"
+
- #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
- #: lib/choose_repository.tcl:310
++#: lib/choose_repository.tcl:138
+msgid "Open Recent Repository:"
+msgstr "Apri archivio recente:"
+
- #: lib/choose_repository.tcl:381 lib/choose_repository.tcl:476
++#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
++#: lib/choose_repository.tcl:316
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "Impossibile creare l'archivio %s:"
+
- #: lib/choose_repository.tcl:410 lib/choose_repository.tcl:535
- #: lib/choose_repository.tcl:1007
++#: lib/choose_repository.tcl:387
+msgid "Directory:"
+msgstr "Directory:"
+
- #: lib/choose_repository.tcl:435
++#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544
++#: lib/choose_repository.tcl:1017
+msgid "Git Repository"
+msgstr "Archivio Git"
+
- #: lib/choose_repository.tcl:439
++#: lib/choose_repository.tcl:442
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr "La directory %s esiste già."
+
- #: lib/choose_repository.tcl:453
++#: lib/choose_repository.tcl:446
+#, tcl-format
+msgid "File %s already exists."
+msgstr "Il file %s esiste già."
+
- #: lib/choose_repository.tcl:466
- msgid "URL:"
- msgstr "URL:"
++#: lib/choose_repository.tcl:460
+msgid "Clone"
+msgstr "Clona"
+
- #: lib/choose_repository.tcl:487
++#: lib/choose_repository.tcl:473
++msgid "Source Location:"
++msgstr "Posizione sorgente:"
+
- #: lib/choose_repository.tcl:493
++#: lib/choose_repository.tcl:484
++msgid "Target Directory:"
++msgstr "Directory di destinazione:"
++
++#: lib/choose_repository.tcl:496
+msgid "Clone Type:"
+msgstr "Tipo di clone:"
+
- #: lib/choose_repository.tcl:499
++#: lib/choose_repository.tcl:502
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr "Standard (veloce, semi-ridondante, con hardlink)"
+
- #: lib/choose_repository.tcl:505
++#: lib/choose_repository.tcl:508
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr "Copia completa (più lento, backup ridondante)"
+
- #: lib/choose_repository.tcl:541 lib/choose_repository.tcl:588
- #: lib/choose_repository.tcl:734 lib/choose_repository.tcl:804
- #: lib/choose_repository.tcl:1013 lib/choose_repository.tcl:1021
++#: 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:577
++#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
++#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813
++#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "%s non è un archivio Git."
+
- #: lib/choose_repository.tcl:581
++#: lib/choose_repository.tcl:586
+msgid "Standard only available for local repository."
+msgstr "Standard è disponibile solo per archivi locali."
+
- #: lib/choose_repository.tcl:602
++#: lib/choose_repository.tcl:590
+msgid "Shared only available for local repository."
+msgstr "Shared è disponibile solo per archivi locali."
+
- #: lib/choose_repository.tcl:613
++#: lib/choose_repository.tcl:611
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "Il file/directory %s esiste già."
+
- #: lib/choose_repository.tcl:625
++#: lib/choose_repository.tcl:622
+msgid "Failed to configure origin"
+msgstr "Impossibile configurare origin"
+
- #: lib/choose_repository.tcl:626
++#: lib/choose_repository.tcl:634
+msgid "Counting objects"
+msgstr "Calcolo oggetti"
+
- #: lib/choose_repository.tcl:650
++#: lib/choose_repository.tcl:635
+msgid "buckets"
+msgstr ""
+
- #: lib/choose_repository.tcl:686
++#: lib/choose_repository.tcl:659
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr "Impossibile copiare oggetti/info/alternate: %s"
+
- #: lib/choose_repository.tcl:688 lib/choose_repository.tcl:902
- #: lib/choose_repository.tcl:914
++#: lib/choose_repository.tcl:695
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "Niente da clonare da %s."
+
- #: lib/choose_repository.tcl:701
++#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911
++#: lib/choose_repository.tcl:923
+msgid "The 'master' branch has not been initialized."
+msgstr "Il ramo 'master' non è stato inizializzato."
+
- #: lib/choose_repository.tcl:713
++#: lib/choose_repository.tcl:710
+msgid "Hardlinks are unavailable. Falling back to copying."
+msgstr "Impossibile utilizzare gli hardlink. Si ricorrerà alla copia."
+
- #: lib/choose_repository.tcl:744
++#: lib/choose_repository.tcl:722
+#, tcl-format
+msgid "Cloning from %s"
+msgstr "Clonazione da %s"
+
- #: lib/choose_repository.tcl:745
++#: lib/choose_repository.tcl:753
+msgid "Copying objects"
+msgstr "Copia degli oggetti"
+
- #: lib/choose_repository.tcl:769
++#: lib/choose_repository.tcl:754
+msgid "KiB"
+msgstr "KiB"
+
- #: lib/choose_repository.tcl:779
++#: lib/choose_repository.tcl:778
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr "Impossibile copiare oggetto: %s"
+
- #: lib/choose_repository.tcl:780
++#: lib/choose_repository.tcl:788
+msgid "Linking objects"
+msgstr "Collegamento oggetti"
+
- #: lib/choose_repository.tcl:788
++#: lib/choose_repository.tcl:789
+msgid "objects"
+msgstr "oggetti"
+
- #: lib/choose_repository.tcl:843
++#: lib/choose_repository.tcl:797
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr "Hardlink impossibile sull'oggetto: %s"
+
- #: lib/choose_repository.tcl:854
++#: lib/choose_repository.tcl:852
+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:878
++#: lib/choose_repository.tcl:863
+msgid "Cannot fetch tags. See console output for details."
+msgstr ""
+"Impossibile recuperare le etichette. Controllare i dettagli forniti dalla "
+"console."
+
- #: lib/choose_repository.tcl:887
++#: lib/choose_repository.tcl:887
+msgid "Cannot determine HEAD. See console output for details."
+msgstr ""
+"Impossibile determinare HEAD. Controllare i dettagli forniti dalla console."
+
- #: lib/choose_repository.tcl:893
++#: lib/choose_repository.tcl:896
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr "Impossibile ripulire %s"
+
- #: lib/choose_repository.tcl:900
++#: lib/choose_repository.tcl:902
+msgid "Clone failed."
+msgstr "Clonazione non riuscita."
+
- #: lib/choose_repository.tcl:911
++#: lib/choose_repository.tcl:909
+msgid "No default branch obtained."
+msgstr "Non è stato trovato un ramo predefinito."
+
- #: lib/choose_repository.tcl:923
++#: lib/choose_repository.tcl:920
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr "Impossibile risolvere %s come una revisione."
+
- #: lib/choose_repository.tcl:924 lib/index.tcl:65 lib/index.tcl:127
- #: lib/index.tcl:193
++#: lib/choose_repository.tcl:932
+msgid "Creating working directory"
+msgstr "Creazione directory di lavoro"
+
- #: lib/choose_repository.tcl:953
++#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128
++#: lib/index.tcl:196
+msgid "files"
+msgstr "file"
+
- #: lib/choose_repository.tcl:969
++#: lib/choose_repository.tcl:962
+msgid "Initial file checkout failed."
+msgstr "Attivazione iniziale non riuscita."
+
- #: lib/choose_repository.tcl:979
++#: lib/choose_repository.tcl:978
+msgid "Open"
+msgstr "Apri"
+
- #: lib/choose_repository.tcl:1027
++#: lib/choose_repository.tcl:988
+msgid "Repository:"
+msgstr "Archivio:"
+
- #: lib/commit.tcl:154
++#: lib/choose_repository.tcl:1037
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "Impossibile accedere all'archivio %s:"
+
+#: lib/choose_rev.tcl:53
+msgid "This Detached Checkout"
+msgstr "Questa revisione attiva staccata"
+
+#: lib/choose_rev.tcl:60
+msgid "Revision Expression:"
+msgstr "Espressione di revisione:"
+
+#: lib/choose_rev.tcl:74
+msgid "Local Branch"
+msgstr "Ramo locale"
+
+#: lib/choose_rev.tcl:79
+msgid "Tracking Branch"
+msgstr "Duplicato locale di ramo remoto"
+
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+msgid "Tag"
+msgstr "Etichetta"
+
+#: lib/choose_rev.tcl:317
+#, tcl-format
+msgid "Invalid revision: %s"
+msgstr "Revisione non valida: %s"
+
+#: lib/choose_rev.tcl:338
+msgid "No revision selected."
+msgstr "Nessuna revisione selezionata."
+
+#: lib/choose_rev.tcl:346
+msgid "Revision expression is empty."
+msgstr "L'espressione di revisione è vuota."
+
+#: lib/choose_rev.tcl:531
+msgid "Updated"
+msgstr "Aggiornato"
+
+#: lib/choose_rev.tcl:559
+msgid "URL"
+msgstr "URL"
+
+#: lib/commit.tcl:9
+msgid ""
+"There is nothing to amend.\n"
+"\n"
+"You are about to create the initial commit. There is no commit before this "
+"to amend.\n"
+msgstr ""
+"Non c'è niente da correggere.\n"
+"\n"
+"Stai per creare la revisione iniziale. Non esiste una revisione precedente "
+"da correggere.\n"
+
+#: lib/commit.tcl:18
+msgid ""
+"Cannot amend while merging.\n"
+"\n"
+"You are currently in the middle of a merge that has not been fully "
+"completed. You cannot amend the prior commit unless you first abort the "
+"current merge activity.\n"
+msgstr ""
+"Non è possibile effettuare una correzione durante una fusione.\n"
+"\n"
+"In questo momento si sta effettuando una fusione che non è stata del tutto "
+"completata. Non puoi correggere la revisione precedente a meno che prima tu "
+"non interrompa l'operazione di fusione in corso.\n"
+
+#: lib/commit.tcl:49
+msgid "Error loading commit data for amend:"
+msgstr "Errore durante il caricamento dei dati della revisione da correggere:"
+
+#: lib/commit.tcl:76
+msgid "Unable to obtain your identity:"
+msgstr "Impossibile ottenere la tua identità:"
+
+#: lib/commit.tcl:81
+msgid "Invalid GIT_COMMITTER_IDENT:"
+msgstr "GIT_COMMITTER_IDENT non valida:"
+
+#: lib/commit.tcl:133
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before another commit can be created.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n"
+"\n"
+"Un altro programma Git ha modificato questo archivio dall'ultima analisi. "
+"Bisogna effettuare una nuova analisi prima di poter creare una nuova "
+"revisione.\n"
+"\n"
+"La nuova analisi comincerà ora.\n"
+
- #: lib/commit.tcl:162
++#: lib/commit.tcl:156
+#, tcl-format
+msgid ""
+"Unmerged files cannot be committed.\n"
+"\n"
+"File %s has merge conflicts. You must resolve them and stage the file "
+"before committing.\n"
+msgstr ""
+"Non è possibile creare una revisione con file non sottoposti a fusione.\n"
+"\n"
+"Il file %s presenta dei conflitti. Devi risolverli e preparare il file per "
+"creare una nuova revisione prima di effettuare questa azione.\n"
+
- #: lib/commit.tcl:170
++#: lib/commit.tcl:164
+#, tcl-format
+msgid ""
+"Unknown file state %s detected.\n"
+"\n"
+"File %s cannot be committed by this program.\n"
+msgstr ""
+"Stato di file %s sconosciuto.\n"
+"\n"
+"Questo programma non può creare una revisione contenente il file %s.\n"
+
- #: lib/commit.tcl:183
++#: lib/commit.tcl:172
+msgid ""
+"No changes to commit.\n"
+"\n"
+"You must stage at least 1 file before you can commit.\n"
+msgstr ""
+"Nessuna modifica per la nuova revisione.\n"
+"\n"
+"Devi preparare per una nuova revisione almeno 1 file prima di effettuare "
+"questa operazione.\n"
+
- #: lib/commit.tcl:207
++#: lib/commit.tcl:187
+msgid ""
+"Please supply a commit message.\n"
+"\n"
+"A good commit message has the following format:\n"
+"\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 ""
+"Bisogna fornire un messaggio di revisione.\n"
+"\n"
+"Un buon messaggio di revisione ha il seguente formato:\n"
+"\n"
+"- Prima linea: descrivi in una frase ciò che hai fatto.\n"
+"- Seconda linea: vuota.\n"
+"- Terza linea: spiega a cosa serve la tua modifica.\n"
+
- #: lib/commit.tcl:221
++#: lib/commit.tcl:211
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "attenzione: Tcl non supporta la codifica '%s'."
+
- #: lib/commit.tcl:236
++#: lib/commit.tcl:227
+msgid "Calling pre-commit hook..."
+msgstr "Avvio pre-commit hook..."
+
- #: lib/commit.tcl:259
++#: lib/commit.tcl:242
+msgid "Commit declined by pre-commit hook."
+msgstr "Revisione rifiutata dal pre-commit hook."
+
- #: lib/commit.tcl:274
++#: lib/commit.tcl:265
+msgid "Calling commit-msg hook..."
+msgstr "Avvio commit-msg hook..."
+
- #: lib/commit.tcl:287
++#: lib/commit.tcl:280
+msgid "Commit declined by commit-msg hook."
+msgstr "Revisione rifiutata dal commit-msg hook."
+
- #: lib/commit.tcl:303
++#: lib/commit.tcl:293
+msgid "Committing changes..."
+msgstr "Archiviazione modifiche..."
+
- #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
++#: lib/commit.tcl:309
+msgid "write-tree failed:"
+msgstr "write-tree non riuscito:"
+
- #: lib/commit.tcl:321
++#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
+msgid "Commit failed."
+msgstr "Impossibile creare una nuova revisione."
+
- #: lib/commit.tcl:326
++#: lib/commit.tcl:327
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr "La revisione %s sembra essere danneggiata"
+
- #: lib/commit.tcl:333
++#: lib/commit.tcl:332
+msgid ""
+"No changes to commit.\n"
+"\n"
+"No files were modified by this commit and it was not a merge commit.\n"
+"\n"
+"A rescan will be automatically started now.\n"
+msgstr ""
+"Nessuna modifica per la nuova revisione.\n"
+"\n"
+"Questa revisione non modifica alcun file e non effettua alcuna fusione.\n"
+"\n"
+"Si procederà subito ad una nuova analisi.\n"
+
- #: lib/commit.tcl:347
++#: lib/commit.tcl:339
+msgid "No changes to commit."
+msgstr "Nessuna modifica per la nuova revisione."
+
- #: lib/commit.tcl:367
++#: lib/commit.tcl:353
+msgid "commit-tree failed:"
+msgstr "commit-tree non riuscito:"
+
- #: lib/commit.tcl:454
++#: lib/commit.tcl:373
+msgid "update-ref failed:"
+msgstr "update-ref non riuscito:"
+
- #: lib/diff.tcl:44
++#: lib/commit.tcl:461
+#, tcl-format
+msgid "Created commit %s: %s"
+msgstr "Creata revisione %s: %s"
+
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr "Elaborazione in corso... attendere..."
+
+#: lib/console.tcl:186
+msgid "Success"
+msgstr "Successo"
+
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr "Errore: comando non riuscito"
+
+#: lib/database.tcl:43
+msgid "Number of loose objects"
+msgstr "Numero di oggetti slegati"
+
+#: lib/database.tcl:44
+msgid "Disk space used by loose objects"
+msgstr "Spazio su disco utilizzato da oggetti slegati"
+
+#: lib/database.tcl:45
+msgid "Number of packed objects"
+msgstr "Numero di oggetti impacchettati"
+
+#: lib/database.tcl:46
+msgid "Number of packs"
+msgstr "Numero di pacchetti"
+
+#: lib/database.tcl:47
+msgid "Disk space used by packed objects"
+msgstr "Spazio su disco utilizzato da oggetti impacchettati"
+
+#: lib/database.tcl:48
+msgid "Packed objects waiting for pruning"
+msgstr "Oggetti impacchettati che attendono la potatura"
+
+#: lib/database.tcl:49
+msgid "Garbage files"
+msgstr "File inutili"
+
+#: lib/database.tcl:72
+msgid "Compressing the object database"
+msgstr "Compressione dell'archivio in corso"
+
+#: lib/database.tcl:83
+msgid "Verifying the object database with fsck-objects"
+msgstr "Verifica dell'archivio con fsck-objects in corso"
+
+#: lib/database.tcl:108
+#, tcl-format
+msgid ""
+"This repository currently has approximately %i loose objects.\n"
+"\n"
+"To maintain optimal performance it is strongly recommended that you compress "
+"the database when more than %i loose objects exist.\n"
+"\n"
+"Compress the database now?"
+msgstr ""
+"Questo archivio attualmente ha circa %i oggetti slegati.\n"
+"\n"
+"Per mantenere buone prestazioni si raccomanda di comprimere l'archivio "
+"quando sono presenti più di %i oggetti slegati.\n"
+"\n"
+"Comprimere l'archivio ora?"
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Git ha restituito una data non valida: %s"
+
- #: lib/diff.tcl:83
++#: lib/diff.tcl:59
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but "
+"the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have "
+"the same state."
+msgstr ""
+"Non sono state trovate differenze.\n"
+"\n"
+"%s non ha modifiche.\n"
+"\n"
+"La data di modifica di questo file è stata cambiata da un'altra "
+"applicazione, ma il contenuto del file è rimasto invariato.\n"
+"\n"
+"Si procederà automaticamente ad una nuova analisi per trovare altri file che "
+"potrebbero avere lo stesso stato."
+
- #: lib/diff.tcl:116 lib/diff.tcl:190
++#: lib/diff.tcl:99
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Caricamento delle differenze di %s..."
+
- #: lib/diff.tcl:117
++#: lib/diff.tcl:120
++msgid ""
++"LOCAL: deleted\n"
++"REMOTE:\n"
++msgstr ""
++"LOCALE: cancellato\n"
++"REMOTO:\n"
++
++#: lib/diff.tcl:125
++msgid ""
++"REMOTE: deleted\n"
++"LOCAL:\n"
++msgstr ""
++"REMOTO: cancellato\n"
++"LOCALE:\n"
++
++#: lib/diff.tcl:132
++msgid "LOCAL:\n"
++msgstr "LOCALE:\n"
++
++#: lib/diff.tcl:135
++msgid "REMOTE:\n"
++msgstr "REMOTO:\n"
++
++#: lib/diff.tcl:197 lib/diff.tcl:296
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "Impossibile visualizzare %s"
+
- #: lib/diff.tcl:124
++#: lib/diff.tcl:198
+msgid "Error loading file:"
+msgstr "Errore nel caricamento del file:"
+
- #: lib/diff.tcl:136
++#: lib/diff.tcl:205
+msgid "Git Repository (subproject)"
+msgstr "Archivio Git (sottoprogetto)"
+
- #: lib/diff.tcl:191
- msgid "Error loading diff:"
- msgstr "Errore nel caricamento delle differenze:"
++#: lib/diff.tcl:217
+msgid "* Binary file (not showing content)."
+msgstr "* File binario (il contenuto non sarà mostrato)."
+
- #: lib/diff.tcl:313
++#: lib/diff.tcl:222
++#, tcl-format
++msgid ""
++"* Untracked file is %d bytes.\n"
++"* Showing only first %d bytes.\n"
++msgstr ""
++"* Il file non tracciato è di %d byte.\n"
++"* Saranno visualizzati solo i primi %d byte.\n"
++
++#: lib/diff.tcl:228
++#, tcl-format
++msgid ""
++"\n"
++"* Untracked file clipped here by %s.\n"
++"* To see the entire file, use an external editor.\n"
++msgstr ""
++"\n"
++"* %s non visualizza completamente questo file non tracciato.\n"
++"* Per visualizzare il file completo, usare un programma esterno.\n"
+
- #: lib/diff.tcl:320
++#: lib/diff.tcl:436
+msgid "Failed to unstage selected hunk."
+msgstr "Impossibile rimuovere la sezione scelta dalla nuova revisione."
+
- #: lib/diff.tcl:386
++#: lib/diff.tcl:443
+msgid "Failed to stage selected hunk."
+msgstr "Impossibile preparare la sezione scelta per una nuova revisione."
+
- #: lib/diff.tcl:394
++#: lib/diff.tcl:509
+msgid "Failed to unstage selected line."
+msgstr "Impossibile rimuovere la riga scelta dalla nuova revisione."
+
- #: lib/index.tcl:282
++#: lib/diff.tcl:517
+msgid "Failed to stage selected line."
+msgstr "Impossibile preparare la riga scelta per una nuova revisione."
+
++#: lib/encoding.tcl:443
++msgid "Default"
++msgstr "Predefinito"
++
++#: lib/encoding.tcl:448
++#, tcl-format
++msgid "System (%s)"
++msgstr "Codifica di sistema (%s)"
++
++#: lib/encoding.tcl:459 lib/encoding.tcl:465
++msgid "Other"
++msgstr "Altro"
++
+#: lib/error.tcl:20 lib/error.tcl:114
+msgid "error"
+msgstr "errore"
+
+#: lib/error.tcl:36
+msgid "warning"
+msgstr "attenzione"
+
+#: lib/error.tcl:94
+msgid "You must correct the above errors before committing."
+msgstr ""
+"Bisogna correggere gli errori suddetti prima di creare una nuova revisione."
+
+#: 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:313
++#: lib/index.tcl:287
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "%s non farà parte della prossima revisione"
+
- #: lib/index.tcl:326
++#: lib/index.tcl:326
+msgid "Ready to commit."
+msgstr "Pronto per creare una nuova revisione."
+
- #: lib/index.tcl:381
++#: lib/index.tcl:339
+#, tcl-format
+msgid "Adding %s"
+msgstr "Aggiunta di %s in corso"
+
- #: lib/index.tcl:383
++#: lib/index.tcl:396
+#, tcl-format
+msgid "Revert changes in file %s?"
+msgstr "Annullare le modifiche nel file %s?"
+
- #: lib/index.tcl:391
++#: lib/index.tcl:398
+#, tcl-format
+msgid "Revert changes in these %i files?"
+msgstr "Annullare le modifiche in questi %i file?"
+
- #: lib/index.tcl:394
++#: lib/index.tcl:406
+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/merge.tcl:44
++#: lib/index.tcl:409
+msgid "Do Nothing"
+msgstr "Non fare niente"
+
++#: lib/index.tcl:427
++msgid "Reverting selected files"
++msgstr "Annullo le modifiche nei file selezionati"
++
++#: lib/index.tcl:431
++#, tcl-format
++msgid "Reverting %s"
++msgstr "Annullo le modifiche in %s"
++
+#: lib/merge.tcl:13
+msgid ""
+"Cannot merge while amending.\n"
+"\n"
+"You must finish amending this commit before starting any type of merge.\n"
+msgstr ""
+"Non posso effettuare fusioni durante una correzione.\n"
+"\n"
+"Bisogna finire di correggere questa revisione prima di iniziare una "
+"qualunque fusione.\n"
+
+#: lib/merge.tcl:27
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before a merge can be performed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"L'ultimo stato analizzato non corrisponde allo stato dell'archivio.\n"
+"\n"
+"Un altro programma Git ha modificato questo archivio dall'ultima analisi."
+"Bisogna effettuare una nuova analisi prima di poter effettuare una fusione.\n"
+"\n"
+"La nuova analisi comincerà ora.\n"
+
- #: lib/merge.tcl:54
++#: lib/merge.tcl:45
+#, tcl-format
+msgid ""
+"You are in the middle of a conflicted merge.\n"
+"\n"
+"File %s has merge conflicts.\n"
+"\n"
+"You must resolve them, stage the file, and commit to complete the current "
+"merge. Only then can you begin another merge.\n"
+msgstr ""
+"Sei nel mezzo di una fusione con conflitti.\n"
+"\n"
+"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 attuale. Solo a questo punto potrai "
+"iniziare un'altra fusione.\n"
+
- #: lib/merge.tcl:106
++#: lib/merge.tcl:55
+#, tcl-format
+msgid ""
+"You are in the middle of a change.\n"
+"\n"
+"File %s is modified.\n"
+"\n"
+"You should complete the current commit before starting a merge. Doing so "
+"will help you abort a failed merge, should the need arise.\n"
+msgstr ""
+"Sei nel mezzo di una modifica.\n"
+"\n"
+"Il file %s è stato modificato.\n"
+"\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:119
++#: lib/merge.tcl:107
+#, tcl-format
+msgid "%s of %s"
+msgstr "%s di %s"
+
- #: lib/merge.tcl:130
++#: lib/merge.tcl:120
+#, tcl-format
+msgid "Merging %s and %s..."
+msgstr "Fusione di %s e %s in corso..."
+
- #: lib/merge.tcl:132
++#: lib/merge.tcl:131
+msgid "Merge completed successfully."
+msgstr "Fusione completata con successo."
+
- #: lib/merge.tcl:157
++#: lib/merge.tcl:133
+msgid "Merge failed. Conflict resolution is required."
+msgstr "Fusione non riuscita. Bisogna risolvere i conflitti."
+
- #: lib/merge.tcl:176
++#: lib/merge.tcl:158
+#, tcl-format
+msgid "Merge Into %s"
+msgstr "Fusione in %s"
+
- #: lib/merge.tcl:211
++#: lib/merge.tcl:177
+msgid "Revision To Merge"
+msgstr "Revisione da fondere"
+
- #: lib/merge.tcl:221
++#: lib/merge.tcl:212
+msgid ""
+"Cannot abort while amending.\n"
+"\n"
+"You must finish amending this commit.\n"
+msgstr ""
+"Interruzione impossibile durante una correzione.\n"
+"\n"
+"Bisogna finire di correggere questa revisione.\n"
+
- #: lib/merge.tcl:227
++#: lib/merge.tcl:222
+msgid ""
+"Abort merge?\n"
+"\n"
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with aborting the current merge?"
+msgstr ""
+"Interrompere fusione?\n"
+"\n"
+"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 attuale?"
+
- "Ripristinare la revisione corrente e annullare le modifiche?\n"
++#: lib/merge.tcl:228
+msgid ""
+"Reset changes?\n"
+"\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with resetting the current changes?"
+msgstr ""
- #: lib/merge.tcl:238
++"Ripristinare la revisione attuale e annullare le modifiche?\n"
+"\n"
+"L'annullamento delle modifiche causerà la perdita di *TUTTE* le modifiche "
+"non ancora presenti nell'archivio.\n"
+"\n"
+"Continuare con l'annullamento delle modifiche attuali?"
+
- #: lib/merge.tcl:238
++#: lib/merge.tcl:239
+msgid "Aborting"
+msgstr "Interruzione"
+
- #: lib/merge.tcl:266
++#: lib/merge.tcl:239
+msgid "files reset"
+msgstr "ripristino file"
+
- #: lib/merge.tcl:268
++#: lib/merge.tcl:267
+msgid "Abort failed."
+msgstr "Interruzione non riuscita."
+
- #: lib/option.tcl:95
++#: lib/merge.tcl:269
+msgid "Abort completed. Ready."
+msgstr "Interruzione completata. Pronto."
+
- #: lib/option.tcl:99
++#: lib/mergetool.tcl:8
++msgid "Force resolution to the base version?"
++msgstr "Imporre la risoluzione alla revisione comune?"
++
++#: lib/mergetool.tcl:9
++msgid "Force resolution to this branch?"
++msgstr "Imporre la risoluzione al ramo attuale?"
++
++#: lib/mergetool.tcl:10
++msgid "Force resolution to the other branch?"
++msgstr "Imporre la risoluzione all'altro ramo?"
++
++#: lib/mergetool.tcl:14
++#, tcl-format
++msgid ""
++"Note that the diff shows only conflicting changes.\n"
++"\n"
++"%s will be overwritten.\n"
++"\n"
++"This operation can be undone only by restarting the merge."
++msgstr ""
++"Si stanno mostrando solo le modifiche con conflitti.\n"
++"\n"
++"%s sarà sovrascritto.\n"
++"\n"
++"Questa operazione può essere modificata solo ricominciando la fusione."
++
++#: lib/mergetool.tcl:45
++#, tcl-format
++msgid "File %s seems to have unresolved conflicts, still stage?"
++msgstr ""
++"Il file %s sembra contenere conflitti non risolti, preparare per la prossima "
++"revisione?"
++
++#: lib/mergetool.tcl:60
++#, tcl-format
++msgid "Adding resolution for %s"
++msgstr ""
++"La risoluzione dei conflitti per %s è preparata per la prossima revisione"
++
++#: lib/mergetool.tcl:141
++msgid "Cannot resolve deletion or link conflicts using a tool"
++msgstr ""
++"Non è possibile risolvere i conflitti per cancellazioni o link con un "
++"programma esterno"
++
++#: lib/mergetool.tcl:146
++msgid "Conflict file does not exist"
++msgstr "Non esiste un file con conflitti."
++
++#: lib/mergetool.tcl:264
++#, tcl-format
++msgid "Not a GUI merge tool: '%s'"
++msgstr "'%s' non è una GUI per la risoluzione dei conflitti."
++
++#: lib/mergetool.tcl:268
++#, tcl-format
++msgid "Unsupported merge tool '%s'"
++msgstr "Il programma '%s' non è supportato"
++
++#: lib/mergetool.tcl:303
++msgid "Merge tool is already running, terminate it?"
++msgstr "La risoluzione dei conflitti è già avviata, terminarla?"
++
++#: lib/mergetool.tcl:323
++#, tcl-format
++msgid ""
++"Error retrieving versions:\n"
++"%s"
++msgstr ""
++"Errore: revisione non trovata:\n"
++"%s"
++
++#: lib/mergetool.tcl:343
++#, tcl-format
++msgid ""
++"Could not start the merge tool:\n"
++"\n"
++"%s"
++msgstr ""
++"Impossibile avviare la risoluzione dei conflitti:\n"
++"\n"
++"%s"
++
++#: lib/mergetool.tcl:347
++msgid "Running merge tool..."
++msgstr "Avvio del programma per la risoluzione dei conflitti in corso..."
++
++#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
++msgid "Merge tool failed."
++msgstr "Risoluzione dei conflitti non riuscita."
++
++#: lib/option.tcl:11
++#, tcl-format
++msgid "Invalid global encoding '%s'"
++msgstr ""
++"La codifica dei caratteri '%s' specificata per tutti gli archivi non è valida"
++
++#: lib/option.tcl:19
++#, tcl-format
++msgid "Invalid repo encoding '%s'"
++msgstr ""
++"La codifica dei caratteri '%s' specificata per l'archivio attuale non è "
++"valida"
++
++#: lib/option.tcl:117
+msgid "Restore Defaults"
+msgstr "Ripristina valori predefiniti"
+
- #: lib/option.tcl:109
++#: lib/option.tcl:121
+msgid "Save"
+msgstr "Salva"
+
- #: lib/option.tcl:110
++#: lib/option.tcl:131
+#, tcl-format
+msgid "%s Repository"
+msgstr "Archivio di %s"
+
- #: lib/option.tcl:116
++#: lib/option.tcl:132
+msgid "Global (All Repositories)"
+msgstr "Tutti gli archivi"
+
- #: lib/option.tcl:117
++#: lib/option.tcl:138
+msgid "User Name"
+msgstr "Nome utente"
+
- #: lib/option.tcl:119
++#: lib/option.tcl:139
+msgid "Email Address"
+msgstr "Indirizzo Email"
+
- #: lib/option.tcl:120
++#: lib/option.tcl:141
+msgid "Summarize Merge Commits"
+msgstr "Riepilogo nelle revisioni di fusione"
+
- #: lib/option.tcl:121
++#: lib/option.tcl:142
+msgid "Merge Verbosity"
+msgstr "Prolissità della fusione"
+
- #: lib/option.tcl:123
++#: lib/option.tcl:143
+msgid "Show Diffstat After Merge"
+msgstr "Mostra statistiche delle differenze dopo la fusione"
+
- #: lib/option.tcl:124
++#: lib/option.tcl:144
++msgid "Use Merge Tool"
++msgstr "Programma da utilizzare per la risoluzione dei conflitti"
++
++#: lib/option.tcl:146
+msgid "Trust File Modification Timestamps"
+msgstr "Fidati delle date di modifica dei file"
+
- #: lib/option.tcl:125
++#: lib/option.tcl:147
+msgid "Prune Tracking Branches During Fetch"
+msgstr ""
+"Effettua potatura dei duplicati locali di rami remoti durante il recupero"
+
- #: lib/option.tcl:126
++#: lib/option.tcl:148
+msgid "Match Tracking Branches"
+msgstr "Appaia duplicati locali di rami remoti"
+
- #: lib/option.tcl:127
++#: lib/option.tcl:149
+msgid "Blame Copy Only On Changed Files"
+msgstr "Ricerca copie solo nei file modificati"
+
- #: lib/option.tcl:128
++#: lib/option.tcl:150
+msgid "Minimum Letters To Blame Copy On"
+msgstr "Numero minimo di lettere che attivano la ricerca delle copie"
+
- #: lib/option.tcl:129
++#: lib/option.tcl:151
++msgid "Blame History Context Radius (days)"
++msgstr "Giorni di contesto nella cronologia delle annotazioni"
++
++#: lib/option.tcl:152
+msgid "Number of Diff Context Lines"
+msgstr "Numero di linee di contesto nelle differenze"
+
- #: lib/option.tcl:130
++#: lib/option.tcl:153
+msgid "Commit Message Text Width"
+msgstr "Larghezza del messaggio di revisione"
+
- #: lib/option.tcl:194
++#: lib/option.tcl:154
+msgid "New Branch Name Template"
+msgstr "Modello per il nome di un nuovo ramo"
+
- #: lib/option.tcl:218
++#: lib/option.tcl:155
++msgid "Default File Contents Encoding"
++msgstr "Codifica predefinita per il contenuto dei file"
++
++#: lib/option.tcl:203
++msgid "Change"
++msgstr "Cambia"
++
++#: lib/option.tcl:230
+msgid "Spelling Dictionary:"
+msgstr "Lingua dizionario:"
+
- #: lib/option.tcl:222
++#: lib/option.tcl:254
+msgid "Change Font"
+msgstr "Cambia caratteri"
+
- #: lib/option.tcl:228
++#: lib/option.tcl:258
+#, tcl-format
+msgid "Choose %s"
+msgstr "Scegli %s"
+
- #: lib/option.tcl:242
++#: lib/option.tcl:264
+msgid "pt."
+msgstr "pt."
+
- #: lib/option.tcl:277
++#: lib/option.tcl:278
+msgid "Preferences"
+msgstr "Preferenze"
+
- #: lib/remote.tcl:165
++#: lib/option.tcl:314
+msgid "Failed to completely save options:"
+msgstr "Impossibile salvare completamente le opzioni:"
+
- #: lib/remote.tcl:170
++#: lib/remote.tcl:163
++msgid "Remove Remote"
++msgstr "Rimuovi archivio remoto"
++
++#: lib/remote.tcl:168
+msgid "Prune from"
+msgstr "Effettua potatura da"
+
- #: lib/remote.tcl:213
++#: lib/remote.tcl:173
+msgid "Fetch from"
+msgstr "Recupera da"
+
- msgid "Delete Remote Branch"
- msgstr "Cancella ramo remoto"
++#: lib/remote.tcl:215
+msgid "Push to"
+msgstr "Propaga verso"
+
++#: lib/remote_add.tcl:19
++msgid "Add Remote"
++msgstr "Aggiungi archivio remoto"
++
++#: lib/remote_add.tcl:24
++msgid "Add New Remote"
++msgstr "Aggiungi nuovo archivio remoto"
++
++#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
++msgid "Add"
++msgstr "Aggiungi"
++
++#: lib/remote_add.tcl:37
++msgid "Remote Details"
++msgstr "Dettagli sull'archivio remoto"
++
++#: lib/remote_add.tcl:50
++msgid "Location:"
++msgstr "Posizione:"
++
++#: lib/remote_add.tcl:62
++msgid "Further Action"
++msgstr "Altra azione"
++
++#: lib/remote_add.tcl:65
++msgid "Fetch Immediately"
++msgstr "Recupera subito"
++
++#: lib/remote_add.tcl:71
++msgid "Initialize Remote Repository and Push"
++msgstr "Inizializza l'archivio remoto e propaga"
++
++#: lib/remote_add.tcl:77
++msgid "Do Nothing Else Now"
++msgstr "Non fare altro"
++
++#: lib/remote_add.tcl:101
++msgid "Please supply a remote name."
++msgstr "Inserire un nome per l'archivio remoto."
++
++#: lib/remote_add.tcl:114
++#, tcl-format
++msgid "'%s' is not an acceptable remote name."
++msgstr "'%s' non è utilizzabile come nome di archivio remoto."
++
++#: lib/remote_add.tcl:125
++#, tcl-format
++msgid "Failed to add remote '%s' of location '%s'."
++msgstr "Impossibile aggiungere l'archivio remoto '%s' posto in '%s'."
++
++#: lib/remote_add.tcl:133 lib/transport.tcl:6
++#, tcl-format
++msgid "fetch %s"
++msgstr "recupera da %s"
++
++#: lib/remote_add.tcl:134
++#, tcl-format
++msgid "Fetching the %s"
++msgstr "Recupero %s"
++
++#: lib/remote_add.tcl:157
++#, tcl-format
++msgid "Do not know how to initialize repository at location '%s'."
++msgstr "Impossibile inizializzare l'archivio posto in '%s'."
++
++#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
++#, tcl-format
++msgid "push %s"
++msgstr "propaga verso %s"
++
++#: lib/remote_add.tcl:164
++#, tcl-format
++msgid "Setting up the %s (at %s)"
++msgstr "Imposto %s (in %s)"
++
+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
- msgid "Arbitrary URL:"
- msgstr "URL specifico:"
++msgid "Delete Branch Remotely"
++msgstr "Elimina ramo remoto"
+
+#: lib/remote_branch_delete.tcl:47
+msgid "From Repository"
+msgstr "Da archivio"
+
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
+msgid "Remote:"
+msgstr "Remoto:"
+
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
- #: lib/spellcheck.tcl:387
++msgid "Arbitrary Location:"
++msgstr "Posizione specifica:"
+
+#: lib/remote_branch_delete.tcl:84
+msgid "Branches"
+msgstr "Rami"
+
+#: lib/remote_branch_delete.tcl:109
+msgid "Delete Only If"
+msgstr "Elimina solo se"
+
+#: lib/remote_branch_delete.tcl:111
+msgid "Merged Into:"
+msgstr "Fuso in:"
+
+#: lib/remote_branch_delete.tcl:119
+msgid "Always (Do not perform merge checks)"
+msgstr "Sempre (non verificare le fusioni)"
+
+#: lib/remote_branch_delete.tcl:152
+msgid "A branch is required for 'Merged Into'."
+msgstr "Si richiede un ramo per 'Fuso in'."
+
+#: lib/remote_branch_delete.tcl:184
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+"I rami seguenti non sono stati fusi completamente in %s:\n"
+"\n"
+" - %s"
+
+#: lib/remote_branch_delete.tcl:189
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits. Try fetching from %s first."
+msgstr ""
+"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."
+msgstr "Scegliere uno o più rami da cancellare."
+
+#: lib/remote_branch_delete.tcl:216
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+"Ricomporre rami cancellati è difficile.\n"
+"\n"
+"Cancellare i rami selezionati?"
+
+#: lib/remote_branch_delete.tcl:226
+#, tcl-format
+msgid "Deleting branches from %s"
+msgstr "Cancellazione rami da %s"
+
+#: lib/remote_branch_delete.tcl:286
+msgid "No repository selected."
+msgstr "Nessun archivio selezionato."
+
+#: lib/remote_branch_delete.tcl:291
+#, tcl-format
+msgid "Scanning %s..."
+msgstr "Analisi in corso %s..."
+
++#: lib/search.tcl:21
++msgid "Find:"
++msgstr "Trova:"
++
++#: lib/search.tcl:23
++msgid "Next"
++msgstr "Succ"
++
++#: lib/search.tcl:24
++msgid "Prev"
++msgstr "Prec"
++
++#: lib/search.tcl:25
++msgid "Case-Sensitive"
++msgstr "Distingui maiuscole"
++
+#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
+msgid "Cannot write shortcut:"
+msgstr "Impossibile scrivere shortcut:"
+
+#: lib/shortcut.tcl:136
+msgid "Cannot write icon:"
+msgstr "Impossibile scrivere icona:"
+
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "Correttore ortografico non supportato"
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "Correzione ortografica indisponibile"
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "La configurazione del correttore ortografico non è valida"
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr "Il dizionario è stato reimpostato su %s."
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "Il correttore ortografico ha riportato un errore all'avvio"
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "Correttore ortografico non riconosciuto"
+
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr "Nessun suggerimento"
+
- #: lib/spellcheck.tcl:391
++#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr "Il correttore ortografico ha mandato un EOF inaspettato"
+
- #: lib/transport.tcl:6
++#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr "Errore nel correttore ortografico"
+
++#: lib/sshkey.tcl:31
++msgid "No keys found."
++msgstr "Chiavi non trovate."
++
++#: lib/sshkey.tcl:34
++#, tcl-format
++msgid "Found a public key in: %s"
++msgstr "Chiave pubblica trovata in: %s"
++
++#: lib/sshkey.tcl:40
++msgid "Generate Key"
++msgstr "Crea chiave"
++
++#: lib/sshkey.tcl:56
++msgid "Copy To Clipboard"
++msgstr "Copia negli appunti"
++
++#: lib/sshkey.tcl:70
++msgid "Your OpenSSH Public Key"
++msgstr "La tua chiave pubblica OpenSSH"
++
++#: lib/sshkey.tcl:78
++msgid "Generating..."
++msgstr "Creazione chiave in corso..."
++
++#: lib/sshkey.tcl:84
++#, tcl-format
++msgid ""
++"Could not start ssh-keygen:\n"
++"\n"
++"%s"
++msgstr ""
++"Impossibile avviare ssh-keygen:\n"
++"\n"
++"%s"
++
++#: lib/sshkey.tcl:111
++msgid "Generation failed."
++msgstr "Errore durante la creazione della chiave."
++
++#: lib/sshkey.tcl:118
++msgid "Generation succeded, but no keys found."
++msgstr "La chiave è stata creata con successo, ma non è stata trovata."
++
++#: lib/sshkey.tcl:121
++#, tcl-format
++msgid "Your key is in: %s"
++msgstr "La chiave è in: %s"
++
+#: lib/status_bar.tcl:83
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
+msgstr "%1$s ... %6$s: %2$*i di %4$*i (%7$3i%%)"
+
- msgid "fetch %s"
- msgstr "recupera da %s"
++#: lib/tools.tcl:75
+#, tcl-format
- #: lib/transport.tcl:25 lib/transport.tcl:71
- #, tcl-format
- msgid "push %s"
- msgstr "propaga verso %s"
-
++msgid "Running %s requires a selected file."
++msgstr "Bisogna selezionare un file prima di eseguire %s."
++
++#: lib/tools.tcl:90
++#, tcl-format
++msgid "Are you sure you want to run %s?"
++msgstr "Vuoi davvero eseguire %s?"
++
++#: lib/tools.tcl:110
++#, tcl-format
++msgid "Tool: %s"
++msgstr "Strumento: %s"
++
++#: lib/tools.tcl:111
++#, tcl-format
++msgid "Running: %s"
++msgstr "Eseguo: %s"
++
++#: lib/tools.tcl:149
++#, tcl-format
++msgid "Tool completed succesfully: %s"
++msgstr "Il programma esterno è terminato con successo: %s"
++
++#: lib/tools.tcl:151
++#, tcl-format
++msgid "Tool failed: %s"
++msgstr "Il programma esterno ha riportato un errore: %s"
++
++#: lib/tools_dlg.tcl:22
++msgid "Add Tool"
++msgstr "Aggiungi strumento"
++
++#: lib/tools_dlg.tcl:28
++msgid "Add New Tool Command"
++msgstr "Aggiungi un nuovo comando"
++
++#: lib/tools_dlg.tcl:33
++msgid "Add globally"
++msgstr "Aggiungi per tutti gli archivi"
++
++#: lib/tools_dlg.tcl:45
++msgid "Tool Details"
++msgstr "Dettagli sullo strumento"
++
++#: lib/tools_dlg.tcl:48
++msgid "Use '/' separators to create a submenu tree:"
++msgstr "Utilizza il separatore '/' per creare un albero di sottomenu:"
++
++#: lib/tools_dlg.tcl:61
++msgid "Command:"
++msgstr "Comando:"
++
++#: lib/tools_dlg.tcl:74
++msgid "Show a dialog before running"
++msgstr "Mostra una finestra di dialogo prima dell'avvio"
++
++#: lib/tools_dlg.tcl:80
++msgid "Ask the user to select a revision (sets $REVISION)"
++msgstr "Chiedi all'utente di scegliere una revisione (imposta $REVISION)"
++
++#: lib/tools_dlg.tcl:85
++msgid "Ask the user for additional arguments (sets $ARGS)"
++msgstr "Chiedi all'utente di fornire argomenti aggiuntivi (imposta $ARGS)"
++
++#: lib/tools_dlg.tcl:92
++msgid "Don't show the command output window"
++msgstr "Non mostrare la finestra di comando"
++
++#: lib/tools_dlg.tcl:97
++msgid "Run only if a diff is selected ($FILENAME not empty)"
++msgstr "Avvia solo se è selezionata una differenza ($FILENAME non è vuoto)"
++
++#: lib/tools_dlg.tcl:121
++msgid "Please supply a name for the tool."
++msgstr "Bisogna dare un nome allo strumento."
++
++#: lib/tools_dlg.tcl:129
++#, tcl-format
++msgid "Tool '%s' already exists."
++msgstr "Lo strumento '%s' esiste già."
++
++#: lib/tools_dlg.tcl:151
++#, tcl-format
++msgid ""
++"Could not add tool:\n"
++"%s"
++msgstr ""
++"Impossibile aggiungere lo strumento:\n"
++"\n"
++"%s"
++
++#: lib/tools_dlg.tcl:190
++msgid "Remove Tool"
++msgstr "Rimuovi strumento"
++
++#: lib/tools_dlg.tcl:196
++msgid "Remove Tool Commands"
++msgstr "Rimuovi i comandi dello strumento"
++
++#: lib/tools_dlg.tcl:200
++msgid "Remove"
++msgstr "Rimuovi"
++
++#: lib/tools_dlg.tcl:236
++msgid "(Blue denotes repository-local tools)"
++msgstr "(Il colore blu indica strumenti per l'archivio locale)"
++
++#: lib/tools_dlg.tcl:297
++#, tcl-format
++msgid "Run Command: %s"
++msgstr "Avvia il comando: %s"
++
++#: lib/tools_dlg.tcl:311
++msgid "Arguments"
++msgstr "Argomenti"
++
++#: lib/tools_dlg.tcl:348
++msgid "OK"
++msgstr "OK"
+
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
+msgstr "Recupero nuove modifiche da %s"
+
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr "potatura remota di %s"
+
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
+msgstr "Effettua potatura dei duplicati locali di rami remoti cancellati da %s"
+
+#: lib/transport.tcl:26
+#, tcl-format
+msgid "Pushing changes to %s"
+msgstr "Propagazione modifiche a %s"
+
+#: lib/transport.tcl:72
+#, tcl-format
+msgid "Pushing %s %s to %s"
+msgstr "Propagazione %s %s a %s"
+
+#: lib/transport.tcl:89
+msgid "Push Branches"
+msgstr "Propaga rami"
+
+#: lib/transport.tcl:103
+msgid "Source Branches"
+msgstr "Rami di origine"
+
+#: lib/transport.tcl:120
+msgid "Destination Repository"
+msgstr "Archivio di destinazione"
+
+#: lib/transport.tcl:158
+msgid "Transfer Options"
+msgstr "Opzioni di trasferimento"
+
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr "Sovrascrivi ramo esistente (alcune modifiche potrebbero essere perse)"
+
+#: lib/transport.tcl:164
+msgid "Use thin pack (for slow network connections)"
+msgstr "Utilizza 'thin pack' (per connessioni lente)"
+
+#: lib/transport.tcl:168
+msgid "Include tags"
+msgstr "Includi etichette"
diff --cc git-gui/po/ja.po
index 5db44a4ada05ad5c883adca30c3c3dd8d775698d,0000000000000000000000000000000000000000..8ba64177fac52aae8a25974cb51a39a85d132859
mode 100644,000000..100644
mode 100644,000000..100644
--- 1/git-gui/po/ja.po
--- /dev/null
+++ b/git-gui/po/ja.po
- "POT-Creation-Date: 2008-08-02 14:45-0700\n"
- "PO-Revision-Date: 2008-08-03 17:00+0900\n"
+# Translation of git-gui to Japanese
+# Copyright (C) 2007 Shawn Pearce
+# This file is distributed under the same license as the git-gui package.
+# しらいし ななこ <nanako3@bluebottle.com>, 2007.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: git-gui\n"
+"Report-Msgid-Bugs-To: \n"
- #: git-gui.sh:41 git-gui.sh:688 git-gui.sh:702 git-gui.sh:715 git-gui.sh:798
- #: git-gui.sh:817
++"POT-Creation-Date: 2008-11-16 13:56-0800\n"
++"PO-Revision-Date: 2008-11-26 19:17+0900\n"
+"Last-Translator: しらいし ななこ <nanako3@lavabit.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:644
++#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847
++#: git-gui.sh:866
+msgid "git-gui: fatal error"
+msgstr "git-gui: 致命的なエラー"
+
- #: git-gui.sh:674
++#: git-gui.sh:689
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "%s に無効なフォントが指定されています:"
+
- #: git-gui.sh:675
++#: git-gui.sh:723
+msgid "Main Font"
+msgstr "主フォント"
+
- #: git-gui.sh:689
++#: git-gui.sh:724
+msgid "Diff/Console Font"
+msgstr "diff/コンソール・フォント"
+
- #: git-gui.sh:716
++#: git-gui.sh:738
+msgid "Cannot find git in PATH."
+msgstr "PATH 中に git が見つかりません"
+
- #: git-gui.sh:734
++#: git-gui.sh:765
+msgid "Cannot parse Git version string:"
+msgstr "Git バージョン名が理解できません:"
+
- #: git-gui.sh:972
++#: git-gui.sh:783
+#, tcl-format
+msgid ""
+"Git version cannot be determined.\n"
+"\n"
+"%s claims it is version '%s'.\n"
+"\n"
+"%s requires at least Git 1.5.0 or later.\n"
+"\n"
+"Assume '%s' is version 1.5.0?\n"
+msgstr ""
+"Git のバージョンが確認できません。\n"
+"\n"
+"%s はバージョン '%s' とのことです。\n"
+"\n"
+"%s は最低でも 1.5.0 かそれ以降の Git が必要です\n"
+"\n"
+"'%s' はバージョン 1.5.0 と思って良いですか？\n"
+
- #: git-gui.sh:979
++#: git-gui.sh:1062
+msgid "Git directory not found:"
+msgstr "Git ディレクトリが見つかりません:"
+
- #: git-gui.sh:986
++#: git-gui.sh:1069
+msgid "Cannot move to top of working directory:"
+msgstr "作業ディレクトリの最上位に移動できません"
+
- #: git-gui.sh:991
++#: git-gui.sh:1076
+msgid "Cannot use funny .git directory:"
+msgstr "変な .git ディレクトリは使えません"
+
- #: git-gui.sh:1138 lib/checkout_op.tcl:305
++#: git-gui.sh:1081
+msgid "No working directory"
+msgstr "作業ディレクトリがありません"
+
- #: git-gui.sh:1194
++#: git-gui.sh:1247 lib/checkout_op.tcl:305
+msgid "Refreshing file status..."
+msgstr "ファイル状態を更新しています…"
+
- #: git-gui.sh:1369 lib/browser.tcl:246
++#: git-gui.sh:1303
+msgid "Scanning for modified files ..."
+msgstr "変更されたファイルをスキャンしています…"
+
- #: git-gui.sh:1635
++#: git-gui.sh:1367
++msgid "Calling prepare-commit-msg hook..."
++msgstr "prepare-commit-msg フックを実行中・・・"
++
++#: git-gui.sh:1384
++msgid "Commit declined by prepare-commit-msg hook."
++msgstr "prepare-commit-msg フックがコミットを拒否しました"
++
++#: git-gui.sh:1542 lib/browser.tcl:246
+msgid "Ready."
+msgstr "準備完了"
+
- #: git-gui.sh:1637
++#: git-gui.sh:1819
+msgid "Unmodified"
+msgstr "変更無し"
+
- #: git-gui.sh:1638 git-gui.sh:1643
++#: git-gui.sh:1821
+msgid "Modified, not staged"
+msgstr "変更あり、コミット未予定"
+
- #: git-gui.sh:1639 git-gui.sh:1644
++#: git-gui.sh:1822 git-gui.sh:1830
+msgid "Staged for commit"
+msgstr "コミット予定済"
+
- #: git-gui.sh:1640 git-gui.sh:1645
++#: git-gui.sh:1823 git-gui.sh:1831
+msgid "Portions staged for commit"
+msgstr "部分的にコミット予定済"
+
- #: git-gui.sh:1642
++#: git-gui.sh:1824 git-gui.sh:1832
+msgid "Staged for commit, missing"
+msgstr "コミット予定済、ファイル無し"
+
- #: git-gui.sh:1647
++#: git-gui.sh:1826
++msgid "File type changed, not staged"
++msgstr "ファイル型変更、コミット未予定"
++
++#: git-gui.sh:1827
++msgid "File type changed, staged"
++msgstr "ファイル型変更、コミット予定済"
++
++#: git-gui.sh:1829
+msgid "Untracked, not staged"
+msgstr "管理外、コミット未予定"
+
- #: git-gui.sh:1648
++#: git-gui.sh:1834
+msgid "Missing"
+msgstr "ファイル無し"
+
- #: git-gui.sh:1649
++#: git-gui.sh:1835
+msgid "Staged for removal"
+msgstr "削除予定済"
+
- #: git-gui.sh:1651 git-gui.sh:1652 git-gui.sh:1653 git-gui.sh:1654
++#: git-gui.sh:1836
+msgid "Staged for removal, still present"
+msgstr "削除予定済、ファイル未削除"
+
- #: git-gui.sh:1689
++#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841
++#: git-gui.sh:1842 git-gui.sh:1843
+msgid "Requires merge resolution"
+msgstr "要マージ解決"
+
- #: git-gui.sh:1698
++#: git-gui.sh:1878
+msgid "Starting gitk... please wait..."
+msgstr "gitk を起動中…お待ち下さい…"
+
- #: git-gui.sh:1948 lib/choose_repository.tcl:36
++#: git-gui.sh:1887
+msgid "Couldn't find gitk in PATH"
+msgstr "PATH 中に gitk が見つかりません"
+
- #: git-gui.sh:1949
++#: git-gui.sh:2280 lib/choose_repository.tcl:36
+msgid "Repository"
+msgstr "リポジトリ"
+
- #: git-gui.sh:1951 lib/choose_rev.tcl:561
++#: git-gui.sh:2281
+msgid "Edit"
+msgstr "編集"
+
- #: git-gui.sh:1954 lib/choose_rev.tcl:548
++#: git-gui.sh:2283 lib/choose_rev.tcl:561
+msgid "Branch"
+msgstr "ブランチ"
+
- #: git-gui.sh:1957 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
++#: git-gui.sh:2286 lib/choose_rev.tcl:548
+msgid "Commit@@noun"
+msgstr "コミット"
+
- #: git-gui.sh:1958 lib/choose_rev.tcl:557
++#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+msgid "Merge"
+msgstr "マージ"
+
- #: git-gui.sh:1967
++#: git-gui.sh:2290 lib/choose_rev.tcl:557
+msgid "Remote"
+msgstr "リモート"
+
- #: git-gui.sh:1971
++#: git-gui.sh:2293
++msgid "Tools"
++msgstr "ツール"
++
++#: git-gui.sh:2302
++msgid "Explore Working Copy"
++msgstr "ワーキングコピーをブラウズ"
++
++#: git-gui.sh:2307
+msgid "Browse Current Branch's Files"
+msgstr "現在のブランチのファイルを見る"
+
- #: git-gui.sh:1976
++#: git-gui.sh:2311
+msgid "Browse Branch Files..."
+msgstr "ブランチのファイルを見る…"
+
- #: git-gui.sh:1980
++#: git-gui.sh:2316
+msgid "Visualize Current Branch's History"
+msgstr "現在のブランチの履歴を見る"
+
- #: git-gui.sh:1987
++#: git-gui.sh:2320
+msgid "Visualize All Branch History"
+msgstr "全てのブランチの履歴を見る"
+
- #: git-gui.sh:1989
++#: git-gui.sh:2327
+#, tcl-format
+msgid "Browse %s's Files"
+msgstr "ブランチ %s のファイルを見る"
+
- #: git-gui.sh:1994 lib/database.tcl:27 lib/database.tcl:67
++#: git-gui.sh:2329
+#, tcl-format
+msgid "Visualize %s's History"
+msgstr "ブランチ %s の履歴を見る"
+
- #: git-gui.sh:1997 lib/database.tcl:34
++#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67
+msgid "Database Statistics"
+msgstr "データベース統計"
+
- #: git-gui.sh:2000
++#: git-gui.sh:2337 lib/database.tcl:34
+msgid "Compress Database"
+msgstr "データベース圧縮"
+
- #: git-gui.sh:2007 git-gui.sh:2011 git-gui.sh:2015 lib/shortcut.tcl:7
++#: git-gui.sh:2340
+msgid "Verify Database"
+msgstr "データベース検証"
+
- #: git-gui.sh:2023 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
++#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7
+#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
+msgid "Create Desktop Icon"
+msgstr "デスクトップ・アイコンを作る"
+
- #: git-gui.sh:2031
++#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+msgid "Quit"
+msgstr "終了"
+
- #: git-gui.sh:2034
++#: git-gui.sh:2371
+msgid "Undo"
+msgstr "元に戻す"
+
- #: git-gui.sh:2038 git-gui.sh:2545
++#: git-gui.sh:2374
+msgid "Redo"
+msgstr "やり直し"
+
- #: git-gui.sh:2041 git-gui.sh:2548 git-gui.sh:2622 git-gui.sh:2715
++#: git-gui.sh:2378 git-gui.sh:2923
+msgid "Cut"
+msgstr "切り取り"
+
- #: git-gui.sh:2044 git-gui.sh:2551
++#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
+#: lib/console.tcl:69
+msgid "Copy"
+msgstr "コピー"
+
- #: git-gui.sh:2047 git-gui.sh:2554 lib/branch_delete.tcl:26
++#: git-gui.sh:2384 git-gui.sh:2929
+msgid "Paste"
+msgstr "貼り付け"
+
- #: git-gui.sh:2051 git-gui.sh:2558 git-gui.sh:2719 lib/console.tcl:71
++#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
+#: lib/remote_branch_delete.tcl:38
+msgid "Delete"
+msgstr "削除"
+
- #: git-gui.sh:2060
++#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
+msgid "Select All"
+msgstr "全て選択"
+
- #: git-gui.sh:2066
++#: git-gui.sh:2400
+msgid "Create..."
+msgstr "作成…"
+
- #: git-gui.sh:2072
++#: git-gui.sh:2406
+msgid "Checkout..."
+msgstr "チェックアウト"
+
- #: git-gui.sh:2077 git-gui.sh:2187
++#: git-gui.sh:2412
+msgid "Rename..."
+msgstr "名前変更…"
+
- #: git-gui.sh:2082
++#: git-gui.sh:2417
+msgid "Delete..."
+msgstr "削除…"
+
- #: git-gui.sh:2094 git-gui.sh:2491
++#: git-gui.sh:2422
+msgid "Reset..."
+msgstr "リセット…"
+
- #: git-gui.sh:2102 git-gui.sh:2498
++#: git-gui.sh:2432
++msgid "Done"
++msgstr "完了"
++
++#: git-gui.sh:2434
++msgid "Commit@@verb"
++msgstr "コミット"
++
++#: git-gui.sh:2443 git-gui.sh:2864
+msgid "New Commit"
+msgstr "新規コミット"
+
- #: git-gui.sh:2111 git-gui.sh:2458 lib/remote_branch_delete.tcl:99
++#: git-gui.sh:2451 git-gui.sh:2871
+msgid "Amend Last Commit"
+msgstr "最新コミットを訂正"
+
- #: git-gui.sh:2117
++#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
+msgid "Rescan"
+msgstr "再スキャン"
+
- #: git-gui.sh:2123
++#: git-gui.sh:2467
+msgid "Stage To Commit"
+msgstr "コミット予定する"
+
- #: git-gui.sh:2129
++#: git-gui.sh:2473
+msgid "Stage Changed Files To Commit"
+msgstr "変更されたファイルをコミット予定"
+
- #: git-gui.sh:2134 lib/index.tcl:395
++#: git-gui.sh:2479
+msgid "Unstage From Commit"
+msgstr "コミットから降ろす"
+
- #: git-gui.sh:2141 git-gui.sh:2702
++#: git-gui.sh:2484 lib/index.tcl:410
+msgid "Revert Changes"
+msgstr "変更を元に戻す"
+
- #: git-gui.sh:2145 git-gui.sh:2706
++#: git-gui.sh:2491 git-gui.sh:3069
+msgid "Show Less Context"
+msgstr "文脈を少なく"
+
- #: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
++#: git-gui.sh:2495 git-gui.sh:3073
+msgid "Show More Context"
+msgstr "文脈を多く"
+
- #: git-gui.sh:2155 git-gui.sh:2474
- msgid "Commit@@verb"
- msgstr "コミット"
-
- #: git-gui.sh:2166
++#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
+msgid "Sign Off"
+msgstr "署名"
+
- #: git-gui.sh:2171
++#: git-gui.sh:2518
+msgid "Local Merge..."
+msgstr "ローカル・マージ…"
+
- #: git-gui.sh:2183
++#: git-gui.sh:2523
+msgid "Abort Merge..."
+msgstr "マージ中止…"
+
- #: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14
- #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
++#: git-gui.sh:2535 git-gui.sh:2575
++msgid "Add..."
++msgstr "追加"
++
++#: git-gui.sh:2539
+msgid "Push..."
+msgstr "プッシュ…"
+
- #: git-gui.sh:2201
++#: git-gui.sh:2543
++msgid "Delete Branch..."
++msgstr "ブランチ削除..."
++
++#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14
++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#, tcl-format
+msgid "About %s"
+msgstr "%s について"
+
- #: git-gui.sh:2209 git-gui.sh:2740
++#: git-gui.sh:2557
+msgid "Preferences..."
+msgstr "設定…"
+
- #: git-gui.sh:2215 lib/choose_repository.tcl:47
++#: git-gui.sh:2565 git-gui.sh:3115
+msgid "Options..."
+msgstr "オプション…"
+
- #: git-gui.sh:2256
++#: git-gui.sh:2576
++msgid "Remove..."
++msgstr "削除..."
++
++#: git-gui.sh:2585 lib/choose_repository.tcl:50
+msgid "Help"
+msgstr "ヘルプ"
+
- #: git-gui.sh:2340
++#: git-gui.sh:2611
+msgid "Online Documentation"
+msgstr "オンライン・ドキュメント"
+
- #: git-gui.sh:2373
++#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
++msgid "Show SSH Key"
++msgstr "SSH キーを表示"
++
++#: git-gui.sh:2707
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+"致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま"
+"せん"
+
- #: git-gui.sh:2394
++#: git-gui.sh:2740
+msgid "Current Branch:"
+msgstr "現在のブランチ"
+
- #: git-gui.sh:2414
++#: git-gui.sh:2761
+msgid "Staged Changes (Will Commit)"
+msgstr "ステージングされた（コミット予定済の）変更"
+
- #: git-gui.sh:2464
++#: git-gui.sh:2781
+msgid "Unstaged Changes"
+msgstr "コミット予定に入っていない変更"
+
- #: git-gui.sh:2480 lib/transport.tcl:93 lib/transport.tcl:182
++#: git-gui.sh:2831
+msgid "Stage Changed"
+msgstr "変更をコミット予定に入れる"
+
- #: git-gui.sh:2510
++#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "プッシュ"
+
- #: git-gui.sh:2511
++#: git-gui.sh:2885
+msgid "Initial Commit Message:"
+msgstr "最初のコミットメッセージ:"
+
- #: git-gui.sh:2512
++#: git-gui.sh:2886
+msgid "Amended Commit Message:"
+msgstr "訂正したコミットメッセージ:"
+
- #: git-gui.sh:2513
++#: git-gui.sh:2887
+msgid "Amended Initial Commit Message:"
+msgstr "訂正した最初のコミットメッセージ:"
+
- #: git-gui.sh:2514
++#: git-gui.sh:2888
+msgid "Amended Merge Commit Message:"
+msgstr "訂正したマージコミットメッセージ:"
+
- #: git-gui.sh:2515
++#: git-gui.sh:2889
+msgid "Merge Commit Message:"
+msgstr "マージコミットメッセージ:"
+
- #: git-gui.sh:2561 git-gui.sh:2723 lib/console.tcl:73
++#: git-gui.sh:2890
+msgid "Commit Message:"
+msgstr "コミットメッセージ:"
+
- #: git-gui.sh:2585 lib/blame.tcl:100
++#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
+msgid "Copy All"
+msgstr "全てコピー"
+
- #: git-gui.sh:2691
- msgid "Apply/Reverse Hunk"
- msgstr "パッチを適用/取り消す"
-
- #: git-gui.sh:2696
- msgid "Apply/Reverse Line"
- msgstr "パッチ行を適用/取り消す"
-
- #: git-gui.sh:2711
++#: git-gui.sh:2963 lib/blame.tcl:104
+msgid "File:"
+msgstr "ファイル:"
+
- #: git-gui.sh:2732
++#: git-gui.sh:3078
+msgid "Refresh"
+msgstr "再読み込み"
+
- #: git-gui.sh:2736
++#: git-gui.sh:3099
+msgid "Decrease Font Size"
+msgstr "フォントを小さく"
+
- #: git-gui.sh:2747
++#: git-gui.sh:3103
+msgid "Increase Font Size"
+msgstr "フォントを大きく"
+
- #: git-gui.sh:2748
++#: git-gui.sh:3111 lib/blame.tcl:281
++msgid "Encoding"
++msgstr "エンコーディング"
++
++#: git-gui.sh:3122
++msgid "Apply/Reverse Hunk"
++msgstr "パッチを適用/取り消す"
++
++#: git-gui.sh:3127
++msgid "Apply/Reverse Line"
++msgstr "パッチ行を適用/取り消す"
++
++#: git-gui.sh:3137
++msgid "Run Merge Tool"
++msgstr "マージツールを起動"
++
++#: git-gui.sh:3142
++msgid "Use Remote Version"
++msgstr "リモートの方を採用"
++
++#: git-gui.sh:3146
++msgid "Use Local Version"
++msgstr "ローカルの方を採用"
++
++#: git-gui.sh:3150
++msgid "Revert To Base"
++msgstr "ベース版を採用"
++
++#: git-gui.sh:3169
+msgid "Unstage Hunk From Commit"
+msgstr "パッチをコミット予定から外す"
+
- #: git-gui.sh:2750
++#: git-gui.sh:3170
+msgid "Unstage Line From Commit"
+msgstr "コミット予定から行を外す"
+
- #: git-gui.sh:2751
++#: git-gui.sh:3172
+msgid "Stage Hunk For Commit"
+msgstr "パッチをコミット予定に加える"
+
- #: git-gui.sh:2771
++#: git-gui.sh:3173
+msgid "Stage Line For Commit"
+msgstr "パッチ行をコミット予定に加える"
+
- #: git-gui.sh:2876
++#: git-gui.sh:3196
+msgid "Initializing..."
+msgstr "初期化しています…"
+
- #: git-gui.sh:2906
++#: git-gui.sh:3301
+#, tcl-format
+msgid ""
+"Possible environment issues exist.\n"
+"\n"
+"The following environment variables are probably\n"
+"going to be ignored by any Git subprocess run\n"
+"by %s:\n"
+"\n"
+msgstr ""
+"環境に問題がある可能性があります\n"
+"\n"
+"以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\n"
+"\n"
+
- #: git-gui.sh:2911
++#: git-gui.sh:3331
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+"\n"
+"これは Cygwin で配布されている Tcl バイナリに\n"
+"関しての既知の問題によります"
+
- #: lib/blame.tcl:70
++#: git-gui.sh:3336
+#, tcl-format
+msgid ""
+"\n"
+"\n"
+"A good replacement for %s\n"
+"is placing values for the user.name and\n"
+"user.email settings into your personal\n"
+"~/.gitconfig file.\n"
+msgstr ""
+"\n"
+"\n"
+"個人的な ~/.gitconfig ファイル内で user.name と user.email の値を設定\n"
+"するのが、%s の良い代用となります\n"
+
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr "Git のグラフィカルUI git-gui"
+
- #: lib/blame.tcl:74
++#: lib/blame.tcl:72
+msgid "File Viewer"
+msgstr "ファイルピューワ"
+
- #: lib/blame.tcl:257
++#: lib/blame.tcl:78
+msgid "Commit:"
+msgstr "コミット:"
+
- #: lib/blame.tcl:260
++#: lib/blame.tcl:271
+msgid "Copy Commit"
+msgstr "コミットをコピー"
+
- #: lib/blame.tcl:388
++#: lib/blame.tcl:275
++msgid "Find Text..."
++msgstr "テキストを検索"
++
++#: lib/blame.tcl:284
+msgid "Do Full Copy Detection"
+msgstr "コピー検知"
+
- #: lib/blame.tcl:492
++#: lib/blame.tcl:288
++msgid "Show History Context"
++msgstr "文脈を見せる"
++
++#: lib/blame.tcl:291
++msgid "Blame Parent Commit"
++msgstr "親コミットを註釈"
++
++#: lib/blame.tcl:450
+#, tcl-format
+msgid "Reading %s..."
+msgstr "%s を読んでいます…"
+
- #: lib/blame.tcl:512
++#: lib/blame.tcl:557
+msgid "Loading copy/move tracking annotations..."
+msgstr "コピー・移動追跡データを読んでいます…"
+
- #: lib/blame.tcl:704
++#: lib/blame.tcl:577
+msgid "lines annotated"
+msgstr "行を注釈しました"
+
- #: lib/blame.tcl:707
++#: lib/blame.tcl:769
+msgid "Loading original location annotations..."
+msgstr "元位置行の注釈データを読んでいます…"
+
- #: lib/blame.tcl:737
++#: lib/blame.tcl:772
+msgid "Annotation complete."
+msgstr "注釈完了しました"
+
- #: lib/blame.tcl:738
++#: lib/blame.tcl:802
+msgid "Busy"
+msgstr "実行中"
+
- #: lib/blame.tcl:777
++#: lib/blame.tcl:803
+msgid "Annotation process is already running."
+msgstr "すでに blame プロセスを実行中です。"
+
- #: lib/blame.tcl:827
++#: lib/blame.tcl:842
+msgid "Running thorough copy detection..."
+msgstr "コピー検知を実行中…"
+
- #: lib/blame.tcl:883
++#: lib/blame.tcl:910
+msgid "Loading annotation..."
+msgstr "注釈を読み込んでいます…"
+
- #: lib/blame.tcl:887
++#: lib/blame.tcl:964
+msgid "Author:"
+msgstr "作者:"
+
- #: lib/blame.tcl:892
++#: lib/blame.tcl:968
+msgid "Committer:"
+msgstr "コミット者:"
+
- #: lib/blame.tcl:1006
++#: lib/blame.tcl:973
+msgid "Original File:"
+msgstr "元ファイル"
+
- #: lib/blame.tcl:1012
++#: lib/blame.tcl:1021
++msgid "Cannot find HEAD commit:"
++msgstr "HEAD コミットが見つかりません"
++
++#: lib/blame.tcl:1076
++msgid "Cannot find parent commit:"
++msgstr "親コミットが見つかりません:"
++
++#: lib/blame.tcl:1091
++msgid "Unable to display parent"
++msgstr "親を表示できません"
++
++#: lib/blame.tcl:1092 lib/diff.tcl:297
++msgid "Error loading diff:"
++msgstr "diff を読む際のエラーです:"
++
++#: lib/blame.tcl:1232
+msgid "Originally By:"
+msgstr "原作者:"
+
- #: lib/blame.tcl:1017
++#: lib/blame.tcl:1238
+msgid "In File:"
+msgstr "ファイル:"
+
- #: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:171
- #: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
++#: lib/blame.tcl:1243
+msgid "Copied Or Moved Here By:"
+msgstr "複写・移動者:"
+
+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
+msgid "Checkout Branch"
+msgstr "ブランチをチェックアウト"
+
+#: lib/branch_checkout.tcl:23
+msgid "Checkout"
+msgstr "チェックアウト"
+
+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
- #: lib/branch_checkout.tcl:32 lib/browser.tcl:287
++#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
++#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
++#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
++#: lib/transport.tcl:97
+msgid "Cancel"
+msgstr "中止"
+
- #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:244
++#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
+msgid "Revision"
+msgstr "リビジョン"
+
- #: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
++#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
+msgid "Options"
+msgstr "オプション"
+
+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
+msgstr "トラッキング・ブランチをフェッチ"
+
+#: lib/branch_checkout.tcl:44
+msgid "Detach From Local Branch"
+msgstr "ローカル・ブランチから削除"
+
+#: lib/branch_create.tcl:22
+msgid "Create Branch"
+msgstr "ブランチを作成"
+
+#: lib/branch_create.tcl:27
+msgid "Create New Branch"
+msgstr "ブランチを新規作成"
+
- #: lib/branch_create.tcl:43
++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377
+msgid "Create"
+msgstr "作成"
+
+#: lib/branch_create.tcl:40
+msgid "Branch Name"
+msgstr "ブランチ名"
+
- #: lib/browser.tcl:278 lib/choose_repository.tcl:387
- #: lib/choose_repository.tcl:472 lib/choose_repository.tcl:482
- #: lib/choose_repository.tcl:985
++#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
+msgid "Name:"
+msgstr "名前:"
+
+#: lib/branch_create.tcl:58
+msgid "Match Tracking Branch Name"
+msgstr "トラッキング・ブランチ名を合わせる"
+
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
+msgstr "初期リビジョン"
+
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
+msgstr "既存のブランチを更新:"
+
+#: lib/branch_create.tcl:75
+msgid "No"
+msgstr "いいえ"
+
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
+msgstr "早送りのみ"
+
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
+msgid "Reset"
+msgstr "リセット"
+
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
+msgstr "作成してすぐチェックアウト"
+
+#: lib/branch_create.tcl:131
+msgid "Please select a tracking branch."
+msgstr "トラッキング・ブランチを選択して下さい。"
+
+#: lib/branch_create.tcl:140
+#, tcl-format
+msgid "Tracking branch %s is not a branch in the remote repository."
+msgstr "トラッキング・ブランチ %s は遠隔リポジトリのブランチではありません。"
+
+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
+msgid "Please supply a branch name."
+msgstr "ブランチ名を指定して下さい。"
+
+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#, tcl-format
+msgid "'%s' is not an acceptable branch name."
+msgstr "'%s' はブランチ名に使えません。"
+
+#: lib/branch_delete.tcl:15
+msgid "Delete Branch"
+msgstr "ブランチ削除"
+
+#: lib/branch_delete.tcl:20
+msgid "Delete Local Branch"
+msgstr "ローカル・ブランチを削除"
+
+#: lib/branch_delete.tcl:37
+msgid "Local Branches"
+msgstr "ローカル・ブランチ"
+
+#: lib/branch_delete.tcl:52
+msgid "Delete Only If Merged Into"
+msgstr "マージ済みの時のみ削除"
+
+#: lib/branch_delete.tcl:54
+msgid "Always (Do not perform merge test.)"
+msgstr "無条件(マージテストしない)"
+
+#: lib/branch_delete.tcl:103
+#, tcl-format
+msgid "The following branches are not completely merged into %s:"
+msgstr "以下のブランチは %s に完全にマージされていません:"
+
+#: lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult. \n"
+"\n"
+" Delete the selected branches?"
+msgstr ""
+"ブランチを削除すると元に戻すのは困難です。 \n"
+"\n"
+" 選択したブランチを削除しますか？"
+
+#: lib/branch_delete.tcl:141
+#, tcl-format
+msgid ""
+"Failed to delete branches:\n"
+"%s"
+msgstr ""
+"以下のブランチを削除できません:\n"
+"%s"
+
+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
+msgid "Rename Branch"
+msgstr "ブランチの名前変更"
+
+#: lib/branch_rename.tcl:26
+msgid "Rename"
+msgstr "名前変更"
+
+#: lib/branch_rename.tcl:36
+msgid "Branch:"
+msgstr "ブランチ:"
+
+#: lib/branch_rename.tcl:39
+msgid "New Name:"
+msgstr "新しい名前:"
+
+#: lib/branch_rename.tcl:75
+msgid "Please select a branch to rename."
+msgstr "名前を変更するブランチを選んで下さい。"
+
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201
+#, tcl-format
+msgid "Branch '%s' already exists."
+msgstr "'%s'というブランチは既に存在します。"
+
+#: lib/branch_rename.tcl:117
+#, tcl-format
+msgid "Failed to rename '%s'."
+msgstr "'%s'の名前変更に失敗しました。"
+
+#: lib/browser.tcl:17
+msgid "Starting..."
+msgstr "起動中…"
+
+#: lib/browser.tcl:26
+msgid "File Browser"
+msgstr "ファイル・ブラウザ"
+
+#: lib/browser.tcl:126 lib/browser.tcl:143
+#, tcl-format
+msgid "Loading %s..."
+msgstr "%s をロード中…"
+
+#: lib/browser.tcl:187
+msgid "[Up To Parent]"
+msgstr "[上位フォルダへ]"
+
+#: lib/browser.tcl:267 lib/browser.tcl:273
+msgid "Browse Branch Files"
+msgstr "現在のブランチのファイルを見る"
+
- #: lib/checkout_op.tcl:532 lib/merge.tcl:163
++#: lib/browser.tcl:278 lib/choose_repository.tcl:394
++#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491
++#: lib/choose_repository.tcl:995
+msgid "Browse"
+msgstr "ブラウズ"
+
+#: lib/checkout_op.tcl:84
+#, tcl-format
+msgid "Fetching %s from %s"
+msgstr "%s から %s をフェッチしています"
+
+#: lib/checkout_op.tcl:132
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr "致命的エラー: %s を解決できません"
+
+#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
++#: lib/sshkey.tcl:53
+msgid "Close"
+msgstr "閉じる"
+
+#: lib/checkout_op.tcl:174
+#, tcl-format
+msgid "Branch '%s' does not exist."
+msgstr "ブランチ'%s'は存在しません。"
+
+#: lib/checkout_op.tcl:193
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
+msgstr "'%s' に簡易 git-pull を設定できませんでした"
+
+#: lib/checkout_op.tcl:228
+#, tcl-format
+msgid ""
+"Branch '%s' already exists.\n"
+"\n"
+"It cannot fast-forward to %s.\n"
+"A merge is required."
+msgstr ""
+"ブランチ '%s' は既に存在します。\n"
+"\n"
+"%s に早送りできません。\n"
+"マージが必要です。"
+
+#: lib/checkout_op.tcl:242
+#, tcl-format
+msgid "Merge strategy '%s' not supported."
+msgstr "'%s' マージ戦略はサポートされていません。"
+
+#: lib/checkout_op.tcl:261
+#, tcl-format
+msgid "Failed to update '%s'."
+msgstr "'%s' の更新に失敗しました。"
+
+#: lib/checkout_op.tcl:273
+msgid "Staging area (index) is already locked."
+msgstr "インデックスは既にロックされています。"
+
+#: lib/checkout_op.tcl:288
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before the current branch can be changed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"最後にスキャンした状態はリポジトリの状態と合致しません。\n"
+"\n"
+"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。現在"
+"のブランチを変更する前に、再スキャンが必要です。\n"
+"\n"
+"自動的に再スキャンを開始します。\n"
+
+#: lib/checkout_op.tcl:344
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "作業ディレクトリを '%s' に更新しています…"
+
+#: lib/checkout_op.tcl:345
+msgid "files checked out"
+msgstr "チェックアウトされたファイル"
+
+#: lib/checkout_op.tcl:375
+#, tcl-format
+msgid "Aborted checkout of '%s' (file level merging is required)."
+msgstr "'%s' のチェックアウトを中止しました（ファイル毎のマージが必要です）。"
+
+#: lib/checkout_op.tcl:376
+msgid "File level merge required."
+msgstr "ファイル毎のマージが必要です。"
+
+#: lib/checkout_op.tcl:380
+#, tcl-format
+msgid "Staying on branch '%s'."
+msgstr "ブランチ '%s' に滞まります。"
+
+#: lib/checkout_op.tcl:451
+msgid ""
+"You are no longer on a local branch.\n"
+"\n"
+"If you wanted to be on a branch, create one now starting from 'This Detached "
+"Checkout'."
+msgstr ""
+"ローカル・ブランチから離れます。\n"
+"\n"
+"ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン"
+"チを開始してください。"
+
+#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
+#, tcl-format
+msgid "Checked out '%s'."
+msgstr "'%s' をチェックアウトしました"
+
+#: lib/checkout_op.tcl:500
+#, tcl-format
+msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgstr "'%s' を '%s' にリセットすると、以下のコミットが失なわれます:"
+
+#: lib/checkout_op.tcl:522
+msgid "Recovering lost commits may not be easy."
+msgstr "失なわれたコミットを回復するのは簡単ではありません。"
+
+#: lib/checkout_op.tcl:527
+#, tcl-format
+msgid "Reset '%s'?"
+msgstr "'%s' をリセットしますか？"
+
- #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
++#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+msgid "Visualize"
+msgstr "可視化"
+
+#: lib/checkout_op.tcl:600
+#, tcl-format
+msgid ""
+"Failed to set current branch.\n"
+"\n"
+"This working directory is only partially switched. We successfully updated "
+"your files, but failed to update an internal Git file.\n"
+"\n"
+"This should not have occurred. %s will now close and give up."
+msgstr ""
+"現在のブランチを設定できません。\n"
+"\n"
+"作業ディレクトリは部分的にしか切り替わっていません。ファイルの更新には成功し"
+"ましたが、 Git の内部データを更新できませんでした。\n"
+"起こるはずのないエラーです。あきらめて %s を終了します。"
+
+#: lib/choose_font.tcl:39
+msgid "Select"
+msgstr "選択"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr "フォント・ファミリー"
+
+#: lib/choose_font.tcl:74
+msgid "Font Size"
+msgstr "フォントの大きさ"
+
+#: lib/choose_font.tcl:91
+msgid "Font Example"
+msgstr "フォント・サンプル"
+
+#: lib/choose_font.tcl:103
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+"これはサンプル文です。\n"
+"このフォントが気に入ればお使いになれます。"
+
+#: lib/choose_repository.tcl:28
+msgid "Git Gui"
+msgstr "Git GUI"
+
- #: lib/choose_repository.tcl:87
++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382
+msgid "Create New Repository"
+msgstr "新しいリポジトリを作る"
+
- #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:458
++#: lib/choose_repository.tcl:93
+msgid "New..."
+msgstr "新規…"
+
- #: lib/choose_repository.tcl:100
++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465
+msgid "Clone Existing Repository"
+msgstr "既存リポジトリを複製する"
+
- #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:974
++#: lib/choose_repository.tcl:106
+msgid "Clone..."
+msgstr "複製…"
+
- #: lib/choose_repository.tcl:113
++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
+msgid "Open Existing Repository"
+msgstr "既存リポジトリを開く"
+
- #: lib/choose_repository.tcl:126
++#: lib/choose_repository.tcl:119
+msgid "Open..."
+msgstr "開く…"
+
- #: lib/choose_repository.tcl:132
++#: lib/choose_repository.tcl:132
+msgid "Recent Repositories"
+msgstr "最近使ったリポジトリ"
+
- #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
- #: lib/choose_repository.tcl:310
++#: lib/choose_repository.tcl:138
+msgid "Open Recent Repository:"
+msgstr "最近使ったリポジトリを開く"
+
- #: lib/choose_repository.tcl:381 lib/choose_repository.tcl:476
++#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
++#: lib/choose_repository.tcl:316
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "リポジトリ %s を作製できません:"
+
- #: lib/choose_repository.tcl:410 lib/choose_repository.tcl:535
- #: lib/choose_repository.tcl:1007
++#: lib/choose_repository.tcl:387
+msgid "Directory:"
+msgstr "ディレクトリ:"
+
- #: lib/choose_repository.tcl:435
++#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544
++#: lib/choose_repository.tcl:1017
+msgid "Git Repository"
+msgstr "GIT リポジトリ"
+
- #: lib/choose_repository.tcl:439
++#: lib/choose_repository.tcl:442
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr "ディレクトリ '%s' は既に存在します。"
+
- #: lib/choose_repository.tcl:453
++#: lib/choose_repository.tcl:446
+#, tcl-format
+msgid "File %s already exists."
+msgstr "ファイル '%s' は既に存在します。"
+
- #: lib/choose_repository.tcl:466
- msgid "URL:"
- msgstr "URL:"
++#: lib/choose_repository.tcl:460
+msgid "Clone"
+msgstr "複製"
+
- #: lib/choose_repository.tcl:487
++#: lib/choose_repository.tcl:473
++msgid "Source Location:"
++msgstr "ソースの位置"
+
- #: lib/choose_repository.tcl:493
++#: lib/choose_repository.tcl:484
++msgid "Target Directory:"
++msgstr "先ディレクトリ:"
++
++#: lib/choose_repository.tcl:496
+msgid "Clone Type:"
+msgstr "複製方式:"
+
- #: lib/choose_repository.tcl:499
++#: lib/choose_repository.tcl:502
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr "標準(高速・中冗長度・ハードリンク)"
+
- #: lib/choose_repository.tcl:505
++#: lib/choose_repository.tcl:508
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr "全複写(低速・冗長バックアップ)"
+
- #: lib/choose_repository.tcl:541 lib/choose_repository.tcl:588
- #: lib/choose_repository.tcl:734 lib/choose_repository.tcl:804
- #: lib/choose_repository.tcl:1013 lib/choose_repository.tcl:1021
++#: lib/choose_repository.tcl:514
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr "共有(最高速・非推奨・バックアップ無し)"
+
- #: lib/choose_repository.tcl:577
++#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
++#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813
++#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "Git リポジトリではありません: %s"
+
- #: lib/choose_repository.tcl:581
++#: lib/choose_repository.tcl:586
+msgid "Standard only available for local repository."
+msgstr "標準方式は同一計算機上のリポジトリにのみ使えます。"
+
- #: lib/choose_repository.tcl:602
++#: lib/choose_repository.tcl:590
+msgid "Shared only available for local repository."
+msgstr "共有方式は同一計算機上のリポジトリにのみ使えます。"
+
- #: lib/choose_repository.tcl:613
++#: lib/choose_repository.tcl:611
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "'%s' は既に存在します。"
+
- #: lib/choose_repository.tcl:625
++#: lib/choose_repository.tcl:622
+msgid "Failed to configure origin"
+msgstr "origin を設定できませんでした"
+
- #: lib/choose_repository.tcl:626
++#: lib/choose_repository.tcl:634
+msgid "Counting objects"
+msgstr "オブジェクトを数えています"
+
- #: lib/choose_repository.tcl:650
++#: lib/choose_repository.tcl:635
+msgid "buckets"
+msgstr "バケツ"
+
- #: lib/choose_repository.tcl:686
++#: lib/choose_repository.tcl:659
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr "objects/info/alternates を複写できません: %s"
+
- #: lib/choose_repository.tcl:688 lib/choose_repository.tcl:902
- #: lib/choose_repository.tcl:914
++#: lib/choose_repository.tcl:695
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "%s から複製する内容はありません"
+
- #: lib/choose_repository.tcl:701
++#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911
++#: lib/choose_repository.tcl:923
+msgid "The 'master' branch has not been initialized."
+msgstr "'master' ブランチが初期化されていません"
+
- #: lib/choose_repository.tcl:713
++#: lib/choose_repository.tcl:710
+msgid "Hardlinks are unavailable. Falling back to copying."
+msgstr "ハードリンクが作れないので、コピーします"
+
- #: lib/choose_repository.tcl:744
++#: lib/choose_repository.tcl:722
+#, tcl-format
+msgid "Cloning from %s"
+msgstr "%s から複製しています"
+
- #: lib/choose_repository.tcl:745
++#: lib/choose_repository.tcl:753
+msgid "Copying objects"
+msgstr "オブジェクトを複写しています"
+
- #: lib/choose_repository.tcl:769
++#: lib/choose_repository.tcl:754
+msgid "KiB"
+msgstr "KiB"
+
- #: lib/choose_repository.tcl:779
++#: lib/choose_repository.tcl:778
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr "オブジェクトを複写できません: %s"
+
- #: lib/choose_repository.tcl:780
++#: lib/choose_repository.tcl:788
+msgid "Linking objects"
+msgstr "オブジェクトを連結しています"
+
- #: lib/choose_repository.tcl:788
++#: lib/choose_repository.tcl:789
+msgid "objects"
+msgstr "オブジェクト"
+
- #: lib/choose_repository.tcl:843
++#: lib/choose_repository.tcl:797
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr "オブジェクトをハードリンクできません: %s"
+
- #: lib/choose_repository.tcl:854
++#: lib/choose_repository.tcl:852
+msgid "Cannot fetch branches and objects. See console output for details."
+msgstr "ブランチやオブジェクトを取得できません。コンソール出力を見て下さい"
+
- #: lib/choose_repository.tcl:878
++#: lib/choose_repository.tcl:863
+msgid "Cannot fetch tags. See console output for details."
+msgstr "タグを取得できません。コンソール出力を見て下さい"
+
- #: lib/choose_repository.tcl:887
++#: lib/choose_repository.tcl:887
+msgid "Cannot determine HEAD. See console output for details."
+msgstr "HEAD を確定できません。コンソール出力を見て下さい"
+
- #: lib/choose_repository.tcl:893
++#: lib/choose_repository.tcl:896
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr "%s を掃除できません"
+
- #: lib/choose_repository.tcl:900
++#: lib/choose_repository.tcl:902
+msgid "Clone failed."
+msgstr "複写に失敗しました。"
+
- #: lib/choose_repository.tcl:911
++#: lib/choose_repository.tcl:909
+msgid "No default branch obtained."
+msgstr "デフォールト・ブランチが取得されませんでした"
+
- #: lib/choose_repository.tcl:923
++#: lib/choose_repository.tcl:920
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr "%s をコミットとして解釈できません"
+
- #: lib/choose_repository.tcl:924 lib/index.tcl:65 lib/index.tcl:127
- #: lib/index.tcl:193
++#: lib/choose_repository.tcl:932
+msgid "Creating working directory"
+msgstr "作業ディレクトリを作成しています"
+
- #: lib/choose_repository.tcl:953
++#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128
++#: lib/index.tcl:196
+msgid "files"
+msgstr "ファイル"
+
- #: lib/choose_repository.tcl:969
++#: lib/choose_repository.tcl:962
+msgid "Initial file checkout failed."
+msgstr "初期チェックアウトに失敗しました"
+
- #: lib/choose_repository.tcl:979
++#: lib/choose_repository.tcl:978
+msgid "Open"
+msgstr "開く"
+
- #: lib/choose_repository.tcl:1027
++#: lib/choose_repository.tcl:988
+msgid "Repository:"
+msgstr "リポジトリ:"
+
- #: lib/commit.tcl:154
++#: lib/choose_repository.tcl:1037
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "リポジトリ %s を開けません:"
+
+#: lib/choose_rev.tcl:53
+msgid "This Detached Checkout"
+msgstr "分離されたチェックアウト"
+
+#: lib/choose_rev.tcl:60
+msgid "Revision Expression:"
+msgstr "リビジョン式:"
+
+#: lib/choose_rev.tcl:74
+msgid "Local Branch"
+msgstr "ローカル・ブランチ"
+
+#: lib/choose_rev.tcl:79
+msgid "Tracking Branch"
+msgstr "トラッキング・ブランチ"
+
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+msgid "Tag"
+msgstr "タグ"
+
+#: lib/choose_rev.tcl:317
+#, tcl-format
+msgid "Invalid revision: %s"
+msgstr "無効なリビジョン: %s"
+
+#: lib/choose_rev.tcl:338
+msgid "No revision selected."
+msgstr "リビジョンが未選択です。"
+
+#: lib/choose_rev.tcl:346
+msgid "Revision expression is empty."
+msgstr "リビジョン式が空です。"
+
+#: lib/choose_rev.tcl:531
+msgid "Updated"
+msgstr "更新しました"
+
+#: lib/choose_rev.tcl:559
+msgid "URL"
+msgstr "URL"
+
+#: lib/commit.tcl:9
+msgid ""
+"There is nothing to amend.\n"
+"\n"
+"You are about to create the initial commit. There is no commit before this "
+"to amend.\n"
+msgstr ""
+"訂正するコミットがそもそもありません。\n"
+"\n"
+"これから作るのは最初のコミットです。その前にはまだ訂正するようなコミットはあ"
+"りません。\n"
+
+#: lib/commit.tcl:18
+msgid ""
+"Cannot amend while merging.\n"
+"\n"
+"You are currently in the middle of a merge that has not been fully "
+"completed. You cannot amend the prior commit unless you first abort the "
+"current merge activity.\n"
+msgstr ""
+"マージ中にコミットの訂正はできません。\n"
+"\n"
+"現在はまだマージの途中です。先にこのマージを中止しないと、前のコミットの訂正"
+"はできません\n"
+
+#: lib/commit.tcl:49
+msgid "Error loading commit data for amend:"
+msgstr "訂正するコミットのデータを読めません:"
+
+#: lib/commit.tcl:76
+msgid "Unable to obtain your identity:"
+msgstr "ユーザの正体を確認できません:"
+
+#: lib/commit.tcl:81
+msgid "Invalid GIT_COMMITTER_IDENT:"
+msgstr "GIT_COMMITTER_IDENT が無効です:"
+
+#: lib/commit.tcl:133
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before another commit can be created.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"最後にスキャンした状態はリポジトリの状態と合致しません。\n"
+"\n"
+"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。新し"
+"くコミットする前に、再スキャンが必要です。\n"
+"\n"
+"自動的に再スキャンを開始します。\n"
+
- #: lib/commit.tcl:162
++#: lib/commit.tcl:156
+#, tcl-format
+msgid ""
+"Unmerged files cannot be committed.\n"
+"\n"
+"File %s has merge conflicts. You must resolve them and stage the file "
+"before committing.\n"
+msgstr ""
+"マージしていないファイルはコミットできません。\n"
+"\n"
+"ファイル %s にはマージ衝突が残っています。まず解決してコミット予定に加える必"
+"要があります。\n"
+
- #: lib/commit.tcl:170
++#: lib/commit.tcl:164
+#, tcl-format
+msgid ""
+"Unknown file state %s detected.\n"
+"\n"
+"File %s cannot be committed by this program.\n"
+msgstr ""
+"不明なファイル状態 %s です。\n"
+"\n"
+"ファイル %s は本プログラムではコミットできません。\n"
+
- #: lib/commit.tcl:183
++#: lib/commit.tcl:172
+msgid ""
+"No changes to commit.\n"
+"\n"
+"You must stage at least 1 file before you can commit.\n"
+msgstr ""
+"コミットする変更がありません。\n"
+"\n"
+"最低一つの変更をコミット予定に加えてからコミットして下さい。\n"
+
- #: lib/commit.tcl:207
++#: lib/commit.tcl:187
+msgid ""
+"Please supply a commit message.\n"
+"\n"
+"A good commit message has the following format:\n"
+"\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 ""
+"コミット・メッセージを入力して下さい。\n"
+"\n"
+"正しいコミット・メッセージは:\n"
+"\n"
+"- 第１行: 何をしたか、を１行で要約。\n"
+"- 第２行: 空白\n"
+"- 残りの行: なぜ、この変更が良い変更か、の説明。\n"
+
- #: lib/commit.tcl:221
++#: lib/commit.tcl:211
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません"
+
- #: lib/commit.tcl:236
++#: lib/commit.tcl:227
+msgid "Calling pre-commit hook..."
+msgstr "コミット前フックを実行中・・・"
+
- #: lib/commit.tcl:259
++#: lib/commit.tcl:242
+msgid "Commit declined by pre-commit hook."
+msgstr "コミット前フックがコミットを拒否しました"
+
- #: lib/commit.tcl:274
++#: lib/commit.tcl:265
+msgid "Calling commit-msg hook..."
+msgstr "コミット・メッセージ・フックを実行中・・・"
+
- #: lib/commit.tcl:287
++#: lib/commit.tcl:280
+msgid "Commit declined by commit-msg hook."
+msgstr "コミット・メッセージ・フックがコミットを拒否しました"
+
- #: lib/commit.tcl:303
++#: lib/commit.tcl:293
+msgid "Committing changes..."
+msgstr "変更点をコミット中・・・"
+
- #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
++#: lib/commit.tcl:309
+msgid "write-tree failed:"
+msgstr "write-tree が失敗しました:"
+
- #: lib/commit.tcl:321
++#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
+msgid "Commit failed."
+msgstr "コミットに失敗しました。"
+
- #: lib/commit.tcl:326
++#: lib/commit.tcl:327
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr "コミット %s は壊れています"
+
- #: lib/commit.tcl:333
++#: lib/commit.tcl:332
+msgid ""
+"No changes to commit.\n"
+"\n"
+"No files were modified by this commit and it was not a merge commit.\n"
+"\n"
+"A rescan will be automatically started now.\n"
+msgstr ""
+"コミットする変更がありません。\n"
+"\n"
+"マージでなく、また、一つも変更点がありません。\n"
+"\n"
+"自動的に再スキャンを開始します。\n"
+
- #: lib/commit.tcl:347
++#: lib/commit.tcl:339
+msgid "No changes to commit."
+msgstr "コミットする変更がありません。"
+
- #: lib/commit.tcl:367
++#: lib/commit.tcl:353
+msgid "commit-tree failed:"
+msgstr "commit-tree が失敗しました:"
+
- #: lib/commit.tcl:454
++#: lib/commit.tcl:373
+msgid "update-ref failed:"
+msgstr "update-ref が失敗しました:"
+
- #: lib/diff.tcl:44
++#: lib/commit.tcl:461
+#, tcl-format
+msgid "Created commit %s: %s"
+msgstr "コミット %s を作成しました: %s"
+
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr "実行中…お待ち下さい…"
+
+#: lib/console.tcl:186
+msgid "Success"
+msgstr "成功"
+
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr "エラー: コマンドが失敗しました"
+
+#: lib/database.tcl:43
+msgid "Number of loose objects"
+msgstr "ばらばらなオブジェクトの数"
+
+#: lib/database.tcl:44
+msgid "Disk space used by loose objects"
+msgstr "ばらばらなオブジェクトの使用するディスク量"
+
+#: lib/database.tcl:45
+msgid "Number of packed objects"
+msgstr "パックされたオブジェクトの数"
+
+#: lib/database.tcl:46
+msgid "Number of packs"
+msgstr "パックの数"
+
+#: lib/database.tcl:47
+msgid "Disk space used by packed objects"
+msgstr "パックされたオブジェクトの使用するディスク量"
+
+#: lib/database.tcl:48
+msgid "Packed objects waiting for pruning"
+msgstr "パックに存在するので捨てて良いオブジェクトの数"
+
+#: lib/database.tcl:49
+msgid "Garbage files"
+msgstr "ゴミファイル"
+
+#: lib/database.tcl:72
+msgid "Compressing the object database"
+msgstr "データベース圧縮"
+
+#: lib/database.tcl:83
+msgid "Verifying the object database with fsck-objects"
+msgstr "fsck-objects でオブジェクト・データベースを検証しています"
+
+#: lib/database.tcl:108
+#, tcl-format
+msgid ""
+"This repository currently has approximately %i loose objects.\n"
+"\n"
+"To maintain optimal performance it is strongly recommended that you compress "
+"the database when more than %i loose objects exist.\n"
+"\n"
+"Compress the database now?"
+msgstr ""
+"このリポジトリにはおおよそ %i 個の個別オブジェクトがあります\n"
+"\n"
+"最適な性能を保つために、%i 個以上の個別オブジェクトを作る毎にデータベースを圧"
+"縮することを推奨します\n"
+"\n"
+"データベースを圧縮しますか？"
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Git から出た無効な日付: %s"
+
- #: lib/diff.tcl:83
++#: lib/diff.tcl:59
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but "
+"the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have "
+"the same state."
+msgstr ""
+"変更がありません。\n"
+"\n"
+"%s には変更がありません。\n"
+"\n"
+"このファイルの変更時刻は他のアプリケーションによって更新されていますがファイ"
+"ル内容には変更がありません。\n"
+"\n"
+"同様な状態のファイルを探すために、自動的に再スキャンを開始します。"
+
- #: lib/diff.tcl:116 lib/diff.tcl:190
++#: lib/diff.tcl:99
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "%s の変更点をロード中…"
+
- #: lib/diff.tcl:117
++#: lib/diff.tcl:120
++msgid ""
++"LOCAL: deleted\n"
++"REMOTE:\n"
++msgstr ""
++"LOCAL: 削除\n"
++"Remote:\n"
++
++#: lib/diff.tcl:125
++msgid ""
++"REMOTE: deleted\n"
++"LOCAL:\n"
++msgstr ""
++"REMOTE: 削除\n"
++"LOCAL:\n"
++
++#: lib/diff.tcl:132
++msgid "LOCAL:\n"
++msgstr "LOCAL:\n"
++
++#: lib/diff.tcl:135
++msgid "REMOTE:\n"
++msgstr "REMOTE\n"
++
++#: lib/diff.tcl:197 lib/diff.tcl:296
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "%s を表示できません"
+
- #: lib/diff.tcl:124
++#: lib/diff.tcl:198
+msgid "Error loading file:"
+msgstr "ファイルを読む際のエラーです:"
+
- #: lib/diff.tcl:136
++#: lib/diff.tcl:205
+msgid "Git Repository (subproject)"
+msgstr "Git リポジトリ(サブプロジェクト)"
+
- #: lib/diff.tcl:191
- msgid "Error loading diff:"
- msgstr "diff を読む際のエラーです:"
++#: lib/diff.tcl:217
+msgid "* Binary file (not showing content)."
+msgstr "* バイナリファイル(内容は表示しません)"
+
- #: lib/diff.tcl:313
++#: lib/diff.tcl:222
++#, tcl-format
++msgid ""
++"* Untracked file is %d bytes.\n"
++"* Showing only first %d bytes.\n"
++msgstr ""
++"* 管理外のファイルの大きさは %d バイトです。\n"
++"* 最初の %d バイトだけ表示しています。\n"
+
- #: lib/diff.tcl:320
++#: lib/diff.tcl:228
++#, tcl-format
++msgid ""
++"\n"
++"* Untracked file clipped here by %s.\n"
++"* To see the entire file, use an external editor.\n"
++msgstr ""
++"\n"
++"\n"
++"* %s は管理外のファイルをここで切りおとしました。\n"
++"* 全体を見るには外部エディタを使ってください。\n"
++
++#: lib/diff.tcl:436
+msgid "Failed to unstage selected hunk."
+msgstr "選択されたパッチをコミット予定から外せません。"
+
- #: lib/diff.tcl:386
++#: lib/diff.tcl:443
+msgid "Failed to stage selected hunk."
+msgstr "選択されたパッチをコミット予定に加えられません。"
+
- #: lib/diff.tcl:394
++#: lib/diff.tcl:509
+msgid "Failed to unstage selected line."
+msgstr "選択されたパッチ行をコミット予定から外せません。"
+
- #: lib/index.tcl:282
++#: lib/diff.tcl:517
+msgid "Failed to stage selected line."
+msgstr "選択されたパッチ行をコミット予定に加えられません。"
+
++#: lib/encoding.tcl:443
++msgid "Default"
++msgstr "デフォールト"
++
++#: lib/encoding.tcl:448
++#, tcl-format
++msgid "System (%s)"
++msgstr "システム (%s)"
++
++#: lib/encoding.tcl:459 lib/encoding.tcl:465
++msgid "Other"
++msgstr "その他"
++
+#: lib/error.tcl:20 lib/error.tcl:114
+msgid "error"
+msgstr "エラー"
+
+#: lib/error.tcl:36
+msgid "warning"
+msgstr "警告"
+
+#: lib/error.tcl:94
+msgid "You must correct the above errors before committing."
+msgstr "コミットする前に、以上のエラーを修正して下さい"
+
+#: 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:313
++#: lib/index.tcl:287
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "コミットから '%s' を降ろす"
+
- #: lib/index.tcl:326
++#: lib/index.tcl:326
+msgid "Ready to commit."
+msgstr "コミット準備完了"
+
- #: lib/index.tcl:381
++#: lib/index.tcl:339
+#, tcl-format
+msgid "Adding %s"
+msgstr "コミットに %s を加えています"
+
- #: lib/index.tcl:383
++#: lib/index.tcl:396
+#, tcl-format
+msgid "Revert changes in file %s?"
+msgstr "ファイル %s にした変更を元に戻しますか？"
+
- #: lib/index.tcl:391
++#: lib/index.tcl:398
+#, tcl-format
+msgid "Revert changes in these %i files?"
+msgstr "これら %i 個のファイルにした変更を元に戻しますか？"
+
- #: lib/index.tcl:394
++#: lib/index.tcl:406
+msgid "Any unstaged changes will be permanently lost by the revert."
+msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。"
+
- #: lib/merge.tcl:44
++#: lib/index.tcl:409
+msgid "Do Nothing"
+msgstr "何もしない"
+
++#: lib/index.tcl:427
++msgid "Reverting selected files"
++msgstr "選択されたファイルにした変更を元に戻します"
++
++#: lib/index.tcl:431
++#, tcl-format
++msgid "Reverting %s"
++msgstr "%s にした変更を元に戻します"
++
+#: lib/merge.tcl:13
+msgid ""
+"Cannot merge while amending.\n"
+"\n"
+"You must finish amending this commit before starting any type of merge.\n"
+msgstr ""
+"訂正中にはマージできません。\n"
+"\n"
+"訂正処理を完了するまでは新たにマージを開始できません。\n"
+
+#: lib/merge.tcl:27
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before a merge can be performed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"最後にスキャンした状態はリポジトリの状態と合致しません。\n"
+"\n"
+"最後にスキャンして以後、別の Git プログラムがリポジトリを変更しています。マー"
+"ジを開始する前に、再スキャンが必要です。\n"
+"\n"
+"自動的に再スキャンを開始します。\n"
+
- #: lib/merge.tcl:54
++#: lib/merge.tcl:45
+#, tcl-format
+msgid ""
+"You are in the middle of a conflicted merge.\n"
+"\n"
+"File %s has merge conflicts.\n"
+"\n"
+"You must resolve them, stage the file, and commit to complete the current "
+"merge. Only then can you begin another merge.\n"
+msgstr ""
+"衝突のあったマージの途中です。\n"
+"\n"
+"ファイル %s にはマージ中の衝突が残っています。\n"
+"\n"
+"このファイルの衝突を解決し、コミット予定に加えて、コミットすることでマージを"
+"完了します。そうやって始めて、新たなマージを開始できるようになります。\n"
+
- #: lib/merge.tcl:106
++#: lib/merge.tcl:55
+#, tcl-format
+msgid ""
+"You are in the middle of a change.\n"
+"\n"
+"File %s is modified.\n"
+"\n"
+"You should complete the current commit before starting a merge. Doing so "
+"will help you abort a failed merge, should the need arise.\n"
+msgstr ""
+"変更の途中です。\n"
+"\n"
+"ファイル %s は変更中です。\n"
+"\n"
+"現在のコミットを完了してからマージを開始して下さい。そうする方がマージに失敗"
+"したときの回復が楽です。\n"
+
- #: lib/merge.tcl:119
++#: lib/merge.tcl:107
+#, tcl-format
+msgid "%s of %s"
+msgstr "%s の %s ブランチ"
+
- #: lib/merge.tcl:130
++#: lib/merge.tcl:120
+#, tcl-format
+msgid "Merging %s and %s..."
+msgstr "%s と %s をマージ中・・・"
+
- #: lib/merge.tcl:132
++#: lib/merge.tcl:131
+msgid "Merge completed successfully."
+msgstr "マージが完了しました"
+
- #: lib/merge.tcl:157
++#: lib/merge.tcl:133
+msgid "Merge failed. Conflict resolution is required."
+msgstr "マージが失敗しました。衝突の解決が必要です。"
+
- #: lib/merge.tcl:176
++#: lib/merge.tcl:158
+#, tcl-format
+msgid "Merge Into %s"
+msgstr "%s にマージ"
+
- #: lib/merge.tcl:211
++#: lib/merge.tcl:177
+msgid "Revision To Merge"
+msgstr "マージするリビジョン"
+
- #: lib/merge.tcl:221
++#: lib/merge.tcl:212
+msgid ""
+"Cannot abort while amending.\n"
+"\n"
+"You must finish amending this commit.\n"
+msgstr ""
+"訂正中には中止できません。\n"
+"\n"
+"まず今のコミット訂正を完了させて下さい。\n"
+
- #: lib/merge.tcl:227
++#: lib/merge.tcl:222
+msgid ""
+"Abort merge?\n"
+"\n"
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with aborting the current merge?"
+msgstr ""
+"マージを中断しますか？\n"
+"\n"
+"現在のマージを中断すると、コミットしていない全ての変更が失われます。\n"
+"\n"
+"マージを中断してよろしいですか？"
+
- #: lib/merge.tcl:238
++#: lib/merge.tcl:228
+msgid ""
+"Reset changes?\n"
+"\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with resetting the current changes?"
+msgstr ""
+"変更点をリセットしますか？\n"
+"\n"
+"変更点をリセットすると、コミットしていない全ての変更が失われます。\n"
+"\n"
+"リセットしてよろしいですか？"
+
- #: lib/merge.tcl:238
++#: lib/merge.tcl:239
+msgid "Aborting"
+msgstr "中断しています"
+
- #: lib/merge.tcl:266
++#: lib/merge.tcl:239
+msgid "files reset"
+msgstr "リセットしたファイル"
+
- #: lib/merge.tcl:268
++#: lib/merge.tcl:267
+msgid "Abort failed."
+msgstr "中断に失敗しました。"
+
- #: lib/option.tcl:95
++#: lib/merge.tcl:269
+msgid "Abort completed. Ready."
+msgstr "中断完了。"
+
- #: lib/option.tcl:99
++#: lib/mergetool.tcl:8
++msgid "Force resolution to the base version?"
++msgstr "共通の版を使いますか?"
++
++#: lib/mergetool.tcl:9
++msgid "Force resolution to this branch?"
++msgstr "自分の側の版を使いますか?"
++
++#: lib/mergetool.tcl:10
++msgid "Force resolution to the other branch?"
++msgstr "相手制の版を使いますか?"
++
++#: lib/mergetool.tcl:14
++#, tcl-format
++msgid ""
++"Note that the diff shows only conflicting changes.\n"
++"\n"
++"%s will be overwritten.\n"
++"\n"
++"This operation can be undone only by restarting the merge."
++msgstr ""
++"競合する変更点だけが表示されていることに注意してください。\n"
++"\n"
++"%s は上書きされます。\n"
++"\n"
++"やり直すにはマージ全体をやり直してください。"
++
++#: lib/mergetool.tcl:45
++#, tcl-format
++msgid "File %s seems to have unresolved conflicts, still stage?"
++msgstr "ファイル %s には解決していない競合部分がまだあるようですが、いいですか?"
++
++#: lib/mergetool.tcl:60
++#, tcl-format
++msgid "Adding resolution for %s"
++msgstr "%s への解決をステージします"
++
++#: lib/mergetool.tcl:141
++msgid "Cannot resolve deletion or link conflicts using a tool"
++msgstr "ツールでは削除やリンク競合は扱えません"
++
++#: lib/mergetool.tcl:146
++msgid "Conflict file does not exist"
++msgstr "競合ファイルは存在しません。"
++
++#: lib/mergetool.tcl:264
++#, tcl-format
++msgid "Not a GUI merge tool: '%s'"
++msgstr "GUI マージツールではありません: %s"
++
++#: lib/mergetool.tcl:268
++#, tcl-format
++msgid "Unsupported merge tool '%s'"
++msgstr "マージツール '%s' はサポートしていません"
++
++#: lib/mergetool.tcl:303
++msgid "Merge tool is already running, terminate it?"
++msgstr "マージツールはすでに起動しています。終了しますか?"
++
++#: lib/mergetool.tcl:323
++#, tcl-format
++msgid ""
++"Error retrieving versions:\n"
++"%s"
++msgstr ""
++"版の取り出し時にエラーが出ました:\n"
++"%s"
++
++#: lib/mergetool.tcl:343
++#, tcl-format
++msgid ""
++"Could not start the merge tool:\n"
++"\n"
++"%s"
++msgstr ""
++"マージツールが起動できません:\n"
++"\n"
++"%s"
++
++#: lib/mergetool.tcl:347
++msgid "Running merge tool..."
++msgstr "マージツールを実行しています..."
++
++#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
++msgid "Merge tool failed."
++msgstr "マージツールが失敗しました。"
++
++#: lib/option.tcl:11
++#, tcl-format
++msgid "Invalid global encoding '%s'"
++msgstr "全体エンコーディングに 無効な %s が指定されています"
++
++#: lib/option.tcl:19
++#, tcl-format
++msgid "Invalid repo encoding '%s'"
++msgstr "リポジトリエンコーディングに 無効な %s が指定されています"
++
++#: lib/option.tcl:117
+msgid "Restore Defaults"
+msgstr "既定値に戻す"
+
- #: lib/option.tcl:109
++#: lib/option.tcl:121
+msgid "Save"
+msgstr "保存"
+
- #: lib/option.tcl:110
++#: lib/option.tcl:131
+#, tcl-format
+msgid "%s Repository"
+msgstr "%s リポジトリ"
+
- #: lib/option.tcl:116
++#: lib/option.tcl:132
+msgid "Global (All Repositories)"
+msgstr "大域（全てのリポジトリ）"
+
- #: lib/option.tcl:117
++#: lib/option.tcl:138
+msgid "User Name"
+msgstr "ユーザ名"
+
- #: lib/option.tcl:119
++#: lib/option.tcl:139
+msgid "Email Address"
+msgstr "電子メールアドレス"
+
- #: lib/option.tcl:120
++#: lib/option.tcl:141
+msgid "Summarize Merge Commits"
+msgstr "マージコミットの要約"
+
- #: lib/option.tcl:121
++#: lib/option.tcl:142
+msgid "Merge Verbosity"
+msgstr "マージの冗長度"
+
- #: lib/option.tcl:123
++#: lib/option.tcl:143
+msgid "Show Diffstat After Merge"
+msgstr "マージ後に diffstat を表示"
+
- #: lib/option.tcl:124
++#: lib/option.tcl:144
++msgid "Use Merge Tool"
++msgstr "マージツールを使用"
++
++#: lib/option.tcl:146
+msgid "Trust File Modification Timestamps"
+msgstr "ファイル変更時刻を信頼する"
+
- #: lib/option.tcl:125
++#: lib/option.tcl:147
+msgid "Prune Tracking Branches During Fetch"
+msgstr "フェッチ中にトラッキングブランチを刈る"
+
- #: lib/option.tcl:126
++#: lib/option.tcl:148
+msgid "Match Tracking Branches"
+msgstr "トラッキングブランチを合わせる"
+
- #: lib/option.tcl:127
++#: lib/option.tcl:149
+msgid "Blame Copy Only On Changed Files"
+msgstr "変更されたファイルのみコピー検知を行なう"
+
- #: lib/option.tcl:128
++#: lib/option.tcl:150
+msgid "Minimum Letters To Blame Copy On"
+msgstr "コピーを検知する最少文字数"
+
- #: lib/option.tcl:129
++#: lib/option.tcl:151
++msgid "Blame History Context Radius (days)"
++msgstr "註釈する履歴半径（日数）"
++
++#: lib/option.tcl:152
+msgid "Number of Diff Context Lines"
+msgstr "diff の文脈行数"
+
- #: lib/option.tcl:130
++#: lib/option.tcl:153
+msgid "Commit Message Text Width"
+msgstr "コミットメッセージのテキスト幅"
+
- #: lib/option.tcl:194
++#: lib/option.tcl:154
+msgid "New Branch Name Template"
+msgstr "新しいブランチ名のテンプレート"
+
- #: lib/option.tcl:218
++#: lib/option.tcl:155
++msgid "Default File Contents Encoding"
++msgstr "ファイル内容のデフォールトエンコーディング"
++
++#: lib/option.tcl:203
++msgid "Change"
++msgstr "変更"
++
++#: lib/option.tcl:230
+msgid "Spelling Dictionary:"
+msgstr "スペルチェック辞書"
+
- #: lib/option.tcl:222
++#: lib/option.tcl:254
+msgid "Change Font"
+msgstr "フォントを変更"
+
- #: lib/option.tcl:228
++#: lib/option.tcl:258
+#, tcl-format
+msgid "Choose %s"
+msgstr "%s を選択"
+
- #: lib/option.tcl:242
++#: lib/option.tcl:264
+msgid "pt."
+msgstr "ポイント"
+
- #: lib/option.tcl:277
++#: lib/option.tcl:278
+msgid "Preferences"
+msgstr "設定"
+
- #: lib/remote.tcl:165
++#: lib/option.tcl:314
+msgid "Failed to completely save options:"
+msgstr "完全にオプションを保存できません:"
+
- #: lib/remote.tcl:170
++#: lib/remote.tcl:163
++msgid "Remove Remote"
++msgstr "リモートを削除"
++
++#: lib/remote.tcl:168
+msgid "Prune from"
+msgstr "から刈込む…"
+
- #: lib/remote.tcl:213
++#: lib/remote.tcl:173
+msgid "Fetch from"
+msgstr "取得元"
+
- msgid "Delete Remote Branch"
- msgstr "リモート・ブランチを削除"
++#: lib/remote.tcl:215
+msgid "Push to"
+msgstr "プッシュ先"
+
++#: lib/remote_add.tcl:19
++msgid "Add Remote"
++msgstr "リモートを追加"
++
++#: lib/remote_add.tcl:24
++msgid "Add New Remote"
++msgstr "リモートを新規に追加"
++
++#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
++msgid "Add"
++msgstr "追加"
++
++#: lib/remote_add.tcl:37
++msgid "Remote Details"
++msgstr "リモートの詳細"
++
++#: lib/remote_add.tcl:50
++msgid "Location:"
++msgstr "場所:"
++
++#: lib/remote_add.tcl:62
++msgid "Further Action"
++msgstr "その他の動作"
++
++#: lib/remote_add.tcl:65
++msgid "Fetch Immediately"
++msgstr "即座に取得"
++
++#: lib/remote_add.tcl:71
++msgid "Initialize Remote Repository and Push"
++msgstr "リモートレポジトリを初期化してプッシュ"
++
++#: lib/remote_add.tcl:77
++msgid "Do Nothing Else Now"
++msgstr "何もしない"
++
++#: lib/remote_add.tcl:101
++msgid "Please supply a remote name."
++msgstr "リモート名を指定して下さい。"
++
++#: lib/remote_add.tcl:114
++#, tcl-format
++msgid "'%s' is not an acceptable remote name."
++msgstr "'%s' はリモート名に使えません。"
++
++#: lib/remote_add.tcl:125
++#, tcl-format
++msgid "Failed to add remote '%s' of location '%s'."
++msgstr "場所 '%2$s' のリモート '%1$s'の名前変更に失敗しました。"
++
++#: lib/remote_add.tcl:133 lib/transport.tcl:6
++#, tcl-format
++msgid "fetch %s"
++msgstr "%s を取得"
++
++#: lib/remote_add.tcl:134
++#, tcl-format
++msgid "Fetching the %s"
++msgstr "%s からフェッチしています"
++
++#: lib/remote_add.tcl:157
++#, tcl-format
++msgid "Do not know how to initialize repository at location '%s'."
++msgstr "リポジトリ '%s' を初期化できません。"
++
++#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
++#, tcl-format
++msgid "push %s"
++msgstr "%s をプッシュ"
++
++#: lib/remote_add.tcl:164
++#, tcl-format
++msgid "Setting up the %s (at %s)"
++msgstr "%2$s にある %1$s をセットアップします"
++
+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
- msgid "Arbitrary URL:"
- msgstr "任意の URL:"
++msgid "Delete Branch Remotely"
++msgstr "遠隔でブランチ削除"
+
+#: lib/remote_branch_delete.tcl:47
+msgid "From Repository"
+msgstr "元のリポジトリ"
+
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
+msgid "Remote:"
+msgstr "リモート:"
+
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
- #: lib/spellcheck.tcl:387
++msgid "Arbitrary Location:"
++msgstr "任意の位置:"
+
+#: lib/remote_branch_delete.tcl:84
+msgid "Branches"
+msgstr "ブランチ"
+
+#: lib/remote_branch_delete.tcl:109
+msgid "Delete Only If"
+msgstr "条件付で削除"
+
+#: lib/remote_branch_delete.tcl:111
+msgid "Merged Into:"
+msgstr "マージ先:"
+
+#: lib/remote_branch_delete.tcl:119
+msgid "Always (Do not perform merge checks)"
+msgstr "無条件（マージ検査をしない）"
+
+#: lib/remote_branch_delete.tcl:152
+msgid "A branch is required for 'Merged Into'."
+msgstr "'マージ先' にはブランチが必要です。"
+
+#: lib/remote_branch_delete.tcl:184
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+"以下のブランチは %s に完全にマージされていません:\n"
+"\n"
+" - %s"
+
+#: lib/remote_branch_delete.tcl:189
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits. Try fetching from %s first."
+msgstr ""
+"必要なコミットが不足しているために、マージ検査が失敗しました。まず %s から"
+"フェッチして下さい。"
+
+#: lib/remote_branch_delete.tcl:207
+msgid "Please select one or more branches to delete."
+msgstr "削除するブランチを選択して下さい。"
+
+#: lib/remote_branch_delete.tcl:216
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+"削除したブランチを回復するのは困難です。\n"
+"\n"
+"選択したブランチを削除して良いですか？"
+
+#: lib/remote_branch_delete.tcl:226
+#, tcl-format
+msgid "Deleting branches from %s"
+msgstr "%s からブランチを削除しています。"
+
+#: lib/remote_branch_delete.tcl:286
+msgid "No repository selected."
+msgstr "リポジトリが選択されていません。"
+
+#: lib/remote_branch_delete.tcl:291
+#, tcl-format
+msgid "Scanning %s..."
+msgstr "%s をスキャンしています…"
+
++#: lib/search.tcl:21
++msgid "Find:"
++msgstr "検索:"
++
++#: lib/search.tcl:23
++msgid "Next"
++msgstr "次"
++
++#: lib/search.tcl:24
++msgid "Prev"
++msgstr "前"
++
++#: lib/search.tcl:25
++msgid "Case-Sensitive"
++msgstr "大文字小文字を区別"
++
+#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
+msgid "Cannot write shortcut:"
+msgstr "ショートカットが書けません:"
+
+#: lib/shortcut.tcl:136
+msgid "Cannot write icon:"
+msgstr "アイコンが書けません:"
+
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "サポートされていないスペルチェッカーです"
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "スペルチェック機能は使えません"
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "スペルチェックの設定が不正です"
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr "辞書を %s に巻き戻します"
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "スペルチェッカーの起動に失敗しました"
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "スペルチェッカーが判別できません"
+
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr "提案なし"
+
- #: lib/spellcheck.tcl:391
++#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr "スペルチェッカーが予想外の EOF を返しました"
+
- #: lib/transport.tcl:6
++#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr "スペルチェック失敗"
+
++#: lib/sshkey.tcl:31
++msgid "No keys found."
++msgstr "キーがありません。"
++
++#: lib/sshkey.tcl:34
++#, tcl-format
++msgid "Found a public key in: %s"
++msgstr "公開鍵がありました: %s"
++
++#: lib/sshkey.tcl:40
++msgid "Generate Key"
++msgstr "鍵を生成"
++
++#: lib/sshkey.tcl:56
++msgid "Copy To Clipboard"
++msgstr "クリップボードにコピー"
++
++#: lib/sshkey.tcl:70
++msgid "Your OpenSSH Public Key"
++msgstr "あなたの OpenSSH 公開鍵"
++
++#: lib/sshkey.tcl:78
++msgid "Generating..."
++msgstr "生成中..."
++
++#: lib/sshkey.tcl:84
++#, tcl-format
++msgid ""
++"Could not start ssh-keygen:\n"
++"\n"
++"%s"
++msgstr ""
++"ssh-keygen を起動できません:\n"
++"\n"
++"%s"
++
++#: lib/sshkey.tcl:111
++msgid "Generation failed."
++msgstr "生成に失敗しました。"
++
++#: lib/sshkey.tcl:118
++msgid "Generation succeded, but no keys found."
++msgstr "生成には成功しましたが、鍵が見つかりません。"
++
++#: lib/sshkey.tcl:121
++#, tcl-format
++msgid "Your key is in: %s"
++msgstr "あなたの鍵は %s にあります"
++
+#: lib/status_bar.tcl:83
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
+msgstr "%1$s ... %4$*i %6$s 中の %2$*i (%7$3i%%)"
+
- msgid "fetch %s"
- msgstr "%s を取得"
++#: lib/tools.tcl:75
+#, tcl-format
- #: lib/transport.tcl:25 lib/transport.tcl:71
- #, tcl-format
- msgid "push %s"
- msgstr "%s をプッシュ"
-
++msgid "Running %s requires a selected file."
++msgstr "ファイルを選択してから %s を起動してください。"
++
++#: lib/tools.tcl:90
++#, tcl-format
++msgid "Are you sure you want to run %s?"
++msgstr "本当に %s を起動しますか?"
++
++#: lib/tools.tcl:110
++#, tcl-format
++msgid "Tool: %s"
++msgstr "ツール: %s"
++
++#: lib/tools.tcl:111
++#, tcl-format
++msgid "Running: %s"
++msgstr "実行中: %s"
++
++#: lib/tools.tcl:149
++#, tcl-format
++msgid "Tool completed succesfully: %s"
++msgstr "ツールが完了しました: %s"
++
++#: lib/tools.tcl:151
++#, tcl-format
++msgid "Tool failed: %s"
++msgstr "ツールが失敗しました: %s"
++
++#: lib/tools_dlg.tcl:22
++msgid "Add Tool"
++msgstr "ツールの追加"
++
++#: lib/tools_dlg.tcl:28
++msgid "Add New Tool Command"
++msgstr "新規ツールコマンドの追加"
++
++#: lib/tools_dlg.tcl:33
++msgid "Add globally"
++msgstr "全体に追加"
++
++#: lib/tools_dlg.tcl:45
++msgid "Tool Details"
++msgstr "ツールの詳細"
++
++#: lib/tools_dlg.tcl:48
++msgid "Use '/' separators to create a submenu tree:"
++msgstr "'/' でサブメニューを区切ります:"
++
++#: lib/tools_dlg.tcl:61
++msgid "Command:"
++msgstr "コマンド:"
++
++#: lib/tools_dlg.tcl:74
++msgid "Show a dialog before running"
++msgstr "起動する前にダイアログを表示"
++
++#: lib/tools_dlg.tcl:80
++msgid "Ask the user to select a revision (sets $REVISION)"
++msgstr "ユーザにコミットを一つ選ばせる ($REVISION にセットします)"
++
++#: lib/tools_dlg.tcl:85
++msgid "Ask the user for additional arguments (sets $ARGS)"
++msgstr "ユーザに他の引数を追加させる ($ARGS にセットします)"
++
++#: lib/tools_dlg.tcl:92
++msgid "Don't show the command output window"
++msgstr "コマンドからの出力ウィンドウを見せない"
++
++#: lib/tools_dlg.tcl:97
++msgid "Run only if a diff is selected ($FILENAME not empty)"
++msgstr "パッチが選ばれているときだけ動かす($FILENAME が空でない)"
++
++#: lib/tools_dlg.tcl:121
++msgid "Please supply a name for the tool."
++msgstr "ツール名を指定して下さい。"
++
++#: lib/tools_dlg.tcl:129
++#, tcl-format
++msgid "Tool '%s' already exists."
++msgstr "ツール '%s' は既に存在します。"
++
++#: lib/tools_dlg.tcl:151
++#, tcl-format
++msgid ""
++"Could not add tool:\n"
++"%s"
++msgstr ""
++"ツールを追加できません:\n"
++"%s"
++
++#: lib/tools_dlg.tcl:190
++msgid "Remove Tool"
++msgstr "ツールの削除"
++
++#: lib/tools_dlg.tcl:196
++msgid "Remove Tool Commands"
++msgstr "ツールコマンドの削除"
++
++#: lib/tools_dlg.tcl:200
++msgid "Remove"
++msgstr "削除"
++
++#: lib/tools_dlg.tcl:236
++msgid "(Blue denotes repository-local tools)"
++msgstr "(青色はローカルレポジトリのツールです)"
++
++#: lib/tools_dlg.tcl:297
++#, tcl-format
++msgid "Run Command: %s"
++msgstr "コマンドを起動: %s"
++
++#: lib/tools_dlg.tcl:311
++msgid "Arguments"
++msgstr "引数"
++
++#: lib/tools_dlg.tcl:348
++msgid "OK"
++msgstr "OK"
+
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
+msgstr "%s から新しい変更をフェッチしています"
+
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr "遠隔刈込 %s"
+
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
+msgstr "%s から削除されたトラッキング・ブランチを刈っています"
+
+#: lib/transport.tcl:26
+#, tcl-format
+msgid "Pushing changes to %s"
+msgstr "%s へ変更をプッシュしています"
+
+#: lib/transport.tcl:72
+#, tcl-format
+msgid "Pushing %s %s to %s"
+msgstr "%3$s へ %1$s %2$s をプッシュしています"
+
+#: lib/transport.tcl:89
+msgid "Push Branches"
+msgstr "ブランチをプッシュ"
+
+#: lib/transport.tcl:103
+msgid "Source Branches"
+msgstr "元のブランチ"
+
+#: lib/transport.tcl:120
+msgid "Destination Repository"
+msgstr "送り先リポジトリ"
+
+#: lib/transport.tcl:158
+msgid "Transfer Options"
+msgstr "通信オプション"
+
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr "既存ブランチを上書き(変更を破棄する可能性があります)"
+
+#: lib/transport.tcl:164
+msgid "Use thin pack (for slow network connections)"
+msgstr "Thin Pack を使う（遅いネットワーク接続）"
+
+#: lib/transport.tcl:168
+msgid "Include tags"
+msgstr "タグを含める"
diff --cc git-gui/po/sv.po
index 0196ba8cefdb5a4867a5f08586d9cb47dfe05e7e,0000000000000000000000000000000000000000..d434220b13f89d7dd93b687e78ae25cc3fe552a7
mode 100644,000000..100644
mode 100644,000000..100644
--- 1/git-gui/po/sv.po
--- /dev/null
+++ b/git-gui/po/sv.po
- # Copyright (C) 2007 Shawn Pearce, et al.
+# Swedish translation of git-gui.
- # Peter Karlsson <peter@softwolves.pp.se>, 2007-2008.
++# Copyright (C) 2007-2008 Shawn Pearce, et al.
+# This file is distributed under the same license as the git-gui package.
+#
- "POT-Creation-Date: 2008-08-03 01:34+0200\n"
- "PO-Revision-Date: 2008-08-03 01:45+0200\n"
- "Last-Translator: Mikael Magnusson <mikachu@gmail.com>\n"
++# Peter Krefting <peter@softwolves.pp.se>, 2007-2008.
+# Mikael Magnusson <mikachu@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: sv\n"
+"Report-Msgid-Bugs-To: \n"
- #: git-gui.sh:41 git-gui.sh:688 git-gui.sh:702 git-gui.sh:715 git-gui.sh:798
- #: git-gui.sh:817
++"POT-Creation-Date: 2008-11-16 13:56-0800\n"
++"PO-Revision-Date: 2008-11-21 08:35+0100\n"
++"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
- #: git-gui.sh:644
++#: git-gui.sh:41 git-gui.sh:737 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847
++#: git-gui.sh:866
+msgid "git-gui: fatal error"
+msgstr "git-gui: ödesdigert fel"
+
- #: git-gui.sh:674
++#: git-gui.sh:689
+#, tcl-format
+msgid "Invalid font specified in %s:"
+msgstr "Ogiltigt teckensnitt angivet i %s:"
+
- #: git-gui.sh:675
++#: git-gui.sh:723
+msgid "Main Font"
+msgstr "Huvudteckensnitt"
+
- #: git-gui.sh:689
++#: git-gui.sh:724
+msgid "Diff/Console Font"
+msgstr "Diff/konsolteckensnitt"
+
- #: git-gui.sh:716
++#: git-gui.sh:738
+msgid "Cannot find git in PATH."
+msgstr "Hittar inte git i PATH."
+
- #: git-gui.sh:734
++#: git-gui.sh:765
+msgid "Cannot parse Git version string:"
+msgstr "Kan inte tolka versionssträng från Git:"
+
- #: git-gui.sh:972
++#: git-gui.sh:783
+#, tcl-format
+msgid ""
+"Git version cannot be determined.\n"
+"\n"
+"%s claims it is version '%s'.\n"
+"\n"
+"%s requires at least Git 1.5.0 or later.\n"
+"\n"
+"Assume '%s' is version 1.5.0?\n"
+msgstr ""
+"Kan inte avgöra Gits version.\n"
+"\n"
+"%s säger att dess version är \"%s\".\n"
+"\n"
+"%s kräver minst Git 1.5.0 eller senare.\n"
+"\n"
+"Anta att \"%s\" är version 1.5.0?\n"
+
- #: git-gui.sh:979
++#: git-gui.sh:1062
+msgid "Git directory not found:"
+msgstr "Git-katalogen hittades inte:"
+
- #: git-gui.sh:986
++#: git-gui.sh:1069
+msgid "Cannot move to top of working directory:"
+msgstr "Kan inte gå till början på arbetskatalogen:"
+
- #: git-gui.sh:991
++#: git-gui.sh:1076
+msgid "Cannot use funny .git directory:"
+msgstr "Kan inte använda underlig .git-katalog:"
+
- #: git-gui.sh:1138 lib/checkout_op.tcl:305
++#: git-gui.sh:1081
+msgid "No working directory"
+msgstr "Ingen arbetskatalog"
+
- #: git-gui.sh:1194
++#: git-gui.sh:1247 lib/checkout_op.tcl:305
+msgid "Refreshing file status..."
+msgstr "Uppdaterar filstatus..."
+
- #: git-gui.sh:1369 lib/browser.tcl:246
++#: git-gui.sh:1303
+msgid "Scanning for modified files ..."
+msgstr "Söker efter ändrade filer..."
+
- #: git-gui.sh:1635
++#: git-gui.sh:1367
++msgid "Calling prepare-commit-msg hook..."
++msgstr "Anropar kroken för förberedning av incheckningsmeddelande (prepare-commit-msg)..."
++
++#: git-gui.sh:1384
++msgid "Commit declined by prepare-commit-msg hook."
++msgstr "Incheckningen avvisades av kroken för förberedning av incheckningsmeddelande (prepare-commit-msg)."
++
++#: git-gui.sh:1542 lib/browser.tcl:246
+msgid "Ready."
+msgstr "Klar."
+
- #: git-gui.sh:1637
++#: git-gui.sh:1819
+msgid "Unmodified"
+msgstr "Oförändrade"
+
- #: git-gui.sh:1638 git-gui.sh:1643
++#: git-gui.sh:1821
+msgid "Modified, not staged"
+msgstr "Förändrade, ej köade"
+
- #: git-gui.sh:1639 git-gui.sh:1644
++#: git-gui.sh:1822 git-gui.sh:1830
+msgid "Staged for commit"
+msgstr "Köade för incheckning"
+
- #: git-gui.sh:1640 git-gui.sh:1645
++#: git-gui.sh:1823 git-gui.sh:1831
+msgid "Portions staged for commit"
+msgstr "Delar köade för incheckning"
+
- #: git-gui.sh:1642
++#: git-gui.sh:1824 git-gui.sh:1832
+msgid "Staged for commit, missing"
+msgstr "Köade för incheckning, saknade"
+
- #: git-gui.sh:1647
++#: git-gui.sh:1826
++msgid "File type changed, not staged"
++msgstr "Filtyp ändrad, ej köade"
++
++#: git-gui.sh:1827
++msgid "File type changed, staged"
++msgstr "Filtyp ändrad, köade"
++
++#: git-gui.sh:1829
+msgid "Untracked, not staged"
+msgstr "Ej spårade, ej köade"
+
- #: git-gui.sh:1648
++#: git-gui.sh:1834
+msgid "Missing"
+msgstr "Saknade"
+
- #: git-gui.sh:1649
++#: git-gui.sh:1835
+msgid "Staged for removal"
+msgstr "Köade för borttagning"
+
- #: git-gui.sh:1651 git-gui.sh:1652 git-gui.sh:1653 git-gui.sh:1654
++#: git-gui.sh:1836
+msgid "Staged for removal, still present"
+msgstr "Köade för borttagning, fortfarande närvarande"
+
- #: git-gui.sh:1689
++#: git-gui.sh:1838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841
++#: git-gui.sh:1842 git-gui.sh:1843
+msgid "Requires merge resolution"
+msgstr "Kräver konflikthantering efter sammanslagning"
+
- #: git-gui.sh:1698
++#: git-gui.sh:1878
+msgid "Starting gitk... please wait..."
+msgstr "Startar gitk... vänta..."
+
- #: git-gui.sh:1948 lib/choose_repository.tcl:36
++#: git-gui.sh:1887
+msgid "Couldn't find gitk in PATH"
+msgstr "Hittar inte gitk i PATH."
+
- #: git-gui.sh:1949
++#: git-gui.sh:2280 lib/choose_repository.tcl:36
+msgid "Repository"
+msgstr "Arkiv"
+
- #: git-gui.sh:1951 lib/choose_rev.tcl:561
++#: git-gui.sh:2281
+msgid "Edit"
+msgstr "Redigera"
+
- #: git-gui.sh:1954 lib/choose_rev.tcl:548
++#: git-gui.sh:2283 lib/choose_rev.tcl:561
+msgid "Branch"
+msgstr "Gren"
+
- #: git-gui.sh:1957 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
++#: git-gui.sh:2286 lib/choose_rev.tcl:548
+msgid "Commit@@noun"
+msgstr "Incheckning"
+
- #: git-gui.sh:1958 lib/choose_rev.tcl:557
++#: git-gui.sh:2289 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+msgid "Merge"
+msgstr "Slå ihop"
+
- msgstr "Fjärr"
++#: git-gui.sh:2290 lib/choose_rev.tcl:557
+msgid "Remote"
- #: git-gui.sh:1967
++msgstr "Fjärrarkiv"
++
++#: git-gui.sh:2293
++msgid "Tools"
++msgstr "Verktyg"
++
++#: git-gui.sh:2302
++msgid "Explore Working Copy"
++msgstr "Utforska arbetskopia"
+
- #: git-gui.sh:1971
++#: git-gui.sh:2307
+msgid "Browse Current Branch's Files"
+msgstr "Bläddra i grenens filer"
+
- #: git-gui.sh:1976
++#: git-gui.sh:2311
+msgid "Browse Branch Files..."
+msgstr "Bläddra filer på gren..."
+
- #: git-gui.sh:1980
++#: git-gui.sh:2316
+msgid "Visualize Current Branch's History"
+msgstr "Visualisera grenens historik"
+
- #: git-gui.sh:1987
++#: git-gui.sh:2320
+msgid "Visualize All Branch History"
+msgstr "Visualisera alla grenars historik"
+
- #: git-gui.sh:1989
++#: git-gui.sh:2327
+#, tcl-format
+msgid "Browse %s's Files"
+msgstr "Bläddra i filer för %s"
+
- #: git-gui.sh:1994 lib/database.tcl:27 lib/database.tcl:67
++#: git-gui.sh:2329
+#, tcl-format
+msgid "Visualize %s's History"
+msgstr "Visualisera historik för %s"
+
- #: git-gui.sh:1997 lib/database.tcl:34
++#: git-gui.sh:2334 lib/database.tcl:27 lib/database.tcl:67
+msgid "Database Statistics"
+msgstr "Databasstatistik"
+
- #: git-gui.sh:2000
++#: git-gui.sh:2337 lib/database.tcl:34
+msgid "Compress Database"
+msgstr "Komprimera databas"
+
- #: git-gui.sh:2007 git-gui.sh:2011 git-gui.sh:2015 lib/shortcut.tcl:7
++#: git-gui.sh:2340
+msgid "Verify Database"
+msgstr "Verifiera databas"
+
- #: git-gui.sh:2023 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
++#: git-gui.sh:2347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7
+#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
+msgid "Create Desktop Icon"
+msgstr "Skapa skrivbordsikon"
+
- #: git-gui.sh:2031
++#: git-gui.sh:2363 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+msgid "Quit"
+msgstr "Avsluta"
+
- #: git-gui.sh:2034
++#: git-gui.sh:2371
+msgid "Undo"
+msgstr "Ångra"
+
- #: git-gui.sh:2038 git-gui.sh:2545
++#: git-gui.sh:2374
+msgid "Redo"
+msgstr "Gör om"
+
- #: git-gui.sh:2041 git-gui.sh:2548 git-gui.sh:2622 git-gui.sh:2715
++#: git-gui.sh:2378 git-gui.sh:2923
+msgid "Cut"
+msgstr "Klipp ut"
+
- #: git-gui.sh:2044 git-gui.sh:2551
++#: git-gui.sh:2381 git-gui.sh:2926 git-gui.sh:3000 git-gui.sh:3082
+#: lib/console.tcl:69
+msgid "Copy"
+msgstr "Kopiera"
+
- #: git-gui.sh:2047 git-gui.sh:2554 lib/branch_delete.tcl:26
++#: git-gui.sh:2384 git-gui.sh:2929
+msgid "Paste"
+msgstr "Klistra in"
+
- #: git-gui.sh:2051 git-gui.sh:2558 git-gui.sh:2719 lib/console.tcl:71
++#: git-gui.sh:2387 git-gui.sh:2932 lib/branch_delete.tcl:26
+#: lib/remote_branch_delete.tcl:38
+msgid "Delete"
+msgstr "Ta bort"
+
- #: git-gui.sh:2060
++#: git-gui.sh:2391 git-gui.sh:2936 git-gui.sh:3086 lib/console.tcl:71
+msgid "Select All"
+msgstr "Markera alla"
+
- #: git-gui.sh:2066
++#: git-gui.sh:2400
+msgid "Create..."
+msgstr "Skapa..."
+
- #: git-gui.sh:2072
++#: git-gui.sh:2406
+msgid "Checkout..."
+msgstr "Checka ut..."
+
- #: git-gui.sh:2077 git-gui.sh:2187
++#: git-gui.sh:2412
+msgid "Rename..."
+msgstr "Byt namn..."
+
- #: git-gui.sh:2082
++#: git-gui.sh:2417
+msgid "Delete..."
+msgstr "Ta bort..."
+
- #: git-gui.sh:2094 git-gui.sh:2491
++#: git-gui.sh:2422
+msgid "Reset..."
+msgstr "Återställ..."
+
- #: git-gui.sh:2102 git-gui.sh:2498
++#: git-gui.sh:2432
++msgid "Done"
++msgstr "Färdig"
++
++#: git-gui.sh:2434
++msgid "Commit@@verb"
++msgstr "Checka in"
++
++#: git-gui.sh:2443 git-gui.sh:2864
+msgid "New Commit"
+msgstr "Ny incheckning"
+
- #: git-gui.sh:2111 git-gui.sh:2458 lib/remote_branch_delete.tcl:99
++#: git-gui.sh:2451 git-gui.sh:2871
+msgid "Amend Last Commit"
+msgstr "Lägg till föregående incheckning"
+
- #: git-gui.sh:2117
++#: git-gui.sh:2461 git-gui.sh:2825 lib/remote_branch_delete.tcl:99
+msgid "Rescan"
+msgstr "Sök på nytt"
+
- #: git-gui.sh:2123
++#: git-gui.sh:2467
+msgid "Stage To Commit"
+msgstr "Köa för incheckning"
+
- #: git-gui.sh:2129
++#: git-gui.sh:2473
+msgid "Stage Changed Files To Commit"
+msgstr "Köa ändrade filer för incheckning"
+
- #: git-gui.sh:2134 lib/index.tcl:395
++#: git-gui.sh:2479
+msgid "Unstage From Commit"
+msgstr "Ta bort från incheckningskö"
+
- #: git-gui.sh:2141 git-gui.sh:2702
++#: git-gui.sh:2484 lib/index.tcl:410
+msgid "Revert Changes"
+msgstr "Återställ ändringar"
+
- #: git-gui.sh:2145 git-gui.sh:2706
++#: git-gui.sh:2491 git-gui.sh:3069
+msgid "Show Less Context"
+msgstr "Visa mindre sammanhang"
+
- #: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
++#: git-gui.sh:2495 git-gui.sh:3073
+msgid "Show More Context"
+msgstr "Visa mer sammanhang"
+
- #: git-gui.sh:2155 git-gui.sh:2474
- msgid "Commit@@verb"
- msgstr "Checka in"
-
- #: git-gui.sh:2166
++#: git-gui.sh:2502 git-gui.sh:2838 git-gui.sh:2947
+msgid "Sign Off"
+msgstr "Skriv under"
+
- #: git-gui.sh:2171
++#: git-gui.sh:2518
+msgid "Local Merge..."
+msgstr "Lokal sammanslagning..."
+
- #: git-gui.sh:2183
++#: git-gui.sh:2523
+msgid "Abort Merge..."
+msgstr "Avbryt sammanslagning..."
+
- #: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14
- #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
++#: git-gui.sh:2535 git-gui.sh:2575
++msgid "Add..."
++msgstr "Lägg till..."
++
++#: git-gui.sh:2539
+msgid "Push..."
+msgstr "Sänd..."
+
- #: git-gui.sh:2201
++#: git-gui.sh:2543
++msgid "Delete Branch..."
++msgstr "Ta bort gren..."
++
++#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14
++#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#, tcl-format
+msgid "About %s"
+msgstr "Om %s"
+
- #: git-gui.sh:2209 git-gui.sh:2740
++#: git-gui.sh:2557
+msgid "Preferences..."
+msgstr "Inställningar..."
+
- #: git-gui.sh:2215 lib/choose_repository.tcl:47
++#: git-gui.sh:2565 git-gui.sh:3115
+msgid "Options..."
+msgstr "Alternativ..."
+
- #: git-gui.sh:2256
++#: git-gui.sh:2576
++msgid "Remove..."
++msgstr "Ta bort..."
++
++#: git-gui.sh:2585 lib/choose_repository.tcl:50
+msgid "Help"
+msgstr "Hjälp"
+
- #: git-gui.sh:2340
++#: git-gui.sh:2611
+msgid "Online Documentation"
+msgstr "Webbdokumentation"
+
- #: git-gui.sh:2373
++#: git-gui.sh:2614 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
++msgid "Show SSH Key"
++msgstr "Visa SSH-nyckel"
++
++#: git-gui.sh:2707
+#, tcl-format
+msgid "fatal: cannot stat path %s: No such file or directory"
+msgstr ""
+"ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas"
+
- #: git-gui.sh:2394
++#: git-gui.sh:2740
+msgid "Current Branch:"
+msgstr "Aktuell gren:"
+
- #: git-gui.sh:2414
++#: git-gui.sh:2761
+msgid "Staged Changes (Will Commit)"
+msgstr "Köade ändringar (kommer att checkas in)"
+
- #: git-gui.sh:2464
++#: git-gui.sh:2781
+msgid "Unstaged Changes"
+msgstr "Oköade ändringar"
+
- #: git-gui.sh:2480 lib/transport.tcl:93 lib/transport.tcl:182
++#: git-gui.sh:2831
+msgid "Stage Changed"
+msgstr "Köa ändrade"
+
- #: git-gui.sh:2510
++#: git-gui.sh:2850 lib/transport.tcl:93 lib/transport.tcl:182
+msgid "Push"
+msgstr "Sänd"
+
- #: git-gui.sh:2511
++#: git-gui.sh:2885
+msgid "Initial Commit Message:"
+msgstr "Inledande incheckningsmeddelande:"
+
- #: git-gui.sh:2512
++#: git-gui.sh:2886
+msgid "Amended Commit Message:"
+msgstr "Utökat incheckningsmeddelande:"
+
- #: git-gui.sh:2513
++#: git-gui.sh:2887
+msgid "Amended Initial Commit Message:"
+msgstr "Utökat inledande incheckningsmeddelande:"
+
- #: git-gui.sh:2514
++#: git-gui.sh:2888
+msgid "Amended Merge Commit Message:"
+msgstr "Utökat incheckningsmeddelande för sammanslagning:"
+
- #: git-gui.sh:2515
++#: git-gui.sh:2889
+msgid "Merge Commit Message:"
+msgstr "Incheckningsmeddelande för sammanslagning:"
+
- #: git-gui.sh:2561 git-gui.sh:2723 lib/console.tcl:73
++#: git-gui.sh:2890
+msgid "Commit Message:"
+msgstr "Incheckningsmeddelande:"
+
- #: git-gui.sh:2585 lib/blame.tcl:100
++#: git-gui.sh:2939 git-gui.sh:3090 lib/console.tcl:73
+msgid "Copy All"
+msgstr "Kopiera alla"
+
- #: git-gui.sh:2691
- msgid "Apply/Reverse Hunk"
- msgstr "Använd/återställ del"
-
- #: git-gui.sh:2696
- msgid "Apply/Reverse Line"
- msgstr "Använd/återställ rad"
-
- #: git-gui.sh:2711
++#: git-gui.sh:2963 lib/blame.tcl:104
+msgid "File:"
+msgstr "Fil:"
+
- #: git-gui.sh:2732
++#: git-gui.sh:3078
+msgid "Refresh"
+msgstr "Uppdatera"
+
- #: git-gui.sh:2736
++#: git-gui.sh:3099
+msgid "Decrease Font Size"
+msgstr "Minska teckensnittsstorlek"
+
- #: git-gui.sh:2747
++#: git-gui.sh:3103
+msgid "Increase Font Size"
+msgstr "Öka teckensnittsstorlek"
+
- #: git-gui.sh:2748
++#: git-gui.sh:3111 lib/blame.tcl:281
++msgid "Encoding"
++msgstr "Teckenkodning"
++
++#: git-gui.sh:3122
++msgid "Apply/Reverse Hunk"
++msgstr "Använd/återställ del"
++
++#: git-gui.sh:3127
++msgid "Apply/Reverse Line"
++msgstr "Använd/återställ rad"
++
++#: git-gui.sh:3137
++msgid "Run Merge Tool"
++msgstr "Starta verktyg för sammanslagning"
++
++#: git-gui.sh:3142
++msgid "Use Remote Version"
++msgstr "Använd versionen från fjärrarkivet"
++
++#: git-gui.sh:3146
++msgid "Use Local Version"
++msgstr "Använd lokala versionen"
++
++#: git-gui.sh:3150
++msgid "Revert To Base"
++msgstr "Återställ till basversionen"
++
++#: git-gui.sh:3169
+msgid "Unstage Hunk From Commit"
+msgstr "Ta bort del ur incheckningskö"
+
- #: git-gui.sh:2750
++#: git-gui.sh:3170
+msgid "Unstage Line From Commit"
+msgstr "Ta bort rad ur incheckningskö"
+
- #: git-gui.sh:2751
++#: git-gui.sh:3172
+msgid "Stage Hunk For Commit"
+msgstr "Ställ del i incheckningskö"
+
- #: git-gui.sh:2771
++#: git-gui.sh:3173
+msgid "Stage Line For Commit"
+msgstr "Ställ rad i incheckningskö"
+
- #: git-gui.sh:2876
++#: git-gui.sh:3196
+msgid "Initializing..."
+msgstr "Initierar..."
+
- #: git-gui.sh:2906
++#: git-gui.sh:3301
+#, tcl-format
+msgid ""
+"Possible environment issues exist.\n"
+"\n"
+"The following environment variables are probably\n"
+"going to be ignored by any Git subprocess run\n"
+"by %s:\n"
+"\n"
+msgstr ""
+"Det finns möjliga problem med miljövariabler.\n"
+"\n"
+"Följande miljövariabler kommer troligen att\n"
+"ignoreras av alla Git-underprocesser som körs\n"
+"av %s:\n"
+"\n"
+
- #: git-gui.sh:2911
++#: git-gui.sh:3331
+msgid ""
+"\n"
+"This is due to a known issue with the\n"
+"Tcl binary distributed by Cygwin."
+msgstr ""
+"\n"
+"Detta beror på ett känt problem med\n"
+"Tcl-binären som följer med Cygwin."
+
- #: lib/blame.tcl:70
++#: git-gui.sh:3336
+#, tcl-format
+msgid ""
+"\n"
+"\n"
+"A good replacement for %s\n"
+"is placing values for the user.name and\n"
+"user.email settings into your personal\n"
+"~/.gitconfig file.\n"
+msgstr ""
+"\n"
+"\n"
+"Du kan ersätta %s\n"
+"med att lägga in värden för inställningarna\n"
+"user.name och user.email i din personliga\n"
+"~/.gitconfig-fil.\n"
+
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - ett grafiskt användargränssnitt för Git."
+
- #: lib/blame.tcl:74
++#: lib/blame.tcl:72
+msgid "File Viewer"
+msgstr "Filvisare"
+
- #: lib/blame.tcl:257
++#: lib/blame.tcl:78
+msgid "Commit:"
+msgstr "Incheckning:"
+
- #: lib/blame.tcl:260
++#: lib/blame.tcl:271
+msgid "Copy Commit"
+msgstr "Kopiera incheckning"
+
- #: lib/blame.tcl:388
++#: lib/blame.tcl:275
++msgid "Find Text..."
++msgstr "Sök text..."
++
++#: lib/blame.tcl:284
+msgid "Do Full Copy Detection"
+msgstr "Gör full kopieringsigenkänning"
+
- #: lib/blame.tcl:492
++#: lib/blame.tcl:288
++msgid "Show History Context"
++msgstr "Visa historiksammanhang"
++
++#: lib/blame.tcl:291
++msgid "Blame Parent Commit"
++msgstr "Klandra föräldraincheckning"
++
++#: lib/blame.tcl:450
+#, tcl-format
+msgid "Reading %s..."
+msgstr "Läser %s..."
+
- #: lib/blame.tcl:512
++#: lib/blame.tcl:557
+msgid "Loading copy/move tracking annotations..."
+msgstr "Läser annoteringar för kopiering/flyttning..."
+
- #: lib/blame.tcl:704
++#: lib/blame.tcl:577
+msgid "lines annotated"
+msgstr "rader annoterade"
+
- #: lib/blame.tcl:707
++#: lib/blame.tcl:769
+msgid "Loading original location annotations..."
+msgstr "Läser in annotering av originalplacering..."
+
- #: lib/blame.tcl:737
++#: lib/blame.tcl:772
+msgid "Annotation complete."
+msgstr "Annotering fullbordad."
+
- #: lib/blame.tcl:738
++#: lib/blame.tcl:802
+msgid "Busy"
+msgstr "Upptagen"
+
- #: lib/blame.tcl:777
++#: lib/blame.tcl:803
+msgid "Annotation process is already running."
+msgstr "Annoteringsprocess körs redan."
+
- #: lib/blame.tcl:827
++#: lib/blame.tcl:842
+msgid "Running thorough copy detection..."
+msgstr "Kör grundlig kopieringsigenkänning..."
+
- #: lib/blame.tcl:883
++#: lib/blame.tcl:910
+msgid "Loading annotation..."
+msgstr "Läser in annotering..."
+
- #: lib/blame.tcl:887
++#: lib/blame.tcl:964
+msgid "Author:"
+msgstr "Författare:"
+
- #: lib/blame.tcl:892
++#: lib/blame.tcl:968
+msgid "Committer:"
+msgstr "Incheckare:"
+
- #: lib/blame.tcl:1006
++#: lib/blame.tcl:973
+msgid "Original File:"
+msgstr "Ursprunglig fil:"
+
- #: lib/blame.tcl:1012
++#: lib/blame.tcl:1021
++msgid "Cannot find HEAD commit:"
++msgstr "Hittar inte incheckning för HEAD:"
++
++#: lib/blame.tcl:1076
++msgid "Cannot find parent commit:"
++msgstr "Hittar inte föräldraincheckning:"
++
++#: lib/blame.tcl:1091
++msgid "Unable to display parent"
++msgstr "Kan inte visa förälder"
++
++#: lib/blame.tcl:1092 lib/diff.tcl:297
++msgid "Error loading diff:"
++msgstr "Fel vid inläsning av differens:"
++
++#: lib/blame.tcl:1232
+msgid "Originally By:"
+msgstr "Ursprungligen av:"
+
- #: lib/blame.tcl:1017
++#: lib/blame.tcl:1238
+msgid "In File:"
+msgstr "I filen:"
+
- #: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:171
- #: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
++#: lib/blame.tcl:1243
+msgid "Copied Or Moved Here By:"
+msgstr "Kopierad eller flyttad hit av:"
+
+#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
+msgid "Checkout Branch"
+msgstr "Checka ut gren"
+
+#: lib/branch_checkout.tcl:23
+msgid "Checkout"
+msgstr "Checka ut"
+
+#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
- #: lib/branch_checkout.tcl:32 lib/browser.tcl:287
++#: lib/checkout_op.tcl:544 lib/choose_font.tcl:43 lib/merge.tcl:172
++#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
++#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
++#: lib/transport.tcl:97
+msgid "Cancel"
+msgstr "Avbryt"
+
- #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:244
++#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
+msgid "Revision"
+msgstr "Revision"
+
- #: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
++#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
+msgid "Options"
+msgstr "Alternativ"
+
+#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
+msgstr "Hämta spårande gren"
+
+#: lib/branch_checkout.tcl:44
+msgid "Detach From Local Branch"
+msgstr "Koppla bort från lokal gren"
+
+#: lib/branch_create.tcl:22
+msgid "Create Branch"
+msgstr "Skapa gren"
+
+#: lib/branch_create.tcl:27
+msgid "Create New Branch"
+msgstr "Skapa ny gren"
+
- #: lib/branch_create.tcl:43
++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:377
+msgid "Create"
+msgstr "Skapa"
+
+#: lib/branch_create.tcl:40
+msgid "Branch Name"
+msgstr "Namn på gren"
+
- #: lib/browser.tcl:278 lib/choose_repository.tcl:387
- #: lib/choose_repository.tcl:472 lib/choose_repository.tcl:482
- #: lib/choose_repository.tcl:985
++#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
+msgid "Name:"
+msgstr "Namn:"
+
+#: lib/branch_create.tcl:58
+msgid "Match Tracking Branch Name"
+msgstr "Använd namn på spårad gren"
+
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
+msgstr "Inledande revision"
+
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
+msgstr "Uppdatera befintlig gren:"
+
+#: lib/branch_create.tcl:75
+msgid "No"
+msgstr "Nej"
+
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
+msgstr "Endast snabbspolning"
+
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:536
+msgid "Reset"
+msgstr "Återställ"
+
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
+msgstr "Checka ut när skapad"
+
+#: lib/branch_create.tcl:131
+msgid "Please select a tracking branch."
+msgstr "Välj en gren att spåra."
+
+#: lib/branch_create.tcl:140
+#, tcl-format
+msgid "Tracking branch %s is not a branch in the remote repository."
+msgstr "Den spårade grenen %s är inte en gren i fjärrarkivet."
+
+#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
+msgid "Please supply a branch name."
+msgstr "Ange ett namn för grenen."
+
+#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#, tcl-format
+msgid "'%s' is not an acceptable branch name."
+msgstr "\"%s\" kan inte användas som namn på grenen."
+
+#: lib/branch_delete.tcl:15
+msgid "Delete Branch"
+msgstr "Ta bort gren"
+
+#: lib/branch_delete.tcl:20
+msgid "Delete Local Branch"
+msgstr "Ta bort lokal gren"
+
+#: lib/branch_delete.tcl:37
+msgid "Local Branches"
+msgstr "Lokala grenar"
+
+#: lib/branch_delete.tcl:52
+msgid "Delete Only If Merged Into"
+msgstr "Ta bara bort om sammanslagen med"
+
+#: lib/branch_delete.tcl:54
+msgid "Always (Do not perform merge test.)"
+msgstr "Alltid (utför inte sammanslagningstest)."
+
+#: lib/branch_delete.tcl:103
+#, tcl-format
+msgid "The following branches are not completely merged into %s:"
+msgstr "Följande grenar är inte till fullo sammanslagna med %s:"
+
+#: lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult. \n"
+"\n"
+" Delete the selected branches?"
+msgstr ""
+"Det är svårt att återställa borttagna grenar.\n"
+"\n"
+" Ta bort valda grenar?"
+
+#: lib/branch_delete.tcl:141
+#, tcl-format
+msgid ""
+"Failed to delete branches:\n"
+"%s"
+msgstr ""
+"Kunde inte ta bort grenar:\n"
+"%s"
+
+#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
+msgid "Rename Branch"
+msgstr "Byt namn på gren"
+
+#: lib/branch_rename.tcl:26
+msgid "Rename"
+msgstr "Byt namn"
+
+#: lib/branch_rename.tcl:36
+msgid "Branch:"
+msgstr "Gren:"
+
+#: lib/branch_rename.tcl:39
+msgid "New Name:"
+msgstr "Nytt namn:"
+
+#: lib/branch_rename.tcl:75
+msgid "Please select a branch to rename."
+msgstr "Välj en gren att byta namn på."
+
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:201
+#, tcl-format
+msgid "Branch '%s' already exists."
+msgstr "Grenen \"%s\" finns redan."
+
+#: lib/branch_rename.tcl:117
+#, tcl-format
+msgid "Failed to rename '%s'."
+msgstr "Kunde inte byta namn på \"%s\"."
+
+#: lib/browser.tcl:17
+msgid "Starting..."
+msgstr "Startar..."
+
+#: lib/browser.tcl:26
+msgid "File Browser"
+msgstr "Filbläddrare"
+
+#: lib/browser.tcl:126 lib/browser.tcl:143
+#, tcl-format
+msgid "Loading %s..."
+msgstr "Läser %s..."
+
+#: lib/browser.tcl:187
+msgid "[Up To Parent]"
+msgstr "[Upp till förälder]"
+
+#: lib/browser.tcl:267 lib/browser.tcl:273
+msgid "Browse Branch Files"
+msgstr "Bläddra filer på grenen"
+
- #: lib/checkout_op.tcl:532 lib/merge.tcl:163
++#: lib/browser.tcl:278 lib/choose_repository.tcl:394
++#: lib/choose_repository.tcl:480 lib/choose_repository.tcl:491
++#: lib/choose_repository.tcl:995
+msgid "Browse"
+msgstr "Bläddra"
+
+#: lib/checkout_op.tcl:84
+#, tcl-format
+msgid "Fetching %s from %s"
+msgstr "Hämtar %s från %s"
+
+#: lib/checkout_op.tcl:132
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
+msgstr "ödesdigert: Kunde inte slå upp %s"
+
+#: lib/checkout_op.tcl:145 lib/console.tcl:81 lib/database.tcl:31
++#: lib/sshkey.tcl:53
+msgid "Close"
+msgstr "Stäng"
+
+#: lib/checkout_op.tcl:174
+#, tcl-format
+msgid "Branch '%s' does not exist."
+msgstr "Grenen \"%s\" finns inte."
+
+#: lib/checkout_op.tcl:193
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
+msgstr "Kunde inte konfigurera förenklad git-pull för '%s'."
+
+#: lib/checkout_op.tcl:228
+#, tcl-format
+msgid ""
+"Branch '%s' already exists.\n"
+"\n"
+"It cannot fast-forward to %s.\n"
+"A merge is required."
+msgstr ""
+"Grenen \"%s\" finns redan.\n"
+"\n"
+"Den kan inte snabbspolas till %s.\n"
+"En sammanslagning krävs."
+
+#: lib/checkout_op.tcl:242
+#, tcl-format
+msgid "Merge strategy '%s' not supported."
+msgstr "Sammanslagningsstrategin \"%s\" stöds inte."
+
+#: lib/checkout_op.tcl:261
+#, tcl-format
+msgid "Failed to update '%s'."
+msgstr "Misslyckades med att uppdatera \"%s\"."
+
+#: lib/checkout_op.tcl:273
+msgid "Staging area (index) is already locked."
+msgstr "Köområdet (index) är redan låst."
+
+#: lib/checkout_op.tcl:288
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before the current branch can be changed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n"
+"\n"
+"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste "
+"utföra en ny sökning innan den aktuella grenen kan ändras.\n"
+"\n"
+"Sökningen kommer att startas automatiskt nu.\n"
+
+#: lib/checkout_op.tcl:344
+#, tcl-format
+msgid "Updating working directory to '%s'..."
+msgstr "Uppdaterar arbetskatalogen till \"%s\"..."
+
+#: lib/checkout_op.tcl:345
+msgid "files checked out"
+msgstr "filer utcheckade"
+
+#: lib/checkout_op.tcl:375
+#, tcl-format
+msgid "Aborted checkout of '%s' (file level merging is required)."
+msgstr "Avbryter utcheckning av \"%s\" (sammanslagning på filnivå krävs)."
+
+#: lib/checkout_op.tcl:376
+msgid "File level merge required."
+msgstr "Sammanslagning på filnivå krävs."
+
+#: lib/checkout_op.tcl:380
+#, tcl-format
+msgid "Staying on branch '%s'."
+msgstr "Stannar på grenen \"%s\"."
+
+#: lib/checkout_op.tcl:451
+msgid ""
+"You are no longer on a local branch.\n"
+"\n"
+"If you wanted to be on a branch, create one now starting from 'This Detached "
+"Checkout'."
+msgstr ""
+"Du är inte längre på en lokal gren.\n"
+"\n"
+"Om du ville vara på en gren skapar du en nu, baserad på \"Denna frånkopplade "
+"utcheckning\"."
+
+#: lib/checkout_op.tcl:468 lib/checkout_op.tcl:472
+#, tcl-format
+msgid "Checked out '%s'."
+msgstr "Checkade ut \"%s\"."
+
+#: lib/checkout_op.tcl:500
+#, tcl-format
+msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgstr ""
+"Om du återställer \"%s\" till \"%s\" går följande incheckningar förlorade:"
+
+#: lib/checkout_op.tcl:522
+msgid "Recovering lost commits may not be easy."
+msgstr "Det kanske inte är så enkelt att återskapa förlorade incheckningar."
+
+#: lib/checkout_op.tcl:527
+#, tcl-format
+msgid "Reset '%s'?"
+msgstr "Återställa \"%s\"?"
+
- #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
++#: lib/checkout_op.tcl:532 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+msgid "Visualize"
+msgstr "Visualisera"
+
+#: lib/checkout_op.tcl:600
+#, tcl-format
+msgid ""
+"Failed to set current branch.\n"
+"\n"
+"This working directory is only partially switched. We successfully updated "
+"your files, but failed to update an internal Git file.\n"
+"\n"
+"This should not have occurred. %s will now close and give up."
+msgstr ""
+"Kunde inte ställa in aktuell gren.\n"
+"\n"
+"Arbetskatalogen har bara växlats delvis. Vi uppdaterade filerna utan "
+"problem, men kunde inte uppdatera en intern fil i Git.\n"
+"\n"
+"Detta skulle inte ha hänt. %s kommer nu stängas och ge upp."
+
+#: lib/choose_font.tcl:39
+msgid "Select"
+msgstr "Välj"
+
+#: lib/choose_font.tcl:53
+msgid "Font Family"
+msgstr "Teckensnittsfamilj"
+
+#: lib/choose_font.tcl:74
+msgid "Font Size"
+msgstr "Storlek"
+
+#: lib/choose_font.tcl:91
+msgid "Font Example"
+msgstr "Exempel"
+
+#: lib/choose_font.tcl:103
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
+msgstr ""
+"Detta är en exempeltext.\n"
+"Om du tycker om den här texten kan den vara ditt teckensnitt."
+
+#: lib/choose_repository.tcl:28
+msgid "Git Gui"
+msgstr "Git Gui"
+
- #: lib/choose_repository.tcl:87
++#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:382
+msgid "Create New Repository"
+msgstr "Skapa nytt arkiv"
+
- #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:458
++#: lib/choose_repository.tcl:93
+msgid "New..."
+msgstr "Nytt..."
+
- #: lib/choose_repository.tcl:100
++#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:465
+msgid "Clone Existing Repository"
+msgstr "Klona befintligt arkiv"
+
- #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:974
++#: lib/choose_repository.tcl:106
+msgid "Clone..."
+msgstr "Klona..."
+
- #: lib/choose_repository.tcl:113
++#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:983
+msgid "Open Existing Repository"
+msgstr "Öppna befintligt arkiv"
+
- #: lib/choose_repository.tcl:126
++#: lib/choose_repository.tcl:119
+msgid "Open..."
+msgstr "Öppna..."
+
- #: lib/choose_repository.tcl:132
++#: lib/choose_repository.tcl:132
+msgid "Recent Repositories"
+msgstr "Senaste arkiven"
+
- #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
- #: lib/choose_repository.tcl:310
++#: lib/choose_repository.tcl:138
+msgid "Open Recent Repository:"
+msgstr "Öppna tidigare arkiv:"
+
- #: lib/choose_repository.tcl:381 lib/choose_repository.tcl:476
++#: lib/choose_repository.tcl:302 lib/choose_repository.tcl:309
++#: lib/choose_repository.tcl:316
+#, tcl-format
+msgid "Failed to create repository %s:"
+msgstr "Kunde inte skapa arkivet %s:"
+
- #: lib/choose_repository.tcl:410 lib/choose_repository.tcl:535
- #: lib/choose_repository.tcl:1007
++#: lib/choose_repository.tcl:387
+msgid "Directory:"
+msgstr "Katalog:"
+
- #: lib/choose_repository.tcl:435
++#: lib/choose_repository.tcl:417 lib/choose_repository.tcl:544
++#: lib/choose_repository.tcl:1017
+msgid "Git Repository"
+msgstr "Gitarkiv"
+
- #: lib/choose_repository.tcl:439
++#: lib/choose_repository.tcl:442
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr "Katalogen %s finns redan."
+
- #: lib/choose_repository.tcl:453
++#: lib/choose_repository.tcl:446
+#, tcl-format
+msgid "File %s already exists."
+msgstr "Filen %s finns redan."
+
- #: lib/choose_repository.tcl:466
- msgid "URL:"
- msgstr "Webbadress:"
++#: lib/choose_repository.tcl:460
+msgid "Clone"
+msgstr "Klona"
+
- #: lib/choose_repository.tcl:487
++#: lib/choose_repository.tcl:473
++msgid "Source Location:"
++msgstr "Plats för källkod:"
++
++#: lib/choose_repository.tcl:484
++msgid "Target Directory:"
++msgstr "Målkatalog:"
+
- #: lib/choose_repository.tcl:493
++#: lib/choose_repository.tcl:496
+msgid "Clone Type:"
+msgstr "Typ av klon:"
+
- #: lib/choose_repository.tcl:499
++#: lib/choose_repository.tcl:502
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr "Standard (snabb, semiredundant, hårda länkar)"
+
- #: lib/choose_repository.tcl:505
++#: lib/choose_repository.tcl:508
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr "Full kopia (långsammare, redundant säkerhetskopia)"
+
- #: lib/choose_repository.tcl:541 lib/choose_repository.tcl:588
- #: lib/choose_repository.tcl:734 lib/choose_repository.tcl:804
- #: lib/choose_repository.tcl:1013 lib/choose_repository.tcl:1021
++#: lib/choose_repository.tcl:514
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)"
+
- #: lib/choose_repository.tcl:577
++#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
++#: lib/choose_repository.tcl:743 lib/choose_repository.tcl:813
++#: lib/choose_repository.tcl:1023 lib/choose_repository.tcl:1031
+#, tcl-format
+msgid "Not a Git repository: %s"
+msgstr "Inte ett Gitarkiv: %s"
+
- #: lib/choose_repository.tcl:581
++#: lib/choose_repository.tcl:586
+msgid "Standard only available for local repository."
+msgstr "Standard är endast tillgängligt för lokala arkiv."
+
- #: lib/choose_repository.tcl:602
++#: lib/choose_repository.tcl:590
+msgid "Shared only available for local repository."
+msgstr "Delat är endast tillgängligt för lokala arkiv."
+
- #: lib/choose_repository.tcl:613
++#: lib/choose_repository.tcl:611
+#, tcl-format
+msgid "Location %s already exists."
+msgstr "Platsen %s finns redan."
+
- #: lib/choose_repository.tcl:625
++#: lib/choose_repository.tcl:622
+msgid "Failed to configure origin"
+msgstr "Kunde inte konfigurera ursprung"
+
- #: lib/choose_repository.tcl:626
++#: lib/choose_repository.tcl:634
+msgid "Counting objects"
+msgstr "Räknar objekt"
+
- #: lib/choose_repository.tcl:650
++#: lib/choose_repository.tcl:635
+msgid "buckets"
+msgstr "hinkar"
+
- #: lib/choose_repository.tcl:686
++#: lib/choose_repository.tcl:659
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr "Kunde inte kopiera objekt/info/alternativ: %s"
+
- #: lib/choose_repository.tcl:688 lib/choose_repository.tcl:902
- #: lib/choose_repository.tcl:914
++#: lib/choose_repository.tcl:695
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "Ingenting att klona från %s."
+
- #: lib/choose_repository.tcl:701
++#: lib/choose_repository.tcl:697 lib/choose_repository.tcl:911
++#: lib/choose_repository.tcl:923
+msgid "The 'master' branch has not been initialized."
+msgstr "Grenen \"master\" har inte initierats."
+
- #: lib/choose_repository.tcl:713
++#: lib/choose_repository.tcl:710
+msgid "Hardlinks are unavailable. Falling back to copying."
+msgstr "Hårda länkar är inte tillgängliga. Faller tillbaka på kopiering."
+
- #: lib/choose_repository.tcl:744
++#: lib/choose_repository.tcl:722
+#, tcl-format
+msgid "Cloning from %s"
+msgstr "Klonar från %s"
+
- #: lib/choose_repository.tcl:745
++#: lib/choose_repository.tcl:753
+msgid "Copying objects"
+msgstr "Kopierar objekt"
+
- #: lib/choose_repository.tcl:769
++#: lib/choose_repository.tcl:754
+msgid "KiB"
+msgstr "KiB"
+
- #: lib/choose_repository.tcl:779
++#: lib/choose_repository.tcl:778
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr "Kunde inte kopiera objekt: %s"
+
- #: lib/choose_repository.tcl:780
++#: lib/choose_repository.tcl:788
+msgid "Linking objects"
+msgstr "Länkar objekt"
+
- #: lib/choose_repository.tcl:788
++#: lib/choose_repository.tcl:789
+msgid "objects"
+msgstr "objekt"
+
- #: lib/choose_repository.tcl:843
++#: lib/choose_repository.tcl:797
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr "Kunde inte hårdlänka objekt: %s"
+
- #: lib/choose_repository.tcl:854
++#: lib/choose_repository.tcl:852
+msgid "Cannot fetch branches and objects. See console output for details."
+msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer."
+
- #: lib/choose_repository.tcl:878
++#: lib/choose_repository.tcl:863
+msgid "Cannot fetch tags. See console output for details."
+msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer."
+
- #: lib/choose_repository.tcl:887
++#: lib/choose_repository.tcl:887
+msgid "Cannot determine HEAD. See console output for details."
+msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer."
+
- #: lib/choose_repository.tcl:893
++#: lib/choose_repository.tcl:896
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr "Kunde inte städa upp %s"
+
- #: lib/choose_repository.tcl:900
++#: lib/choose_repository.tcl:902
+msgid "Clone failed."
+msgstr "Kloning misslyckades."
+
- #: lib/choose_repository.tcl:911
++#: lib/choose_repository.tcl:909
+msgid "No default branch obtained."
+msgstr "Hämtade ingen standardgren."
+
- #: lib/choose_repository.tcl:923
++#: lib/choose_repository.tcl:920
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr "Kunde inte slå upp %s till någon incheckning."
+
- #: lib/choose_repository.tcl:924 lib/index.tcl:65 lib/index.tcl:127
- #: lib/index.tcl:193
++#: lib/choose_repository.tcl:932
+msgid "Creating working directory"
+msgstr "Skapar arbetskatalog"
+
- #: lib/choose_repository.tcl:953
++#: lib/choose_repository.tcl:933 lib/index.tcl:65 lib/index.tcl:128
++#: lib/index.tcl:196
+msgid "files"
+msgstr "filer"
+
- #: lib/choose_repository.tcl:969
++#: lib/choose_repository.tcl:962
+msgid "Initial file checkout failed."
+msgstr "Inledande filutcheckning misslyckades."
+
- #: lib/choose_repository.tcl:979
++#: lib/choose_repository.tcl:978
+msgid "Open"
+msgstr "Öppna"
+
- #: lib/choose_repository.tcl:1027
++#: lib/choose_repository.tcl:988
+msgid "Repository:"
+msgstr "Arkiv:"
+
- #: lib/commit.tcl:154
++#: lib/choose_repository.tcl:1037
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "Kunde inte öppna arkivet %s:"
+
+#: lib/choose_rev.tcl:53
+msgid "This Detached Checkout"
+msgstr "Denna frånkopplade utcheckning"
+
+#: lib/choose_rev.tcl:60
+msgid "Revision Expression:"
+msgstr "Revisionsuttryck:"
+
+#: lib/choose_rev.tcl:74
+msgid "Local Branch"
+msgstr "Lokal gren"
+
+#: lib/choose_rev.tcl:79
+msgid "Tracking Branch"
+msgstr "Spårande gren"
+
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+msgid "Tag"
+msgstr "Tagg"
+
+#: lib/choose_rev.tcl:317
+#, tcl-format
+msgid "Invalid revision: %s"
+msgstr "Ogiltig revision: %s"
+
+#: lib/choose_rev.tcl:338
+msgid "No revision selected."
+msgstr "Ingen revision vald."
+
+#: lib/choose_rev.tcl:346
+msgid "Revision expression is empty."
+msgstr "Revisionsuttrycket är tomt."
+
+#: lib/choose_rev.tcl:531
+msgid "Updated"
+msgstr "Uppdaterad"
+
+#: lib/choose_rev.tcl:559
+msgid "URL"
+msgstr "Webbadress"
+
+#: lib/commit.tcl:9
+msgid ""
+"There is nothing to amend.\n"
+"\n"
+"You are about to create the initial commit. There is no commit before this "
+"to amend.\n"
+msgstr ""
+"Det finns ingenting att utöka.\n"
+"\n"
+"Du håller på att skapa den inledande incheckningen. Det finns ingen tidigare "
+"incheckning att utöka.\n"
+
+#: lib/commit.tcl:18
+msgid ""
+"Cannot amend while merging.\n"
+"\n"
+"You are currently in the middle of a merge that has not been fully "
+"completed. You cannot amend the prior commit unless you first abort the "
+"current merge activity.\n"
+msgstr ""
+"Kan inte utöka vid sammanslagning.\n"
+"\n"
+"Du är i mitten av en sammanslagning som inte är fullbordad. Du kan inte "
+"utöka tidigare incheckningar om du inte först avbryter den pågående "
+"sammanslagningen.\n"
+
+#: lib/commit.tcl:49
+msgid "Error loading commit data for amend:"
+msgstr "Fel vid inläsning av incheckningsdata för utökning:"
+
+#: lib/commit.tcl:76
+msgid "Unable to obtain your identity:"
+msgstr "Kunde inte hämta din identitet:"
+
+#: lib/commit.tcl:81
+msgid "Invalid GIT_COMMITTER_IDENT:"
+msgstr "Felaktig GIT_COMMITTER_IDENT:"
+
+#: lib/commit.tcl:133
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before another commit can be created.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n"
+"\n"
+"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste "
+"utföra en ny sökning innan du kan göra en ny incheckning.\n"
+"\n"
+"Sökningen kommer att startas automatiskt nu.\n"
+
- #: lib/commit.tcl:162
++#: lib/commit.tcl:156
+#, tcl-format
+msgid ""
+"Unmerged files cannot be committed.\n"
+"\n"
+"File %s has merge conflicts. You must resolve them and stage the file "
+"before committing.\n"
+msgstr ""
+"Osammanslagna filer kan inte checkas in.\n"
+"\n"
+"Filen %s har sammanslagningskonflikter. Du måste lösa dem och köa filen "
+"innan du checkar in den.\n"
+
- #: lib/commit.tcl:170
++#: lib/commit.tcl:164
+#, tcl-format
+msgid ""
+"Unknown file state %s detected.\n"
+"\n"
+"File %s cannot be committed by this program.\n"
+msgstr ""
+"Okänd filstatus %s upptäckt.\n"
+"\n"
+"Filen %s kan inte checkas in av programmet.\n"
+
- #: lib/commit.tcl:183
++#: lib/commit.tcl:172
+msgid ""
+"No changes to commit.\n"
+"\n"
+"You must stage at least 1 file before you can commit.\n"
+msgstr ""
+"Inga ändringar att checka in.\n"
+"\n"
+"Du måste köa åtminstone en fil innan du kan checka in.\n"
+
- #: lib/commit.tcl:207
++#: lib/commit.tcl:187
+msgid ""
+"Please supply a commit message.\n"
+"\n"
+"A good commit message has the following format:\n"
+"\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 ""
+"Ange ett incheckningsmeddelande.\n"
+"\n"
+"Ett bra incheckningsmeddelande har följande format:\n"
+"\n"
+"- Första raden: Beskriv i en mening vad du gjorde.\n"
+"- Andra raden: Tom\n"
+"- Följande rader: Beskriv varför det här är en bra ändring.\n"
+
- #: lib/commit.tcl:221
++#: lib/commit.tcl:211
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"."
+
- msgstr "Anropar krok före incheckning..."
++#: lib/commit.tcl:227
+msgid "Calling pre-commit hook..."
- #: lib/commit.tcl:236
++msgstr "Anropar kroken före incheckning (pre-commit)..."
+
- msgstr "Incheckningen avvisades av krok före incheckning."
++#: lib/commit.tcl:242
+msgid "Commit declined by pre-commit hook."
- #: lib/commit.tcl:259
++msgstr "Incheckningen avvisades av kroken före incheckning (pre-commit)."
+
- msgstr "Anropar krok för incheckningsmeddelande..."
++#: lib/commit.tcl:265
+msgid "Calling commit-msg hook..."
- #: lib/commit.tcl:274
++msgstr "Anropar kroken för incheckningsmeddelande (commit-msg)..."
+
- msgstr "Incheckning avvisad av krok för incheckningsmeddelande."
++#: lib/commit.tcl:280
+msgid "Commit declined by commit-msg hook."
- #: lib/commit.tcl:287
++msgstr "Incheckning avvisad av kroken för incheckningsmeddelande (commit-msg)."
+
- #: lib/commit.tcl:303
++#: lib/commit.tcl:293
+msgid "Committing changes..."
+msgstr "Checkar in ändringar..."
+
- #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
++#: lib/commit.tcl:309
+msgid "write-tree failed:"
+msgstr "write-tree misslyckades:"
+
- #: lib/commit.tcl:321
++#: lib/commit.tcl:310 lib/commit.tcl:354 lib/commit.tcl:374
+msgid "Commit failed."
+msgstr "Incheckningen misslyckades."
+
- #: lib/commit.tcl:326
++#: lib/commit.tcl:327
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr "Incheckningen %s verkar vara trasig"
+
- #: lib/commit.tcl:333
++#: lib/commit.tcl:332
+msgid ""
+"No changes to commit.\n"
+"\n"
+"No files were modified by this commit and it was not a merge commit.\n"
+"\n"
+"A rescan will be automatically started now.\n"
+msgstr ""
+"Inga ändringar att checka in.\n"
+"\n"
+"Inga filer ändrades av incheckningen och det var inte en sammanslagning.\n"
+"\n"
+"En sökning kommer att startas automatiskt nu.\n"
+
- #: lib/commit.tcl:347
++#: lib/commit.tcl:339
+msgid "No changes to commit."
+msgstr "Inga ändringar att checka in."
+
- #: lib/commit.tcl:367
++#: lib/commit.tcl:353
+msgid "commit-tree failed:"
+msgstr "commit-tree misslyckades:"
+
- #: lib/commit.tcl:454
++#: lib/commit.tcl:373
+msgid "update-ref failed:"
+msgstr "update-ref misslyckades:"
+
- #: lib/diff.tcl:44
++#: lib/commit.tcl:461
+#, tcl-format
+msgid "Created commit %s: %s"
+msgstr "Skapade incheckningen %s: %s"
+
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr "Arbetar... vänta..."
+
+#: lib/console.tcl:186
+msgid "Success"
+msgstr "Lyckades"
+
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr "Fel: Kommando misslyckades"
+
+#: lib/database.tcl:43
+msgid "Number of loose objects"
+msgstr "Antal lösa objekt"
+
+#: lib/database.tcl:44
+msgid "Disk space used by loose objects"
+msgstr "Diskutrymme använt av lösa objekt"
+
+#: lib/database.tcl:45
+msgid "Number of packed objects"
+msgstr "Antal packade objekt"
+
+#: lib/database.tcl:46
+msgid "Number of packs"
+msgstr "Antal paket"
+
+#: lib/database.tcl:47
+msgid "Disk space used by packed objects"
+msgstr "Diskutrymme använt av packade objekt"
+
+#: lib/database.tcl:48
+msgid "Packed objects waiting for pruning"
+msgstr "Packade objekt som väntar på städning"
+
+#: lib/database.tcl:49
+msgid "Garbage files"
+msgstr "Skräpfiler"
+
+#: lib/database.tcl:72
+msgid "Compressing the object database"
+msgstr "Komprimerar objektdatabasen"
+
+#: lib/database.tcl:83
+msgid "Verifying the object database with fsck-objects"
+msgstr "Verifierar objektdatabasen med fsck-objects"
+
+#: lib/database.tcl:108
+#, tcl-format
+msgid ""
+"This repository currently has approximately %i loose objects.\n"
+"\n"
+"To maintain optimal performance it is strongly recommended that you compress "
+"the database when more than %i loose objects exist.\n"
+"\n"
+"Compress the database now?"
+msgstr ""
+"Arkivet har för närvarande omkring %i lösa objekt.\n"
+"\n"
+"För att bibehålla optimal prestanda rekommenderas det å det bestämdaste att "
+"du komprimerar databasen när den innehåller mer än %i lösa objekt.\n"
+"\n"
+"Komprimera databasen nu?"
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Ogiltigt datum från Git: %s"
+
- #: lib/diff.tcl:83
++#: lib/diff.tcl:59
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but "
+"the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have "
+"the same state."
+msgstr ""
+"Hittade inga skillnader.\n"
+"\n"
+"%s innehåller inga ändringar.\n"
+"\n"
+"Modifieringsdatum för filen uppdaterades av ett annat program, men "
+"innehållet i filen har inte ändrats.\n"
+"\n"
+"En sökning kommer automatiskt att startas för att hitta andra filer som kan "
+"vara i samma tillstånd."
+
- #: lib/diff.tcl:116 lib/diff.tcl:190
++#: lib/diff.tcl:99
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Läser differens för %s..."
+
- #: lib/diff.tcl:117
++#: lib/diff.tcl:120
++msgid ""
++"LOCAL: deleted\n"
++"REMOTE:\n"
++msgstr "LOKAL: borttagen\n"
++"FJÄRR:\n"
++
++#: lib/diff.tcl:125
++msgid ""
++"REMOTE: deleted\n"
++"LOCAL:\n"
++msgstr "FJÄRR: borttagen\n"
++"LOKAL:\n"
++
++#: lib/diff.tcl:132
++msgid "LOCAL:\n"
++msgstr "LOKAL:\n"
++
++#: lib/diff.tcl:135
++msgid "REMOTE:\n"
++msgstr "FJÄRR:\n"
++
++#: lib/diff.tcl:197 lib/diff.tcl:296
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "Kan inte visa %s"
+
- #: lib/diff.tcl:124
++#: lib/diff.tcl:198
+msgid "Error loading file:"
+msgstr "Fel vid läsning av fil:"
+
- #: lib/diff.tcl:136
++#: lib/diff.tcl:205
+msgid "Git Repository (subproject)"
+msgstr "Gitarkiv (underprojekt)"
+
- #: lib/diff.tcl:191
- msgid "Error loading diff:"
- msgstr "Fel vid inläsning av differens:"
++#: lib/diff.tcl:217
+msgid "* Binary file (not showing content)."
+msgstr "* Binärfil (visar inte innehållet)."
+
- #: lib/diff.tcl:313
++#: lib/diff.tcl:222
++#, tcl-format
++msgid ""
++"* Untracked file is %d bytes.\n"
++"* Showing only first %d bytes.\n"
++msgstr "* Den ospårade filen är %d byte.\n"
++"* Visar endast inledande %d byte.\n"
+
- #: lib/diff.tcl:320
++#: lib/diff.tcl:228
++#, tcl-format
++msgid ""
++"\n"
++"* Untracked file clipped here by %s.\n"
++"* To see the entire file, use an external editor.\n"
++msgstr ""
++"\n"
++"* Den ospårade filen klipptes här av %s.\n"
++"* För att se hela filen, använd ett externt redigeringsprogram.\n"
++
++#: lib/diff.tcl:436
+msgid "Failed to unstage selected hunk."
+msgstr "Kunde inte ta bort den valda delen från kön."
+
- #: lib/diff.tcl:386
++#: lib/diff.tcl:443
+msgid "Failed to stage selected hunk."
+msgstr "Kunde inte lägga till den valda delen till kön."
+
- #: lib/diff.tcl:394
++#: lib/diff.tcl:509
+msgid "Failed to unstage selected line."
+msgstr "Kunde inte ta bort den valda raden från kön."
+
- #: lib/index.tcl:282
++#: lib/diff.tcl:517
+msgid "Failed to stage selected line."
+msgstr "Kunde inte lägga till den valda raden till kön."
+
++#: lib/encoding.tcl:443
++msgid "Default"
++msgstr "Standard"
++
++#: lib/encoding.tcl:448
++#, tcl-format
++msgid "System (%s)"
++msgstr "Systemets (%s)"
++
++#: lib/encoding.tcl:459 lib/encoding.tcl:465
++msgid "Other"
++msgstr "Annan"
++
+#: lib/error.tcl:20 lib/error.tcl:114
+msgid "error"
+msgstr "fel"
+
+#: lib/error.tcl:36
+msgid "warning"
+msgstr "varning"
+
+#: lib/error.tcl:94
+msgid "You must correct the above errors before committing."
+msgstr "Du måste rätta till felen ovan innan du checkar in."
+
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
+msgstr "Kunde inte låsa upp indexet."
+
+#: lib/index.tcl:15
+msgid "Index Error"
+msgstr "Indexfel"
+
+#: lib/index.tcl:21
+msgid ""
+"Updating the Git index failed. A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr ""
+"Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas "
+"automatiskt för att synkronisera om git-gui."
+
+#: lib/index.tcl:27
+msgid "Continue"
+msgstr "Forstätt"
+
+#: lib/index.tcl:31
+msgid "Unlock Index"
+msgstr "Lås upp index"
+
- #: lib/index.tcl:313
++#: lib/index.tcl:287
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "Tar bort %s för incheckningskön"
+
- #: lib/index.tcl:326
++#: lib/index.tcl:326
+msgid "Ready to commit."
+msgstr "Redo att checka in."
+
- #: lib/index.tcl:381
++#: lib/index.tcl:339
+#, tcl-format
+msgid "Adding %s"
+msgstr "Lägger till %s"
+
- #: lib/index.tcl:383
++#: lib/index.tcl:396
+#, tcl-format
+msgid "Revert changes in file %s?"
+msgstr "Återställ ändringarna i filen %s?"
+
- #: lib/index.tcl:391
++#: lib/index.tcl:398
+#, tcl-format
+msgid "Revert changes in these %i files?"
+msgstr "Återställ ändringarna i dessa %i filer?"
+
- #: lib/index.tcl:394
++#: lib/index.tcl:406
+msgid "Any unstaged changes will be permanently lost by the revert."
+msgstr ""
+"Alla oköade ändringar kommer permanent gå förlorade vid återställningen."
+
- #: lib/merge.tcl:44
++#: lib/index.tcl:409
+msgid "Do Nothing"
+msgstr "Gör ingenting"
+
++#: lib/index.tcl:427
++msgid "Reverting selected files"
++msgstr "Återställer valda filer"
++
++#: lib/index.tcl:431
++#, tcl-format
++msgid "Reverting %s"
++msgstr "Återställer %s"
++
+#: lib/merge.tcl:13
+msgid ""
+"Cannot merge while amending.\n"
+"\n"
+"You must finish amending this commit before starting any type of merge.\n"
+msgstr ""
+"Kan inte slå ihop vid utökning.\n"
+"\n"
+"Du måste göra färdig utökningen av incheckningen innan du påbörjar någon "
+"slags sammanslagning.\n"
+
+#: lib/merge.tcl:27
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan. A "
+"rescan must be performed before a merge can be performed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
+msgstr ""
+"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n"
+"\n"
+"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du måste "
+"utföra en ny sökning innan du kan utföra en sammanslagning.\n"
+"\n"
+"Sökningen kommer att startas automatiskt nu.\n"
+
- #: lib/merge.tcl:54
++#: lib/merge.tcl:45
+#, tcl-format
+msgid ""
+"You are in the middle of a conflicted merge.\n"
+"\n"
+"File %s has merge conflicts.\n"
+"\n"
+"You must resolve them, stage the file, and commit to complete the current "
+"merge. Only then can you begin another merge.\n"
+msgstr ""
+"Du är mitt i en sammanslagning med konflikter.\n"
+"\n"
+"Filen %s har sammanslagningskonflikter.\n"
+"\n"
+"Du måste lösa dem, köa filen och checka in för att fullborda den aktuella "
+"sammanslagningen. När du gjort det kan du påbörja en ny sammanslagning.\n"
+
- #: lib/merge.tcl:106
++#: lib/merge.tcl:55
+#, tcl-format
+msgid ""
+"You are in the middle of a change.\n"
+"\n"
+"File %s is modified.\n"
+"\n"
+"You should complete the current commit before starting a merge. Doing so "
+"will help you abort a failed merge, should the need arise.\n"
+msgstr ""
+"Du är mitt i en ändring.\n"
+"\n"
+"Filen %s har ändringar.\n"
+"\n"
+"Du bör fullborda den aktuella incheckningen innan du påbörjar en "
+"sammanslagning. Om du gör det blir det enklare att avbryta en misslyckad "
+"sammanslagning, om det skulle vara nödvändigt.\n"
+
- #: lib/merge.tcl:119
++#: lib/merge.tcl:107
+#, tcl-format
+msgid "%s of %s"
+msgstr "%s av %s"
+
- #: lib/merge.tcl:130
++#: lib/merge.tcl:120
+#, tcl-format
+msgid "Merging %s and %s..."
+msgstr "Slår ihop %s och %s..."
+
- #: lib/merge.tcl:132
++#: lib/merge.tcl:131
+msgid "Merge completed successfully."
+msgstr "Sammanslagningen avslutades framgångsrikt."
+
- #: lib/merge.tcl:157
++#: lib/merge.tcl:133
+msgid "Merge failed. Conflict resolution is required."
+msgstr "Sammanslagningen misslyckades. Du måste lösa konflikterna."
+
- #: lib/merge.tcl:176
++#: lib/merge.tcl:158
+#, tcl-format
+msgid "Merge Into %s"
+msgstr "Slå ihop i %s"
+
- #: lib/merge.tcl:211
++#: lib/merge.tcl:177
+msgid "Revision To Merge"
+msgstr "Revisioner att slå ihop"
+
- #: lib/merge.tcl:221
++#: lib/merge.tcl:212
+msgid ""
+"Cannot abort while amending.\n"
+"\n"
+"You must finish amending this commit.\n"
+msgstr ""
+"Kan inte avbryta vid utökning.\n"
+"\n"
+"Du måste göra dig färdig med att utöka incheckningen.\n"
+
- #: lib/merge.tcl:227
++#: lib/merge.tcl:222
+msgid ""
+"Abort merge?\n"
+"\n"
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with aborting the current merge?"
+msgstr ""
+"Avbryt sammanslagning?\n"
+"\n"
+"Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att gå "
+"förlorade.\n"
+"\n"
+"Gå vidare med att avbryta den aktuella sammanslagningen?"
+
- #: lib/merge.tcl:238
++#: lib/merge.tcl:228
+msgid ""
+"Reset changes?\n"
+"\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with resetting the current changes?"
+msgstr ""
+"Återställ ändringar?\n"
+"\n"
+"Om du återställer ändringarna kommer *ALLA* ej incheckade ändringar att gå "
+"förlorade.\n"
+"\n"
+"Gå vidare med att återställa de aktuella ändringarna?"
+
- #: lib/merge.tcl:238
++#: lib/merge.tcl:239
+msgid "Aborting"
+msgstr "Avbryter"
+
- #: lib/merge.tcl:266
++#: lib/merge.tcl:239
+msgid "files reset"
+msgstr "filer återställda"
+
- #: lib/merge.tcl:268
++#: lib/merge.tcl:267
+msgid "Abort failed."
+msgstr "Misslyckades avbryta."
+
- #: lib/option.tcl:95
++#: lib/merge.tcl:269
+msgid "Abort completed. Ready."
+msgstr "Avbrytning fullbordad. Redo."
+
- #: lib/option.tcl:99
++#: lib/mergetool.tcl:8
++msgid "Force resolution to the base version?"
++msgstr "Tvinga lösning att använda basversionen?"
++
++#: lib/mergetool.tcl:9
++msgid "Force resolution to this branch?"
++msgstr "Tvinga lösning att använda den aktuella grenen?"
++
++#: lib/mergetool.tcl:10
++msgid "Force resolution to the other branch?"
++msgstr "Tvinga lösning att använda den andra grenen?"
++
++#: lib/mergetool.tcl:14
++#, tcl-format
++msgid ""
++"Note that the diff shows only conflicting changes.\n"
++"\n"
++"%s will be overwritten.\n"
++"\n"
++"This operation can be undone only by restarting the merge."
++msgstr ""
++"Observera att diffen endast visar de ändringar som står i konflikt.\n"
++"\n"
++"%s kommer att skrivas över.\n"
++"\n"
++"Du måste starta om sammanslagningen för att göra den här operationen ogjord."
++
++#: lib/mergetool.tcl:45
++#, tcl-format
++msgid "File %s seems to have unresolved conflicts, still stage?"
++msgstr "Filen %s verkar innehålla olösta konflikter. Vill du köa ändå?"
++
++#: lib/mergetool.tcl:60
++#, tcl-format
++msgid "Adding resolution for %s"
++msgstr "Lägger till lösning för %s"
++
++#: lib/mergetool.tcl:141
++msgid "Cannot resolve deletion or link conflicts using a tool"
++msgstr "Kan inte lösa borttagnings- eller länkkonflikter med ett verktyg"
++
++#: lib/mergetool.tcl:146
++msgid "Conflict file does not exist"
++msgstr "Konfliktfil existerar inte"
++
++#: lib/mergetool.tcl:264
++#, tcl-format
++msgid "Not a GUI merge tool: '%s'"
++msgstr "Inte ett grafiskt verktyg för sammanslagning: %s"
++
++#: lib/mergetool.tcl:268
++#, tcl-format
++msgid "Unsupported merge tool '%s'"
++msgstr "Verktyget \"%s\" för sammanslagning stöds inte"
++
++#: lib/mergetool.tcl:303
++msgid "Merge tool is already running, terminate it?"
++msgstr "Verktyget för sammanslagning körs redan. Vill du avsluta det?"
++
++#: lib/mergetool.tcl:323
++#, tcl-format
++msgid ""
++"Error retrieving versions:\n"
++"%s"
++msgstr "Fel vid hämtning av versioner:\n"
++"%s"
++
++#: lib/mergetool.tcl:343
++#, tcl-format
++msgid ""
++"Could not start the merge tool:\n"
++"\n"
++"%s"
++msgstr "Kunde inte starta verktyg för sammanslagning:\n"
++"\n"
++"%s"
++
++#: lib/mergetool.tcl:347
++msgid "Running merge tool..."
++msgstr "Kör verktyg för sammanslagning..."
++
++#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
++msgid "Merge tool failed."
++msgstr "Verktyget för sammanslagning misslyckades."
++
++#: lib/option.tcl:11
++#, tcl-format
++msgid "Invalid global encoding '%s'"
++msgstr "Den globala teckenkodningen \"%s\" är ogiltig"
++
++#: lib/option.tcl:19
++#, tcl-format
++msgid "Invalid repo encoding '%s'"
++msgstr "Arkivets teckenkodning \"%s\" är ogiltig"
++
++#: lib/option.tcl:117
+msgid "Restore Defaults"
+msgstr "Återställ standardvärden"
+
- #: lib/option.tcl:109
++#: lib/option.tcl:121
+msgid "Save"
+msgstr "Spara"
+
- #: lib/option.tcl:110
++#: lib/option.tcl:131
+#, tcl-format
+msgid "%s Repository"
+msgstr "Arkivet %s"
+
- #: lib/option.tcl:116
++#: lib/option.tcl:132
+msgid "Global (All Repositories)"
+msgstr "Globalt (alla arkiv)"
+
- #: lib/option.tcl:117
++#: lib/option.tcl:138
+msgid "User Name"
+msgstr "Användarnamn"
+
- #: lib/option.tcl:119
++#: lib/option.tcl:139
+msgid "Email Address"
+msgstr "E-postadress"
+
- #: lib/option.tcl:120
++#: lib/option.tcl:141
+msgid "Summarize Merge Commits"
+msgstr "Summera sammanslagningsincheckningar"
+
- #: lib/option.tcl:121
++#: lib/option.tcl:142
+msgid "Merge Verbosity"
+msgstr "Pratsamhet för sammanslagningar"
+
- #: lib/option.tcl:123
++#: lib/option.tcl:143
+msgid "Show Diffstat After Merge"
+msgstr "Visa diffstatistik efter sammanslagning"
+
- #: lib/option.tcl:124
++#: lib/option.tcl:144
++msgid "Use Merge Tool"
++msgstr "Använd verktyg för sammanslagning"
++
++#: lib/option.tcl:146
+msgid "Trust File Modification Timestamps"
+msgstr "Lita på filändringstidsstämplar"
+
- #: lib/option.tcl:125
++#: lib/option.tcl:147
+msgid "Prune Tracking Branches During Fetch"
+msgstr "Städa spårade grenar vid hämtning"
+
- #: lib/option.tcl:126
++#: lib/option.tcl:148
+msgid "Match Tracking Branches"
+msgstr "Matcha spårade grenar"
+
- #: lib/option.tcl:127
++#: lib/option.tcl:149
+msgid "Blame Copy Only On Changed Files"
+msgstr "Klandra kopiering bara i ändrade filer"
+
- #: lib/option.tcl:128
++#: lib/option.tcl:150
+msgid "Minimum Letters To Blame Copy On"
+msgstr "Minsta antal tecken att klandra kopiering för"
+
- #: lib/option.tcl:129
++#: lib/option.tcl:151
++msgid "Blame History Context Radius (days)"
++msgstr "Historikradie för klandring (dagar)"
++
++#: lib/option.tcl:152
+msgid "Number of Diff Context Lines"
+msgstr "Antal rader sammanhang i differenser"
+
- #: lib/option.tcl:130
++#: lib/option.tcl:153
+msgid "Commit Message Text Width"
+msgstr "Textbredd för incheckningsmeddelande"
+
- #: lib/option.tcl:194
++#: lib/option.tcl:154
+msgid "New Branch Name Template"
+msgstr "Mall för namn på nya grenar"
+
- #: lib/option.tcl:218
++#: lib/option.tcl:155
++msgid "Default File Contents Encoding"
++msgstr "Standardteckenkodning för filinnehåll"
++
++#: lib/option.tcl:203
++msgid "Change"
++msgstr "Ändra"
++
++#: lib/option.tcl:230
+msgid "Spelling Dictionary:"
+msgstr "Stavningsordlista:"
+
- #: lib/option.tcl:222
++#: lib/option.tcl:254
+msgid "Change Font"
+msgstr "Byt teckensnitt"
+
- #: lib/option.tcl:228
++#: lib/option.tcl:258
+#, tcl-format
+msgid "Choose %s"
+msgstr "Välj %s"
+
- #: lib/option.tcl:242
++#: lib/option.tcl:264
+msgid "pt."
+msgstr "p."
+
- #: lib/option.tcl:277
++#: lib/option.tcl:278
+msgid "Preferences"
+msgstr "Inställningar"
+
- msgid "Delete Remote Branch"
- msgstr "Ta bort fjärrgren"
++#: lib/option.tcl:314
+msgid "Failed to completely save options:"
+msgstr "Misslyckades med att helt spara alternativ:"
+
++#: lib/remote.tcl:163
++msgid "Remove Remote"
++msgstr "Ta bort fjärrarkiv"
++
++#: lib/remote.tcl:168
++msgid "Prune from"
++msgstr "Ta bort från"
++
++#: lib/remote.tcl:173
++msgid "Fetch from"
++msgstr "Hämta från"
++
++#: lib/remote.tcl:215
++msgid "Push to"
++msgstr "Sänd till"
++
++#: lib/remote_add.tcl:19
++msgid "Add Remote"
++msgstr "Lägg till fjärrarkiv"
++
++#: lib/remote_add.tcl:24
++msgid "Add New Remote"
++msgstr "Lägg till nytt fjärrarkiv"
++
++#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
++msgid "Add"
++msgstr "Lägg till"
++
++#: lib/remote_add.tcl:37
++msgid "Remote Details"
++msgstr "Detaljer för fjärrarkiv"
++
++#: lib/remote_add.tcl:50
++msgid "Location:"
++msgstr "Plats:"
++
++#: lib/remote_add.tcl:62
++msgid "Further Action"
++msgstr "Ytterligare åtgärd"
++
++#: lib/remote_add.tcl:65
++msgid "Fetch Immediately"
++msgstr "Hämta omedelbart"
++
++#: lib/remote_add.tcl:71
++msgid "Initialize Remote Repository and Push"
++msgstr "Initiera fjärrarkiv och sänd till"
++
++#: lib/remote_add.tcl:77
++msgid "Do Nothing Else Now"
++msgstr "Gör ingent mer nu"
++
++#: lib/remote_add.tcl:101
++msgid "Please supply a remote name."
++msgstr "Ange ett namn för fjärrarkivet."
++
++#: lib/remote_add.tcl:114
++#, tcl-format
++msgid "'%s' is not an acceptable remote name."
++msgstr "\"%s\" kan inte användas som namn på fjärrarkivet."
++
++#: lib/remote_add.tcl:125
++#, tcl-format
++msgid "Failed to add remote '%s' of location '%s'."
++msgstr "Kunde inte lägga till fjärrarkivet \"%s\" på platsen \"%s\"."
++
++#: lib/remote_add.tcl:133 lib/transport.tcl:6
++#, tcl-format
++msgid "fetch %s"
++msgstr "hämta %s"
++
++#: lib/remote_add.tcl:134
++#, tcl-format
++msgid "Fetching the %s"
++msgstr "Hämtar %s"
++
++#: lib/remote_add.tcl:157
++#, tcl-format
++msgid "Do not know how to initialize repository at location '%s'."
++msgstr "Vet inte hur arkivet på platsen \"%s\" skall initieras."
++
++#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
++#, tcl-format
++msgid "push %s"
++msgstr "sänd %s"
++
++#: lib/remote_add.tcl:164
++#, tcl-format
++msgid "Setting up the %s (at %s)"
++msgstr "Konfigurerar %s (på %s)"
++
+#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
- msgstr "Fjärr:"
++msgid "Delete Branch Remotely"
++msgstr "Ta bort gren från fjärrarkiv"
+
+#: lib/remote_branch_delete.tcl:47
+msgid "From Repository"
+msgstr "Från arkiv"
+
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
+msgid "Remote:"
- msgid "Arbitrary URL:"
- msgstr "Godtycklig webbadress:"
++msgstr "Fjärrarkiv:"
+
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
- #: lib/remote.tcl:165
- msgid "Prune from"
- msgstr "Ta bort från"
++msgid "Arbitrary Location:"
++msgstr "Godtycklig plats:"
+
+#: lib/remote_branch_delete.tcl:84
+msgid "Branches"
+msgstr "Grenar"
+
+#: lib/remote_branch_delete.tcl:109
+msgid "Delete Only If"
+msgstr "Ta endast bort om"
+
+#: lib/remote_branch_delete.tcl:111
+msgid "Merged Into:"
+msgstr "Sammanslagen i:"
+
+#: lib/remote_branch_delete.tcl:119
+msgid "Always (Do not perform merge checks)"
+msgstr "Alltid (utför inte sammanslagningstest)"
+
+#: lib/remote_branch_delete.tcl:152
+msgid "A branch is required for 'Merged Into'."
+msgstr "En gren krävs för \"Sammanslagen i\"."
+
+#: lib/remote_branch_delete.tcl:184
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+"Följande grenar har inte helt slagits samman i %s:\n"
+"\n"
+" - %s"
+
+#: lib/remote_branch_delete.tcl:189
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits. Try fetching from %s first."
+msgstr ""
+"En eller flera av sammanslagningstesterna misslyckades eftersom du inte har "
+"hämtat de nödvändiga incheckningarna. Försök hämta från %s först."
+
+#: lib/remote_branch_delete.tcl:207
+msgid "Please select one or more branches to delete."
+msgstr "Välj en eller flera grenar att ta bort."
+
+#: lib/remote_branch_delete.tcl:216
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+"Det kan vara svårt att återställa borttagna grenar.\n"
+"\n"
+"Ta bort de valda grenarna?"
+
+#: lib/remote_branch_delete.tcl:226
+#, tcl-format
+msgid "Deleting branches from %s"
+msgstr "Tar bort grenar från %s"
+
+#: lib/remote_branch_delete.tcl:286
+msgid "No repository selected."
+msgstr "Inget arkiv markerat."
+
+#: lib/remote_branch_delete.tcl:291
+#, tcl-format
+msgid "Scanning %s..."
+msgstr "Söker %s..."
+
- #: lib/remote.tcl:170
- msgid "Fetch from"
- msgstr "Hämta från"
++#: lib/search.tcl:21
++msgid "Find:"
++msgstr "Sök:"
+
- #: lib/remote.tcl:213
- msgid "Push to"
- msgstr "Sänd till"
++#: lib/search.tcl:23
++msgid "Next"
++msgstr "Nästa"
+
- #: lib/spellcheck.tcl:387
++#: lib/search.tcl:24
++msgid "Prev"
++msgstr "Föreg"
++
++#: lib/search.tcl:25
++msgid "Case-Sensitive"
++msgstr "Skilj på VERSALER/gemener"
+
+#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
+msgid "Cannot write shortcut:"
+msgstr "Kan inte skriva genväg:"
+
+#: lib/shortcut.tcl:136
+msgid "Cannot write icon:"
+msgstr "Kan inte skriva ikon:"
+
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "Stavningskontrollprogrammet stöds inte"
+
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "Stavningskontroll är ej tillgänglig"
+
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "Ogiltig inställning för stavningskontroll"
+
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
+msgstr "Återställer ordlistan till %s."
+
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "Stavningskontroll misslyckades tyst vid start"
+
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "Stavningskontrollprogrammet känns inte igen"
+
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr "Inga förslag"
+
- #: lib/spellcheck.tcl:391
++#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr "Oväntat filslut från stavningskontroll"
+
- #: lib/transport.tcl:6
++#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr "Stavningskontroll misslyckades"
+
++#: lib/sshkey.tcl:31
++msgid "No keys found."
++msgstr "Inga nycklar hittades."
++
++#: lib/sshkey.tcl:34
++#, tcl-format
++msgid "Found a public key in: %s"
++msgstr "Hittade öppen nyckel i: %s"
++
++#: lib/sshkey.tcl:40
++msgid "Generate Key"
++msgstr "Skapa nyckel"
++
++#: lib/sshkey.tcl:56
++msgid "Copy To Clipboard"
++msgstr "Kopiera till Urklipp"
++
++#: lib/sshkey.tcl:70
++msgid "Your OpenSSH Public Key"
++msgstr "Din öppna OpenSSH-nyckel"
++
++#: lib/sshkey.tcl:78
++msgid "Generating..."
++msgstr "Skapar..."
++
++#: lib/sshkey.tcl:84
++#, tcl-format
++msgid ""
++"Could not start ssh-keygen:\n"
++"\n"
++"%s"
++msgstr "Kunde inte starta ssh-keygen:\n"
++"\n"
++"%s"
++
++#: lib/sshkey.tcl:111
++msgid "Generation failed."
++msgstr "Misslyckades med att skapa."
++
++#: lib/sshkey.tcl:118
++msgid "Generation succeded, but no keys found."
++msgstr "Lyckades skapa nyckeln, men hittar inte någon nyckel."
++
++#: lib/sshkey.tcl:121
++#, tcl-format
++msgid "Your key is in: %s"
++msgstr "Din nyckel finns i: %s"
++
+#: lib/status_bar.tcl:83
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
+msgstr "%s... %*i av %*i %s (%3i%%)"
+
- msgid "fetch %s"
- msgstr "hämta %s"
++#: lib/tools.tcl:75
+#, tcl-format
- #: lib/transport.tcl:25 lib/transport.tcl:71
- #, tcl-format
- msgid "push %s"
- msgstr "sänd %s"
-
++msgid "Running %s requires a selected file."
++msgstr "För att starta %s måste du välja en fil."
++
++#: lib/tools.tcl:90
++#, tcl-format
++msgid "Are you sure you want to run %s?"
++msgstr "Är du säker på att du vill starta %s?"
++
++#: lib/tools.tcl:110
++#, tcl-format
++msgid "Tool: %s"
++msgstr "Verktyg: %s"
++
++#: lib/tools.tcl:111
++#, tcl-format
++msgid "Running: %s"
++msgstr "Exekverar: %s"
++
++#: lib/tools.tcl:149
++#, tcl-format
++msgid "Tool completed succesfully: %s"
++msgstr "Verktyget avslutades framgångsrikt."
++
++#: lib/tools.tcl:151
++#, tcl-format
++msgid "Tool failed: %s"
++msgstr "Verktyget misslyckades: %s"
++
++#: lib/tools_dlg.tcl:22
++msgid "Add Tool"
++msgstr "Lägg till verktyg"
++
++#: lib/tools_dlg.tcl:28
++msgid "Add New Tool Command"
++msgstr "Lägg till nytt verktygskommando"
++
++#: lib/tools_dlg.tcl:33
++msgid "Add globally"
++msgstr "Lägg till globalt"
++
++#: lib/tools_dlg.tcl:45
++msgid "Tool Details"
++msgstr "Detaljer för verktyg"
++
++#: lib/tools_dlg.tcl:48
++msgid "Use '/' separators to create a submenu tree:"
++msgstr "Använd \"/\"-avdelare för att skapa ett undermenyträd:"
++
++#: lib/tools_dlg.tcl:61
++msgid "Command:"
++msgstr "Kommando:"
++
++#: lib/tools_dlg.tcl:74
++msgid "Show a dialog before running"
++msgstr "Visa dialog innan programmet startas"
++
++#: lib/tools_dlg.tcl:80
++msgid "Ask the user to select a revision (sets $REVISION)"
++msgstr "Be användaren välja en version (sätter $REVISION)"
++
++#: lib/tools_dlg.tcl:85
++msgid "Ask the user for additional arguments (sets $ARGS)"
++msgstr "Be användaren om ytterligare parametrar (sätter $ARGS)"
++
++#: lib/tools_dlg.tcl:92
++msgid "Don't show the command output window"
++msgstr "Visa inte kommandots utdatafönster"
++
++#: lib/tools_dlg.tcl:97
++msgid "Run only if a diff is selected ($FILENAME not empty)"
++msgstr "Kör endast om en diff har markerats ($FILENAME är inte tomt)"
++
++#: lib/tools_dlg.tcl:121
++msgid "Please supply a name for the tool."
++msgstr "Ange ett namn för verktyget."
++
++#: lib/tools_dlg.tcl:129
++#, tcl-format
++msgid "Tool '%s' already exists."
++msgstr "Verktyget \"%s\" finns redan."
++
++#: lib/tools_dlg.tcl:151
++#, tcl-format
++msgid ""
++"Could not add tool:\n"
++"%s"
++msgstr "Kunde inte lägga till verktyget:\n"
++"%s"
++
++#: lib/tools_dlg.tcl:190
++msgid "Remove Tool"
++msgstr "Ta bort verktyg"
++
++#: lib/tools_dlg.tcl:196
++msgid "Remove Tool Commands"
++msgstr "Ta bort verktygskommandon"
++
++#: lib/tools_dlg.tcl:200
++msgid "Remove"
++msgstr "Ta bort"
++
++#: lib/tools_dlg.tcl:236
++msgid "(Blue denotes repository-local tools)"
++msgstr "(Blått anger verktyg lokala för arkivet)"
++
++#: lib/tools_dlg.tcl:297
++#, tcl-format
++msgid "Run Command: %s"
++msgstr "Kör kommandot: %s"
++
++#: lib/tools_dlg.tcl:311
++msgid "Arguments"
++msgstr "Argument"
++
++#: lib/tools_dlg.tcl:348
++msgid "OK"
++msgstr "OK"
+
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
+msgstr "Hämtar nya ändringar från %s"
+
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr "fjärrborttagning %s"
+
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
+msgstr "Tar bort spårande grenar som tagits bort från %s"
+
- msgstr "Sänder grenar"
+#: lib/transport.tcl:26
+#, tcl-format
+msgid "Pushing changes to %s"
+msgstr "Sänder ändringar till %s"
+
+#: lib/transport.tcl:72
+#, tcl-format
+msgid "Pushing %s %s to %s"
+msgstr "Sänder %s %s till %s"
+
+#: lib/transport.tcl:89
+msgid "Push Branches"
++msgstr "Sänd grenar"
+
+#: lib/transport.tcl:103
+msgid "Source Branches"
+msgstr "Källgrenar"
+
+#: lib/transport.tcl:120
+msgid "Destination Repository"
+msgstr "Destinationsarkiv"
+
+#: lib/transport.tcl:158
+msgid "Transfer Options"
+msgstr "Överföringsalternativ"
+
+#: lib/transport.tcl:160
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr "Tvinga överskrivning av befintlig gren (kan kasta bort ändringar)"
+
+#: lib/transport.tcl:164
+msgid "Use thin pack (for slow network connections)"
+msgstr "Använd tunt paket (för långsamma nätverksanslutningar)"
+
+#: lib/transport.tcl:168
+msgid "Include tags"
+msgstr "Ta med taggar"
+
++#~ msgid "URL:"
++#~ msgstr "Webbadress:"
++
++#~ msgid "Delete Remote Branch"
++#~ msgstr "Ta bort fjärrgren"
++
+#~ msgid ""
+#~ "Unable to start gitk:\n"
+#~ "\n"
+#~ "%s does not exist"
+#~ msgstr ""
+#~ "Kan inte starta gitk:\n"
+#~ "\n"
+#~ "%s finns inte"
+
+#~ msgid "Apple"
+#~ msgstr "Äpple"
+
+#~ msgid "Not connected to aspell"
+#~ msgstr "Inte ansluten till aspell"