[meld] [l10n] Updated Italian translation.

From: Milo Casagrande <miloc src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] [l10n] Updated Italian translation.
Date: Wed, 16 Oct 2013 10:28:41 +0000 (UTC)
commit e04481ea55577f8922e7eb36027f4eefdd1a4cd1
Author: Milo Casagrande <milo ubuntu com>
Date:   Wed Oct 16 12:28:32 2013 +0200

    [l10n] Updated Italian translation.

 po/it.po | 1335 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 636 insertions(+), 699 deletions(-)
---
diff --git a/po/it.po b/po/it.po
index 38445dc..a130dc9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2013-09-16 14:05+0200\n"
-"PO-Revision-Date: 2013-09-16 14:05+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-16 12:28+0200\n"
+"PO-Revision-Date: 2013-10-16 12:28+0200\n"
 "Last-Translator: Milo Casagrande <milo ubuntu com>\n"
 "Language-Team: Italian <tp lists linux it>\n"
 "Language: it\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../bin/meld:121
+#: ../bin/meld:107
 msgid "Cannot import: "
 msgstr "Impossibile importare: "
 
-#: ../bin/meld:124
+#: ../bin/meld:110
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld richiede %s o più recente."
@@ -47,6 +47,110 @@ msgstr "Confronta e unisce file"
 msgid "Meld comparison description"
 msgstr "Descrizione confronto Meld"
 
+#: ../data/ui/application.ui.h:1
+msgid "About Meld"
+msgstr "Informazioni su Meld"
+
+#: ../data/ui/application.ui.h:2
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2013 Kai Willadsen"
+msgstr ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2013 Kai Willadsen"
+
+#: ../data/ui/application.ui.h:4
+msgid "http://meldmerge.org/";
+msgstr "http://meldmerge.org/";
+
+#: ../data/ui/application.ui.h:5
+msgid "Website"
+msgstr "Sito web"
+
+#: ../data/ui/application.ui.h:6
+msgid "translator-credits"
+msgstr "Milo Casagrande <milo ubuntu com>, 2013"
+
+#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "C_onfronta"
+
+#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "Confronta i file selezionati"
+
+#: ../data/ui/dirdiff.ui.h:3
+msgid "Copy _Left"
+msgstr "Copia a _sinistra"
+
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Copy to left"
+msgstr "Copia a sinistra"
+
+#: ../data/ui/dirdiff.ui.h:5
+msgid "Copy _Right"
+msgstr "Copia a _destra"
+
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Copy to right"
+msgstr "Copia a destra"
+
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Delete selected"
+msgstr "Elimina selezione"
+
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1387
+msgid "Hide"
+msgstr "Nascondi"
+
+# (ndt) suggerimento, messo 'riquadro'
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Hide selected"
+msgstr "Nasconde la selezione"
+
+#: ../data/ui/dirdiff.ui.h:10
+#, fuzzy
+msgid "Ignore Filename Case"
+msgstr "_Ignorare maiuscole/minuscole"
+
+#: ../data/ui/dirdiff.ui.h:11
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+
+#: ../data/ui/dirdiff.ui.h:12
+msgid "Same"
+msgstr "Identici"
+
+#: ../data/ui/dirdiff.ui.h:13
+msgid "Show identical"
+msgstr "Mostra identici"
+
+#: ../data/ui/dirdiff.ui.h:14
+msgid "New"
+msgstr "Nuovi"
+
+#: ../data/ui/dirdiff.ui.h:15
+msgid "Show new"
+msgstr "Mostra nuovi"
+
+#: ../data/ui/dirdiff.ui.h:16
+msgid "Modified"
+msgstr "Modificati"
+
+#: ../data/ui/dirdiff.ui.h:17
+msgid "Show modified"
+msgstr "Mostra i modificati"
+
+#: ../data/ui/dirdiff.ui.h:18
+msgid "Filters"
+msgstr "Filtri"
+
+#: ../data/ui/dirdiff.ui.h:19
+msgid "Set active filters"
+msgstr "Imposta i filtri attivi"
+
 #: ../data/ui/EditableList.ui.h:1
 msgid "Editable List"
 msgstr "Elenco modificabile"
@@ -59,11 +163,12 @@ msgstr "Attivo"
 msgid "Column Name"
 msgstr "Nome colonna"
 
-#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:172
+#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
 msgid "_Add"
 msgstr "A_ggiungi"
 
-#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:175 ../meld/vcview.py:715
+#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
+#: ../meld/vcview.py:647
 msgid "_Remove"
 msgstr "_Rimuovi"
 
@@ -84,8 +189,8 @@ msgid "Move _Down"
 msgstr "Sposta _giù"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:343
-#: ../meld/vcview.py:231
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:323
+#: ../meld/vcview.py:176
 msgid "Name"
 msgstr "Nome"
 
@@ -95,12 +200,11 @@ msgstr "Modello"
 
 #: ../data/ui/EditableList.ui.h:12
 msgid "Add new filter"
-msgstr "Aggiunge un nuovo filtro"
+msgstr "Aggiungi nuovo filtro"
 
 #: ../data/ui/EditableList.ui.h:13
-#, fuzzy
 msgid "Remove selected filter"
-msgstr "Rimuove lo strumento selezionato"
+msgstr "Rimuove il filtro selezionato"
 
 #: ../data/ui/filediff.ui.h:1
 msgid "Save changes to documents before closing?"
@@ -122,26 +226,26 @@ msgstr "A_nnulla"
 msgid "_Save"
 msgstr "_Salva"
 
-# (ndt) l'azione annulla effettivamente le modifiche che non sono state salvate.
 #: ../data/ui/filediff.ui.h:6
-msgid "Revert unsaved changes to documents?"
-msgstr "Annullare le modifiche non salvate dei documenti?"
-
-#: ../data/ui/filediff.ui.h:7
-msgid "Changes made to the following documents will be permanently lost:\n"
-msgstr ""
-"Le modifiche apportate ai seguenti documenti andranno perse per sempre:\n"
-
-#: ../data/ui/filediff.ui.h:9
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
 msgstr ""
 
-#: ../data/ui/filediff.ui.h:10 ../meld/filediff.py:295
+#: ../data/ui/filediff.ui.h:7 ../meld/filediff.py:294
 msgid "Lock scrolling of all panes"
 msgstr ""
 
+# (ndt) l'azione annulla effettivamente le modifiche che non sono state salvate.
+#: ../data/ui/filediff.ui.h:8
+msgid "Revert unsaved changes to documents?"
+msgstr "Annullare le modifiche non salvate dei documenti?"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "Changes made to the following documents will be permanently lost:\n"
+msgstr ""
+"Le modifiche apportate ai seguenti documenti andranno perse per sempre:\n"
+
 #: ../data/ui/findbar.ui.h:1
 msgid "_Replace"
 msgstr "Sostit_uisci"
@@ -182,46 +286,6 @@ msgstr "Espressione _regolare"
 msgid "Wrapped"
 msgstr "A capo"
 
-#: ../data/ui/meldapp.ui.h:2
-msgid ""
-"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2013 Kai Willadsen"
-msgstr ""
-"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2013 Kai Willadsen"
-
-#: ../data/ui/meldapp.ui.h:4
-msgid ""
-"Meld is free software: you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation, either version 2 of the License, or (at your option) any later "
-"version.\n"
-"\n"
-"Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details. \n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program.  If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"Meld is free software: you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation, either version 2 of the License, or (at your option) any later "
-"version.\n"
-"\n"
-"Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details. \n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program.  If not, see <http://www.gnu.org/licenses/>."
-
-#: ../data/ui/meldapp.ui.h:9
-msgid "translator-credits"
-msgstr "Milo Casagrande <milo ubuntu com>, 2013"
-
 #: ../data/ui/patch-dialog.ui.h:1
 msgid "Format as Patch"
 msgstr "Crea una patch"
@@ -243,11 +307,10 @@ msgid "_Reverse patch direction"
 msgstr ""
 
 #: ../data/ui/patch-dialog.ui.h:6
