[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: Sun, 9 Feb 2014 15:09:51 +0000 (UTC)
commit e3b0806bed25b890bf47174bac026381f1a3db6d
Author: Milo Casagrande <milo ubuntu com>
Date:   Sun Feb 9 16:09:47 2014 +0100

    [l10n] Updated Italian translation.

 po/it.po |  660 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 299 insertions(+), 361 deletions(-)
---
diff --git a/po/it.po b/po/it.po
index b8b9795..9c8543a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,28 +1,29 @@
 # Italian translation of meld
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2013, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the meld package.
-# Milo Casagrande <milo ubuntu com>, 2013.
+# Milo Casagrande <milo ubuntu com>, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-16 22:00+0100\n"
-"PO-Revision-Date: 2013-12-16 22:00+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=meld&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-02-09 10:46+0000\n"
+"PO-Revision-Date: 2014-02-09 16:08+0100\n"
 "Last-Translator: Milo Casagrande <milo ubuntu com>\n"
 "Language-Team: Italian <tp lists linux it>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.6.4\n"
 
-#: ../bin/meld:117
+#: ../bin/meld:119
 msgid "Cannot import: "
 msgstr "Impossibile importare: "
 
-#: ../bin/meld:120
+#: ../bin/meld:122
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld richiede %s o più recente."
@@ -304,10 +305,22 @@ msgstr ""
 "della versione, con i comandi eseguiti."
 
 #: ../data/org.gnome.meld.gschema.xml.h:44
+msgid "Version control pane position"
+msgstr "Posizione riquadro controllo versione"
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
+msgid ""
+"This is the height of the main version control tree when the console pane is "
+"shown."
+msgstr ""
+"Questa è l'altezza dell'albero principale del controllo versione quando il "
+"riquadro della console è mostrato."
+
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Confronto come sinistra-locale/destra-remoto"
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
@@ -317,11 +330,11 @@ msgstr ""
 "sinistra-locale destra-remoto per determinare l'ordine con cui mostrare i "
 "file. Altrimenti viene usato lo schema sinistra-altri destra-personale."
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid "Show margin in commit message editor"
 msgstr "Mostra i margini nell'editor del messaggio di commit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:49
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
@@ -329,20 +342,20 @@ msgstr ""
 "Se VERO, viene visualizzata una guida per mostrare il margine nell'editor "
 "del messaggio di commit."
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:50
 msgid "Margin column in commit message editor"
 msgstr "Colonna nell'editor del messaggio di commit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid ""
 "The column of the margin is at in the version control commit message editor."
 msgstr "Il margine del messaggio di commit."
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid "Automatically hard-wrap commit messages"
 msgstr "A capo automatico nei messaggi di commit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the defined commit margin before commit."
@@ -350,22 +363,22 @@ msgstr ""
 "Se VERO, l'editor del messaggio di commit andrà a capo al margine "
 "predefinito prima di eseguire il commit."
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:54
 msgid "Version control status filters"
 msgstr "Filtri sullo stato del sistema di controllo della versione"
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "Elenco di stati usati per filtrare i file visualizzati nel confronto per i "
 "sistemi di controllo della versione."
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid "Filename-based filters"
 msgstr "Filtri sui nomi dei file"
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -373,11 +386,11 @@ msgstr ""
 "Elenco di filtri basati sui nomi dei file che, se attivi, rimuovono i file "
 "dal confronto in un confronto tra directory."
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid "Text-based filters"
 msgstr "Filtri di testo"
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -451,7 +464,7 @@ msgstr "Copia a destra"
 msgid "Delete selected"
 msgstr "Elimina selezione"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1418
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1409
 msgid "Hide"
 msgstr "Nascondi"
 
@@ -488,7 +501,7 @@ msgstr "Nuovi"
 msgid "Show new"
 msgstr "Mostra nuovi"
 
-#: ../data/ui/dirdiff.ui.h:16
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:71
 msgid "Modified"
 msgstr "Modificati"
 
@@ -521,7 +534,7 @@ msgid "_Add"
 msgstr "A_ggiungi"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:677
+#: ../meld/vcview.py:672
 msgid "_Remove"
 msgstr "_Rimuovi"
 
@@ -542,8 +555,8 @@ msgid "Move _Down"
 msgstr "Sposta _giù"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:365
-#: ../meld/vcview.py:187
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:355
+#: ../meld/vcview.py:185
 msgid "Name"
 msgstr "Nome"
 
@@ -588,16 +601,12 @@ msgstr ""
 "sbloccarlo e apportare le modifiche: tali modifiche devono però essere "
 "salvata su un nuovo file."
 
-#: ../data/ui/filediff.ui.h:7 ../meld/filediff.py:301
-msgid "Lock scrolling of all panes"
-msgstr "Blocca lo scorrimento di tutti i riquadri"
-
 # (ndt) l'azione annulla effettivamente le modifiche che non sono state salvate.
-#: ../data/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:7
 msgid "Revert unsaved changes to documents?"
 msgstr "Annullare le modifiche non salvate dei documenti?"
 
-#: ../data/ui/filediff.ui.h:9
+#: ../data/ui/filediff.ui.h:8
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr ""
 "Le modifiche apportate ai seguenti documenti andranno perse per sempre:\n"
@@ -666,7 +675,7 @@ msgstr "Inve_rti direzione patch"
 msgid "Copy to Clipboard"
 msgstr "Copia negli appunti"
 
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:121
+#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:119
 msgid "Save Patch"
 msgstr "Salva patch"
 
@@ -821,7 +830,7 @@ 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:38 ../meld/meldwindow.py:106
+#: ../data/ui/preferences.ui.h:38 ../meld/meldwindow.py:104
 msgid "File Filters"
 msgstr "Filtri dei file"
 
@@ -847,7 +856,7 @@ msgstr "Ignorare modifiche che inseriscono o eliminano righe vuote"
 msgid "Text Filters"
 msgstr "Filtri di testo"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:618
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:582
 msgid "New comparison"
 msgstr "Nuovo confronto"
 
@@ -956,128 +965,142 @@ msgid "Delete from working copy"
 msgstr "Elimina dalla copia di lavoro"
 
 #: ../data/ui/vcview.ui.h:18
+msgid "Console"
+msgstr "Console"
+
+#: ../data/ui/vcview.ui.h:19
+msgid "Show or hide the version control console output pane"
+msgstr ""
+"Mostra o nasconde il riquadro dell'output del sistema di controllo della "
+"versione"
+
+#: ../data/ui/vcview.ui.h:20
 msgid "_Flatten"
 msgstr "_Appiattisci"
 
-#: ../data/ui/vcview.ui.h:19
+#: ../data/ui/vcview.ui.h:21
 msgid "Flatten directories"
 msgstr "Appiattisce le directory"
 
-#: ../data/ui/vcview.ui.h:20
+#: ../data/ui/vcview.ui.h:22
 msgid "_Modified"
 msgstr "_Modificati"
 
-#: ../data/ui/vcview.ui.h:21
+#: ../data/ui/vcview.ui.h:23
 msgid "Show modified files"
 msgstr "Mostra i file modificati"
 
-#: ../data/ui/vcview.ui.h:22
+#: ../data/ui/vcview.ui.h:24
 msgid "_Normal"
 msgstr "_Normali"
 
-#: ../data/ui/vcview.ui.h:23
+#: ../data/ui/vcview.ui.h:25
 msgid "Show normal files"
 msgstr "Mostra i file normali"
 
-#: ../data/ui/vcview.ui.h:24
+#: ../data/ui/vcview.ui.h:26
 msgid "Un_versioned"
 msgstr "Non _monitorati"
 
-#: ../data/ui/vcview.ui.h:25
+#: ../data/ui/vcview.ui.h:27
 msgid "Show unversioned files"
 msgstr "Mostra file non monitorati"
 
-#: ../data/ui/vcview.ui.h:26
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:64
 msgid "Ignored"
 msgstr "Ignorati"
 
-#: ../data/ui/vcview.ui.h:27
+#: ../data/ui/vcview.ui.h:29
 msgid "Show ignored files"
 msgstr "Mostra file ignorati"
 
-#: ../data/ui/vcview.ui.h:28
+#: ../data/ui/vcview.ui.h:30
 msgid "Commit"
 msgstr "Commit"
 
-#: ../data/ui/vcview.ui.h:29
+#: ../data/ui/vcview.ui.h:31
 msgid "Commit Files"
 msgstr "Commit dei file"
 
-#: ../data/ui/vcview.ui.h:30
+#: ../data/ui/vcview.ui.h:32
 msgid "Log Message"
 msgstr "Messaggio di registro"
 
-#: ../data/ui/vcview.ui.h:31
+#: ../data/ui/vcview.ui.h:33
 msgid "Previous logs:"
 msgstr "Registri precedenti:"
 
-#: ../data/ui/vcview.ui.h:32
+#: ../data/ui/vcview.ui.h:34
 msgid "Co_mmit"
 msgstr "Co_mmit"
 
-#: ../data/ui/vcview.ui.h:33
+#: ../data/ui/vcview.ui.h:35
+msgid "Console output"
+msgstr "Output della console"
+
+#: ../data/ui/vcview.ui.h:36
 msgid "Push local commits to remote?"
 msgstr "Inviare i commit locali in remoto?"
 
-#: ../data/ui/vcview.ui.h:34
+#: ../data/ui/vcview.ui.h:37
 msgid "The commits to be pushed are determined by your version control system."
 msgstr ""
 "I commit da inviare sono determinati dal sistema di controllo della versione."
 
-#: ../data/ui/vcview.ui.h:35
+#: ../data/ui/vcview.ui.h:38
 msgid "_Push commits"
 msgstr "_Push dei commit"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:383
+#: ../meld/dirdiff.py:373
 msgid "Size"
 msgstr "Dimensione"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:391
+#: ../meld/dirdiff.py:381
 msgid "Modification time"
 msgstr "Data e ora di modifica"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:399
+#: ../meld/dirdiff.py:389
 msgid "Permissions"
 msgstr "Permessi"
 
-#: ../meld/dirdiff.py:558
+#: ../meld/dirdiff.py:548
 #, python-format
 msgid "Hide %s"
 msgstr "Nascondi %s"
 
-#: ../meld/dirdiff.py:687 ../meld/dirdiff.py:709
+#: ../meld/dirdiff.py:677 ../meld/dirdiff.py:699
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Analisi di %s"
 
-#: ../meld/dirdiff.py:809
+#: ../meld/dirdiff.py:828
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Fatto"
 
-#: ../meld/dirdiff.py:815
+#: ../meld/dirdiff.py:835
 msgid "Multiple errors occurred while scanning this folder"
 msgstr ""
 "Si sono verificati molteplici errore durante l'analisi di questa cartella"
 
-#: ../meld/dirdiff.py:816
+#: ../meld/dirdiff.py:836
 msgid "Files with invalid encodings found"
 msgstr "Trovati file con codifiche non valide"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:818
+#: ../meld/dirdiff.py:838
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Alcuni file presentano delle codifiche non corrette. I nomi sono:"
 
-#: ../meld/dirdiff.py:820
+#: ../meld/dirdiff.py:840
 msgid "Files hidden by case insensitive comparison"
 msgstr "File nascosti dal confronto senza distinzione maiuscole/minuscole"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:822
+#: ../meld/dirdiff.py:842
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1085,17 +1108,17 @@ msgstr ""
 "Confronto eseguito senza distinzione tra maiuscole/minuscole su un file "
 "system che applica tale distinzione. Alcuni file sono nascosti:"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:853
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "«%s» è nascosto da «%s»"
 
-#: ../meld/dirdiff.py:858 ../meld/filediff.py:1111 ../meld/filediff.py:1249
-#: ../meld/filediff.py:1420 ../meld/filediff.py:1450 ../meld/filediff.py:1452
+#: ../meld/dirdiff.py:878 ../meld/filediff.py:1102 ../meld/filediff.py:1240
+#: ../meld/filediff.py:1411 ../meld/filediff.py:1441 ../meld/filediff.py:1443
 msgid "Hi_de"
 msgstr "Nascon_di"
 
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:909
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -1104,11 +1127,11 @@ msgstr ""
 "«%s» esiste già.\n"
 "Sovrascrivere?"
 
-#: ../meld/dirdiff.py:897
+#: ../meld/dirdiff.py:917
 msgid "Error copying file"
 msgstr "Errore nel copiare il file"
 
-#: ../meld/dirdiff.py:898
+#: ../meld/dirdiff.py:918
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1121,238 +1144,193 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:921
+#: ../meld/dirdiff.py:941
 #, python-format
 msgid "Error deleting %s"
 msgstr "Errore nell'eliminare %s"
 
-#: ../meld/dirdiff.py:1052
-#, python-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] "%i secondo"
-msgstr[1] "%i secondi"
-
-#: ../meld/dirdiff.py:1053
-#, python-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] "%i minuto"
-msgstr[1] "%i minuti"
-
-#: ../meld/dirdiff.py:1054
-#, python-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] "%i ora"
-msgstr[1] "%i ore"
-
-#: ../meld/dirdiff.py:1055
-#, python-format
-msgid "%i day"
-msgid_plural "%i days"
-msgstr[0] "%i giorno"
-msgstr[1] "%i giorni"
-
-#: ../meld/dirdiff.py:1056
-#, python-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i settimana"
-msgstr[1] "%i settimane"
-
-#: ../meld/dirdiff.py:1057
-#, python-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i mese"
-msgstr[1] "%i mesi"
-
-#: ../meld/dirdiff.py:1058
-#, python-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i anno"
-msgstr[1] "%i anni"
-
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:231
 msgid "Format as Patch..."
 msgstr "Formatta come patch..."
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:232
 msgid "Create a patch using differences between files"
 msgstr "Crea una patch utilizzando le differenze tra i file"
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:234
 msgid "Save A_ll"
 msgstr "Sal_va tutti"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:235
 msgid "Save all files in the current comparison"
 msgstr "Salva tutti i file nel confronto attuale"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:238
 msgid "Revert files to their saved versions"
 msgstr "Ripristina i file alla loro versione salvata"
 
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:240
 msgid "Add Synchronization Point"
 msgstr "Aggiungi punto sincronizzazione"
 
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:241
 msgid "Add a manual point for synchronization of changes between files"
 msgstr "Aggiunge un punto manuale per sincronizzare le modifiche tra i file"
 
-#: ../meld/filediff.py:242
+#: ../meld/filediff.py:244
 msgid "Clear Synchronization Points"
 msgstr "Pulisci punti sincronizzazione"
 
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:245
 msgid "Clear manual change sychronization points"
 msgstr "Pulisce i punti manuali di sincronizzazione delle modifiche"
 
-#: ../meld/filediff.py:245
+#: ../meld/filediff.py:247
 msgid "Previous Conflict"
 msgstr "Conflitto precedente"
 
-#: ../meld/filediff.py:246
+#: ../meld/filediff.py:248
 msgid "Go to the previous conflict"
 msgstr "Va al conflitto precedente"
 
-#: ../meld/filediff.py:248
+#: ../meld/filediff.py:250
 msgid "Next Conflict"
 msgstr "Conflitto successivo"
 
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:251
 msgid "Go to the next conflict"
 msgstr "Va al conflitto successivo"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:253
 msgid "Push to Left"
 msgstr "Invia a sinistra"
 
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:254
 msgid "Push current change to the left"
 msgstr "Invia la modifica corrente a sinistra"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:257
 msgid "Push to Right"
 msgstr "Invia a destra"
 
-#: ../meld/filediff.py:256
+#: ../meld/filediff.py:258
 msgid "Push current change to the right"
 msgstr "Invia la modifica corrente a destra"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:262
 msgid "Pull from Left"
 msgstr "Prendi da sinistra"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:263
 msgid "Pull change from the left"
 msgstr "Prende la modifica da sinistra"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:266
 msgid "Pull from Right"
 msgstr "Prendi da destra"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:267
 msgid "Pull change from the right"
 msgstr "Prende la modifica da destra"
 
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:269
 msgid "Copy Above Left"
 msgstr "Copia a sinistra sopra"
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:270
 msgid "Copy change above the left chunk"
 msgstr "Copia la modifica sopra al pezzo a sinistra"
 
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:272
 msgid "Copy Below Left"
 msgstr "Copia a sinistra sotto"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:273
 msgid "Copy change below the left chunk"
 msgstr "Copia la modifica sotto al pezzo a sinistra"
 
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:275
 msgid "Copy Above Right"
 msgstr "Copia a destra sopra"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:276
 msgid "Copy change above the right chunk"
 msgstr "Copia la modifica sopra al pezzo a destra"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:278
 msgid "Copy Below Right"
 msgstr "Copia a destra sotto"
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:279
 msgid "Copy change below the right chunk"
 msgstr "Copia la modifica sotto al pezzo a destra"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:281
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:282
 msgid "Delete change"
 msgstr "Elimina la modifica"
 
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:284
 msgid "Merge All from Left"
 msgstr "Unisci tutte da sinistra"
 
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:285
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Unisce tutte le modifiche senza conflitti da sinistra"
 
-#: ../meld/filediff.py:285
+#: ../meld/filediff.py:287
 msgid "Merge All from Right"
 msgstr "Unisci tutte da destra"
 
-#: ../meld/filediff.py:286
+#: ../meld/filediff.py:288
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Unisce tutte le modifiche senza conflitti da destra"
 
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:290
 msgid "Merge All"
 msgstr "Unisci tutte"
 
-#: ../meld/filediff.py:289
+#: ../meld/filediff.py:291
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr ""
 "Unisce tutte le modifiche senza conflitti dai riquadri destro e sinistro"
 
-#: ../meld/filediff.py:293
+#: ../meld/filediff.py:295
 msgid "Cycle Through Documents"
 msgstr "Passa tra i documenti"
 
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:296
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr ""
 "Sposta il focus della tastiera al documento successivo in questo confronto"
 
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:302
 msgid "Lock Scrolling"
 msgstr "Blocca scorrimento"
 
+#: ../meld/filediff.py:303
+msgid "Lock scrolling of all panes"
+msgstr "Blocca lo scorrimento di tutti i riquadri"
+
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:490
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:490
 msgid "OVR"
 msgstr "SSC"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:474
+#: ../meld/filediff.py:492
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Rg %i, Col %d"
 
-#: ../meld/filediff.py:811
+#: ../meld/filediff.py:829
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -1361,55 +1339,55 @@ msgstr ""
 "Il filtro «%s» ha modificato il numero di righe nel file: il confronto non "
 "sarà corretto. Consultare il manuale per maggiori informazioni."
 
-#: ../meld/filediff.py:1099
+#: ../meld/filediff.py:1090
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Impostazione del numero dei pannelli"
 
-#: ../meld/filediff.py:1105
+#: ../meld/filediff.py:1096
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Apertura dei file"
 
-#: ../meld/filediff.py:1128 ../meld/filediff.py:1138 ../meld/filediff.py:1151
-#: ../meld/filediff.py:1157
+#: ../meld/filediff.py:1119 ../meld/filediff.py:1129 ../meld/filediff.py:1142
+#: ../meld/filediff.py:1148
 msgid "Could not read file"
 msgstr "Impossibile leggere il file"
 
-#: ../meld/filediff.py:1129
+#: ../meld/filediff.py:1120
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lettura dei file"
 
-#: ../meld/filediff.py:1139
+#: ../meld/filediff.py:1130
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "«%s» sembra essere un file binario."
 
-#: ../meld/filediff.py:1152
+#: ../meld/filediff.py:1143
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s non è presente nelle codifiche: %s"
 
-#: ../meld/filediff.py:1187
+#: ../meld/filediff.py:1178
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcolo delle differenze"
 
-#: ../meld/filediff.py:1244
+#: ../meld/filediff.py:1235
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Il file «%s» è stato modificato"
 
-#: ../meld/filediff.py:1245
+#: ../meld/filediff.py:1236
 msgid "Do you want to reload the file?"
 msgstr "Ricaricare il file?"
 
-#: ../meld/filediff.py:1248
+#: ../meld/filediff.py:1239
 msgid "_Reload"
 msgstr "_Ricarica"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1400
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1417,20 +1395,20 @@ msgstr ""
 "Sono in uso filtri sul testo e potrebbero nascondere differenze tra i file. "
 "Confrontare i file senza i filtri?"
 
-#: ../meld/filediff.py:1415
+#: ../meld/filediff.py:1406
 msgid "Files are identical"
 msgstr "I file sono identici"
 
-#: ../meld/filediff.py:1423
+#: ../meld/filediff.py:1414
 msgid "Show without filters"
 msgstr "Mostra senza filtri"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1436
 msgid "Change highlighting incomplete"
 msgstr "Evidenziazione modifica incompleta"
 
 # (ndt) un po' libera...
-#: ../meld/filediff.py:1446
+#: ../meld/filediff.py:1437
 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."
@@ -1439,15 +1417,15 @@ msgstr ""
 "possibile fare in modo che anche le modifiche di grandi dimensioni vengano "
 "evidenziate, ma potrebbe rallentare il programma."
 
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1445
 msgid "Keep highlighting"
 msgstr "Continua a evidenziare"
 
-#: ../meld/filediff.py:1456
+#: ../meld/filediff.py:1447
 msgid "_Keep highlighting"
 msgstr "Continua _evidenziazione"
 
-#: ../meld/filediff.py:1587
+#: ../meld/filediff.py:1578
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1456,7 +1434,7 @@ msgstr ""
 "«%s» esiste già.\n"
 "Sovrascrivere?"
 
-#: ../meld/filediff.py:1600
+#: ../meld/filediff.py:1591
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1467,36 +1445,36 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1611
+#: ../meld/filediff.py:1602
 msgid "Save Left Pane As"
 msgstr "Salva riquadro sinistro come"
 
-#: ../meld/filediff.py:1613
+#: ../meld/filediff.py:1604
 msgid "Save Middle Pane As"
 msgstr "Salva riquadro centrale come"
 
-#: ../meld/filediff.py:1615
+#: ../meld/filediff.py:1606
 msgid "Save Right Pane As"
 msgstr "Salva riquadro destro come"
 
-#: ../meld/filediff.py:1626
+#: ../meld/filediff.py:1617
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Il file «%s» è stato modificato"
 
-#: ../meld/filediff.py:1628
+#: ../meld/filediff.py:1619
 msgid "If you save it, any external changes will be lost."
 msgstr "Salvare il file può comportare la perdita delle modifiche esterne."
 
-#: ../meld/filediff.py:1631
+#: ../meld/filediff.py:1622
 msgid "Save Anyway"
 msgstr "Salva comunque"
 
-#: ../meld/filediff.py:1632
+#: ../meld/filediff.py:1623
 msgid "Don't Save"
 msgstr "Non salvare"
 
-#: ../meld/filediff.py:1656
+#: ../meld/filediff.py:1647
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1507,7 +1485,7 @@ msgstr ""
 "\n"
 "Quale formato utilizzare?"
 
-#: ../meld/filediff.py:1672
+#: ../meld/filediff.py:1663
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1516,11 +1494,11 @@ msgstr ""
 "«%s» contiene caratteri non codificabili con «%s»\n"
 "Salvare in UTF-8?"
 
-#: ../meld/filediff.py:2048
+#: ../meld/filediff.py:2022
 msgid "Live comparison updating disabled"
 msgstr "Aggiornamento automatico dei confronti disabilitato"
 
-#: ../meld/filediff.py:2049
+#: ../meld/filediff.py:2023
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1531,345 +1509,337 @@ msgstr ""
 "manualmente, quello automatico verrà ripristinato quando tutti i punti di "
 "sincronizzazione saranno rimossi."
 
-#: ../meld/filemerge.py:51
+#: ../meld/filemerge.py:49
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Unione dei file"
 
-#: ../meld/gutterrendererchunk.py:92
+#: ../meld/gutterrendererchunk.py:91
 msgid "Copy _up"
 msgstr "Copia _su"
 
-#: ../meld/gutterrendererchunk.py:93
+#: ../meld/gutterrendererchunk.py:92
 msgid "Copy _down"
 msgstr "Copia _giù"
 
-#: ../meld/meldapp.py:138
+#: ../meld/meldapp.py:132
 msgid "wrong number of arguments supplied to --diff"
 msgstr "numero errato di argomenti forniti per --diff"
 
-#: ../meld/meldapp.py:143
+#: ../meld/meldapp.py:137
 msgid "Start with an empty window"
 msgstr "Parte con una finestra vuota"
 
-#: ../meld/meldapp.py:144 ../meld/meldapp.py:146
+#: ../meld/meldapp.py:138 ../meld/meldapp.py:140
 msgid "file"
 msgstr "file"
 
-#: ../meld/meldapp.py:144 ../meld/meldapp.py:148
+#: ../meld/meldapp.py:138 ../meld/meldapp.py:142
 msgid "dir"
 msgstr "dir"
 
-#: ../meld/meldapp.py:145
+#: ../meld/meldapp.py:139
 msgid "Start a version control comparison"
 msgstr "Inizia una comparazione da controllo di versione"
 
-#: ../meld/meldapp.py:147
+#: ../meld/meldapp.py:141
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Inizia una comparazione a 2 o a 3 file"
 
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:143
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Inizia una comparazione a 2 o a 3 directory"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:151
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld è uno strumento per confrontare file e directory."
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:154
 msgid "Set label to use instead of file name"
 msgstr "Imposta l'etichetta da utilizzare al posto del nome del file"
 
-#: ../meld/meldapp.py:162
+#: ../meld/meldapp.py:156
 msgid "Open a new tab in an already running instance"
 msgstr "Apre una nuova scheda in un'istanza già in esecuzione"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldapp.py:159
 msgid "Automatically compare all differing files on startup"
 msgstr "Confronta automaticamente all'avvio tutti i file diversi"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:161
 msgid "Ignored for compatibility"
 msgstr "Ignorato per compatibilità"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:164
 msgid "Set the target file for saving a merge result"
 msgstr "Imposta il file destinazione per salvare il risultato dell'unione"
 
-#: ../meld/meldapp.py:172
+#: ../meld/meldapp.py:166
 msgid "Automatically merge files"
 msgstr "Unisce automaticamente i file"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:169
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Carica un confronto salvato da un file Meld"
 
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:172
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Crea una scheda con le differenze per i file o le cartelle forniti"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:175
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "troppi argomenti (ne servono da 0 a 3, forniti %d)"
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:178
 msgid "can't auto-merge less than 3 files"
 msgstr "impossibile eseguire l'unione automatica con meno di 3 file"
 
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:180
 msgid "can't auto-merge directories"
 msgstr "impossibile eseguire l'unione automatica di directory"
 
-#: ../meld/meldapp.py:196
+#: ../meld/meldapp.py:190
 msgid "Error reading saved comparison file"
 msgstr "Errore nel leggere il file di confronto salvato"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:107
+#: ../meld/meldbuffer.py:125
 msgid "<unnamed>"
 msgstr "<senza nome>"
 
-#: ../meld/melddoc.py:77 ../meld/melddoc.py:78
+#: ../meld/melddoc.py:75 ../meld/melddoc.py:76
 msgid "untitled"
 msgstr "senza nome"
 
-#: ../meld/meldwindow.py:51
+#: ../meld/meldwindow.py:49
 msgid "_File"
 msgstr "_File"
 
-#: ../meld/meldwindow.py:52
+#: ../meld/meldwindow.py:50
 msgid "_New Comparison..."
 msgstr "N_uovo confronto..."
 
-#: ../meld/meldwindow.py:53
+#: ../meld/meldwindow.py:51
 msgid "Start a new comparison"
 msgstr "Avvia un nuovo confronto"
 
-#: ../meld/meldwindow.py:56
+#: ../meld/meldwindow.py:54
 msgid "Save the current file"
 msgstr "Salva il file corrente"
 
-#: ../meld/meldwindow.py:58
+#: ../meld/meldwindow.py:56
 msgid "Save As..."
 msgstr "Salva come..."
 
-#: ../meld/meldwindow.py:59
+#: ../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:62
+#: ../meld/meldwindow.py:60
 msgid "Close the current file"
 msgstr "Chiude il file corrente"
 
-#: ../meld/meldwindow.py:65
+#: ../meld/meldwindow.py:63
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../meld/meldwindow.py:67
+#: ../meld/meldwindow.py:65
 msgid "Undo the last action"
 msgstr "Annulla l'ultima azione"
 
-#: ../meld/meldwindow.py:70
+#: ../meld/meldwindow.py:68
 msgid "Redo the last undone action"
 msgstr "Ripete l'ultima azione annullata"
 
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:70
 msgid "Cut the selection"
 msgstr "Taglia la selezione"
 
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:72
 msgid "Copy the selection"
 msgstr "Copia la selezione"
 
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:74
 msgid "Paste the clipboard"
 msgstr "Incolla dagli appunti"
 
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:76
 msgid "Find..."
 msgstr "Trova..."
 
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:76
 msgid "Search for text"
 msgstr "Cerca una stringa di testo"
 
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:78
 msgid "Find Ne_xt"
 msgstr "Trova successi_vo"
 
-#: ../meld/meldwindow.py:81
+#: ../meld/meldwindow.py:79
 msgid "Search forwards for the same text"
 msgstr "Cerca lo stesso testo in avanti"
 
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:81
 msgid "Find _Previous"
 msgstr "Trova pr_ecedente"
 
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:82
 msgid "Search backwards for the same text"
 msgstr "Cerca lo stesso testo all'indietro"
 
-#: ../meld/meldwindow.py:87
+#: ../meld/meldwindow.py:85
 msgid "_Replace..."
 msgstr "Sostit_uisci..."
 
-#: ../meld/meldwindow.py:88
+#: ../meld/meldwindow.py:86
 msgid "Find and replace text"
 msgstr "Trova e sostituisce testo"
 
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:89
 msgid "_Changes"
 msgstr "_Modifiche"
 
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:90
 msgid "Next Change"
 msgstr "Modifica successiva"
 
-#: ../meld/meldwindow.py:93
+#: ../meld/meldwindow.py:91
 msgid "Go to the next change"
 msgstr "Va alla modifica successiva"
 
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:93
 msgid "Previous Change"
 msgstr "Modifica precedente"
 
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:94
 msgid "Go to the previous change"
 msgstr "Va alla modifica precedente"
 
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:96
 msgid "Open Externally"
 msgstr "Apri esternamente"
 
-#: ../meld/meldwindow.py:99
+#: ../meld/meldwindow.py:97
 msgid "Open selected file or directory in the default external application"
 msgstr ""
 "Apre il file o la directory selezionata nell'applicazione esterna predefinita"
 
-#: ../meld/meldwindow.py:103
+#: ../meld/meldwindow.py:101
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../meld/meldwindow.py:104
+#: ../meld/meldwindow.py:102
 msgid "File Status"
 msgstr "Stato del file"
 
-#: ../meld/meldwindow.py:105
+#: ../meld/meldwindow.py:103
 msgid "Version Status"
 msgstr "Stato versione"
 
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:106
 msgid "Stop the current action"
 msgstr "Ferma l'azione corrente"
 
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:109
 msgid "Refresh the view"
 msgstr "Aggiorna la vista"
 
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:112
 msgid "_Tabs"
 msgstr "_Schede"
 
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:113
 msgid "_Previous Tab"
 msgstr "Scheda _precedente"
 
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:114
 msgid "Activate previous tab"
 msgstr "Attiva la scheda precedente"
 
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:116
 msgid "_Next Tab"
 msgstr "Scheda _successiva"
 
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:117
 msgid "Activate next tab"
 msgstr "Attiva la scheda successiva"
 
-#: ../meld/meldwindow.py:122
+#: ../meld/meldwindow.py:120
 msgid "Move Tab _Left"
 msgstr "Sposta scheda a _sinistra"
 
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:121
 msgid "Move current tab to left"
 msgstr "Sposta la scheda corrente a sinistra"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:124
 msgid "Move Tab _Right"
 msgstr "Sposta scheda a _destra"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:125
 msgid "Move current tab to right"
 msgstr "Sposta la scheda corrente a destra"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:129
 msgid "Fullscreen"
 msgstr "Schermo intero"
 
 # (ndt) suggerimento
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:130
 msgid "View the comparison in fullscreen"
 msgstr "Visualizza a schermo intero"
 
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:132
 msgid "_Toolbar"
 msgstr "Barra degli s_trumenti"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:133
 msgid "Show or hide the toolbar"
 msgstr "Mostra o nasconde la barra degli strumenti"
 
-#: ../meld/meldwindow.py:137
-msgid "_Statusbar"
-msgstr "Barra di _stato"
-
-#: ../meld/meldwindow.py:138
-msgid "Show or hide the statusbar"
-msgstr "Mostra o nasconde la barra di stato"
-
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:142
 msgid "Open Recent"
 msgstr "Apri recenti"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:143
 msgid "Open recent files"
 msgstr "Apre i file recenti"
 
-#: ../meld/meldwindow.py:539
+#: ../meld/meldwindow.py:505
 msgid "Switch to this tab"
 msgstr "Passa a questa scheda"
 
-#: ../meld/meldwindow.py:662
+#: ../meld/meldwindow.py:626
 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:180
+#: ../meld/misc.py:178
 msgid "[None]"
 msgstr "[Nessuno]"
 
-#: ../meld/preferences.py:36
+#: ../meld/preferences.py:34
 msgid "label"
 msgstr "etichetta"
 
-#: ../meld/preferences.py:36
+#: ../meld/preferences.py:34
 msgid "pattern"
 msgstr "modello"
 
-#: ../meld/recent.py:109
+#: ../meld/recent.py:105
 msgid "Version control:"
 msgstr "Controllo della versione:"
 
-#: ../meld/ui/findbar.py:143
+#: ../meld/ui/findbar.py:141
 msgid "Regular expression error"
 msgstr "Errore nell'espressione regolare"
 
-#: ../meld/ui/notebooklabel.py:67
+#: ../meld/ui/notebooklabel.py:65
 msgid "Close tab"
 msgstr "Chiudi scheda"
 
-#: ../meld/ui/vcdialogs.py:63
+#: ../meld/ui/vcdialogs.py:61
 msgid "No files will be committed"
 msgstr "Non verrà eseguito il commit di alcun file"
 
@@ -1917,86 +1887,105 @@ msgstr "Locale"
 msgid "Remote"
 msgstr "Remoto"
 
-#. These are the possible states of files. Be sure to get the colons correct.
-#: ../meld/vc/_vc.py:62
-msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
-"Not present"
-msgstr ""
-"Ignorato:Non in revisione:::Errore::Aggiunto recentemente:Modificato:"
-"Conflitto:Rimosso:Mancante:Non presente"
+#: ../meld/vc/_vc.py:65
+msgid "Unversioned"
+msgstr "Non monitorato"
 
-#: ../meld/vcview.py:217 ../meld/vcview.py:392
+#: ../meld/vc/_vc.py:68
+msgid "Error"
+msgstr "Errore"
+
+#: ../meld/vc/_vc.py:70
+msgid "Newly added"
+msgstr "Aggiunto di recente"
+
+#: ../meld/vc/_vc.py:72
+msgid "Conflict"
+msgstr "Conflitto"
+
+#: ../meld/vc/_vc.py:73
+msgid "Removed"
+msgstr "Rimosso"
+
+#: ../meld/vc/_vc.py:74
+msgid "Missing"
+msgstr "Mancante"
+
+#: ../meld/vc/_vc.py:75
+msgid "Not present"
+msgstr "Non presente"
+
+#: ../meld/vcview.py:215 ../meld/vcview.py:387
 msgid "Location"
 msgstr "Posizione"
 
-#: ../meld/vcview.py:218
+#: ../meld/vcview.py:216
 msgid "Status"
 msgstr "Stato"
 
-#: ../meld/vcview.py:219
+#: ../meld/vcview.py:217
 msgid "Revision"
 msgstr "Revisione"
 
-#: ../meld/vcview.py:220
+#: ../meld/vcview.py:218
 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:303
+#: ../meld/vcview.py:298
 #, python-format
 msgid "%s not installed"
 msgstr "%s non è installato"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:307
+#: ../meld/vcview.py:302
 msgid "Invalid repository"
 msgstr "Repository non valido"
 
-#: ../meld/vcview.py:316
+#: ../meld/vcview.py:311
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:318 ../meld/vcview.py:326
+#: ../meld/vcview.py:313 ../meld/vcview.py:321
 msgid "None"
 msgstr "Nessuno"
 
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:332
 msgid "No valid version control system found in this folder"
 msgstr ""
 "Nessun sistema di controllo della versione valido trovato in questa cartella"
 
-#: ../meld/vcview.py:339
+#: ../meld/vcview.py:334
 msgid "Only one version control system found in this folder"
 msgstr "Solo un sistema di controllo della versione trovato in questa cartella"
 
-#: ../meld/vcview.py:341
+#: ../meld/vcview.py:336
 msgid "Choose which version control system to use"
 msgstr "Scegliere il sistema di controllo della versione da usare"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:392
+#: ../meld/vcview.py:387
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:406 ../meld/vcview.py:414
+#: ../meld/vcview.py:401 ../meld/vcview.py:409
 #, python-format
 msgid "Scanning %s"
 msgstr "Analisi di %s"
 
-#: ../meld/vcview.py:448
+#: ../meld/vcview.py:443
 msgid "(Empty)"
 msgstr "(vuoto)"
 
-#: ../meld/vcview.py:671
+#: ../meld/vcview.py:666
 msgid "Remove folder and all its files?"
 msgstr "Rimuovere la cartella e tutti i suoi file?"
 
-#: ../meld/vcview.py:673
+#: ../meld/vcview.py:668
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2004,58 +1993,7 @@ msgstr ""
 "Verranno rimossi dal controllo di versione tutti i file selezionati, le "
 "cartelle selezionate e tutti i file al loro interno."
 
-#: ../meld/vcview.py:707
+#: ../meld/vcview.py:702
 #, python-format
 msgid "Error removing %s"
 msgstr "Errore nel rimuovere %s"
-
-#~ msgid "http://meldmerge.org/";
-#~ msgstr "http://meldmerge.org/";
-
-#~ msgid "Loading"
-#~ msgstr "Caricamento"
-
-#~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-#~ msgstr ""
-#~ "Al caricamento dei file, provare queste codifiche in ordine. (es. utf8, "
-#~ "iso8859)"
-
-#~ msgid "Encoding"
-#~ msgstr "Codifica"
-
-#~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-#~ msgstr "Backup\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-
-#~ msgid ""
-#~ "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
-#~ "Desktop.ini\n"
-#~ msgstr ""
-#~ "Meta-dati specifici del SO\t0\t.DS_Store ._* .Spotlight-V100 .Trashes "
-#~ "Thumbs.db Desktop.ini\n"
-
-#~ msgid "Version Control\t1\t%s\n"
-#~ msgstr "Controllo di versione\t1\t%s\n"
-
-#~ 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,exe}\n"
-
-#~ msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
-#~ msgstr "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
-
-#~ msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-#~ msgstr "Parole chiave CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-
-#~ msgid "C++ comment\t0\t//.*\n"
-#~ msgstr "Commento C++\t0\t//.*\n"
-
-#~ msgid "C comment\t0\t/\\*.*?\\*/\n"
-#~ msgstr "Commento C\t0\t/\\*.*?\\*/\n"
-
-#~ msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
-#~ msgstr "Tutti gli spazi\t0\t[ \\t\\r\\f\\v]*\n"
-
-#~ msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
-#~ msgstr "Spazi iniziali\t0\t^[ \\t\\r\\f\\v]*\n"
-
-#~ msgid "Script comment\t0\t#.*"
-#~ msgstr "Commento script\t0\t#.*"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]