aboutsummaryrefslogtreecommitdiff
path: root/git-gui/po/glossary
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-06 23:51:15 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-06 23:51:15 -0800
commitd9f405931fa3d96b2a80fe5ad8205eea7c443f56 (patch)
treeb1ebb40e8ede5b364eef9ddb70f92fbf51486c4d /git-gui/po/glossary
parent5f7003b18cf84c0629eada39bca417d9c33cb132 (diff)
parentcfb5e104423b51aefb4d0e21a093bd9373b0af0b (diff)
downloadgit-d9f405931fa3d96b2a80fe5ad8205eea7c443f56.tar.gz
git-d9f405931fa3d96b2a80fe5ad8205eea7c443f56.tar.xz
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: Update Hungarian translation. 100% completed. Update ja.po for git-gui git-gui: Improve the application icon on Windows. git-gui: install-sh from automake does not like -m755 git-gui: Reorder msgfmt command-line arguments Update German translation. 100% completed. Update git-gui.pot with latest (few) string additions and changes. git-gui: update it.po and glossary/it.po git-gui: fix a typo in lib/commit.tcl
Diffstat (limited to 'git-gui/po/glossary')
-rw-r--r--git-gui/po/glossary/it.po16
1 files changed, 10 insertions, 6 deletions
diff --git a/git-gui/po/glossary/it.po b/git-gui/po/glossary/it.po
index 8e3d9a2f0..bb46b48d6 100644
--- a/git-gui/po/glossary/it.po
+++ b/git-gui/po/glossary/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: git-gui glossary\n"
-"POT-Creation-Date: 2007-10-05 22:30+0200\n"
+"POT-Creation-Date: 2007-10-19 21:43+0200\n"
"PO-Revision-Date: 2007-10-10 15:24+0200\n"
"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n"
"Language-Team: Italian \n"
@@ -50,8 +50,8 @@ msgstr "attivazione, checkout, revisione attiva, prelievo (TortoiseCVS)?"
#. "The action of updating the working tree to a revision which was stored in the object database."
msgid "checkout [verb]"
msgstr ""
-"attivare, effettuare un checkout, attivare revisione, prelevare (TortoiseCVS), "
-"ritirare (TSVN)?"
+"attivare, effettuare un checkout, attivare revisione, prelevare "
+"(TortoiseCVS), ritirare (TSVN)?"
#. ""
msgid "clone [verb]"
@@ -99,7 +99,7 @@ msgstr "effettuare la fusione, unire, fondere, eseguire la fusione"
msgid "message"
msgstr "messaggio, commento"
-#. ""
+#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
msgid "prune"
msgstr "potatura"
@@ -117,6 +117,10 @@ msgstr "propaga"
msgid "redo"
msgstr "ripeti, rifai"
+#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
+msgid "remote"
+msgstr "remoto"
+
#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)"
msgid "repository"
msgstr "archivio, repository, database? deposito (rapidsvn)?"
@@ -160,8 +164,8 @@ msgstr "etichettare"
#. "A regular git branch that is used to follow changes from another repository."
msgid "tracking branch"
msgstr ""
-"duplicato locale di ramo remoto, ramo in 'tracking', ramo inseguitore? ramo di {inseguimento,allineamento,"
-"rilevamento,puntamento}?"
+"duplicato locale di ramo remoto, ramo in 'tracking', ramo inseguitore? ramo "
+"di {inseguimento,allineamento,rilevamento,puntamento}?"
#. ""
msgid "undo"