-#, fuzzy
 msgid "Copy to Clipboard"
-msgstr "Incolla dagli appunti"
+msgstr "Copia negli appunti"
 
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:124
+#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:123
 msgid "Save Patch"
 msgstr "Salva patch"
 
@@ -316,14 +379,12 @@ msgid "External Editor"
 msgstr "Editor esterni"
 
 #: ../data/ui/preferences.ui.h:17
-#, fuzzy
 msgid "Use _default system editor"
-msgstr "Editor predefinito di GNOME"
+msgstr "Usare editor _predefinito di sistema"
 
 #: ../data/ui/preferences.ui.h:18
-#, fuzzy
 msgid "Edito_r command:"
-msgstr "Carattere dell'editor"
+msgstr "Comando dell'edito_r:"
 
 #: ../data/ui/preferences.ui.h:19
 msgid "Editor"
@@ -340,7 +401,7 @@ msgstr ""
 
 #: ../data/ui/preferences.ui.h:22
 msgid "_Timestamp resolution:"
-msgstr ""
+msgstr "Risoluzione marcatura _temporale:"
 
 #: ../data/ui/preferences.ui.h:23
 msgid "Symbolic Links"
@@ -360,9 +421,8 @@ msgstr "Confronto cartelle"
 
 # (ndt) oppure "Salva e comprimi" ?
 #: ../data/ui/preferences.ui.h:27
-#, fuzzy
 msgid "Version Comparisons"
-msgstr "_Salva con compressione"
+msgstr "Confronto versione"
 
 #: ../data/ui/preferences.ui.h:28
 msgid "_When comparing file revisions:"
@@ -373,7 +433,6 @@ msgid "Commit Messages"
 msgstr "Messaggio di commit"
 
 #: ../data/ui/preferences.ui.h:30
-#, fuzzy
 msgid "Show _right margin at:"
 msgstr "Mostrare _il margine destro a:"
 
@@ -395,10 +454,9 @@ msgstr ""
 "directory per nome. Ogni modello è una lista di nomi che possono contenere "
 "caratteri jolly, analogamente alla shell, separati da spazi."
 
-#: ../data/ui/preferences.ui.h:34 ../meld/meldwindow.py:122
-#, fuzzy
+#: ../data/ui/preferences.ui.h:34 ../meld/meldwindow.py:104
 msgid "File Filters"
-msgstr "Tutti i file"
+msgstr "Filtri dei file"
 
 #: ../data/ui/preferences.ui.h:35
 msgid ""
@@ -436,7 +494,7 @@ msgstr ""
 msgid "Encoding"
 msgstr "Codifica"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:681
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:616
 msgid "New comparison"
 msgstr "Nuovo confronto"
 
@@ -445,9 +503,8 @@ msgid "File comparison"
 msgstr "Confronto di file"
 
 #: ../data/ui/tab-placeholder.ui.h:3
-#, fuzzy
 msgid "Directory comparison"
-msgstr "Confronta _directory"
+msgstr "Confronto di directory"
 
 #: ../data/ui/tab-placeholder.ui.h:4
 #, fuzzy
@@ -460,34 +517,28 @@ msgid "_3-way comparison"
 msgstr "Confronta _file"
 
 #: ../data/ui/tab-placeholder.ui.h:6
-#, fuzzy
 msgid "Select Third File"
-msgstr "Seleziona file"
+msgstr "Seleziona terzo file"
 
 #: ../data/ui/tab-placeholder.ui.h:7
-#, fuzzy
 msgid "Select Second File"
-msgstr "Formato selezionato"
+msgstr "Seleziona secondo file"
 
 #: ../data/ui/tab-placeholder.ui.h:8
-#, fuzzy
 msgid "Select First File"
-msgstr "Formato selezionato"
+msgstr "Seleziona primo file"
 
 #: ../data/ui/tab-placeholder.ui.h:9
-#, fuzzy
 msgid "Select First Folder"
-msgstr "Seleziona directory"
+msgstr "Seleziona prima cartella"
 
 #: ../data/ui/tab-placeholder.ui.h:10
-#, fuzzy
 msgid "Select Second Folder"
-msgstr "Formato selezionato"
+msgstr "Seleziona seconda cartella"
 
 #: ../data/ui/tab-placeholder.ui.h:11
-#, fuzzy
 msgid "Select Third Folder"
-msgstr "Formato selezionato"
+msgstr "Seleziona terza cartella"
 
 #: ../data/ui/tab-placeholder.ui.h:12
 #, fuzzy
@@ -503,179 +554,186 @@ msgstr "Confronta _file"
 msgid "C_ompare"
 msgstr "C_onfronta"
 
-#: ../data/ui/vcview.ui.h:1
-msgid "Commit"
-msgstr "Commit"
-
-#: ../data/ui/vcview.ui.h:2
-msgid "Commit Files"
-msgstr ""
-
 #: ../data/ui/vcview.ui.h:3
-msgid "Log Message"
-msgstr "Messaggio di registro"
+msgid "Co_mmit..."
+msgstr "Co_mmit..."
 
 #: ../data/ui/vcview.ui.h:4
-#, fuzzy
-msgid "Previous logs:"
-msgstr "Pagina _precedente"
+msgid "Commit changes to version control"
+msgstr "Esegue il commit delle modifiche"
 
 #: ../data/ui/vcview.ui.h:5
-msgid "Co_mmit"
-msgstr "Co_mmit"
+msgid "_Update"
+msgstr "A_ggiorna"
 
 #: ../data/ui/vcview.ui.h:6
-msgid "Push local commits to remote?"
-msgstr ""
+msgid "Update working copy from version control"
+msgstr "Aggiorna la copia di lavoro dal sistema di controllo della versione"
 
 #: ../data/ui/vcview.ui.h:7
-msgid "The commits to be pushed are determined by your version control system."
-msgstr ""
+msgid "_Push"
+msgstr "_Push"
 
 #: ../data/ui/vcview.ui.h:8
 #, fuzzy
-msgid "_Push commits"
-msgstr "_Push dei commit"
+msgid "Push local changes to remote"
+msgstr "Copia tutte le modifiche dal riquadro destro al riquadro sinistro"
 
-#: ../meld/dirdiff.py:269 ../meld/vcview.py:160
-msgid "_Compare"
-msgstr "C_onfronta"
+#: ../data/ui/vcview.ui.h:10
+msgid "Add to version control"
+msgstr "Aggiungi al sistema di controllo della versione"
 
-#: ../meld/dirdiff.py:269
+#: ../data/ui/vcview.ui.h:12
 #, fuzzy
-msgid "Compare selected"
-msgstr "Copia la selezione"
+msgid "Remove from version control"
+msgstr "Scegliere un controllo di versione"
 
-#: ../meld/dirdiff.py:270
-msgid "Copy _Left"
-msgstr "Copia a _sinistra"
+#: ../data/ui/vcview.ui.h:13
+msgid "Mar_k as Resolved"
+msgstr "Marca _risolto"
 
-#: ../meld/dirdiff.py:270
+#: ../data/ui/vcview.ui.h:14
 #, fuzzy
-msgid "Copy to left"
-msgstr "Copia la selezione"
+msgid "Mark as resolved in version control"
+msgstr "Marca come risolto per il controllo di versione"
 
-#: ../meld/dirdiff.py:271
-msgid "Copy _Right"
-msgstr "Copia a _destra"
+#: ../data/ui/vcview.ui.h:15
+#, fuzzy
+msgid "Re_vert"
+msgstr "_Ripristina"
 
-#: ../meld/dirdiff.py:271
+#: ../data/ui/vcview.ui.h:16
 #, fuzzy
-msgid "Copy to right"
-msgstr "Copia a destra"
+msgid "Revert working copy to original state"
+msgstr "Riporta all'originale"
 
-#: ../meld/dirdiff.py:272
-msgid "Delete selected"
-msgstr "Elimina selezione"
+#: ../data/ui/vcview.ui.h:17
+msgid "Delete from working copy"
+msgstr "Elimina dalla copia di lavoro"
 
