[meld] Update Italian translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Update Italian translation
- Date: Wed, 18 Sep 2019 07:42:16 +0000 (UTC)
commit f0442f73365757d6d3d506de24e9c693846f88c2
Author: Milo Casagrande <milo ubuntu com>
Date: Wed Sep 18 07:43:02 2019 +0000
Update Italian translation
po/it.po | 1519 ++++++++++++++++++++++++++++----------------------------------
1 file changed, 680 insertions(+), 839 deletions(-)
---
diff --git a/po/it.po b/po/it.po
index ff4a5557..66c819a7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2019-02-19 08:12+0000\n"
-"PO-Revision-Date: 2019-02-20 09:23+0100\n"
+"POT-Creation-Date: 2019-09-13 23:37+0000\n"
+"PO-Revision-Date: 2019-09-18 09:37+0200\n"
"Last-Translator: Milo Casagrande <milo milo name>\n"
"Language-Team: Italian <tp lists linux it>\n"
"Language: it\n"
@@ -16,18 +16,18 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
-#: ../bin/meld:190
+#: ../bin/meld:194
msgid "Cannot import: "
msgstr "Impossibile importare: "
-#: ../bin/meld:193
+#: ../bin/meld:197
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meld richiede %s o più recente."
-#: ../bin/meld:262
+#: ../bin/meld:276
#, c-format
msgid ""
"Couldn’t load Meld-specific CSS (%s)\n"
@@ -170,16 +170,16 @@ msgstr ""
"della sintassi"
#: ../data/org.gnome.meld.gschema.xml.h:17
-msgid "Displayed whitespace"
-msgstr "Spazi bianchi"
+msgid "Draw whitespace"
+msgstr "Disegna spazi bianchi"
#: ../data/org.gnome.meld.gschema.xml.h:18
msgid ""
-"Selector for individual whitespace character types to be shown. Possible "
-"values are 'space', 'tab', 'newline' and 'nbsp'."
+"If true, whitespace characters will be drawn in comparisons even if they are "
+"not in a changed area."
msgstr ""
-"Selettore per gli spazi bianchi da visualizzare. I possibili valori sono "
-"\"space\", \"tab\", \"newline\" e \"nbsp\"."
+"Se VERO, gli spazi bianchi vengono disegnati nei confronti anche se non sono "
+"in un'area modificata."
#: ../data/org.gnome.meld.gschema.xml.h:19
msgid "Wrap mode"
@@ -230,21 +230,38 @@ msgstr ""
"come una descrizione di carattere Pango."
#: ../data/org.gnome.meld.gschema.xml.h:27
+msgid "Show overview source map"
+msgstr "Mostra mappa panoramica"
+
+#: ../data/org.gnome.meld.gschema.xml.h:28
+msgid ""
+"If true, file comparisons will have paired source maps for compared files."
+msgstr "Se VERO, i confronti tra file dispongono di panoramiche del codice."
+
+#: ../data/org.gnome.meld.gschema.xml.h:29
+msgid "Style of overview map"
+msgstr "Stile della mappa panoramica"
+
+#: ../data/org.gnome.meld.gschema.xml.h:30
+msgid "Style options for how the overview map is displayed."
+msgstr "Opzioni di visualizzazione della mappa panoramica."
+
+#: ../data/org.gnome.meld.gschema.xml.h:31
msgid "Ignore blank lines when comparing files"
msgstr "Ignora le righe vuote nei confronti"
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:32
msgid ""
"If true, blank lines will be trimmed when highlighting changes between files."
msgstr ""
"Se VERO, le righe vuote non verranno considerate nell'evidenziare le "
"modifiche tra i file."
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:33
msgid "Use the system default editor"
msgstr "Usa l'editor predefinito di sistema"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:34
msgid ""
"If false, custom-editor-command will be used instead of the system editor "
"when opening files externally."
@@ -252,11 +269,11 @@ msgstr ""
"Se FALSO, viene usato custom-editor-command al posto di quello di sistema "
"per aprire i file esternamente."
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:35
msgid "The custom editor launch command"
msgstr "Il comando per lanciare l'editor personalizzato"
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:36
msgid ""
"The command used to launch a custom editor. Some limited templating is "
"supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -264,11 +281,11 @@ msgstr ""
"Il comando usato per lanciare l'editor personalizzato. È supportata una "
"forma basilare di modelli: \"{file}\" e \"{line}\" sono token riconosciuti."
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:37
msgid "Columns to display"
msgstr "Colonne da visualizzare"
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: ../data/org.gnome.meld.gschema.xml.h:38
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
@@ -276,23 +293,23 @@ msgstr ""
"Elenco di nomi di colonne nel confronto tra directory e se debbano essere "
"visualizzate."
-#: ../data/org.gnome.meld.gschema.xml.h:35
-#: ../meld/resources/ui/preferences.ui.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../meld/resources/ui/preferences.ui.h:28
msgid "Ignore symbolic links"
msgstr "Ignorare collegamenti simbolici"
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:40
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
msgstr ""
"Se VERO, il confronto tra directory non segue i collegamenti simbolici."
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:41
msgid "Use shallow comparison"
msgstr "Usa confronto superficiale"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:42
msgid ""
"If true, folder comparisons compare files based solely on size and mtime, "
"considering files to be identical if their size and mtime match, and "
@@ -301,11 +318,11 @@ msgstr ""
"Se VERO, il confronto tra directory confronta i file solamente su dimensione "
"e mtime, considerando solo i file con stessa dimensione e mtime come uguali."
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../data/org.gnome.meld.gschema.xml.h:43
msgid "File timestamp resolution"
msgstr "Risoluzione marcatura temporale del file"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:44
msgid ""
"When comparing based on mtime, this is the minimum difference in nanoseconds "
"between two files before they’re considered to have different mtimes. This "
@@ -317,12 +334,12 @@ msgstr ""
"confronto di file provenienti da file system con risoluzioni temporali "
"differenti."
-#: ../data/org.gnome.meld.gschema.xml.h:41
-#: ../meld/resources/ui/preferences.ui.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../meld/resources/ui/preferences.ui.h:25
msgid "Apply text filters during folder comparisons"
msgstr "Applicare filtri di testo durante i confronti sulla cartella"
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:46
msgid ""
"If true, folder comparisons that compare file contents also apply active "
"text filters and the blank line trimming option, and ignore newline "
@@ -332,19 +349,19 @@ msgstr ""
"file applicano anche i filtri di testo attivi, l'opzione di esclusione delle "
"righe vuote e ignorano le differenze sugli a capo."
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:47
msgid "File status filters"
msgstr "Filtri sullo stato dei file"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:48
msgid "List of statuses used to filter visible files in folder comparison."
msgstr "Elenco di stati usati per filtrare i file nel confronto tra directory."
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:49
msgid "Show the version control console output"
msgstr "Mostra l'output del sistema di controllo della versione"
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:50
msgid ""
"If true, a console output section will be shown in version control views, "
"showing the commands run for version control operations."
@@ -352,11 +369,11 @@ msgstr ""
"Se VERO, viene mostrato l'output della console nella vista del controllo "
"della versione, con i comandi eseguiti."
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:51
msgid "Version control pane position"
msgstr "Posizione riquadro controllo versione"
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:52
msgid ""
"This is the height of the main version control tree when the console pane is "
"shown."
@@ -364,11 +381,11 @@ msgstr ""
"Questa è l'altezza dell'albero principale del controllo versione quando il "
"riquadro della console è mostrato."
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:53
msgid "Present version comparisons as left-local/right-remote"
msgstr "Confronto come sinistra-locale/destra-remoto"
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:54
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, "
@@ -378,12 +395,12 @@ 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:51
+#: ../data/org.gnome.meld.gschema.xml.h:55
msgid "Order for files in three-way version control merge comparisons"
msgstr ""
"Ordine dei file nel confronto a tre vie su unione da controllo della versione"
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:56
msgid ""
"Choices for file order are remote/merged/local and local/merged/remote. This "
"preference only affects three-way comparisons launched from the version "
@@ -394,11 +411,11 @@ msgstr ""
"dalla visualizzazione del controllo versione: viene quindi utilizzata "
"solamente nella risoluzione di unioni/conflitti."
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:57
msgid "Show margin in commit message editor"
msgstr "Mostra i margini nell'editor del messaggio di commit"
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:58
msgid ""
"If true, a guide will be displayed to show what column the margin is at in "
"the version control commit message editor."
@@ -406,11 +423,11 @@ msgstr ""
"Se VERO, viene visualizzata una guida per mostrare il margine nell'editor "
"del messaggio di commit."
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:59
msgid "Margin column in commit message editor"
msgstr "Colonna nell'editor del messaggio di commit"
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:60
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
@@ -418,11 +435,11 @@ msgstr ""
"La colonna in cui visualizzare il margine dell'editor per il messaggio di "
"commit del controllo versione."
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:61
msgid "Automatically hard-wrap commit messages"
msgstr "A capo automatico nei messaggi di commit"
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:62
msgid ""
"If true, the version control commit message editor will hard-wrap (i.e., "
"insert line breaks) at the commit margin before commit."
@@ -430,22 +447,22 @@ msgstr ""
"Se VERO, l'editor del messaggio di commit andrà a capo automaticamente al "
"margine predefinito (inserirà a capo) prima di eseguire il commit."
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:63
msgid "Version control status filters"
msgstr "Filtri sullo stato del sistema di controllo della versione"
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:64
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:61
+#: ../data/org.gnome.meld.gschema.xml.h:65
msgid "Filename-based filters"
msgstr "Filtri sui nomi dei file"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: ../data/org.gnome.meld.gschema.xml.h:66
msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
@@ -453,11 +470,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:63
+#: ../data/org.gnome.meld.gschema.xml.h:67
msgid "Text-based filters"
msgstr "Filtri di testo"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: ../data/org.gnome.meld.gschema.xml.h:68
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, "
@@ -468,8 +485,8 @@ msgstr ""
"confronto in sé."
#: ../data/styles/meld-base.xml.h:1
-msgid "Meld base scheme"
-msgstr "Schema base Meld"
+msgid "Classic (Meld)"
+msgstr "Classico (Meld)"
#: ../data/styles/meld-base.xml.h:2
msgid "Base color scheme for Meld highlighting"
@@ -520,233 +537,352 @@ msgstr "Schermo intero"
#: ../meld/resources/gtk/help-overlay.ui.h:8
msgctxt "shortcut window"
-msgid "Tabs"
-msgstr "Schede"
+msgid "Panes"
+msgstr "Riquadri"
#: ../meld/resources/gtk/help-overlay.ui.h:9
msgctxt "shortcut window"
-msgid "Go to previous tab"
-msgstr "Va alla scheda precedente"
+msgid "Previous comparison pane"
+msgstr "Riquadro precedente"
#: ../meld/resources/gtk/help-overlay.ui.h:10
msgctxt "shortcut window"
-msgid "Go to next tab"
-msgstr "Va alla scheda successiva"
+msgid "Next comparison pane"
+msgstr "Riquadro successivo"
#: ../meld/resources/gtk/help-overlay.ui.h:11
msgctxt "shortcut window"
-msgid "Switch to tab"
-msgstr "Passa a una scheda"
+msgid "Changes"
+msgstr "Modifiche"
#: ../meld/resources/gtk/help-overlay.ui.h:12
msgctxt "shortcut window"
-msgid "Move tab left"
-msgstr "Sposta scheda a sinistra"
+msgid "Go to previous change"
+msgstr "Va alla modifica precedente"
#: ../meld/resources/gtk/help-overlay.ui.h:13
msgctxt "shortcut window"
-msgid "Move tab right"
-msgstr "Sposta scheda a destra"
+msgid "Go to next change"
+msgstr "Va alla modifica successiva"
#: ../meld/resources/gtk/help-overlay.ui.h:14
msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Modifiche"
+msgid "Tabs"
+msgstr "Schede"
#: ../meld/resources/gtk/help-overlay.ui.h:15
msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Va alla modifica precedente"
+msgid "Go to previous tab"
+msgstr "Va alla scheda precedente"
#: ../meld/resources/gtk/help-overlay.ui.h:16
msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Va alla modifica successiva"
+msgid "Go to next tab"
+msgstr "Va alla scheda successiva"
#: ../meld/resources/gtk/help-overlay.ui.h:17
msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Passa a una scheda"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:18
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Sposta scheda a sinistra"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:19
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Sposta scheda a destra"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:20
+msgctxt "shortcut window"
msgid "Editing"
msgstr "Modifica"
-#: ../meld/resources/gtk/help-overlay.ui.h:18
+#: ../meld/resources/gtk/help-overlay.ui.h:21
msgctxt "shortcut window"
msgid "Undo"
msgstr "Annulla"
-#: ../meld/resources/gtk/help-overlay.ui.h:19
+#: ../meld/resources/gtk/help-overlay.ui.h:22
msgctxt "shortcut window"
msgid "Redo"
msgstr "Ripeti"
-#: ../meld/resources/gtk/help-overlay.ui.h:20
+#: ../meld/resources/gtk/help-overlay.ui.h:23
msgctxt "shortcut window"
msgid "Cut"
msgstr "Taglia"
-#: ../meld/resources/gtk/help-overlay.ui.h:21
+#: ../meld/resources/gtk/help-overlay.ui.h:24
msgctxt "shortcut window"
msgid "Copy"
msgstr "Copia"
-#: ../meld/resources/gtk/help-overlay.ui.h:22
+#: ../meld/resources/gtk/help-overlay.ui.h:25
msgctxt "shortcut window"
msgid "Paste"
msgstr "Incolla"
-#: ../meld/resources/gtk/help-overlay.ui.h:23
+#: ../meld/resources/gtk/help-overlay.ui.h:26
msgctxt "shortcut window"
msgid "Find"
msgstr "Trova"
-#: ../meld/resources/gtk/help-overlay.ui.h:24
+#: ../meld/resources/gtk/help-overlay.ui.h:27
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Trova successivo"
-#: ../meld/resources/gtk/help-overlay.ui.h:25
+#: ../meld/resources/gtk/help-overlay.ui.h:28
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Trova precedente"
-#: ../meld/resources/gtk/help-overlay.ui.h:26
+#: ../meld/resources/gtk/help-overlay.ui.h:29
msgctxt "shortcut window"
msgid "Replace"
msgstr "Sostituisce"
-#: ../meld/resources/gtk/help-overlay.ui.h:27
+#: ../meld/resources/gtk/help-overlay.ui.h:30
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Confronto di file"
-#: ../meld/resources/gtk/help-overlay.ui.h:28
+#: ../meld/resources/gtk/help-overlay.ui.h:31
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Salva il file corrente"
-#: ../meld/resources/gtk/help-overlay.ui.h:29
+#: ../meld/resources/gtk/help-overlay.ui.h:32
msgctxt "shortcut window"
msgid "Save current file to new path"
msgstr "Salva il file corrente in un nuovo percorso"
-#: ../meld/resources/gtk/help-overlay.ui.h:30
+#: ../meld/resources/gtk/help-overlay.ui.h:33
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Salva tutti i file nel confronto"
-#: ../meld/resources/gtk/help-overlay.ui.h:31
+#: ../meld/resources/gtk/help-overlay.ui.h:34
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Conflitto precedente"
-#: ../meld/resources/gtk/help-overlay.ui.h:32
+#: ../meld/resources/gtk/help-overlay.ui.h:35
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Conflitto successivo"
-#: ../meld/resources/gtk/help-overlay.ui.h:33
+#: ../meld/resources/gtk/help-overlay.ui.h:36
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Invia la modifica a sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:34
+#: ../meld/resources/gtk/help-overlay.ui.h:37
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Invia la modifica a destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:35
+#: ../meld/resources/gtk/help-overlay.ui.h:38
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Prende la modifica da sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:36
+#: ../meld/resources/gtk/help-overlay.ui.h:39
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Prende la modifica da destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:37
+#: ../meld/resources/gtk/help-overlay.ui.h:40
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Copia la modifica sopra a sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:38
+#: ../meld/resources/gtk/help-overlay.ui.h:41
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Copia la modifica sotto a sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:39
+#: ../meld/resources/gtk/help-overlay.ui.h:42
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Copia la modifica sopra a destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:40
+#: ../meld/resources/gtk/help-overlay.ui.h:43
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Copia la modifica sotto a destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:41
+#: ../meld/resources/gtk/help-overlay.ui.h:44
msgctxt "shortcut window"
msgid "Delete change"
msgstr "Elimina la modifica"
-#: ../meld/resources/gtk/help-overlay.ui.h:42
-msgctxt "shortcut window"
-msgid "Previous comparison pane"
-msgstr "Riquadro precedente"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:43
-msgctxt "shortcut window"
-msgid "Next comparison pane"
-msgstr "Riquadro successivo"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:44
+#: ../meld/resources/gtk/help-overlay.ui.h:45
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Confronto cartelle"
-#: ../meld/resources/gtk/help-overlay.ui.h:45
+#: ../meld/resources/gtk/help-overlay.ui.h:46
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Copia a sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:46
+#: ../meld/resources/gtk/help-overlay.ui.h:47
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Copia a destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:47
+#: ../meld/resources/gtk/help-overlay.ui.h:48
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Confronto controllo di versione"
-#: ../meld/resources/gtk/help-overlay.ui.h:48
+#: ../meld/resources/gtk/help-overlay.ui.h:49
msgctxt "shortcut window"
msgid "Commit to version control"
msgstr "Esegue il commit"
-#: ../meld/resources/gtk/help-overlay.ui.h:49
+#: ../meld/resources/gtk/help-overlay.ui.h:50
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Mostra/Nasconde output della console"
#: ../meld/resources/gtk/menus.ui.h:1
-msgid "_Preferences"
-msgstr "Preferen_ze"
+msgid "Refresh"
+msgstr "Aggiorna"
#: ../meld/resources/gtk/menus.ui.h:2
-msgid "_Help"
-msgstr "A_iuto"
+msgid "Stop"
+msgstr "Ferma"
#: ../meld/resources/gtk/menus.ui.h:3
-msgid "Keyboard Shortcuts"
-msgstr "Scorciatoie da tastiera"
+msgid "Fullscreen"
+msgstr "Schermo intero"
#: ../meld/resources/gtk/menus.ui.h:4
-msgid "_About"
-msgstr "I_nformazioni"
+msgid "Save As…"
+msgstr "Salva come…"
#: ../meld/resources/gtk/menus.ui.h:5
-msgid "_Quit"
-msgstr "_Chiudi"
+msgid "Save A_ll"
+msgstr "Sal_va tutti"
+
+#: ../meld/resources/gtk/menus.ui.h:6
+msgid "Revert files…"
+msgstr "Ripristina file…"
+
+#: ../meld/resources/gtk/menus.ui.h:7
+msgid "Open Externally"
+msgstr "Apri esternamente"
+
+#: ../meld/resources/gtk/menus.ui.h:8
+msgid "_Find…"
+msgstr "_Trova…"
+
+#: ../meld/resources/gtk/menus.ui.h:9
+msgid "_Replace…"
+msgstr "Sostit_uisci…"
+
+#: ../meld/resources/gtk/menus.ui.h:10
+msgid "View"
+msgstr "Vista"
+
+#: ../meld/resources/gtk/menus.ui.h:11
+msgid "Overview Map"
+msgstr "Mappa panoramica"
+
+#: ../meld/resources/gtk/menus.ui.h:12
+msgid "Version control console"
+msgstr "Console controllo di versione"
+
+#: ../meld/resources/gtk/menus.ui.h:13
+msgid "Lock scrolling"
+msgstr "Blocca scorrimento"
+
+#: ../meld/resources/gtk/menus.ui.h:14
+msgid "Comparison"
+msgstr "Confronto"
+
+#: ../meld/resources/gtk/menus.ui.h:15
+msgid "Merge All from Left"
+msgstr "Unisci tutte da sinistra"
+
+#: ../meld/resources/gtk/menus.ui.h:16
+msgid "Merge All from Right"
+msgstr "Unisci tutte da destra"
+
+#: ../meld/resources/gtk/menus.ui.h:17
+msgid "Merge All"
+msgstr "Unisci tutte"
+
+#: ../meld/resources/gtk/menus.ui.h:18
+#: ../meld/resources/ui/filediff-menus.ui.h:10
+msgid "Add Synchronization Point"
+msgstr "Aggiungi punto sincronizzazione"
+
+#: ../meld/resources/gtk/menus.ui.h:19
+#: ../meld/resources/ui/filediff-menus.ui.h:11
+msgid "Clear Synchronization Points"
+msgstr "Pulisci punti sincronizzazione"
+
+#: ../meld/resources/gtk/menus.ui.h:20
+msgid "Format as Patch…"
+msgstr "Formatta come patch…"
+
+#: ../meld/resources/gtk/menus.ui.h:21
+msgid "_Preferences"
+msgstr "Preferen_ze"
+
+#: ../meld/resources/gtk/menus.ui.h:22
+msgid "Keyboard Shortcuts"
+msgstr "Scorciatoie da tastiera"
+
+#: ../meld/resources/gtk/menus.ui.h:23
+msgid "_Help"
+msgstr "A_iuto"
+
+#: ../meld/resources/gtk/menus.ui.h:24
+msgid "_About Meld"
+msgstr "I_nformazioni su Meld"
+
+#: ../meld/resources/gtk/menus.ui.h:25
+msgid "File status"
+msgstr "Stato del file"
+
+#: ../meld/resources/gtk/menus.ui.h:26
+msgid "Same"
+msgstr "Identici"
+
+#: ../meld/resources/gtk/menus.ui.h:27
+msgid "New"
+msgstr "Nuovi"
+
+#: ../meld/resources/gtk/menus.ui.h:28 ../meld/vc/_vc.py:77
+msgid "Modified"
+msgstr "Modificati"
+
+#: ../meld/resources/gtk/menus.ui.h:29
+msgid "Ignore filename case"
+msgstr "Ignora maiuscole/minuscole nel nome del file"
+
+#: ../meld/resources/gtk/menus.ui.h:30
+msgid "Normal"
+msgstr "Normale"
+
+#: ../meld/resources/gtk/menus.ui.h:31 ../meld/vc/_vc.py:71
+msgid "Unversioned"
+msgstr "Non monitorato"
+
+#: ../meld/resources/gtk/menus.ui.h:32 ../meld/vc/_vc.py:70
+msgid "Ignored"
+msgstr "Ignorati"
+
+#: ../meld/resources/gtk/menus.ui.h:33
+msgid "Flatten folders"
+msgstr "Appiattisce le cartelle"
#: ../meld/resources/ui/about-dialog.ui.h:1
msgid "About Meld"
@@ -768,6 +904,44 @@ msgstr "Sito web"
msgid "translator-credits"
msgstr "Milo Casagrande <milo milo name>"
+#: ../meld/resources/ui/appwindow.ui.h:2
+msgid "Start a new comparison"
+msgstr "Avvia un nuovo confronto"
+
+#: ../meld/resources/ui/appwindow.ui.h:3
+msgid "Open a recent comparison"
+msgstr "Apre un confronto recente"
+
+#: ../meld/resources/ui/appwindow.ui.h:4
+msgid "Go to the previous change"
+msgstr "Va alla modifica precedente"
+
+#: ../meld/resources/ui/appwindow.ui.h:5
+msgid "Go to the next change"
+msgstr "Va alla modifica successiva"
+
+#: ../meld/resources/ui/appwindow.ui.h:6
+msgid "Go to the previous conflict"
+msgstr "Va al conflitto precedente"
+
+#: ../meld/resources/ui/appwindow.ui.h:7
+msgid "Go to the next conflict"
+msgstr "Va al conflitto successivo"
+
+#: ../meld/resources/ui/appwindow.ui.h:8
+msgid "Version Filters"
+msgstr "Filtri versione"
+
+#: ../meld/resources/ui/appwindow.ui.h:9
+#: ../meld/resources/ui/preferences.ui.h:40
+msgid "File Filters"
+msgstr "Filtri dei file"
+
+#: ../meld/resources/ui/appwindow.ui.h:10
+#: ../meld/resources/ui/preferences.ui.h:45
+msgid "Text Filters"
+msgstr "Filtri di testo"
+
#: ../meld/resources/ui/column-list.ui.h:1
#: ../meld/resources/ui/filter-list.ui.h:1
msgid "Active"
@@ -778,8 +952,8 @@ msgid "Column Name"
msgstr "Nome colonna"
#: ../meld/resources/ui/column-list.ui.h:3
-#: ../meld/resources/ui/filter-list.ui.h:7 ../meld/resources/ui/vcview.ui.h:11
-#: ../meld/vcview.py:694
+#: ../meld/resources/ui/filter-list.ui.h:7
+#: ../meld/resources/ui/vcview-menus.ui.h:5 ../meld/vcview.py:740
msgid "_Remove"
msgstr "_Rimuovi"
@@ -823,306 +997,126 @@ msgstr "Registri precedenti:"
msgid "Co_mmit"
msgstr "Co_mmit"
-#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "C_onfronta"
-
-#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2
-msgid "Compare selected files"
-msgstr "Confronta i file selezionati"
-
-#: ../meld/resources/ui/dirdiff.ui.h:3
-msgid "Collapse Recursively"
-msgstr "Contrai ricorsivamente"
-
-#: ../meld/resources/ui/dirdiff.ui.h:4
-msgid "Collapse selected folder and all subfolders"
-msgstr "Chiude la cartella selezionata e tutte le sotto-cartelle"
-
-#: ../meld/resources/ui/dirdiff.ui.h:5
-msgid "Expand Recursively"
-msgstr "Espandi ricorsivamente"
-
-#: ../meld/resources/ui/dirdiff.ui.h:6
-msgid "Expand selected folder and all subfolders"
-msgstr "Espande la cartella selezionata e tutte le sotto-cartelle"
-
-#: ../meld/resources/ui/dirdiff.ui.h:7
-msgid "Copy to _Left"
-msgstr "Copia a _sinistra"
-
-#: ../meld/resources/ui/dirdiff.ui.h:8
+#: ../meld/resources/ui/dirdiff-actions.ui.h:1
msgid "Copy to left"
msgstr "Copia a sinistra"
-#: ../meld/resources/ui/dirdiff.ui.h:9
-msgid "Copy to _Right"
-msgstr "Copia a _destra"
-
-#: ../meld/resources/ui/dirdiff.ui.h:10
+#: ../meld/resources/ui/dirdiff-actions.ui.h:2
msgid "Copy to right"
msgstr "Copia a destra"
-#: ../meld/resources/ui/dirdiff.ui.h:11
+#: ../meld/resources/ui/dirdiff-actions.ui.h:3
msgid "Delete selected"
msgstr "Elimina selezione"
-#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959
-#: ../meld/filediff.py:1600
-msgid "Hide"
-msgstr "Nascondi"
-
-#: ../meld/resources/ui/dirdiff.ui.h:13
-msgid "Hide selected"
-msgstr "Nasconde la selezione"
-
-#: ../meld/resources/ui/dirdiff.ui.h:14
-msgid "Ignore Filename Case"
-msgstr "Ignora maiuscole/minuscole nel nome del file"
-
-#: ../meld/resources/ui/dirdiff.ui.h:15
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-"Considera identici i nomi dei file la cui differenza è tra maiuscole e "
-"minuscole"
-
-#: ../meld/resources/ui/dirdiff.ui.h:16
-msgid "Same"
-msgstr "Identici"
-
-#: ../meld/resources/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "Mostra identici"
+#: ../meld/resources/ui/dirdiff-menus.ui.h:1
+msgid "_Compare selected files"
+msgstr "_Confronta i file selezionati"
-#: ../meld/resources/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "Nuovi"
+#: ../meld/resources/ui/dirdiff-menus.ui.h:2
+msgid "Copy to _left"
+msgstr "Copia a _sinistra"
-#: ../meld/resources/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "Mostra nuovi"
+#: ../meld/resources/ui/dirdiff-menus.ui.h:3
+msgid "Copy to _right"
+msgstr "Copia a _destra"
-#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77
-msgid "Modified"
-msgstr "Modificati"
+#: ../meld/resources/ui/dirdiff-menus.ui.h:4
+msgid "_Delete selected"
+msgstr "_Elimina selezione"
-#: ../meld/resources/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "Mostra modificati"
+#: ../meld/resources/ui/dirdiff-menus.ui.h:5
+msgid "Collapse Recursively"
+msgstr "Contrai ricorsivamente"
-#: ../meld/resources/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "Filtri"
+#: ../meld/resources/ui/dirdiff-menus.ui.h:6
+msgid "Expand Recursively"
+msgstr "Espandi ricorsivamente"
-#: ../meld/resources/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "Imposta i filtri attivi"
+#: ../meld/resources/ui/dirdiff-menus.ui.h:7
+msgid "_Open Externally"
+msgstr "_Apri esternamente"
#: ../meld/resources/ui/encoding-selector.ui.h:1
msgid "Search text encoding…"
msgstr "Codifica testo di ricerca…"
-#: ../meld/resources/ui/filediff.ui.h:1
-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 ""
-"Impossibile scrivere su questo file. È possibile fare clic qui per "
-"sbloccarlo e apportare le modifiche: tali modifiche devono però essere "
-"salvata su un nuovo file."
-
-#: ../meld/resources/ui/filediff.ui.h:2
-msgid "File 3"
-msgstr "File 3"
-
-#: ../meld/resources/ui/filediff.ui.h:3
-msgid "File 2"
-msgstr "File 2"
-
-#: ../meld/resources/ui/filediff.ui.h:4
-msgid "File 1"
-msgstr "File 1"
-
-#: ../meld/resources/ui/filediff.ui.h:5
-msgid "Format as Patch…"
-msgstr "Formatta come patch…"
-
-#: ../meld/resources/ui/filediff.ui.h:6
-msgid "Create a patch using differences between files"
-msgstr "Crea una patch utilizzando le differenze tra i file"
-
-#: ../meld/resources/ui/filediff.ui.h:7
-msgid "Save A_ll"
-msgstr "Sal_va tutti"
-
-#: ../meld/resources/ui/filediff.ui.h:8
-msgid "Save all files in the current comparison"
-msgstr "Salva tutti i file nel confronto attuale"
-
-#: ../meld/resources/ui/filediff.ui.h:9
-msgid "Revert files to their saved versions"
-msgstr "Ripristina i file alla loro versione salvata"
-
-#: ../meld/resources/ui/filediff.ui.h:10
-msgid "Add Synchronization Point"
-msgstr "Aggiungi punto sincronizzazione"
-
-#: ../meld/resources/ui/filediff.ui.h:11
-msgid "Add a synchronization point for changes between files"
-msgstr "Aggiunge un punto di sincronizzazione per le modifiche tra i file"
-
-#: ../meld/resources/ui/filediff.ui.h:12
-msgid "Clear Synchronization Points"
-msgstr "Pulisci punti sincronizzazione"
-
-#: ../meld/resources/ui/filediff.ui.h:13
-msgid "Clear sychronization points for changes between files"
-msgstr "Azzera tutti i punti di sincronizzazione per le modifiche tra i file"
-
-#: ../meld/resources/ui/filediff.ui.h:14
-msgid "Previous Conflict"
-msgstr "Conflitto precedente"
-
-#: ../meld/resources/ui/filediff.ui.h:15
-msgid "Go to the previous conflict"
-msgstr "Va al conflitto precedente"
-
-#: ../meld/resources/ui/filediff.ui.h:16
-msgid "Next Conflict"
-msgstr "Conflitto successivo"
-
-#: ../meld/resources/ui/filediff.ui.h:17
-msgid "Go to the next conflict"
-msgstr "Va al conflitto successivo"
-
-#: ../meld/resources/ui/filediff.ui.h:18
-msgid "Push to Left"
-msgstr "Invia a sinistra"
-
-#: ../meld/resources/ui/filediff.ui.h:19
+#: ../meld/resources/ui/filediff-actions.ui.h:1
msgid "Push current change to the left"
msgstr "Invia la modifica corrente a sinistra"
-#: ../meld/resources/ui/filediff.ui.h:20
-msgid "Push to Right"
-msgstr "Invia a destra"
-
-#: ../meld/resources/ui/filediff.ui.h:21
+#: ../meld/resources/ui/filediff-actions.ui.h:2
msgid "Push current change to the right"
msgstr "Invia la modifica corrente a destra"
-#: ../meld/resources/ui/filediff.ui.h:22
-msgid "Pull from Left"
-msgstr "Prendi da sinistra"
+#: ../meld/resources/ui/filediff-actions.ui.h:3
+msgid "Copy chunks"
+msgstr "Copia chunk"
-#: ../meld/resources/ui/filediff.ui.h:23
-msgid "Pull change from the left"
-msgstr "Prende la modifica da sinistra"
-
-#: ../meld/resources/ui/filediff.ui.h:24
-msgid "Pull from Right"
-msgstr "Prendi da destra"
-
-#: ../meld/resources/ui/filediff.ui.h:25
-msgid "Pull change from the right"
-msgstr "Prende la modifica da destra"
-
-#: ../meld/resources/ui/filediff.ui.h:26
-msgid "Copy Above Left"
-msgstr "Copia a sinistra sopra"
+#: ../meld/resources/ui/filediff-actions.ui.h:4
+msgid "Delete change"
+msgstr "Elimina la modifica"
-#: ../meld/resources/ui/filediff.ui.h:27
+#: ../meld/resources/ui/filediff-menus.ui.h:1
msgid "Copy change above the left chunk"
msgstr "Copia la modifica sopra al pezzo a sinistra"
-#: ../meld/resources/ui/filediff.ui.h:28
-msgid "Copy Below Left"
-msgstr "Copia a sinistra sotto"
-
-#: ../meld/resources/ui/filediff.ui.h:29
+#: ../meld/resources/ui/filediff-menus.ui.h:2
msgid "Copy change below the left chunk"
msgstr "Copia la modifica sotto al pezzo a sinistra"
-#: ../meld/resources/ui/filediff.ui.h:30
-msgid "Copy Above Right"
-msgstr "Copia a destra sopra"
-
-#: ../meld/resources/ui/filediff.ui.h:31
+#: ../meld/resources/ui/filediff-menus.ui.h:3
msgid "Copy change above the right chunk"
msgstr "Copia la modifica sopra al pezzo a destra"
-#: ../meld/resources/ui/filediff.ui.h:32
-msgid "Copy Below Right"
-msgstr "Copia a destra sotto"
-
-#: ../meld/resources/ui/filediff.ui.h:33
+#: ../meld/resources/ui/filediff-menus.ui.h:4
msgid "Copy change below the right chunk"
msgstr "Copia la modifica sotto al pezzo a destra"
-#: ../meld/resources/ui/filediff.ui.h:34
-msgid "Delete"
-msgstr "Elimina"
-
-#: ../meld/resources/ui/filediff.ui.h:35
-msgid "Delete change"
-msgstr "Elimina la modifica"
-
-#: ../meld/resources/ui/filediff.ui.h:36
-msgid "Merge All from Left"
-msgstr "Unisci tutte da sinistra"
-
-#: ../meld/resources/ui/filediff.ui.h:37
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Unisce tutte le modifiche senza conflitti da sinistra"
-
-#: ../meld/resources/ui/filediff.ui.h:38
-msgid "Merge All from Right"
-msgstr "Unisci tutte da destra"
+#: ../meld/resources/ui/filediff-menus.ui.h:5
+msgid "_Undo"
+msgstr "A_nnulla"
-#: ../meld/resources/ui/filediff.ui.h:39
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Unisce tutte le modifiche senza conflitti da destra"
+#: ../meld/resources/ui/filediff-menus.ui.h:6
+msgid "_Redo"
+msgstr "_Ripeti"
-#: ../meld/resources/ui/filediff.ui.h:40
-msgid "Merge All"
-msgstr "Unisci tutte"
+#: ../meld/resources/ui/filediff-menus.ui.h:7
+msgid "Cu_t"
+msgstr "Ta_glia"
-#: ../meld/resources/ui/filediff.ui.h:41
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr ""
-"Unisce tutte le modifiche senza conflitti dai riquadri destro e sinistro"
+#: ../meld/resources/ui/filediff-menus.ui.h:8
+msgid "_Copy"
+msgstr "_Copia"
-#: ../meld/resources/ui/filediff.ui.h:42
-msgid "Previous Pane"
-msgstr "Riquadro precedente"
+#: ../meld/resources/ui/filediff-menus.ui.h:9
+msgid "_Paste"
+msgstr "_Incolla"
-#: ../meld/resources/ui/filediff.ui.h:43
-msgid "Move keyboard focus to the previous document in this comparison"
+#: ../meld/resources/ui/filediff.ui.h:1
+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 ""
-"Sposta il focus della tastiera al documento precedente in questo confronto"
-
-#: ../meld/resources/ui/filediff.ui.h:44
-msgid "Next Pane"
-msgstr "Riquadro successivo"
+"Impossibile scrivere su questo file. È possibile fare clic qui per "
+"sbloccarlo e apportare le modifiche: tali modifiche devono però essere "
+"salvata su un nuovo file."
-#: ../meld/resources/ui/filediff.ui.h:45
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr ""
-"Sposta il focus della tastiera al documento successivo in questo confronto"
+#: ../meld/resources/ui/filediff.ui.h:2
+msgid "File 3"
+msgstr "File 3"
-#: ../meld/resources/ui/filediff.ui.h:46
-msgid "Lock Scrolling"
-msgstr "Blocca scorrimento"
+#: ../meld/resources/ui/filediff.ui.h:3
+msgid "File 2"
+msgstr "File 2"
-#: ../meld/resources/ui/filediff.ui.h:47
-msgid "Lock scrolling of all panes"
-msgstr "Blocca lo scorrimento di tutti i riquadri"
+#: ../meld/resources/ui/filediff.ui.h:4
+msgid "File 1"
+msgstr "File 1"
#. Create icon and filename CellRenderer
-#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30
-#: ../meld/dirdiff.py:455
+#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:17
+#: ../meld/dirdiff.py:509
msgid "Name"
msgstr "Nome"
@@ -1134,7 +1128,8 @@ msgstr "Modello"
msgid "Add new filter"
msgstr "Aggiungi nuovo filtro"
-#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9
+#: ../meld/resources/ui/filter-list.ui.h:5
+#: ../meld/resources/ui/vcview-menus.ui.h:4
msgid "_Add"
msgstr "A_ggiungi"
@@ -1142,83 +1137,71 @@ msgstr "A_ggiungi"
msgid "Remove selected filter"
msgstr "Rimuove il filtro selezionato"
-#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041
-#: ../meld/iohelpers.py:113
-msgid "_Replace"
-msgstr "Sostit_uisci"
-
-#: ../meld/resources/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "Sostituisci _tutti"
-
-#: ../meld/resources/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "_Precedente"
-
-#: ../meld/resources/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "_Successiva"
-
-#: ../meld/resources/ui/findbar.ui.h:5
-msgid "Find:"
-msgstr "Trova:"
-
-#: ../meld/resources/ui/findbar.ui.h:6
-msgid "Replace _with:"
-msgstr "S_ostituisci con:"
-
-#: ../meld/resources/ui/findbar.ui.h:7
+#: ../meld/resources/ui/findbar.ui.h:1
msgid "_Match case"
msgstr "_Maiuscole/Minuscole"
-#: ../meld/resources/ui/findbar.ui.h:8
+#: ../meld/resources/ui/findbar.ui.h:2
msgid "Who_le word"
msgstr "Paro_la intera"
-#: ../meld/resources/ui/findbar.ui.h:9
+#: ../meld/resources/ui/findbar.ui.h:3
msgid "Regular e_xpression"
msgstr "Espressione _regolare"
-#: ../meld/resources/ui/findbar.ui.h:10
+#: ../meld/resources/ui/findbar.ui.h:4
msgid "Wrapped"
msgstr "A capo"
+#: ../meld/resources/ui/findbar.ui.h:5
+msgid "Replace _All"
+msgstr "Sostituisci _tutti"
+
+#: ../meld/resources/ui/findbar.ui.h:6 ../meld/dirdiff.py:1042
+#: ../meld/iohelpers.py:117
+msgid "_Replace"
+msgstr "Sostit_uisci"
+
+#: ../meld/resources/ui/findbar.ui.h:7
+msgid "Switch between Find and Find-and-Replace"
+msgstr "Passa tra «Cerca» e «Cerca e sostituisci»"
+
#: ../meld/resources/ui/language-selector.ui.h:1
msgid "Search highlight mode…"
msgstr "Modalità evidenziazione ricerca…"
-#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532
-#: ../meld/newdifftab.py:53
+#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:341
+#: ../meld/newdifftab.py:52
msgid "New comparison"
msgstr "Nuovo confronto"
#: ../meld/resources/ui/new-diff-tab.ui.h:2
-msgid "File comparison"
-msgstr "Confronto di file"
+msgid "File"
+msgstr "File"
#: ../meld/resources/ui/new-diff-tab.ui.h:3
-msgid "Directory comparison"
-msgstr "Confronto di directory"
+msgid "Folder"
+msgstr "Cartella"
#: ../meld/resources/ui/new-diff-tab.ui.h:4
-msgid "Version control view"
-msgstr "Vista controllo versione"
+msgid "Version control"
+msgstr "Controllo della versione"
#: ../meld/resources/ui/new-diff-tab.ui.h:5
msgid "_3-way comparison"
msgstr "Confronto a 3-_vie"
-#: ../meld/resources/ui/new-diff-tab.ui.h:6
-msgid "Select Third File"
-msgstr "Seleziona terzo file"
+#: ../meld/resources/ui/new-diff-tab.ui.h:6
+msgid "Select First File"
+msgstr "Seleziona primo file"
#: ../meld/resources/ui/new-diff-tab.ui.h:7
msgid "Select Second File"
msgstr "Seleziona secondo file"
#: ../meld/resources/ui/new-diff-tab.ui.h:8
-msgid "Select First File"
-msgstr "Seleziona primo file"
+msgid "Select Third File"
+msgstr "Seleziona terzo file"
#: ../meld/resources/ui/new-diff-tab.ui.h:9
msgid "Select First Folder"
@@ -1256,7 +1239,7 @@ msgstr "Formatta come patch"
msgid "Copy to Clipboard"
msgstr "Copia negli appunti"
-#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165
+#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163
msgid "Save Patch"
msgstr "Salva patch"
@@ -1294,7 +1277,7 @@ msgstr "_Carattere dell'editor:"
#. TRANSLATORS: This is the status bar label for a group of settings,
#. such as text wrapping, show line numbers, whitespace, etc.
-#: ../meld/resources/ui/preferences.ui.h:5 ../meld/ui/statusbar.py:282
+#: ../meld/resources/ui/preferences.ui.h:5 ../meld/ui/statusbar.py:292
msgid "Display"
msgstr "Visualizzazione"
@@ -1335,84 +1318,96 @@ msgid "Syntax highlighting color scheme:"
msgstr "Schema colore per evidenziazione sintassi:"
#: ../meld/resources/ui/preferences.ui.h:15
+msgid "Code Overview"
+msgstr "Panoramica codice"
+
+#: ../meld/resources/ui/preferences.ui.h:16
+msgid "Show overview map"
+msgstr "Mostra mappa panoramica"
+
+#: ../meld/resources/ui/preferences.ui.h:17
+msgid "Overview map style:"
+msgstr "Stile della mappa panoramica:"
+
+#: ../meld/resources/ui/preferences.ui.h:18
msgid "External Editor"
msgstr "Editor esterno"
-#: ../meld/resources/ui/preferences.ui.h:16
+#: ../meld/resources/ui/preferences.ui.h:19
msgid "Use _default system editor"
msgstr "Usare editor _predefinito di sistema"
-#: ../meld/resources/ui/preferences.ui.h:17
+#: ../meld/resources/ui/preferences.ui.h:20
msgid "Edito_r command:"
msgstr "Comando dell'edito_r:"
-#: ../meld/resources/ui/preferences.ui.h:18
+#: ../meld/resources/ui/preferences.ui.h:21
msgid "Editor"
msgstr "Editor"
-#: ../meld/resources/ui/preferences.ui.h:19
+#: ../meld/resources/ui/preferences.ui.h:22
msgid "Shallow Comparison"
msgstr "Confronto superficiale"
-#: ../meld/resources/ui/preferences.ui.h:20
+#: ../meld/resources/ui/preferences.ui.h:23
msgid "C_ompare files based only on size and timestamp"
msgstr "Confrontare i file solo su _dimensione e marcatura temporale"
-#: ../meld/resources/ui/preferences.ui.h:21
+#: ../meld/resources/ui/preferences.ui.h:24
msgid "_Timestamp resolution:"
msgstr "Risoluzione marcatura _temporale:"
-#: ../meld/resources/ui/preferences.ui.h:23
+#: ../meld/resources/ui/preferences.ui.h:26
msgid "Note: enabling text filters may make comparing large files much slower"
msgstr ""
"Nota: abilitare i filtri sul testo può rendere il confronto di file grandi "
"molto più lento"
-#: ../meld/resources/ui/preferences.ui.h:24
+#: ../meld/resources/ui/preferences.ui.h:27
msgid "Symbolic Links"
msgstr "Collegamenti simbolici"
-#: ../meld/resources/ui/preferences.ui.h:26
+#: ../meld/resources/ui/preferences.ui.h:29
msgid "Visible Columns"
msgstr "Colonne visibili"
-#: ../meld/resources/ui/preferences.ui.h:27
+#: ../meld/resources/ui/preferences.ui.h:30
msgid "Folder Comparisons"
msgstr "Confronto cartelle"
-#: ../meld/resources/ui/preferences.ui.h:28
+#: ../meld/resources/ui/preferences.ui.h:31
msgid "Version Comparisons"
msgstr "Confronto versione"
-#: ../meld/resources/ui/preferences.ui.h:29
+#: ../meld/resources/ui/preferences.ui.h:32
msgid "_Order when comparing file revisions:"
msgstr "_Ordine nel confrontare revisioni di file:"
-#: ../meld/resources/ui/preferences.ui.h:30
+#: ../meld/resources/ui/preferences.ui.h:33
msgid "Order when _merging files:"
msgstr "Ordine nell'_unione dei file:"
-#: ../meld/resources/ui/preferences.ui.h:31
+#: ../meld/resources/ui/preferences.ui.h:34
msgid "Commit Messages"
msgstr "Messaggio di commit"
-#: ../meld/resources/ui/preferences.ui.h:32
+#: ../meld/resources/ui/preferences.ui.h:35
msgid "Show _right margin at:"
msgstr "Mostrare _il margine destro a:"
-#: ../meld/resources/ui/preferences.ui.h:33
+#: ../meld/resources/ui/preferences.ui.h:36
msgid "Automatically _break lines at right margin on commit"
msgstr "Spe_zzare le righe sul margine destro nel commit"
-#: ../meld/resources/ui/preferences.ui.h:34
+#: ../meld/resources/ui/preferences.ui.h:37
msgid "Version Control"
msgstr "Controllo della versione"
-#: ../meld/resources/ui/preferences.ui.h:35
+#: ../meld/resources/ui/preferences.ui.h:38
msgid "Filename filters"
msgstr "Filtri sui nomi dei file"
-#: ../meld/resources/ui/preferences.ui.h:36
+#: ../meld/resources/ui/preferences.ui.h:39
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -1422,25 +1417,21 @@ msgstr ""
"directory per nome. Ogni modello è una lista di nomi che possono contenere "
"caratteri jolly, analogamente alla shell, separati da spazi."
-#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114
-msgid "File Filters"
-msgstr "Filtri dei file"
-
-#: ../meld/resources/ui/preferences.ui.h:38
+#: ../meld/resources/ui/preferences.ui.h:41
msgid "Change trimming"
msgstr "Modifica eliminazioni"
-#: ../meld/resources/ui/preferences.ui.h:39
+#: ../meld/resources/ui/preferences.ui.h:42
msgid "Trim blank line differences from the start and end of changes"
msgstr ""
"Elimina le differenze sulle righe vuote all'inizio e alla fine delle "
"modifiche"
-#: ../meld/resources/ui/preferences.ui.h:40
+#: ../meld/resources/ui/preferences.ui.h:43
msgid "Text filters"
msgstr "Filtri di testo"
-#: ../meld/resources/ui/preferences.ui.h:41
+#: ../meld/resources/ui/preferences.ui.h:44
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -1454,39 +1445,47 @@ msgstr ""
"confronto. Se l'espressione contiene gruppi, solamente i gruppi saranno "
"sostituiti. Vedere il manuale utente per maggiori dettagli."
-#: ../meld/resources/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "Filtri di testo"
-
-#: ../meld/resources/ui/preferences.ui.h:43
+#: ../meld/resources/ui/preferences.ui.h:46
msgid "Left is remote, right is local"
msgstr "Sinistra è remoto, destra è locale"
-#: ../meld/resources/ui/preferences.ui.h:44
+#: ../meld/resources/ui/preferences.ui.h:47
msgid "Left is local, right is remote"
msgstr "Sinistra è locale, destra è remoto"
-#: ../meld/resources/ui/preferences.ui.h:45
+#: ../meld/resources/ui/preferences.ui.h:48
+msgid "Simple change map"
+msgstr "Mappa delle modifiche"
+
+#: ../meld/resources/ui/preferences.ui.h:49
+msgid "Compact source map"
+msgstr "Mappa sorgente compatta"
+
+#: ../meld/resources/ui/preferences.ui.h:50
+msgid "Full source map"
+msgstr "Mappa sorgente completa"
+
+#: ../meld/resources/ui/preferences.ui.h:51
msgid "Remote, merge, local"
msgstr "Remoto, unione, locale"
-#: ../meld/resources/ui/preferences.ui.h:46
+#: ../meld/resources/ui/preferences.ui.h:52
msgid "Local, merge, remote"
msgstr "Locale, unione, remoto"
-#: ../meld/resources/ui/preferences.ui.h:47
+#: ../meld/resources/ui/preferences.ui.h:53
msgid "1ns (ext4)"
msgstr "1ns (ext4)"
-#: ../meld/resources/ui/preferences.ui.h:48
+#: ../meld/resources/ui/preferences.ui.h:54
msgid "100ns (NTFS)"
msgstr "100ns (NTFS)"
-#: ../meld/resources/ui/preferences.ui.h:49
+#: ../meld/resources/ui/preferences.ui.h:55
msgid "1s (ext2/ext3)"
msgstr "1s (ext2/ext3)"
-#: ../meld/resources/ui/preferences.ui.h:50
+#: ../meld/resources/ui/preferences.ui.h:56
msgid "2s (VFAT)"
msgstr "2s (VFAT)"
@@ -1503,6 +1502,10 @@ msgstr ""
msgid "_Push commits"
msgstr "_Push dei commit"
+#: ../meld/resources/ui/recent-selector.ui.h:1
+msgid "Search recent comparisons…"
+msgstr "Cerca confronti recenti…"
+
# (ndt) l'azione annulla effettivamente le modifiche che non sono state salvate.
#: ../meld/resources/ui/revert-dialog.ui.h:1
msgid "Discard unsaved changes to documents?"
@@ -1529,8 +1532,8 @@ msgstr "Se non si salva, le modifiche andranno perse per sempre."
msgid "Close _without Saving"
msgstr "Chiudi senza sal_vare"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040
-#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1041
+#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:116
msgid "_Cancel"
msgstr "A_nnulla"
@@ -1546,175 +1549,160 @@ msgstr "Mostra spazi bianchi"
msgid "Text wrapping"
msgstr "A capo automatico"
-#: ../meld/resources/ui/vcview.ui.h:3
+#: ../meld/resources/ui/vcview-menus.ui.h:1
+msgid "_Compare"
+msgstr "C_onfronta"
+
+#: ../meld/resources/ui/vcview-menus.ui.h:2
msgid "Co_mmit…"
msgstr "Co_mmit…"
-#: ../meld/resources/ui/vcview.ui.h:4
+#: ../meld/resources/ui/vcview-menus.ui.h:3
+msgid "_Update"
+msgstr "A_ggiorna"
+
+#: ../meld/resources/ui/vcview-menus.ui.h:6
+msgid "Re_vert"
+msgstr "_Ripristina"
+
+#: ../meld/resources/ui/vcview-menus.ui.h:7 ../meld/resources/ui/vcview.ui.h:15
+msgid "Delete"
+msgstr "Elimina"
+
+#: ../meld/resources/ui/vcview-menus.ui.h:8
+msgid "Mar_k as Resolved"
+msgstr "Marca _risolto"
+
+#: ../meld/resources/ui/vcview.ui.h:1
+msgid "Commit…"
+msgstr "Commit…"
+
+#: ../meld/resources/ui/vcview.ui.h:2
msgid "Commit changes to version control"
msgstr "Esegue il commit delle modifiche"
-#: ../meld/resources/ui/vcview.ui.h:5
-msgid "_Update"
-msgstr "A_ggiorna"
+#: ../meld/resources/ui/vcview.ui.h:3
+msgid "Update"
+msgstr "Aggiorna"
-#: ../meld/resources/ui/vcview.ui.h:6
+#: ../meld/resources/ui/vcview.ui.h:4
msgid "Update working copy from version control"
msgstr "Aggiorna la copia di lavoro dal sistema di controllo della versione"
-#: ../meld/resources/ui/vcview.ui.h:7
-msgid "_Push"
-msgstr "_Push"
+#: ../meld/resources/ui/vcview.ui.h:5
+msgid "Push"
+msgstr "Push"
-#: ../meld/resources/ui/vcview.ui.h:8
+#: ../meld/resources/ui/vcview.ui.h:6
msgid "Push local changes to remote"
msgstr "Invia le modifiche locali in remoto"
-#: ../meld/resources/ui/vcview.ui.h:10
+#: ../meld/resources/ui/vcview.ui.h:7
+msgid "Add"
+msgstr "Aggiungi"
+
+#: ../meld/resources/ui/vcview.ui.h:8
msgid "Add to version control"
msgstr "Aggiunge al controllo di versione"
-#: ../meld/resources/ui/vcview.ui.h:12
+#: ../meld/resources/ui/vcview.ui.h:9
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: ../meld/resources/ui/vcview.ui.h:10
msgid "Remove from version control"
msgstr "Rimuove dal controllo di versione"
-#: ../meld/resources/ui/vcview.ui.h:13
-msgid "Mar_k as Resolved"
-msgstr "Marca _risolto"
+#: ../meld/resources/ui/vcview.ui.h:11
+msgid "Mark as Resolved"
+msgstr "Marca risolto"
-#: ../meld/resources/ui/vcview.ui.h:14
+#: ../meld/resources/ui/vcview.ui.h:12
msgid "Mark as resolved in version control"
msgstr "Marca come risolto nel controllo di versione"
-#: ../meld/resources/ui/vcview.ui.h:15
-msgid "Re_vert"
-msgstr "_Ripristina"
+#: ../meld/resources/ui/vcview.ui.h:13
+msgid "Revert"
+msgstr "Ripristina"
-#: ../meld/resources/ui/vcview.ui.h:16
+#: ../meld/resources/ui/vcview.ui.h:14
msgid "Revert working copy to original state"
msgstr "Riporta la copia di lavoro allo stato originale"
-#: ../meld/resources/ui/vcview.ui.h:17
+#: ../meld/resources/ui/vcview.ui.h:16
msgid "Delete from working copy"
msgstr "Elimina dalla copia di lavoro"
-#: ../meld/resources/ui/vcview.ui.h:18
-msgid "Console"
-msgstr "Console"
-
-#: ../meld/resources/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"
-
-#: ../meld/resources/ui/vcview.ui.h:20
-msgid "_Flatten"
-msgstr "_Appiattisci"
-
-#: ../meld/resources/ui/vcview.ui.h:21
-msgid "Flatten directories"
-msgstr "Appiattisce le directory"
-
-#: ../meld/resources/ui/vcview.ui.h:22
-msgid "_Modified"
-msgstr "_Modificati"
-
-#: ../meld/resources/ui/vcview.ui.h:23
-msgid "Show modified files"
-msgstr "Mostra i file modificati"
-
-#: ../meld/resources/ui/vcview.ui.h:24
-msgid "_Normal"
-msgstr "_Normali"
-
-#: ../meld/resources/ui/vcview.ui.h:25
-msgid "Show normal files"
-msgstr "Mostra i file normali"
-
-#: ../meld/resources/ui/vcview.ui.h:26
-msgid "Un_versioned"
-msgstr "Non _monitorati"
-
-#: ../meld/resources/ui/vcview.ui.h:27
-msgid "Show unversioned files"
-msgstr "Mostra file non monitorati"
-
-#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
-msgid "Ignored"
-msgstr "Ignorati"
-
-#: ../meld/resources/ui/vcview.ui.h:29
-msgid "Show ignored files"
-msgstr "Mostra file ignorati"
-
-#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366
+#: ../meld/resources/ui/vcview.ui.h:18 ../meld/vcview.py:415
msgid "Location"
msgstr "Posizione"
-#: ../meld/resources/ui/vcview.ui.h:32
+#: ../meld/resources/ui/vcview.ui.h:19
msgid "Status"
msgstr "Stato"
-#: ../meld/resources/ui/vcview.ui.h:33
+#: ../meld/resources/ui/vcview.ui.h:20
msgid "Extra"
msgstr "Extra"
-#: ../meld/resources/ui/vcview.ui.h:34
+#: ../meld/resources/ui/vcview.ui.h:21
msgid "Console output"
msgstr "Output della console"
-#: ../meld/const.py:12
+#: ../meld/actiongutter.py:250
+msgid "Copy _up"
+msgstr "Copia _su"
+
+#: ../meld/actiongutter.py:251
+msgid "Copy _down"
+msgstr "Copia _giù"
+
+#: ../meld/const.py:25
msgid "UNIX (LF)"
msgstr "UNIX (LF)"
-#: ../meld/const.py:13
+#: ../meld/const.py:26
msgid "DOS/Windows (CR-LF)"
msgstr "DOS/Windows (CR-LF)"
-#: ../meld/const.py:14
+#: ../meld/const.py:27
msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:476 ../meld/preferences.py:138
+#: ../meld/dirdiff.py:530 ../meld/preferences.py:136
msgid "Size"
msgstr "Dimensione"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:484 ../meld/preferences.py:139
+#: ../meld/dirdiff.py:538 ../meld/preferences.py:137
msgid "Modification time"
msgstr "Data e ora di modifica"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:492 ../meld/preferences.py:140
+#: ../meld/dirdiff.py:546 ../meld/preferences.py:138
msgid "Permissions"
msgstr "Permessi"
-#: ../meld/dirdiff.py:626
-#, python-format
-msgid "Hide %s"
-msgstr "Nascondi %s"
-
-#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791
+#: ../meld/dirdiff.py:769 ../meld/dirdiff.py:792
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Analisi di %s"
-#: ../meld/dirdiff.py:926
+#: ../meld/dirdiff.py:928
#, python-format
msgid "[%s] Done"
msgstr "[%s] Fatto"
-#: ../meld/dirdiff.py:934
+#: ../meld/dirdiff.py:935
msgid "Folders have no differences"
msgstr "Le cartelle non presentano alcuna differenza"
-#: ../meld/dirdiff.py:936
+#: ../meld/dirdiff.py:937
msgid "Contents of scanned files in folders are identical."
msgstr "Il contenuto dei file analizzati nelle cartelle è identico."
-#: ../meld/dirdiff.py:938
+#: ../meld/dirdiff.py:939
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
@@ -1722,41 +1710,45 @@ msgstr ""
"I file analizzati nelle cartelle sembrerebbero identici, ma il loro "
"contenuto non è stato analizzato."
-#: ../meld/dirdiff.py:941
+#: ../meld/dirdiff.py:942
msgid "File filters are in use, so not all files have been scanned."
msgstr ""
"Sono in uso dei filtri sui file: non tutti i file sono stati analizzati."
-#: ../meld/dirdiff.py:943
+#: ../meld/dirdiff.py:944
msgid "Text filters are in use and may be masking content differences."
msgstr ""
"Sono in uso filtri sul testo e potrebbero nascondere differenze tra i file."
-#: ../meld/dirdiff.py:961 ../meld/filediff.py:1602 ../meld/filediff.py:1632
-#: ../meld/filediff.py:1634 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: ../meld/dirdiff.py:960 ../meld/filediff.py:1755
+msgid "Hide"
+msgstr "Nascondi"
+
+#: ../meld/dirdiff.py:962 ../meld/filediff.py:1757 ../meld/filediff.py:1787
+#: ../meld/filediff.py:1789 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
msgid "Hi_de"
msgstr "Nascon_di"
-#: ../meld/dirdiff.py:970
+#: ../meld/dirdiff.py:971
msgid "Multiple errors occurred while scanning this folder"
msgstr ""
"Si sono verificati molteplici errore durante l'analisi di questa cartella"
-#: ../meld/dirdiff.py:971
+#: ../meld/dirdiff.py:972
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:973
+#: ../meld/dirdiff.py:974
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:975
+#: ../meld/dirdiff.py:976
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:977
+#: ../meld/dirdiff.py:978
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1764,17 +1756,17 @@ msgstr ""
"Confronto eseguito senza distinzione tra maiuscole/minuscole su un file "
"system che applica tale distinzione. Alcuni file sono nascosti:"
-#: ../meld/dirdiff.py:988
+#: ../meld/dirdiff.py:989
#, python-format
msgid "“%s” hidden by “%s”"
msgstr "«%s» è nascosto da «%s»"
-#: ../meld/dirdiff.py:1044
+#: ../meld/dirdiff.py:1045
#, python-format
msgid "Replace folder “%s”?"
msgstr "Sostituire la cartella «%s»?"
-#: ../meld/dirdiff.py:1046
+#: ../meld/dirdiff.py:1047
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
@@ -1784,11 +1776,11 @@ msgstr ""
"Sostituendo la cartella esistente, tutti i file in essa contenuti saranno "
"persi."
-#: ../meld/dirdiff.py:1059
+#: ../meld/dirdiff.py:1060
msgid "Error copying file"
msgstr "Errore nel copiare il file"
-#: ../meld/dirdiff.py:1060
+#: ../meld/dirdiff.py:1061
#, python-format
msgid ""
"Couldn’t copy %s\n"
@@ -1801,19 +1793,19 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720
+#: ../meld/dirdiff.py:1086 ../meld/vcview.py:763
msgid "Error deleting {}"
msgstr "Errore nell'eliminare {}"
-#: ../meld/dirdiff.py:1597
+#: ../meld/dirdiff.py:1565
msgid "No folder"
msgstr "Nessuna cartella"
-#: ../meld/filediff.py:919
+#: ../meld/filediff.py:1065
msgid "Comparison results will be inaccurate"
msgstr "I risultati del confronto non saranno precisi"
-#: ../meld/filediff.py:921
+#: ../meld/filediff.py:1067
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1821,65 +1813,65 @@ msgstr ""
"Un filtro ha modificato il numero di righe nel file: ciò non è supportato. "
"Il confronto non sarà corretto."
-#: ../meld/filediff.py:993
+#: ../meld/filediff.py:1139
msgid "Mark conflict as resolved?"
msgstr "Marcare il conflitto come risolto?"
-#: ../meld/filediff.py:995
+#: ../meld/filediff.py:1141
msgid ""
"If the conflict was resolved successfully, you may mark it as resolved now."
msgstr ""
"Se il conflitto è stato risolto con successo, è possibile indicarlo ora."
-#: ../meld/filediff.py:997
+#: ../meld/filediff.py:1143
msgid "Cancel"
msgstr "Annulla"
-#: ../meld/filediff.py:998
+#: ../meld/filediff.py:1144
msgid "Mark _Resolved"
msgstr "Marca _risolto"
-#: ../meld/filediff.py:1317
+#: ../meld/filediff.py:1463
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Si è verificato un problema nell'aprire il file «%s»."
-#: ../meld/filediff.py:1325
+#: ../meld/filediff.py:1471
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Il file «%s» sembra essere un file binario."
-#: ../meld/filediff.py:1327
+#: ../meld/filediff.py:1473
msgid "Do you want to open the file using the default application?"
msgstr "Aprire il file utilizzando l'applicazione predefinita?"
-#: ../meld/filediff.py:1329
+#: ../meld/filediff.py:1475
msgid "Open"
msgstr "Apri"
-#: ../meld/filediff.py:1345
+#: ../meld/filediff.py:1491
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Calcolo delle differenze"
-#: ../meld/filediff.py:1406
+#: ../meld/filediff.py:1550
#, python-format
msgid "File %s has changed on disk"
msgstr "Il file «%s» è stato modificato"
-#: ../meld/filediff.py:1407
+#: ../meld/filediff.py:1551
msgid "Do you want to reload the file?"
msgstr "Ricaricare il file?"
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1553
msgid "_Reload"
msgstr "_Ricarica"
-#: ../meld/filediff.py:1565
+#: ../meld/filediff.py:1720
msgid "Files are identical"
msgstr "I file sono identici"
-#: ../meld/filediff.py:1578
+#: ../meld/filediff.py:1733
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1887,11 +1879,11 @@ msgstr ""
"Sono in uso filtri sul testo e potrebbero nascondere differenze tra i file. "
"Confrontare i file senza i filtri?"
-#: ../meld/filediff.py:1583
+#: ../meld/filediff.py:1738
msgid "Files differ in line endings only"
msgstr "I file differiscono solo nelle terminazioni di riga"
-#: ../meld/filediff.py:1585
+#: ../meld/filediff.py:1740
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1900,16 +1892,16 @@ msgstr ""
"I file sono identici, ma differiscono sono nelle terminazioni di riga:\n"
"%s"
-#: ../meld/filediff.py:1605
+#: ../meld/filediff.py:1760
msgid "Show without filters"
msgstr "Mostra senza filtri"
-#: ../meld/filediff.py:1627
+#: ../meld/filediff.py:1782
msgid "Change highlighting incomplete"
msgstr "Evidenziazione modifica incompleta"
# (ndt) un po’ libera…
-#: ../meld/filediff.py:1628
+#: ../meld/filediff.py:1783
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."
@@ -1918,19 +1910,19 @@ msgstr ""
"possibile fare in modo che anche le modifiche di grandi dimensioni vengano "
"evidenziate, ma potrebbe rallentare il programma."
-#: ../meld/filediff.py:1636
+#: ../meld/filediff.py:1791
msgid "Keep highlighting"
msgstr "Continua a evidenziare"
-#: ../meld/filediff.py:1638
+#: ../meld/filediff.py:1793
msgid "_Keep highlighting"
msgstr "Continua _evidenziazione"
-#: ../meld/filediff.py:1651
+#: ../meld/filediff.py:1806
msgid "Saving failed"
msgstr "Salvataggio non riuscito"
-#: ../meld/filediff.py:1652
+#: ../meld/filediff.py:1807
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
@@ -1938,43 +1930,43 @@ msgstr ""
"Copiare qualsiasi modifica in un altro programma o file per evitare la "
"perdita di dati."
-#: ../meld/filediff.py:1661
+#: ../meld/filediff.py:1816
msgid "Save Left Pane As"
msgstr "Salva riquadro sinistro come"
-#: ../meld/filediff.py:1663
+#: ../meld/filediff.py:1818
msgid "Save Middle Pane As"
msgstr "Salva riquadro centrale come"
-#: ../meld/filediff.py:1665
+#: ../meld/filediff.py:1820
msgid "Save Right Pane As"
msgstr "Salva riquadro destro come"
-#: ../meld/filediff.py:1678
+#: ../meld/filediff.py:1831
#, python-format
msgid "File %s has changed on disk since it was opened"
msgstr "Il file «%s» è stato modificato"
-#: ../meld/filediff.py:1680
+#: ../meld/filediff.py:1833
msgid "If you save it, any external changes will be lost."
msgstr "Salvare il file comporterà la perdita delle modifiche esterne."
-#: ../meld/filediff.py:1683
+#: ../meld/filediff.py:1836
msgid "Save Anyway"
msgstr "Salva comunque"
-#: ../meld/filediff.py:1684
+#: ../meld/filediff.py:1837
msgid "Don’t Save"
msgstr "Non salvare"
-#: ../meld/filediff.py:1726
+#: ../meld/filediff.py:1879
msgid ""
"File “{}” contains characters that can’t be encoded using its current "
"encoding “{}”."
msgstr ""
"Il file «{}» contiene caratteri che non possono essere codificati con «{}»."
-#: ../meld/filediff.py:1730 ../meld/patchdialog.py:144
+#: ../meld/filediff.py:1883 ../meld/patchdialog.py:142
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -1983,16 +1975,20 @@ msgstr ""
"Impossibile salvare il file a causa di:\n"
"%s"
-#: ../meld/filediff.py:1734 ../meld/patchdialog.py:143
+#: ../meld/filediff.py:1887 ../meld/patchdialog.py:141
#, python-format
msgid "Could not save file %s."
msgstr "Impossibile salvare il file %s."
-#: ../meld/filediff.py:2127
+#: ../meld/filediff.py:1948
+msgid "Open File"
+msgstr "Apri file"
+
+#: ../meld/filediff.py:2292
msgid "Live comparison updating disabled"
msgstr "Aggiornamento automatico dei confronti disabilitato"
-#: ../meld/filediff.py:2128
+#: ../meld/filediff.py:2293
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -2008,14 +2004,6 @@ msgstr ""
msgid "[%s] Merging files"
msgstr "[%s] Unione dei file"
-#: ../meld/gutterrendererchunk.py:220
-msgid "Copy _up"
-msgstr "Copia _su"
-
-#: ../meld/gutterrendererchunk.py:221
-msgid "Copy _down"
-msgstr "Copia _giù"
-
#: ../meld/iohelpers.py:43
msgid "Deleting remote folders is not supported"
msgstr "L'eliminazione di cartelle remote non è supportata"
@@ -2038,12 +2026,12 @@ msgstr ""
msgid "_Delete Permanently"
msgstr "Elimina _definitivamente"
-#: ../meld/iohelpers.py:106
+#: ../meld/iohelpers.py:110
#, python-format
msgid "Replace file “%s”?"
msgstr "Sostituire il file «%s»?"
-#: ../meld/iohelpers.py:108
+#: ../meld/iohelpers.py:112
#, python-format
msgid ""
"A file with this name already exists in “%s”.\n"
@@ -2052,278 +2040,124 @@ msgstr ""
"Un file con lo stesso nome esiste già in «%s».\n"
"Sostituendo il file esistente, tutto il suo contenuto sarà perso."
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:171
msgid "wrong number of arguments supplied to --diff"
msgstr "numero errato di argomenti forniti per --diff"
-#: ../meld/meldapp.py:174
+#: ../meld/meldapp.py:176
msgid "Start with an empty window"
msgstr "Parte con una finestra vuota"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
+#: ../meld/meldapp.py:177 ../meld/meldapp.py:179
msgid "file"
msgstr "file"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
+#: ../meld/meldapp.py:177 ../meld/meldapp.py:181
msgid "folder"
msgstr "cartella"
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:178
msgid "Start a version control comparison"
msgstr "Inizia un confronto da controllo di versione"
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:180
msgid "Start a 2- or 3-way file comparison"
msgstr "Inizia un confronto file a 2 o 3 vie"
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:182
msgid "Start a 2- or 3-way folder comparison"
msgstr "Inizia un confronto cartella a 2 o 3 vie"
-#: ../meld/meldapp.py:223
+#: ../meld/meldapp.py:225
#, python-format
msgid "Error: %s\n"
msgstr "Errore: %s\n"
-#: ../meld/meldapp.py:230
+#: ../meld/meldapp.py:232
msgid "Meld is a file and directory comparison tool."
msgstr "Meld è uno strumento per confrontare file e directory."
-#: ../meld/meldapp.py:234
+#: ../meld/meldapp.py:236
msgid "Set label to use instead of file name"
msgstr "Imposta l'etichetta da utilizzare al posto del nome del file"
-#: ../meld/meldapp.py:237
+#: ../meld/meldapp.py:239
msgid "Open a new tab in an already running instance"
msgstr "Apre una nuova scheda in un'istanza già in esecuzione"
-#: ../meld/meldapp.py:240
+#: ../meld/meldapp.py:242
msgid "Automatically compare all differing files on startup"
msgstr "Confronta automaticamente all'avvio tutti i file diversi"
-#: ../meld/meldapp.py:243
+#: ../meld/meldapp.py:245
msgid "Ignored for compatibility"
msgstr "Ignorato per compatibilità"
-#: ../meld/meldapp.py:247
+#: ../meld/meldapp.py:249
msgid "Set the target file for saving a merge result"
msgstr "Imposta il file destinazione per salvare il risultato dell'unione"
-#: ../meld/meldapp.py:250
+#: ../meld/meldapp.py:252
msgid "Automatically merge files"
msgstr "Unisce automaticamente i file"
-#: ../meld/meldapp.py:254
+#: ../meld/meldapp.py:256
msgid "Load a saved comparison from a Meld comparison file"
msgstr "Carica un confronto salvato da un file Meld"
-#: ../meld/meldapp.py:258
+#: ../meld/meldapp.py:260
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:278
+#: ../meld/meldapp.py:280
#, 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:281
+#: ../meld/meldapp.py:283
msgid "can’t auto-merge less than 3 files"
msgstr "impossibile eseguire l'unione automatica con meno di 3 file"
-#: ../meld/meldapp.py:283
+#: ../meld/meldapp.py:285
msgid "can’t auto-merge directories"
msgstr "impossibile eseguire l'unione automatica di directory"
-#: ../meld/meldapp.py:297
+#: ../meld/meldapp.py:300
msgid "Error reading saved comparison file"
msgstr "Errore nel leggere il file di confronto salvato"
-#: ../meld/meldapp.py:314
+#: ../meld/meldapp.py:317
#, python-format
msgid "invalid path or URI “%s”"
msgstr "percorso o URI «%s» non valido"
-#: ../meld/meldapp.py:320
+#: ../meld/meldapp.py:323
msgid "remote folder “{}” not supported"
msgstr "cartella remota «{}» non supportata"
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:123
+#: ../meld/meldbuffer.py:117
msgid "<unnamed>"
msgstr "<senza nome>"
-#: ../meld/melddoc.py:63
+#: ../meld/melddoc.py:64
msgid "untitled"
msgstr "senza nome"
-#: ../meld/meldwindow.py:56
-msgid "_File"
-msgstr "_File"
-
-#: ../meld/meldwindow.py:57
-msgid "_New Comparison…"
-msgstr "N_uovo confronto…"
-
-#: ../meld/meldwindow.py:58
-msgid "Start a new comparison"
-msgstr "Avvia un nuovo confronto"
-
-#: ../meld/meldwindow.py:61
-msgid "Save the current file"
-msgstr "Salva il file corrente"
-
-#: ../meld/meldwindow.py:63
-msgid "Save As…"
-msgstr "Salva come…"
-
-#: ../meld/meldwindow.py:64
-msgid "Save the current file with a different name"
-msgstr "Salva il file corrente con un nome diverso"
-
-#: ../meld/meldwindow.py:67
-msgid "Close the current file"
-msgstr "Chiude il file corrente"
-
-#: ../meld/meldwindow.py:70
-msgid "_Edit"
-msgstr "_Modifica"
-
-#: ../meld/meldwindow.py:72
-msgid "Undo the last action"
-msgstr "Annulla l'ultima azione"
+#: ../meld/meldwindow.py:147
+msgid "Filename"
+msgstr "Nome file"
-#: ../meld/meldwindow.py:75
-msgid "Redo the last undone action"
-msgstr "Ripete l'ultima azione annullata"
-
-#: ../meld/meldwindow.py:77
-msgid "Cut the selection"
-msgstr "Taglia la selezione"
-
-#: ../meld/meldwindow.py:79
-msgid "Copy the selection"
-msgstr "Copia la selezione"
-
-#: ../meld/meldwindow.py:81
-msgid "Paste the clipboard"
-msgstr "Incolla dagli appunti"
-
-#: ../meld/meldwindow.py:83
-msgid "Find…"
-msgstr "Trova…"
-
-#: ../meld/meldwindow.py:83
-msgid "Search for text"
-msgstr "Cerca una stringa di testo"
-
-#: ../meld/meldwindow.py:85
-msgid "Find Ne_xt"
-msgstr "Trova successi_vo"
-
-#: ../meld/meldwindow.py:86
-msgid "Search forwards for the same text"
-msgstr "Cerca lo stesso testo in avanti"
-
-#: ../meld/meldwindow.py:88
-msgid "Find _Previous"
-msgstr "Trova pr_ecedente"
-
-#: ../meld/meldwindow.py:89
-msgid "Search backwards for the same text"
-msgstr "Cerca lo stesso testo all'indietro"
-
-#: ../meld/meldwindow.py:92
-msgid "_Replace…"
-msgstr "Sostit_uisci…"
-
-#: ../meld/meldwindow.py:93
-msgid "Find and replace text"
-msgstr "Trova e sostituisce testo"
-
-#: ../meld/meldwindow.py:95
-msgid "Go to _Line"
-msgstr "Vai alla _riga"
-
-#: ../meld/meldwindow.py:96
-msgid "Go to a specific line"
-msgstr "Va a una riga specifica"
-
-#: ../meld/meldwindow.py:99
-msgid "_Changes"
-msgstr "_Modifiche"
-
-#: ../meld/meldwindow.py:100
-msgid "Next Change"
-msgstr "Modifica successiva"
-
-#: ../meld/meldwindow.py:101
-msgid "Go to the next change"
-msgstr "Va alla modifica successiva"
-
-#: ../meld/meldwindow.py:103
-msgid "Previous Change"
-msgstr "Modifica precedente"
-
-#: ../meld/meldwindow.py:104
-msgid "Go to the previous change"
-msgstr "Va alla modifica precedente"
-
-#: ../meld/meldwindow.py:106
-msgid "Open Externally"
-msgstr "Apri esternamente"
-
-#: ../meld/meldwindow.py:107
-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:111
-msgid "_View"
-msgstr "_Visualizza"
-
-#: ../meld/meldwindow.py:112
-msgid "File Status"
-msgstr "Stato del file"
-
-#: ../meld/meldwindow.py:113
-msgid "Version Status"
-msgstr "Stato versione"
-
-#: ../meld/meldwindow.py:116
-msgid "Stop the current action"
-msgstr "Ferma l'azione corrente"
-
-#: ../meld/meldwindow.py:119
-msgid "Refresh the view"
-msgstr "Aggiorna la vista"
-
-#: ../meld/meldwindow.py:123
-msgid "Fullscreen"
-msgstr "Schermo intero"
-
-# (ndt) suggerimento
-#: ../meld/meldwindow.py:124
-msgid "View the comparison in fullscreen"
-msgstr "Visualizza a schermo intero"
-
-#: ../meld/meldwindow.py:133
-msgid "Open Recent"
-msgstr "Apri recenti"
-
-#: ../meld/meldwindow.py:134
-msgid "Open recent files"
-msgstr "Apre i file recenti"
-
-#: ../meld/meldwindow.py:567
+#: ../meld/meldwindow.py:376
#, python-format
msgid "Need three files to auto-merge, got: %r"
msgstr "Sono necessari tre file per un'unione automatica, ottenuti: %r"
-#: ../meld/meldwindow.py:588
+#: ../meld/meldwindow.py:397
msgid "Cannot compare a mixture of files and directories"
msgstr "Non è possibile confrontare sia file che directory"
-#: ../meld/misc.py:155
+#: ../meld/misc.py:152
msgid ""
"{}\n"
"\n"
@@ -2335,22 +2169,15 @@ msgstr ""
"Riscontrato un errore critico durante l'esecuzione:\n"
"<tt>{}</tt>"
-#: ../meld/misc.py:237
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
-msgstr ""
-"Impossibile trovare i dettagli dello schema colori per %s-%s: installazione "
-"danneggiata"
-
-#: ../meld/misc.py:311
+#: ../meld/misc.py:203
msgid "[None]"
msgstr "[Nessuno]"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: ../meld/preferences.py:41 ../meld/preferences.py:133
msgid "label"
msgstr "etichetta"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: ../meld/preferences.py:41 ../meld/preferences.py:133
msgid "pattern"
msgstr "modello"
@@ -2358,26 +2185,41 @@ msgstr "modello"
msgid "Version control:"
msgstr "Controllo della versione:"
-#: ../meld/ui/bufferselectors.py:114
+#: ../meld/style.py:95
+#, python-format
+msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+msgstr ""
+"Impossibile trovare i dettagli dello schema colori per %s-%s: installazione "
+"danneggiata"
+
+#: ../meld/ui/bufferselectors.py:112
#, python-brace-format
msgid "{name} ({charset})"
msgstr "{name} ({charset})"
-#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152
+#: ../meld/ui/bufferselectors.py:142 ../meld/ui/bufferselectors.py:150
msgid "Plain Text"
msgstr "Testo semplice"
+#: ../meld/ui/filechooser.py:70
+msgid "Autodetect Encoding"
+msgstr "Rilevamento automatico codifica"
+
+#: ../meld/ui/filechooser.py:73
+msgid "Current Locale ({})"
+msgstr "Codifica attuale ({})"
+
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/ui/statusbar.py:124
+#: ../meld/ui/statusbar.py:127
#, python-format
msgid "Ln %i, Col %i"
msgstr "Rg %i, Col %d"
-#: ../meld/ui/statusbar.py:182
+#: ../meld/ui/statusbar.py:187
msgid "Line you want to move the cursor to"
msgstr "Riga su cui spostare il cursore"
-#: ../meld/ui/vcdialogs.py:55
+#: ../meld/ui/vcdialogs.py:53
msgid "No files will be committed"
msgstr "Non verrà eseguito il commit di alcun file"
@@ -2444,10 +2286,6 @@ msgstr "Locale"
msgid "Remote"
msgstr "Remoto"
-#: ../meld/vc/_vc.py:71
-msgid "Unversioned"
-msgstr "Non monitorato"
-
#: ../meld/vc/_vc.py:74
msgid "Error"
msgstr "Errore"
@@ -2476,94 +2314,97 @@ msgstr "Mancante"
msgid "Not present"
msgstr "Non presente"
+#. Translators: This error message is shown when no
+#. repository of this type is found.
+#: ../meld/vcview.py:337
+#, python-format
+msgid "%(name)s (not found)"
+msgstr "%(name)s (non trovato)"
+
#. Translators: This error message is shown when a version
#. control binary isn't installed.
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:341
#, python-format
msgid "%(name)s (%(cmd)s not installed)"
msgstr "%(name)s (%(cmd)s non installato)"
#. Translators: This error message is shown when a version
#. controlled repository is invalid.
-#: ../meld/vcview.py:286
+#: ../meld/vcview.py:345
#, python-format
-msgid "%(name)s (Invalid repository)"
+msgid "%(name)s (invalid repository)"
msgstr "%(name)s (repository non valido)"
-#: ../meld/vcview.py:307
+#: ../meld/vcview.py:359
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:309
-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:311
+#: ../meld/vcview.py:361
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 being viewed
-#: ../meld/vcview.py:366
+#: ../meld/vcview.py:415
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
#. Initial yield so when we add this to our tasks, we don't
#. create iterators that may be invalidated.
-#: ../meld/vcview.py:373
+#: ../meld/vcview.py:422
msgid "Scanning repository"
msgstr "Analisi repository"
-#: ../meld/vcview.py:402
+#: ../meld/vcview.py:451
#, python-format
msgid "Scanning %s"
msgstr "Analisi di %s"
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:490
msgid "(Empty)"
msgstr "(vuoto)"
-#: ../meld/vcview.py:487
+#: ../meld/vcview.py:537
#, python-format
msgid "%s — local"
msgstr "%s — locale"
-#: ../meld/vcview.py:488
+#: ../meld/vcview.py:538
#, python-format
msgid "%s — remote"
msgstr "%s — remoto"
-#: ../meld/vcview.py:496
+#: ../meld/vcview.py:546
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (locale, unione, remoto)"
-#: ../meld/vcview.py:501
+#: ../meld/vcview.py:551
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (remoto, unione, locale)"
-#: ../meld/vcview.py:512
+#: ../meld/vcview.py:562
#, python-format
msgid "%s — repository"
msgstr "%s — repository"
-#: ../meld/vcview.py:518
+#: ../meld/vcview.py:568
#, python-format
msgid "%s (working, repository)"
msgstr "%s (corrente, repository)"
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:572
#, python-format
msgid "%s (repository, working)"
msgstr "%s (repository, corrente)"
-#: ../meld/vcview.py:688
+#: ../meld/vcview.py:734
msgid "Remove folder and all its files?"
msgstr "Rimuovere la cartella e tutti i suoi file?"
-#: ../meld/vcview.py:690
+#: ../meld/vcview.py:736
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2571,6 +2412,6 @@ msgstr ""
"Verranno rimossi dal controllo di versione tutti i file selezionati, le "
"cartelle selezionate e tutti i file al loro interno."
-#: ../meld/vcview.py:804
+#: ../meld/vcview.py:849
msgid "Clear"
msgstr "Pulisci"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