-#: ../meld/dirdiff.py:273 ../meld/filediff.py:1368 ../meld/filediff.py:1403
-msgid "Hide"
-msgstr "Nascondi"
+#: ../data/ui/vcview.ui.h:18
+msgid "_Flatten"
+msgstr "_Appiattisci"
 
-# (ndt) suggerimento, messo 'riquadro'
-#: ../meld/dirdiff.py:273
-msgid "Hide selected"
-msgstr ""
+#: ../data/ui/vcview.ui.h:19
+msgid "Flatten directories"
+msgstr "Appiattisce le directory"
 
-#: ../meld/dirdiff.py:277
-#, fuzzy
-msgid "Ignore Filename Case"
-msgstr "_Ignorare maiuscole/minuscole"
+#: ../data/ui/vcview.ui.h:20
+msgid "_Modified"
+msgstr "_Modificati"
 
-#: ../meld/dirdiff.py:277
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
+#: ../data/ui/vcview.ui.h:21
+msgid "Show modified files"
+msgstr "Mostra i file modificati"
+
+#: ../data/ui/vcview.ui.h:22
+msgid "_Normal"
+msgstr "_Normale"
+
+#: ../data/ui/vcview.ui.h:23
+msgid "Show normal files"
+msgstr "Mostra i file normali"
+
+#: ../data/ui/vcview.ui.h:24
+msgid "Un_versioned"
 msgstr ""
 
-#: ../meld/dirdiff.py:278
-msgid "Same"
-msgstr "Identici"
+#: ../data/ui/vcview.ui.h:25
+msgid "Show unversioned files"
+msgstr "Mostra file non versionati"
 
-#: ../meld/dirdiff.py:278
-#, fuzzy
-msgid "Show identical"
-msgstr "Mostra _nascosti"
+#: ../data/ui/vcview.ui.h:26
+msgid "Ignored"
+msgstr "Ignorati"
 
-#: ../meld/dirdiff.py:279
-msgid "New"
-msgstr "Nuovi"
+#: ../data/ui/vcview.ui.h:27
+msgid "Show ignored files"
+msgstr "Mostra file ignorati"
 
-#: ../meld/dirdiff.py:279
-#, fuzzy
-msgid "Show new"
-msgstr "Mostra _nascosti"
+#: ../data/ui/vcview.ui.h:28
+msgid "Commit"
+msgstr "Commit"
 
-#: ../meld/dirdiff.py:280
-msgid "Modified"
-msgstr "Modificati"
+#: ../data/ui/vcview.ui.h:29
+msgid "Commit Files"
+msgstr ""
 
-#: ../meld/dirdiff.py:280
-msgid "Show modified"
-msgstr "Mostra i modificati"
+#: ../data/ui/vcview.ui.h:30
+msgid "Log Message"
+msgstr "Messaggio di registro"
 
-#: ../meld/dirdiff.py:282
-#, fuzzy
-msgid "Filters"
-msgstr "_Filtra"
+#: ../data/ui/vcview.ui.h:31
+msgid "Previous logs:"
+msgstr "Registri precedenti:"
 
-#: ../meld/dirdiff.py:282
-#, fuzzy
-msgid "Set active filters"
-msgstr "Modifica file di testo"
+#: ../data/ui/vcview.ui.h:32
+msgid "Co_mmit"
+msgstr "Co_mmit"
+
+#: ../data/ui/vcview.ui.h:33
+msgid "Push local commits to remote?"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:34
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:35
+msgid "_Push commits"
+msgstr "_Push dei commit"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:361
-#, fuzzy
+#: ../meld/dirdiff.py:341
 msgid "Size"
-msgstr "Dimensione della scheda"
+msgstr "Dimensione"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:369
+#: ../meld/dirdiff.py:349
 msgid "Modification time"
-msgstr ""
+msgstr "Data e ora di modifica"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:377
+#: ../meld/dirdiff.py:357
 msgid "Permissions"
-msgstr ""
+msgstr "Permessi"
 
-#: ../meld/dirdiff.py:511
+#: ../meld/dirdiff.py:496
 #, python-format
 msgid "Hide %s"
 msgstr "Nascondi %s"
 
-#: ../meld/dirdiff.py:637 ../meld/dirdiff.py:656
-#, fuzzy, python-format
+#: ../meld/dirdiff.py:623 ../meld/dirdiff.py:645
+#, python-format
 msgid "[%s] Scanning %s"
-msgstr "Salvataggio di %s"
+msgstr "[%s] Analisi di %s"
 
-#: ../meld/dirdiff.py:756
+#: ../meld/dirdiff.py:745
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Fatto"
 
-#: ../meld/dirdiff.py:762
+#: ../meld/dirdiff.py:751
 #, fuzzy
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Si è verificato un errore nel creare un nuovo file"
 
-#: ../meld/dirdiff.py:763
+#: ../meld/dirdiff.py:752
 #, fuzzy
 msgid "Files with invalid encodings found"
 msgstr "%s: codifica non valida."
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:765
+#: ../meld/dirdiff.py:754
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 
-#: ../meld/dirdiff.py:767
+#: ../meld/dirdiff.py:756
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:769
+#: ../meld/dirdiff.py:758
 #, fuzzy
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
@@ -685,17 +743,17 @@ msgstr ""
 "sensibile alle maiuscole. Alcuni file non sono visibili:\n"
 "%s"
 
-#: ../meld/dirdiff.py:780
+#: ../meld/dirdiff.py:769
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "«%s» è nascosto da «%s»"
 
-#: ../meld/dirdiff.py:805 ../meld/filediff.py:1096 ../meld/filediff.py:1372
-#: ../meld/filediff.py:1405
+#: ../meld/dirdiff.py:794 ../meld/filediff.py:1103 ../meld/filediff.py:1389
+#: ../meld/filediff.py:1419 ../meld/filediff.py:1421
 msgid "Hi_de"
 msgstr "Nascon_di"
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:825
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -704,287 +762,279 @@ msgstr ""
 "«%s» esiste.\n"
 "Sovrascrivere?"
 
-#: ../meld/dirdiff.py:844
+#: ../meld/dirdiff.py:833
+msgid "Error copying file"
+msgstr "Errore nel copiare il file"
+
+#: ../meld/dirdiff.py:834
 #, python-format
 msgid ""
-"Error copying '%s' to '%s'\n"
+"Couldn't copy %s\n"
+"to %s.\n"
 "\n"
-"%s."
+"%s"
 msgstr ""
-"Errore durante la copia di «%s» in «%s»\n"
+"Impossibile copiare %s\n"
+"in %s.\n"
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:862 ../meld/vcview.py:745
+#: ../meld/dirdiff.py:857
 #, python-format
-msgid ""
-"'%s' is a directory.\n"
-"Remove recursively?"
-msgstr ""
-"«%s» è una directory.\n"
-"Rimuovere ricorsivamente?"
-
-#: ../meld/dirdiff.py:869 ../meld/vcview.py:750
-#, fuzzy, python-format
-msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
-msgstr "Errore nel ripristinare il file «%s»"
+msgid "Error deleting %s"
+msgstr "Errore nell'eliminare %s"
 
-#: ../meld/dirdiff.py:1000
+#: ../meld/dirdiff.py:988
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i secondo"
 msgstr[1] "%i secondi"
 
-#: ../meld/dirdiff.py:1001
-#, fuzzy, python-format
+#: ../meld/dirdiff.py:989
+#, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
-msgstr[0] "_minuti"
-msgstr[1] "_minuti"
+msgstr[0] "%i minuto"
+msgstr[1] "%i minuti"
 
-#: ../meld/dirdiff.py:1002
+#: ../meld/dirdiff.py:990
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i ora"
 msgstr[1] "%i ore"
 
-#: ../meld/dirdiff.py:1003
+#: ../meld/dirdiff.py:991
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i giorno"
 msgstr[1] "%i giorni"
 
-#: ../meld/dirdiff.py:1004
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i settimana"
 msgstr[1] "%i settimane"
 
-#: ../meld/dirdiff.py:1005
+#: ../meld/dirdiff.py:993
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i mese"
 msgstr[1] "%i mesi"
 
-#: ../meld/dirdiff.py:1006
+#: ../meld/dirdiff.py:994
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i anno"
 msgstr[1] "%i anni"
 
-#: ../meld/filediff.py:223
-#, fuzzy
+#: ../meld/filediff.py:222
 msgid "Format as Patch..."
-msgstr "Crea una patch"
+msgstr "Crea una patch..."
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:223
 msgid "Create a patch using differences between files"
 msgstr ""
 
-#: ../meld/filediff.py:226
-#, fuzzy
+#: ../meld/filediff.py:225
 msgid "Save A_ll"
 msgstr "Sal_va tutti"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:226
 #, fuzzy
 msgid "Save all files in the current comparison"
 msgstr "Apre un terminale nella posizione del documento"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:229
 #, fuzzy
 msgid "Revert files to their saved versions"
 msgstr "Ripristina una versione salvata del file"
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:231
 msgid "Add Synchronization Point"
 msgstr ""
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:232
 msgid "Add a manual point for synchronization of changes between files"
 msgstr ""
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:235
 msgid "Clear Synchronization Points"
 msgstr ""
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:236
 msgid "Clear manual change sychronization points"
 msgstr ""
 
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:238
 #, fuzzy
 msgid "Previous Conflict"
 msgstr "Documento pr_ecedente"
 
-#: ../meld/filediff.py:240
+#: ../meld/filediff.py:239
 #, fuzzy
 msgid "Go to the previous conflict"
 msgstr "Mostra la pagina precedente"
 
-#: ../meld/filediff.py:242
+#: ../meld/filediff.py:241
 msgid "Next Conflict"
 msgstr ""
 
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:242
 #, fuzzy
 msgid "Go to the next conflict"
 msgstr "Va alla differenza successiva"
 
-#: ../meld/filediff.py:245
+#: ../meld/filediff.py:244
 #, fuzzy
 msgid "Push to Left"
 msgstr "Percorso al file"
 
-#: ../meld/filediff.py:246
+#: ../meld/filediff.py:245
 msgid "Push current change to the left"
 msgstr ""
 
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:248
 #, fuzzy
 msgid "Push to Right"
 msgstr "Percorso al file"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:249
 msgid "Push current change to the right"
 msgstr ""
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:253
 #, fuzzy
 msgid "Pull from Left"
 msgstr "Copia tutte le modifiche dal riquadro destro al riquadro sinistro"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:254
 #, fuzzy
 msgid "Pull change from the left"
 msgstr "Copia tutte le modifiche dal riquadro destro al riquadro sinistro"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:257
 #, fuzzy
 msgid "Pull from Right"
 msgstr "Copia tutte le modifiche dal riquadro sinistro al riquadro destro"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:258
 #, fuzzy
 msgid "Pull change from the right"
 msgstr "Copia tutte le modifiche dal riquadro sinistro al riquadro destro"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:260
 #, fuzzy
 msgid "Copy Above Left"
 msgstr "Copia a sinistra"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:261
 #, fuzzy
 msgid "Copy change above the left chunk"
 msgstr "Copia tutte le modifiche dal riquadro destro al riquadro sinistro"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:263
 #, fuzzy
 msgid "Copy Below Left"
 msgstr "Copia a sinistra"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:264
 #, fuzzy
 msgid "Copy change below the left chunk"
 msgstr "Copia tutte le modifiche dal riquadro destro al riquadro sinistro"
 
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:266
 #, fuzzy
 msgid "Copy Above Right"
 msgstr "Copia a destra"
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:267
 #, fuzzy
 msgid "Copy change above the right chunk"
 msgstr "Copia tutte le modifiche dal riquadro sinistro al riquadro destro"
 
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:269
 #, fuzzy
 msgid "Copy Below Right"
 msgstr "Copia a destra"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:270
 #, fuzzy
 msgid "Copy change below the right chunk"
 msgstr "Copia tutte le modifiche dal riquadro sinistro al riquadro destro"
 
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:272
 #, fuzzy
 msgid "Delete"
 msgstr "Elimi_na"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:273
 #, fuzzy
 msgid "Delete change"
 msgstr "Elimi_na"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:275
 msgid "Merge All from Left"
 msgstr ""
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:276
 #, fuzzy
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Copia tutte le modifiche dal riquadro destro al riquadro sinistro"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:278
 msgid "Merge All from Right"
 msgstr ""
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:279
 #, fuzzy
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Copia tutte le modifiche dal riquadro sinistro al riquadro destro"
 
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:281
 #, fuzzy
 msgid "Merge All"
 msgstr "_Ignora tutto"
 
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:282
 #, fuzzy
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Copia tutte le modifiche dal riquadro sinistro al riquadro destro"
 
-#: ../meld/filediff.py:287
+#: ../meld/filediff.py:286
 msgid "Cycle Through Documents"
 msgstr ""
 
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:287
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr ""
 
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:293
 #, fuzzy
 msgid "Lock Scrolling"
 msgstr "Controllo ortografico"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:417
+#: ../meld/filediff.py:438
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:417
+#: ../meld/filediff.py:438
 msgid "OVR"
 msgstr "SSC"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:419
-#, fuzzy, python-format
+#: ../meld/filediff.py:440
+#, python-format
 msgid "Ln %i, Col %i"
-msgstr "  Rg %d, Col %d"
+msgstr "Rg %i, Col %d"
 
-#: ../meld/filediff.py:754
+#: ../meld/filediff.py:777
 #, fuzzy, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -993,109 +1043,111 @@ msgstr ""
 "L'espressione regolare «%s» ha cambiato il numero di righe nel file. Il "
 "confronto non sarà corretto. Vedere il manuale utente per maggiori dettagli."
 
-#: ../meld/filediff.py:1084
+#: ../meld/filediff.py:1091
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Impostazione del numero dei pannelli"
 
-#: ../meld/filediff.py:1090
-#, fuzzy, python-format
+#: ../meld/filediff.py:1097
+#, python-format
 msgid "[%s] Opening files"
-msgstr "Errore nell'aprire il file «%s»"
+msgstr "[%s] Apertura dei file"
 
-#: ../meld/filediff.py:1114 ../meld/filediff.py:1124 ../meld/filediff.py:1137
-#: ../meld/filediff.py:1143
-#, fuzzy
+#: ../meld/filediff.py:1120 ../meld/filediff.py:1130 ../meld/filediff.py:1143
+#: ../meld/filediff.py:1149
 msgid "Could not read file"
-msgstr "Impossibile ripristinare il file «%s»."
+msgstr "Impossibile leggere il file"
 
-#: ../meld/filediff.py:1115
+#: ../meld/filediff.py:1121
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lettura dei file"
 
-#: ../meld/filediff.py:1125
+#: ../meld/filediff.py:1131
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "«%s» sembra essere un file binario."
 
-#: ../meld/filediff.py:1138
-#, fuzzy, python-format
+#: ../meld/filediff.py:1144
+#, python-format
 msgid "%s is not in encodings: %s"
-msgstr "%s: codifica non valida."
+msgstr "%s non è presente nelle codifiche: %s"
 
-#: ../meld/filediff.py:1172
+#: ../meld/filediff.py:1178
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcolo delle differenze"
 
-#: ../meld/filediff.py:1359
+#: ../meld/filediff.py:1378
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr ""
 
-#: ../meld/filediff.py:1365
+#: ../meld/filediff.py:1384
 msgid "Files are identical"
 msgstr "I file sono identici"
 
-#: ../meld/filediff.py:1375
+#: ../meld/filediff.py:1392
 #, fuzzy
 msgid "Show without filters"
 msgstr "Mostra file ignorati"
 
-#: ../meld/filediff.py:1397
+#: ../meld/filediff.py:1414
 #, fuzzy
 msgid "Change highlighting incomplete"
 msgstr "Azzera evidenziazione delle occorrenze trovate"
 
-#: ../meld/filediff.py:1398
+#: ../meld/filediff.py:1415
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
 msgstr ""
 
-#: ../meld/filediff.py:1407
+#: ../meld/filediff.py:1423
 #, fuzzy
 msgid "Keep highlighting"
 msgstr "Evidenziazione"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1425
 #, fuzzy
 msgid "_Keep highlighting"
 msgstr "Evidenziazione"
 
-#: ../meld/filediff.py:1541
+#: ../meld/filediff.py:1556
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
 "Overwrite?"
 msgstr ""
-"«%s» esiste.\n"
+"«%s» esiste già.\n"
 "Sovrascrivere?"
 
-#: ../meld/filediff.py:1554
-#, fuzzy, python-format
+#: ../meld/filediff.py:1569
+#, python-format
 msgid ""
 "Error writing to %s\n"
 "\n"
 "%s."
-msgstr "Errore nel ripristinare il file «%s»"
+msgstr ""
+"Errore nello scrivere su %s\n"
+"\n"
+"%s."
 
-#: ../meld/filediff.py:1565
+#: ../meld/filediff.py:1580
 msgid "Save Left Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1567
+#: ../meld/filediff.py:1582
 #, fuzzy
 msgid "Save Middle Pane As"
 msgstr "Riquadro _laterale"
 
-#: ../meld/filediff.py:1569
+#: ../meld/filediff.py:1584
 msgid "Save Right Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1590
+#: ../meld/filediff.py:1604
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1106,7 +1158,7 @@ msgstr ""
 "\n"
 "Quale formato utilizzare?"
 
-#: ../meld/filediff.py:1606
+#: ../meld/filediff.py:1620
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1115,11 +1167,11 @@ msgstr ""
 "«%s» contiene caratteri non codificabili con «%s»\n"
 "Salvare in UTF-8?"
 
-#: ../meld/filediff.py:1974
+#: ../meld/filediff.py:1990
 msgid "Live comparison updating disabled"
 msgstr ""
 
-#: ../meld/filediff.py:1975
+#: ../meld/filediff.py:1991
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1131,97 +1183,95 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Apertura dei file"
 
-#: ../meld/meldapp.py:95
+#: ../meld/gutterrendererchunk.py:92
+msgid "Copy _up"
+msgstr "Copia _su"
+
+#: ../meld/gutterrendererchunk.py:93
+msgid "Copy _down"
+msgstr "Copia _giù"
+
+#: ../meld/meldapp.py:169
 msgid "wrong number of arguments supplied to --diff"
 msgstr "numero errato di argomenti forniti per --diff"
 
-#: ../meld/meldapp.py:99
+#: ../meld/meldapp.py:174
 msgid "Start with an empty window"
 msgstr "Parte con una finestra vuota"
 
-#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
-#, fuzzy
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
 msgid "file"
-msgstr "Tutti i file"
+msgstr "file"
 
-#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
-#, fuzzy
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
 msgid "dir"
-msgstr "Editor"
+msgstr "dir"
 
-#: ../meld/meldapp.py:101
+#: ../meld/meldapp.py:176
 msgid "Start a version control comparison"
 msgstr "Inizia una comparazione da controllo di versione"
 
-#: ../meld/meldapp.py:103
+#: ../meld/meldapp.py:178
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Inizia una comparazione a 2 o a 3 file"
 
-#: ../meld/meldapp.py:105
+#: ../meld/meldapp.py:180
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Inizia una comparazione a 2 o a 3 directory"
 
-#: ../meld/meldapp.py:107
-msgid "Start a comparison between file and dir/file"
-msgstr "Inizia una comparazione tra file e file/directory"
-
-#: ../meld/meldapp.py:114
+#: ../meld/meldapp.py:188
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld è uno strumento di comparazione di file e directory."
 
-#: ../meld/meldapp.py:117
+#: ../meld/meldapp.py:191
 msgid "Set label to use instead of file name"
 msgstr "Imposta l'etichetta da utilizzare al posto del nome del file"
 
-#: ../meld/meldapp.py:119
+#: ../meld/meldapp.py:193
 msgid "Open a new tab in an already running instance"
 msgstr ""
 
-#: ../meld/meldapp.py:122
+#: ../meld/meldapp.py:196
 msgid "Automatically compare all differing files on startup"
 msgstr "Confronta automaticamente all'avvio tutti i file diversi"
 
-#: ../meld/meldapp.py:124
+#: ../meld/meldapp.py:198
 msgid "Ignored for compatibility"
 msgstr "Ignorato per compatibilità"
 
-#: ../meld/meldapp.py:127
+#: ../meld/meldapp.py:201
 msgid "Set the target file for saving a merge result"
 msgstr ""
 
-#: ../meld/meldapp.py:129
+#: ../meld/meldapp.py:203
 #, fuzzy
 msgid "Automatically merge files"
 msgstr "Riconoscimento automatico"
 
-#: ../meld/meldapp.py:132
+#: ../meld/meldapp.py:206
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr ""
 
-#: ../meld/meldapp.py:135
+#: ../meld/meldapp.py:209
 #, fuzzy
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Crea una scheda diff con fino a 3 file o directory forniti."
 
-#: ../meld/meldapp.py:138
+#: ../meld/meldapp.py:212
 #, fuzzy, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "troppi argomenti (ne servono da 0 a 4, forniti %d)"
 
-#: ../meld/meldapp.py:141
+#: ../meld/meldapp.py:215
 msgid "can't auto-merge less than 3 files"
 msgstr ""
 
-#: ../meld/meldapp.py:143
+#: ../meld/meldapp.py:217
 #, fuzzy
 msgid "can't auto-merge directories"
 msgstr "Appiattisce le directory"
 
-#: ../meld/meldapp.py:149
-msgid "D-Bus error; comparisons will open in a new window."
-msgstr ""
-
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:227
 #, fuzzy
 msgid "Error reading saved comparison file"
 msgstr "Errore nel ripristinare il file «%s»"
@@ -1231,667 +1281,560 @@ msgstr "Errore nel ripristinare il file «%s»"
 msgid "<unnamed>"
 msgstr "<senza nome>"
 
-#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
-#, fuzzy
+#: ../meld/melddoc.py:59 ../meld/melddoc.py:60
 msgid "untitled"
-msgstr "File senza nome"
+msgstr "senza nome"
 
-#: ../meld/meldwindow.py:61
+#: ../meld/meldwindow.py:49
 msgid "_File"
 msgstr "_File"
 
-#: ../meld/meldwindow.py:62
-#, fuzzy
+#: ../meld/meldwindow.py:50
 msgid "_New Comparison..."
-msgstr "Preparazione..."
+msgstr "N_uovo confronto..."
 
-#: ../meld/meldwindow.py:63
-#, fuzzy
+#: ../meld/meldwindow.py:51
 msgid "Start a new comparison"
-msgstr "I_ncomincia dalla colonna:"
+msgstr "Avvia un nuovo confronto"
 
-#: ../meld/meldwindow.py:66
+#: ../meld/meldwindow.py:54
 msgid "Save the current file"
 msgstr "Salva il file corrente"
 
-#: ../meld/meldwindow.py:68
-#, fuzzy
+#: ../meld/meldwindow.py:56
 msgid "Save As..."
-msgstr "Sa_lva come..."
+msgstr "Salva come..."
 
-#: ../meld/meldwindow.py:69
+#: ../meld/meldwindow.py:57
 msgid "Save the current file with a different name"
 msgstr "Salva il file corrente con un nome diverso"
 
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:60
 msgid "Close the current file"
 msgstr "Chiude il file corrente"
 
-#: ../meld/meldwindow.py:75
-msgid "Quit the program"
-msgstr "Esce dal programma"
-
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:63
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:65
 msgid "Undo the last action"
 msgstr "Annulla l'ultima azione"
 
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:68
 msgid "Redo the last undone action"
 msgstr "Ripete l'ultima azione annullata"
 
-#: ../meld/meldwindow.py:85
+#: ../meld/meldwindow.py:70
 msgid "Cut the selection"
 msgstr "Taglia la selezione"
 
-#: ../meld/meldwindow.py:87
+#: ../meld/meldwindow.py:72
 msgid "Copy the selection"
 msgstr "Copia la selezione"
 
-#: ../meld/meldwindow.py:89
+#: ../meld/meldwindow.py:74
 msgid "Paste the clipboard"
 msgstr "Incolla dagli appunti"
 
-#: ../meld/meldwindow.py:91
-#, fuzzy
+#: ../meld/meldwindow.py:76
 msgid "Find..."
-msgstr "Tr_ova..."
+msgstr "Trova..."
 
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:76
 msgid "Search for text"
 msgstr "Cerca una stringa di testo"
 
-#: ../meld/meldwindow.py:93
+#: ../meld/meldwindow.py:78
 msgid "Find Ne_xt"
 msgstr "Trova successi_vo"
 
-#: ../meld/meldwindow.py:94
+#: ../meld/meldwindow.py:79
 msgid "Search forwards for the same text"
 msgstr "Cerca lo stesso testo in avanti"
 
-#: ../meld/meldwindow.py:96
-#, fuzzy
+#: ../meld/meldwindow.py:81
 msgid "Find _Previous"
 msgstr "Trova pr_ecedente"
 
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:82
 msgid "Search backwards for the same text"
 msgstr "Cerca lo stesso testo all'indietro"
 
-#: ../meld/meldwindow.py:100
+#: ../meld/meldwindow.py:85
 msgid "_Replace..."
 msgstr "Sostit_uisci..."
 
-#: ../meld/meldwindow.py:101
-#, fuzzy
+#: ../meld/meldwindow.py:86
 msgid "Find and replace text"
-msgstr "Cerca e sostituisce testo"
-
-#: ../meld/meldwindow.py:103
-#, fuzzy
-msgid "Prefere_nces"
-msgstr "Preferen_ze"
-
-#: ../meld/meldwindow.py:104
-msgid "Configure the application"
-msgstr "Configura l'applicazione"
+msgstr "Trova e sostituisce testo"
 
-#: ../meld/meldwindow.py:107
-#, fuzzy
+#: ../meld/meldwindow.py:89
 msgid "_Changes"
-msgstr "Modifica maiuscole/minuscole"
+msgstr "_Modifiche"
 
-#: ../meld/meldwindow.py:108
-#, fuzzy
+#: ../meld/meldwindow.py:90
 msgid "Next Change"
-msgstr "Pagina _successiva"
+msgstr "Modifica successiva"
 
-#: ../meld/meldwindow.py:109
+#: ../meld/meldwindow.py:91
 #, fuzzy
 msgid "Go to the next change"
 msgstr "Mostra la pagina successiva"
 
-#: ../meld/meldwindow.py:111
-#, fuzzy
+#: ../meld/meldwindow.py:93
 msgid "Previous Change"
-msgstr "Pagina _precedente"
+msgstr "Modifica precedente"
 
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:94
 #, fuzzy
 msgid "Go to the previous change"
 msgstr "Mostra la pagina precedente"
 
-#: ../meld/meldwindow.py:114
-#, fuzzy
+#: ../meld/meldwindow.py:96
 msgid "Open Externally"
-msgstr "Apri terminale qui"
+msgstr "Apri esternamente"
 
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:97
 msgid "Open selected file or directory in the default external application"
 msgstr ""
 
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:101
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:102
 #, fuzzy
 msgid "File Status"
 msgstr "Salvataggio file"
 
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:103
 #, fuzzy
 msgid "Version Status"
 msgstr "Stato della versione"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:106
 #, fuzzy
 msgid "Stop the current action"
 msgstr "Salva il file corrente"
 
-#: ../meld/meldwindow.py:127
-#, fuzzy
+#: ../meld/meldwindow.py:109
 msgid "Refresh the view"
-msgstr "Aggiorna vista"
+msgstr "Aggiorna la vista"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:112
 msgid "_Tabs"
-msgstr ""
+msgstr "_Schede"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:113
 #, fuzzy
 msgid "_Previous Tab"
 msgstr "Gruppo _precedente"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:114
 #, fuzzy
 msgid "Activate previous tab"
 msgstr "Attiva il documento precedente"
 
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:116
 #, fuzzy
 msgid "_Next Tab"
 msgstr "Pagina _successiva"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:117
 #, fuzzy
 msgid "Activate next tab"
 msgstr "Attiva il documento successivo"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:120
 #, fuzzy
 msgid "Move Tab _Left"
 msgstr "Copia a sinistra"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:121
 msgid "Move current tab to left"
 msgstr ""
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:124
 #, fuzzy
 msgid "Move Tab _Right"
 msgstr "Copia a destra"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:125
 msgid "Move current tab to right"
 msgstr ""
 
-#: ../meld/meldwindow.py:146
-msgid "_Help"
-msgstr "A_iuto"
-
-#: ../meld/meldwindow.py:147
-msgid "_Contents"
-msgstr "_Sommario"
-
-#: ../meld/meldwindow.py:148
-#, fuzzy
-msgid "Open the Meld manual"
-msgstr "Apre il manuale del programma"
-
-#: ../meld/meldwindow.py:149
-msgid "Report _Bug"
-msgstr "Segnala _errore"
-
-#: ../meld/meldwindow.py:150
-msgid "Report a bug in Meld"
-msgstr "Riporta un errore in Meld"
-
-#: ../meld/meldwindow.py:153
-#, fuzzy
-msgid "About this program"
-msgstr "Esce dal programma"
-
-#: ../meld/meldwindow.py:157
-#, fuzzy
+#: ../meld/meldwindow.py:129
 msgid "Fullscreen"
 msgstr "Schermo intero"
 
 # (ndt) suggerimento
-#: ../meld/meldwindow.py:158
-#, fuzzy
+#: ../meld/meldwindow.py:130
 msgid "View the comparison in fullscreen"
-msgstr "Modifica testo a schermo intero"
+msgstr "Visualizza a schermo intero"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:132
 msgid "_Toolbar"
 msgstr "Barra degli s_trumenti"
 
-#: ../meld/meldwindow.py:161
-#, fuzzy
+#: ../meld/meldwindow.py:133
 msgid "Show or hide the toolbar"
-msgstr "Mostra o nasconde la barra degli strumenti nella finestra corrente"
+msgstr "Mostra o nasconde la barra degli strumenti"
 
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:135
 msgid "_Statusbar"
 msgstr "Barra di _stato"
 
-#: ../meld/meldwindow.py:164
-#, fuzzy
+#: ../meld/meldwindow.py:136
 msgid "Show or hide the statusbar"
-msgstr "Mostra o nasconde la barra di stato nella finestra corrente"
+msgstr "Mostra o nasconde la barra di stato"
 
-#: ../meld/meldwindow.py:173
-#, fuzzy
+#: ../meld/meldwindow.py:145
 msgid "Open Recent"
-msgstr "Apri un nuovo documento"
+msgstr "Apri recenti"
 
-#: ../meld/meldwindow.py:174
-#, fuzzy
+#: ../meld/meldwindow.py:146
 msgid "Open recent files"
-msgstr "Apre un file modificato di recente"
+msgstr "Apre i file recenti"
 
-#: ../meld/meldwindow.py:601
-#, fuzzy
+#: ../meld/meldwindow.py:537
 msgid "Switch to this tab"
-msgstr "Passa al gruppo di schede precedente"
+msgstr "Passa a questa scheda"
 
-#. exit at first non found directory + file
-#: ../meld/meldwindow.py:734
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Non è possibile confrontare sia file che directory.\n"
+#: ../meld/meldwindow.py:660
+msgid "Cannot compare a mixture of files and directories"
+msgstr "Non è possibile confrontare sia file che directory"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:172
+#: ../meld/misc.py:180
 msgid "[None]"
 msgstr "[Nessuno]"
 
-#: ../meld/preferences.py:49
+#: ../meld/preferences.py:46
 msgid "label"
 msgstr "etichetta"
 
-#: ../meld/preferences.py:49
+#: ../meld/preferences.py:46
 msgid "pattern"
 msgstr "modello"
 
-#: ../meld/preferences.py:168 ../meld/preferences.py:240
-#, fuzzy
-msgid "Only available if you have PyGtkSourceView 2 installed"
-msgstr "Disponibile solo se gnome-python-desktop è installato"
-
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:356
+#: ../meld/preferences.py:338
 #, fuzzy
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "Backup\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:358
+#: ../meld/preferences.py:340
 msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
 msgstr ""
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:360
+#: ../meld/preferences.py:342
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "Controllo di versione\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:362
+#: ../meld/preferences.py:344
 #, fuzzy
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 msgstr "Binari\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:364
+#: ../meld/preferences.py:346
 #, fuzzy
 msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 msgstr "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:366
+#: ../meld/preferences.py:348
 #, fuzzy
 msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 msgstr "Parole chiave CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:368
+#: ../meld/preferences.py:350
 #, fuzzy
 msgid "C++ comment\t0\t//.*\n"
 msgstr "Commento C++\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:370
+#: ../meld/preferences.py:352
 #, fuzzy
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "Commento C\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:372
+#: ../meld/preferences.py:354
 #, fuzzy
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "Tutti gli spazi\t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:374
-#, fuzzy
+#: ../meld/preferences.py:356
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "Spazi iniziali\t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:376
+#: ../meld/preferences.py:358
 msgid "Script comment\t0\t#.*"
 msgstr "Commento script\t0\t#.*"
 
-#: ../meld/recent.py:104
-#, fuzzy
+#: ../meld/recent.py:105
 msgid "Version control:"
-msgstr "Versione da ignorare"
-
-#: ../meld/vcview.py:161
-#, fuzzy
-msgid "Compare selected files"
-msgstr "Esporta snippet selezionate"
+msgstr "Controllo della versione:"
 
-#: ../meld/vcview.py:163
-msgid "Co_mmit..."
-msgstr "Co_mmit..."
+#: ../meld/ui/findbar.py:142
+msgid "Regular expression error"
+msgstr "Errore nell'espressione regolare"
 
-#: ../meld/vcview.py:164
-#, fuzzy
-msgid "Commit changes to version control"
-msgstr "Scegliere un controllo di versione"
-
-#: ../meld/vcview.py:166
-msgid "_Update"
-msgstr "A_ggiorna"
+#: ../meld/ui/notebooklabel.py:65
+msgid "Close tab"
+msgstr "Chiudi scheda"
 
-#: ../meld/vcview.py:167
-msgid "Update working copy from version control"
+#: ../meld/ui/vcdialogs.py:55
+msgid "No files will be committed"
 msgstr ""
 
-#: ../meld/vcview.py:169
-msgid "_Push"
-msgstr "_Push"
-
-#: ../meld/vcview.py:170
-#, fuzzy
-msgid "Push local changes to remote"
-msgstr "Copia tutte le modifiche dal riquadro destro al riquadro sinistro"
-
-#: ../meld/vcview.py:173
-#, fuzzy
-msgid "Add to version control"
-msgstr "Vista di controllo versione"
-
-#: ../meld/vcview.py:176
-#, fuzzy
-msgid "Remove from version control"
-msgstr "Scegliere un controllo di versione"
-
-#: ../meld/vcview.py:178
-#, fuzzy
-msgid "Mar_k as Resolved"
-msgstr "Marca come risolto per il controllo di versione"
-
-#: ../meld/vcview.py:179
-#, fuzzy
-msgid "Mark as resolved in version control"
-msgstr "Marca come risolto per il controllo di versione"
+#. Translators: First %s is replaced by translated "%d unpushed
+#. commits", second %s is replaced by translated "%d branches"
+#: ../meld/vc/git.py:126
+#, python-format
+msgid "%s in %s"
+msgstr "%s su %s"
 
-#: ../meld/vcview.py:181
-#, fuzzy
-msgid "Re_vert"
-msgstr "_Ripristina"
+#. Translators: These messages cover the case where there is
+#. only one branch, and are not part of another message.
+#: ../meld/vc/git.py:127 ../meld/vc/git.py:134
+#, python-format
+msgid "%d unpushed commit"
+msgid_plural "%d unpushed commits"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../meld/vcview.py:182
-#, fuzzy
-msgid "Revert working copy to original state"
-msgstr "Riporta all'originale"
+#: ../meld/vc/git.py:129
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] "%d ramo"
+msgstr[1] "%d rami"
 
-#: ../meld/vcview.py:185
-msgid "Delete from working copy"
+#: ../meld/vc/git.py:341
+#, python-format
+msgid "Mode changed from %s to %s"
 msgstr ""
 
-#: ../meld/vcview.py:190
-msgid "_Flatten"
-msgstr "_Appiattisci"
-
-#: ../meld/vcview.py:191
-msgid "Flatten directories"
-msgstr "Appiattisce le directory"
+#: ../meld/vc/_vc.py:47
+msgid "Merged"
+msgstr "Unito"
 
-#: ../meld/vcview.py:193
-msgid "_Modified"
-msgstr "_Modificati"
+#: ../meld/vc/_vc.py:47
+msgid "Base"
+msgstr "Base"
 
-#: ../meld/vcview.py:194
-#, fuzzy
-msgid "Show modified files"
-msgstr "Salvare i file modificati?"
+#: ../meld/vc/_vc.py:47
+msgid "Local"
+msgstr "Locale"
 
-#: ../meld/vcview.py:196
-msgid "_Normal"
-msgstr "_Normale"
+#: ../meld/vc/_vc.py:47
+msgid "Remote"
+msgstr "Remoto"
 
-#: ../meld/vcview.py:197
+#. These are the possible states of files. Be sure to get the colons correct.
+#: ../meld/vc/_vc.py:62
 #, fuzzy
-msgid "Show normal files"
-msgstr "Mostra pagine multiple"
-
-#: ../meld/vcview.py:199
-msgid "Un_versioned"
+msgid ""
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
+"Not present"
 msgstr ""
+"Ignorato:Non versionato:::Errore::Aggiunto recentemente:Modificato:"
+"<b>Conflitto</b>:Rimosso:Mancante"
 
-#: ../meld/vcview.py:200
-msgid "Show unversioned files"
-msgstr "Mostra file non versionati"
-
-#: ../meld/vcview.py:202
-msgid "Ignored"
-msgstr "Ignorati"
-
-#: ../meld/vcview.py:203
-msgid "Show ignored files"
-msgstr "Mostra file ignorati"
-
-#: ../meld/vcview.py:262 ../meld/vcview.py:432
+#: ../meld/vcview.py:206 ../meld/vcview.py:363
 msgid "Location"
 msgstr "Posizione"
 
-#: ../meld/vcview.py:263
+#: ../meld/vcview.py:207
 msgid "Status"
 msgstr "Stato"
 
-#: ../meld/vcview.py:264
+#: ../meld/vcview.py:208
 msgid "Revision"
 msgstr "Revisione"
 
-#: ../meld/vcview.py:265
+#: ../meld/vcview.py:209
 msgid "Options"
 msgstr "Opzioni"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:342
-#, fuzzy, python-format
+#: ../meld/vcview.py:274
+#, python-format
 msgid "%s not installed"
-msgstr "«%s» non trovato"
+msgstr "%s non è installato"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:346
+#: ../meld/vcview.py:278
 msgid "Invalid repository"
 msgstr "Repository non valido"
 
-#: ../meld/vcview.py:355
+#: ../meld/vcview.py:287
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:357 ../meld/vcview.py:365
+#: ../meld/vcview.py:289 ../meld/vcview.py:297
 msgid "None"
 msgstr "Nessuno"
 
-#: ../meld/vcview.py:376
+#: ../meld/vcview.py:308
 msgid "No valid version control system found in this folder"
 msgstr ""
 
-#: ../meld/vcview.py:378
+#: ../meld/vcview.py:310
 #, fuzzy
 msgid "Only one version control system found in this folder"
 msgstr "Solo un controllo di versione in questa directory"
 
-#: ../meld/vcview.py:380
-#, fuzzy
+#: ../meld/vcview.py:312
 msgid "Choose which version control system to use"
-msgstr "Scegliere un controllo di versione"
+msgstr "Scegliere il sistema di controllo da usare"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:432
+#: ../meld/vcview.py:363
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:446 ../meld/vcview.py:454
+#: ../meld/vcview.py:377 ../meld/vcview.py:385
 #, python-format
 msgid "Scanning %s"
 msgstr "Analisi di %s"
 
-#: ../meld/vcview.py:487
+#: ../meld/vcview.py:418
 msgid "(Empty)"
 msgstr "(Vuoto)"
 
-#: ../meld/vcview.py:709
+#: ../meld/vcview.py:641
 msgid "Remove folder and all its files?"
-msgstr ""
+msgstr "Rimuovere la cartella e tutti i suoi file?"
 
-#: ../meld/vcview.py:711
+#: ../meld/vcview.py:643
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr ""
 
-#: ../meld/ui/findbar.py:150
+#: ../meld/vcview.py:677
 #, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"Errore nell'espressione regolare\n"
-"«%s»"
+msgid "Error removing %s"
+msgstr "Errore nel rimuovere %s"
 
-#: ../meld/ui/historyentry.py:381
-msgid "_Browse..."
-msgstr "_Esplora..."
+#~ msgid ""
+#~ "Meld is free software: you can redistribute it and/or modify it under the "
+#~ "terms of the GNU General Public License as published by the Free Software "
+#~ "Foundation, either version 2 of the License, or (at your option) any "
+#~ "later version.\n"
+#~ "\n"
+#~ "Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
+#~ "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+#~ "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+#~ "details. \n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program.  If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Meld is free software: you can redistribute it and/or modify it under the "
+#~ "terms of the GNU General Public License as published by the Free Software "
+#~ "Foundation, either version 2 of the License, or (at your option) any "
+#~ "later version.\n"
+#~ "\n"
+#~ "Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
+#~ "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+#~ "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+#~ "details. \n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#: ../meld/ui/historyentry.py:389
-msgid "Path"
-msgstr "Percorso"
+#, fuzzy
+#~ msgid "Compare selected"
+#~ msgstr "Copia la selezione"
 
-#: ../meld/ui/historyentry.py:390
-msgid "Path to file"
-msgstr "Percorso al file"
+#~ msgid ""
+#~ "'%s' is a directory.\n"
+#~ "Remove recursively?"
+#~ msgstr ""
+#~ "«%s» è una directory.\n"
+#~ "Rimuovere ricorsivamente?"
 
-#: ../meld/ui/historyentry.py:391
-msgid "Pop up a file selector to choose a file"
-msgstr "Fa comparire un selettore di file per scegliere un file"
+#~ msgid "Start a comparison between file and dir/file"
+#~ msgstr "Inizia una comparazione tra file e file/directory"
 
-#: ../meld/ui/historyentry.py:529
-msgid "Select directory"
-msgstr "Seleziona directory"
+#~ msgid "Quit the program"
+#~ msgstr "Esce dal programma"
 
-#: ../meld/ui/historyentry.py:533
-msgid "Select file"
-msgstr "Seleziona file"
+#, fuzzy
+#~ msgid "Prefere_nces"
+#~ msgstr "Preferen_ze"
 
-#: ../meld/ui/notebooklabel.py:63
-msgid "Close tab"
-msgstr "Chiudi scheda"
+#~ msgid "Configure the application"
+#~ msgstr "Configura l'applicazione"
 
-#: ../meld/ui/vcdialogs.py:57
-msgid "No files will be committed"
-msgstr ""
+#~ msgid "_Help"
+#~ msgstr "A_iuto"
 
-#: ../meld/vc/_vc.py:47
-msgid "Merged"
-msgstr "Unito"
+#~ msgid "_Contents"
+#~ msgstr "_Sommario"
 
-#: ../meld/vc/_vc.py:47
-msgid "Base"
-msgstr "Base"
+#, fuzzy
+#~ msgid "Open the Meld manual"
+#~ msgstr "Apre il manuale del programma"
 
-#: ../meld/vc/_vc.py:47
-msgid "Local"
-msgstr "Locale"
+#~ msgid "Report _Bug"
+#~ msgstr "Segnala _errore"
 
-#: ../meld/vc/_vc.py:47
-msgid "Remote"
-msgstr "Remoto"
+#~ msgid "Report a bug in Meld"
+#~ msgstr "Riporta un errore in Meld"
 
-#. These are the possible states of files. Be sure to get the colons correct.
-#: ../meld/vc/_vc.py:62
 #, fuzzy
-msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
-"Not present"
-msgstr ""
-"Ignorato:Non versionato:::Errore::Aggiunto recentemente:Modificato:"
-"<b>Conflitto</b>:Rimosso:Mancante"
+#~ msgid "About this program"
+#~ msgstr "Esce dal programma"
 
-#: ../meld/vc/cvs.py:231
-#, python-format
-msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
-msgstr ""
-"Errore durante la conversione in un'espressione regolare\n"
-"Il modello era «%s»\n"
-"L'errore era «%s»"
+#, fuzzy
+#~ msgid "Only available if you have PyGtkSourceView 2 installed"
+#~ msgstr "Disponibile solo se gnome-python-desktop è installato"
 
-#. Translators: First %s is replaced by translated "%d unpushed
-#. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:120
-#, fuzzy, python-format
-msgid "%s in %s"
-msgstr "/ su %s"
+#~ msgid "_Browse..."
+#~ msgstr "_Esplora..."
 
-#. Translators: These messages cover the case where there is
-#. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:121 ../meld/vc/git.py:128
-#, python-format
-msgid "%d unpushed commit"
-msgid_plural "%d unpushed commits"
-msgstr[0] ""
-msgstr[1] ""
+#~ msgid "Path"
+#~ msgstr "Percorso"
 
-#: ../meld/vc/git.py:123
-#, python-format
-msgid "%d branch"
-msgid_plural "%d branches"
-msgstr[0] ""
-msgstr[1] ""
+#~ msgid "Path to file"
+#~ msgstr "Percorso al file"
 
-#: ../meld/vc/git.py:333
-#, python-format
-msgid "Mode changed from %s to %s"
-msgstr ""
+#~ msgid "Pop up a file selector to choose a file"
+#~ msgstr "Fa comparire un selettore di file per scegliere un file"
+
+#~ msgid "Select directory"
+#~ msgstr "Seleziona directory"
+
+#~ msgid "Select file"
+#~ msgstr "Seleziona file"
+
+#~ msgid ""
+#~ "Error converting to a regular expression\n"
+#~ "The pattern was '%s'\n"
+#~ "The error was '%s'"
+#~ msgstr ""
+#~ "Errore durante la conversione in un'espressione regolare\n"
+#~ "Il modello era «%s»\n"
+#~ "L'errore era «%s»"
 
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
@@ -2590,9 +2533,6 @@ msgstr ""
 #~ "Eseguire \"%s --help\" per visualizzare un elenco completo delle opzioni "
 #~ "disponibili a riga di comando.\n"
 
-#~ msgid "About gedit"
-#~ msgstr "Informazioni sul programma"
-
 #~ msgid "Question"
 #~ msgstr "Domanda"
 
@@ -3399,9 +3339,6 @@ msgstr ""
 #~ msgid "RO"
 #~ msgstr "RO"
 
-#~ msgid "Error saving file %s"
-#~ msgstr "Errore nel salvare il file «%s»"
-
 #~ msgid "Unicode (UTF-8)"
 #~ msgstr "Unicode (UTF-8)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]