[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: Fri, 21 Feb 2020 12:20:32 +0000 (UTC)
commit 2c50b08062d6cd1da4e2902bf0d979906a874827
Author: Milo Casagrande <milo milo name>
Date: Fri Feb 21 12:20:11 2020 +0000
Update Italian translation
po/it.po | 1089 ++++++++++++++++++++++++++++++--------------------------------
1 file changed, 529 insertions(+), 560 deletions(-)
---
diff --git a/po/it.po b/po/it.po
index 66c819a7..2448e9ef 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,14 +1,14 @@
# Italian translation of meld
-# Copyright (C) 2013, 2014, 2017, 2018, 2019 Free Software Foundation, Inc.
+# Copyright (C) 2013, 2014, 2017, 2018, 2019, 2020 Free Software Foundation, Inc.
# This file is distributed under the same license as the meld package.
-# Milo Casagrande <milo milo name>, 2013, 2014, 2017, 2018, 2019.
+# Milo Casagrande <milo milo name>, 2013, 2014, 2017, 2018, 2019, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: meld\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2019-09-13 23:37+0000\n"
-"PO-Revision-Date: 2019-09-18 09:37+0200\n"
+"POT-Creation-Date: 2020-02-19 20:24+0000\n"
+"PO-Revision-Date: 2020-02-21 13:19+0100\n"
"Last-Translator: Milo Casagrande <milo milo name>\n"
"Language-Team: Italian <tp lists linux it>\n"
"Language: it\n"
@@ -16,51 +16,27 @@ 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.3\n"
+"X-Generator: Poedit 2.2.4\n"
-#: ../bin/meld:194
-msgid "Cannot import: "
-msgstr "Impossibile importare: "
-
-#: ../bin/meld:197
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld richiede %s o più recente."
-
-#: ../bin/meld:276
-#, c-format
-msgid ""
-"Couldn’t load Meld-specific CSS (%s)\n"
-"%s"
-msgstr ""
-"Impossibile caricare i fogli di stile specifici di Meld (%s)\n"
-"%s"
-
-#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1
-#: ../meld/resources/ui/appwindow.ui.h:1
+#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
+#: meld/resources/ui/appwindow.ui:9
msgid "Meld"
msgstr "Meld"
-#: ../data/org.gnome.meld.desktop.in.h:2
+#: data/org.gnome.meld.desktop.in.in:4
msgid "Diff Viewer"
msgstr "Visualizzatore di differenze"
-#: ../data/org.gnome.meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Visualizzatore di differenze Meld"
-
-#: ../data/org.gnome.meld.desktop.in.h:4
-#: ../data/org.gnome.meld.appdata.xml.in.h:2
+#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12
msgid "Compare and merge your files"
msgstr "Confronta e unisce file"
#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list
MUST also end with a semicolon!
-#: ../data/org.gnome.meld.desktop.in.h:6
+#: data/org.gnome.meld.desktop.in.in:7
msgid "diff;merge;"
msgstr "diff;merge;differenze;unione;"
-#: ../data/org.gnome.meld.appdata.xml.in.h:3
+#: data/org.gnome.meld.appdata.xml.in.in:14
msgid ""
"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
"compare files, directories, and version controlled projects. It provides "
@@ -73,7 +49,7 @@ msgstr ""
"di directory e supporta diversi sistemi di controllo come Git, Mercurial, "
"Bazaar e Subversion."
-#: ../data/org.gnome.meld.appdata.xml.in.h:4
+#: data/org.gnome.meld.appdata.xml.in.in:21
msgid ""
"Meld helps you review code changes, understand patches, and makes enormous "
"merge conflicts slightly less painful."
@@ -82,35 +58,35 @@ msgstr ""
"comprendere le patch e rende più facile l'unione di file in presenza di "
"conflitti."
-#: ../data/org.gnome.meld.appdata.xml.in.h:5
+#: data/org.gnome.meld.appdata.xml.in.in:51
msgid "The GNOME Project"
msgstr "Il progetto GNOME"
-#: ../data/mime/org.gnome.meld.xml.in.h:1
+#: data/mime/org.gnome.meld.xml.in:4
msgid "Meld comparison description"
msgstr "Descrizione confronto Meld"
-#: ../data/org.gnome.meld.gschema.xml.h:1
+#: data/org.gnome.meld.gschema.xml:37
msgid "Default window width"
msgstr "Larghezza predefinita della finestra"
-#: ../data/org.gnome.meld.gschema.xml.h:2
+#: data/org.gnome.meld.gschema.xml:41
msgid "Default window height"
msgstr "Altezza predefinita della finestra"
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: data/org.gnome.meld.gschema.xml:45
msgid "Default window maximised state"
msgstr "Stato massimizzato predefinito della finestra"
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: data/org.gnome.meld.gschema.xml:49
msgid "Default window fullscreen state"
msgstr "Stato a schermo intero predefinito della finestra"
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: data/org.gnome.meld.gschema.xml:58
msgid "Additional automatically detected text encodings"
msgstr "Codifiche testo aggiuntive rilevate automaticamente"
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: data/org.gnome.meld.gschema.xml:59
msgid ""
"Meld will use these text encodings to try to decode loaded text files before "
"trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -122,36 +98,35 @@ msgstr ""
"sia UTF-8 sia la codifica basata sulla lingua attuale. Altre codifiche "
"possono essere utilizzate in base alla lingua impostata dall'utente."
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: data/org.gnome.meld.gschema.xml:66
msgid "Width of an indentation step"
msgstr "Larghezza di un passo di rientro"
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: data/org.gnome.meld.gschema.xml:67
msgid "The number of spaces to use for a single indent step"
msgstr "Il numero di spazi da usare per un singolo passo d'indentazione"
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: data/org.gnome.meld.gschema.xml:71
msgid "Whether to indent using spaces or tabs"
msgstr "Indica se usare un rientro di spazi o tabulazioni"
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: data/org.gnome.meld.gschema.xml:72
msgid "If true, any new indentation will use spaces instead of tabs."
msgstr "Se VERO, un nuovo rientro userà spazi invece di tabulazioni."
-#: ../data/org.gnome.meld.gschema.xml.h:11
-#: ../meld/resources/ui/statusbar-menu.ui.h:1
+#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
msgid "Show line numbers"
msgstr "Mostrare numeri di riga"
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: data/org.gnome.meld.gschema.xml:77
msgid "If true, line numbers will be shown in the gutter of file comparisons."
msgstr "Se VERO, verranno mostrati i numeri di riga nel confronto."
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: data/org.gnome.meld.gschema.xml:81
msgid "Highlight syntax"
msgstr "Evidenzia la sintassi"
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: data/org.gnome.meld.gschema.xml:82
msgid ""
"Whether to highlight syntax in comparisons. Because of Meld’s own color "
"highlighting, this is off by default."
@@ -159,21 +134,21 @@ msgstr ""
"Indica se evidenziare la sintassi; dato il colore di evidenziazione di Meld, "
"è disattivato per impostazione predefinita"
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: data/org.gnome.meld.gschema.xml:86
msgid "Color scheme to use for syntax highlighting"
msgstr "Schema di colori da utilizzare per l'evidenziazione della sintassi"
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: data/org.gnome.meld.gschema.xml:87
msgid "Used by GtkSourceView to determine colors for syntax highlighting"
msgstr ""
"Utilizzato da GtkSourceView per determinare i colori per l'evidenziazione "
"della sintassi"
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: data/org.gnome.meld.gschema.xml:91
msgid "Draw whitespace"
msgstr "Disegna spazi bianchi"
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: data/org.gnome.meld.gschema.xml:92
msgid ""
"If true, whitespace characters will be drawn in comparisons even if they are "
"not in a changed area."
@@ -181,11 +156,11 @@ msgstr ""
"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
+#: data/org.gnome.meld.gschema.xml:101
msgid "Wrap mode"
msgstr "Modalità a capo"
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: data/org.gnome.meld.gschema.xml:102
msgid ""
"Lines in file comparisons will be wrapped according to this setting, either "
"not at all ('none'), at any character ('char') or only at the end of words "
@@ -195,33 +170,32 @@ msgstr ""
"niente (\"none\"), a un qualsiasi carattere (\"char\") o solo alla fine di "
"una parola (\"word\")."
-#: ../data/org.gnome.meld.gschema.xml.h:21
-#: ../meld/resources/ui/statusbar-menu.ui.h:3
+#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
msgid "Highlight current line"
msgstr "Evidenzia la riga corrente"
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: data/org.gnome.meld.gschema.xml:110
msgid ""
"If true, the line containing the cursor will be highlighted in file "
"comparisons."
msgstr "Se VERO, la riga con il cursore viene evidenziata nel confronto."
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: data/org.gnome.meld.gschema.xml:114
msgid "Use the system default monospace font"
msgstr "Usa il carattere a spaziatura fissa di sistema"
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: data/org.gnome.meld.gschema.xml:115
msgid ""
"If false, custom-font will be used instead of the system monospace font."
msgstr ""
"Se FALSO, viene usato custom-font al posto di quello a spaziatura fissa di "
"sistema."
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: data/org.gnome.meld.gschema.xml:119
msgid "Custom font"
msgstr "Carattere personalizzato"
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: data/org.gnome.meld.gschema.xml:120
msgid ""
"The custom font to use, stored as a string and parsed as a Pango font "
"description."
@@ -229,39 +203,39 @@ msgstr ""
"Il carattere personalizzato da usare, salvato come stringa e interpretato "
"come una descrizione di carattere Pango."
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: data/org.gnome.meld.gschema.xml:126
msgid "Show overview source map"
msgstr "Mostra mappa panoramica"
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: data/org.gnome.meld.gschema.xml:127
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
+#: data/org.gnome.meld.gschema.xml:132
msgid "Style of overview map"
msgstr "Stile della mappa panoramica"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: data/org.gnome.meld.gschema.xml:133
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
+#: data/org.gnome.meld.gschema.xml:139
msgid "Ignore blank lines when comparing files"
msgstr "Ignora le righe vuote nei confronti"
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: data/org.gnome.meld.gschema.xml:140
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:33
+#: data/org.gnome.meld.gschema.xml:147
msgid "Use the system default editor"
msgstr "Usa l'editor predefinito di sistema"
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: data/org.gnome.meld.gschema.xml:148
msgid ""
"If false, custom-editor-command will be used instead of the system editor "
"when opening files externally."
@@ -269,11 +243,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:35
+#: data/org.gnome.meld.gschema.xml:152
msgid "The custom editor launch command"
msgstr "Il comando per lanciare l'editor personalizzato"
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: data/org.gnome.meld.gschema.xml:153
msgid ""
"The command used to launch a custom editor. Some limited templating is "
"supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -281,11 +255,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:37
+#: data/org.gnome.meld.gschema.xml:159
msgid "Columns to display"
msgstr "Colonne da visualizzare"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: data/org.gnome.meld.gschema.xml:160
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
@@ -293,23 +267,22 @@ msgstr ""
"Elenco di nomi di colonne nel confronto tra directory e se debbano essere "
"visualizzate."
-#: ../data/org.gnome.meld.gschema.xml.h:39
-#: ../meld/resources/ui/preferences.ui.h:28
+#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
msgid "Ignore symbolic links"
msgstr "Ignorare collegamenti simbolici"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: data/org.gnome.meld.gschema.xml:165
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:41
+#: data/org.gnome.meld.gschema.xml:169
msgid "Use shallow comparison"
msgstr "Usa confronto superficiale"
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: data/org.gnome.meld.gschema.xml:170
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 "
@@ -318,11 +291,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:43
+#: data/org.gnome.meld.gschema.xml:174
msgid "File timestamp resolution"
msgstr "Risoluzione marcatura temporale del file"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: data/org.gnome.meld.gschema.xml:175
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 "
@@ -334,12 +307,11 @@ msgstr ""
"confronto di file provenienti da file system con risoluzioni temporali "
"differenti."
-#: ../data/org.gnome.meld.gschema.xml.h:45
-#: ../meld/resources/ui/preferences.ui.h:25
+#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
msgid "Apply text filters during folder comparisons"
msgstr "Applicare filtri di testo durante i confronti sulla cartella"
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: data/org.gnome.meld.gschema.xml:180
msgid ""
"If true, folder comparisons that compare file contents also apply active "
"text filters and the blank line trimming option, and ignore newline "
@@ -349,19 +321,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:47
+#: data/org.gnome.meld.gschema.xml:184
msgid "File status filters"
msgstr "Filtri sullo stato dei file"
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: data/org.gnome.meld.gschema.xml:185
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:49
+#: data/org.gnome.meld.gschema.xml:191
msgid "Show the version control console output"
msgstr "Mostra l'output del sistema di controllo della versione"
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: data/org.gnome.meld.gschema.xml:192
msgid ""
"If true, a console output section will be shown in version control views, "
"showing the commands run for version control operations."
@@ -369,11 +341,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:51
+#: data/org.gnome.meld.gschema.xml:196
msgid "Version control pane position"
msgstr "Posizione riquadro controllo versione"
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: data/org.gnome.meld.gschema.xml:197
msgid ""
"This is the height of the main version control tree when the console pane is "
"shown."
@@ -381,11 +353,11 @@ msgstr ""
"Questa è l'altezza dell'albero principale del controllo versione quando il "
"riquadro della console è mostrato."
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: data/org.gnome.meld.gschema.xml:201
msgid "Present version comparisons as left-local/right-remote"
msgstr "Confronto come sinistra-locale/destra-remoto"
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: data/org.gnome.meld.gschema.xml:202
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, "
@@ -395,12 +367,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:55
+#: data/org.gnome.meld.gschema.xml:206
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:56
+#: data/org.gnome.meld.gschema.xml:207
msgid ""
"Choices for file order are remote/merged/local and local/merged/remote. This "
"preference only affects three-way comparisons launched from the version "
@@ -411,11 +383,11 @@ msgstr ""
"dalla visualizzazione del controllo versione: viene quindi utilizzata "
"solamente nella risoluzione di unioni/conflitti."
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: data/org.gnome.meld.gschema.xml:211
msgid "Show margin in commit message editor"
msgstr "Mostra i margini nell'editor del messaggio di commit"
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: data/org.gnome.meld.gschema.xml:212
msgid ""
"If true, a guide will be displayed to show what column the margin is at in "
"the version control commit message editor."
@@ -423,11 +395,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:59
+#: data/org.gnome.meld.gschema.xml:216
msgid "Margin column in commit message editor"
msgstr "Colonna nell'editor del messaggio di commit"
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: data/org.gnome.meld.gschema.xml:217
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
@@ -435,11 +407,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:61
+#: data/org.gnome.meld.gschema.xml:221
msgid "Automatically hard-wrap commit messages"
msgstr "A capo automatico nei messaggi di commit"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: data/org.gnome.meld.gschema.xml:222
msgid ""
"If true, the version control commit message editor will hard-wrap (i.e., "
"insert line breaks) at the commit margin before commit."
@@ -447,22 +419,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:63
+#: data/org.gnome.meld.gschema.xml:226
msgid "Version control status filters"
msgstr "Filtri sullo stato del sistema di controllo della versione"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: data/org.gnome.meld.gschema.xml:227
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:65
+#: data/org.gnome.meld.gschema.xml:241
msgid "Filename-based filters"
msgstr "Filtri sui nomi dei file"
-#: ../data/org.gnome.meld.gschema.xml.h:66
+#: data/org.gnome.meld.gschema.xml:242
msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
@@ -470,11 +442,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:67
+#: data/org.gnome.meld.gschema.xml:256
msgid "Text-based filters"
msgstr "Filtri di testo"
-#: ../data/org.gnome.meld.gschema.xml.h:68
+#: data/org.gnome.meld.gschema.xml:257
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, "
@@ -484,616 +456,605 @@ msgstr ""
"confrontare i file. Il testo verrà visualizzato, ma non farà parte del "
"confronto in sé."
-#: ../data/styles/meld-base.xml.h:1
+#: data/styles/meld-base.style-scheme.xml.in:1
msgid "Classic (Meld)"
msgstr "Classico (Meld)"
-#: ../data/styles/meld-base.xml.h:2
+#: data/styles/meld-base.style-scheme.xml.in:3
msgid "Base color scheme for Meld highlighting"
msgstr "Schema di colori base di Meld per l'evidenziazione della sintassi"
-#: ../data/styles/meld-dark.xml.h:1
+#: data/styles/meld-dark.style-scheme.xml.in:1
msgid "Meld dark scheme"
msgstr "Schema scuro Meld"
-#: ../data/styles/meld-dark.xml.h:2
+#: data/styles/meld-dark.style-scheme.xml.in:3
msgid "Dark color scheme for Meld highlighting"
msgstr "Schema colori scuro di Meld per l'evidenziazione della sintassi"
-#: ../meld/resources/gtk/help-overlay.ui.h:1
+#: meld/resources/gtk/help-overlay.ui:14
msgctxt "shortcut window"
msgid "General"
msgstr "Generale"
-#: ../meld/resources/gtk/help-overlay.ui.h:2
+#: meld/resources/gtk/help-overlay.ui:19
msgctxt "shortcut window"
msgid "New comparison"
msgstr "Nuovo confronto"
-#: ../meld/resources/gtk/help-overlay.ui.h:3
+#: meld/resources/gtk/help-overlay.ui:26
msgctxt "shortcut window"
msgid "Close a comparison"
msgstr "Chiude un confronto"
-#: ../meld/resources/gtk/help-overlay.ui.h:4
+#: meld/resources/gtk/help-overlay.ui:33
msgctxt "shortcut window"
msgid "Quit Meld"
msgstr "Esce dal programma"
-#: ../meld/resources/gtk/help-overlay.ui.h:5
+#: meld/resources/gtk/help-overlay.ui:40
msgctxt "shortcut window"
msgid "Stop the current action"
msgstr "Ferma l'azione corrente"
-#: ../meld/resources/gtk/help-overlay.ui.h:6
+#: meld/resources/gtk/help-overlay.ui:47
msgctxt "shortcut window"
msgid "Refresh comparison"
msgstr "Aggiorna il confronto"
-#: ../meld/resources/gtk/help-overlay.ui.h:7
+#: meld/resources/gtk/help-overlay.ui:54
msgctxt "shortcut window"
msgid "Fullscreen"
msgstr "Schermo intero"
-#: ../meld/resources/gtk/help-overlay.ui.h:8
+#: meld/resources/gtk/help-overlay.ui:63
msgctxt "shortcut window"
msgid "Panes"
msgstr "Riquadri"
-#: ../meld/resources/gtk/help-overlay.ui.h:9
+#: meld/resources/gtk/help-overlay.ui:68
msgctxt "shortcut window"
msgid "Previous comparison pane"
msgstr "Riquadro precedente"
-#: ../meld/resources/gtk/help-overlay.ui.h:10
+#: meld/resources/gtk/help-overlay.ui:75
msgctxt "shortcut window"
msgid "Next comparison pane"
msgstr "Riquadro successivo"
-#: ../meld/resources/gtk/help-overlay.ui.h:11
+#: meld/resources/gtk/help-overlay.ui:84
msgctxt "shortcut window"
msgid "Changes"
msgstr "Modifiche"
-#: ../meld/resources/gtk/help-overlay.ui.h:12
+#: meld/resources/gtk/help-overlay.ui:89
msgctxt "shortcut window"
msgid "Go to previous change"
msgstr "Va alla modifica precedente"
-#: ../meld/resources/gtk/help-overlay.ui.h:13
+#: meld/resources/gtk/help-overlay.ui:96
msgctxt "shortcut window"
msgid "Go to next change"
msgstr "Va alla modifica successiva"
-#: ../meld/resources/gtk/help-overlay.ui.h:14
+#: meld/resources/gtk/help-overlay.ui:105
msgctxt "shortcut window"
msgid "Tabs"
msgstr "Schede"
-#: ../meld/resources/gtk/help-overlay.ui.h:15
+#: meld/resources/gtk/help-overlay.ui:110
msgctxt "shortcut window"
msgid "Go to previous tab"
msgstr "Va alla scheda precedente"
-#: ../meld/resources/gtk/help-overlay.ui.h:16
+#: meld/resources/gtk/help-overlay.ui:117
msgctxt "shortcut window"
msgid "Go to next tab"
msgstr "Va alla scheda successiva"
-#: ../meld/resources/gtk/help-overlay.ui.h:17
+#: meld/resources/gtk/help-overlay.ui:124
msgctxt "shortcut window"
msgid "Switch to tab"
msgstr "Passa a una scheda"
-#: ../meld/resources/gtk/help-overlay.ui.h:18
+#: meld/resources/gtk/help-overlay.ui:131
msgctxt "shortcut window"
msgid "Move tab left"
msgstr "Sposta scheda a sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:19
+#: meld/resources/gtk/help-overlay.ui:138
msgctxt "shortcut window"
msgid "Move tab right"
msgstr "Sposta scheda a destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:20
+#: meld/resources/gtk/help-overlay.ui:147
msgctxt "shortcut window"
msgid "Editing"
msgstr "Modifica"
-#: ../meld/resources/gtk/help-overlay.ui.h:21
+#: meld/resources/gtk/help-overlay.ui:152
msgctxt "shortcut window"
msgid "Undo"
msgstr "Annulla"
-#: ../meld/resources/gtk/help-overlay.ui.h:22
+#: meld/resources/gtk/help-overlay.ui:159
msgctxt "shortcut window"
msgid "Redo"
msgstr "Ripeti"
-#: ../meld/resources/gtk/help-overlay.ui.h:23
+#: meld/resources/gtk/help-overlay.ui:166
msgctxt "shortcut window"
msgid "Cut"
msgstr "Taglia"
-#: ../meld/resources/gtk/help-overlay.ui.h:24
+#: meld/resources/gtk/help-overlay.ui:173
msgctxt "shortcut window"
msgid "Copy"
msgstr "Copia"
-#: ../meld/resources/gtk/help-overlay.ui.h:25
+#: meld/resources/gtk/help-overlay.ui:180
msgctxt "shortcut window"
msgid "Paste"
msgstr "Incolla"
-#: ../meld/resources/gtk/help-overlay.ui.h:26
+#: meld/resources/gtk/help-overlay.ui:187
msgctxt "shortcut window"
msgid "Find"
msgstr "Trova"
-#: ../meld/resources/gtk/help-overlay.ui.h:27
+#: meld/resources/gtk/help-overlay.ui:194
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Trova successivo"
-#: ../meld/resources/gtk/help-overlay.ui.h:28
+#: meld/resources/gtk/help-overlay.ui:201
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Trova precedente"
-#: ../meld/resources/gtk/help-overlay.ui.h:29
+#: meld/resources/gtk/help-overlay.ui:208
msgctxt "shortcut window"
msgid "Replace"
msgstr "Sostituisce"
-#: ../meld/resources/gtk/help-overlay.ui.h:30
+#: meld/resources/gtk/help-overlay.ui:217
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Confronto di file"
-#: ../meld/resources/gtk/help-overlay.ui.h:31
+#: meld/resources/gtk/help-overlay.ui:222
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Salva il file corrente"
-#: ../meld/resources/gtk/help-overlay.ui.h:32
+#: meld/resources/gtk/help-overlay.ui:229
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:33
+#: meld/resources/gtk/help-overlay.ui:236
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Salva tutti i file nel confronto"
-#: ../meld/resources/gtk/help-overlay.ui.h:34
+#: meld/resources/gtk/help-overlay.ui:243
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Conflitto precedente"
-#: ../meld/resources/gtk/help-overlay.ui.h:35
+#: meld/resources/gtk/help-overlay.ui:250
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Conflitto successivo"
-#: ../meld/resources/gtk/help-overlay.ui.h:36
+#: meld/resources/gtk/help-overlay.ui:257
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Invia la modifica a sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:37
+#: meld/resources/gtk/help-overlay.ui:264
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Invia la modifica a destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:38
+#: meld/resources/gtk/help-overlay.ui:271
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Prende la modifica da sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:39
+#: meld/resources/gtk/help-overlay.ui:278
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Prende la modifica da destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:40
+#: meld/resources/gtk/help-overlay.ui:285
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Copia la modifica sopra a sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:41
+#: meld/resources/gtk/help-overlay.ui:292
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Copia la modifica sotto a sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:42
+#: meld/resources/gtk/help-overlay.ui:299
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Copia la modifica sopra a destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:43
+#: meld/resources/gtk/help-overlay.ui:306
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Copia la modifica sotto a destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:44
+#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:341
msgctxt "shortcut window"
msgid "Delete change"
msgstr "Elimina la modifica"
-#: ../meld/resources/gtk/help-overlay.ui.h:45
+#: meld/resources/gtk/help-overlay.ui:322
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Confronto cartelle"
-#: ../meld/resources/gtk/help-overlay.ui.h:46
+#: meld/resources/gtk/help-overlay.ui:327
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Copia a sinistra"
-#: ../meld/resources/gtk/help-overlay.ui.h:47
+#: meld/resources/gtk/help-overlay.ui:334
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Copia a destra"
-#: ../meld/resources/gtk/help-overlay.ui.h:48
+#: meld/resources/gtk/help-overlay.ui:350
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Confronto controllo di versione"
-#: ../meld/resources/gtk/help-overlay.ui.h:49
+#: meld/resources/gtk/help-overlay.ui:355
msgctxt "shortcut window"
msgid "Commit to version control"
msgstr "Esegue il commit"
-#: ../meld/resources/gtk/help-overlay.ui.h:50
+#: meld/resources/gtk/help-overlay.ui:362
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Mostra/Nasconde output della console"
-#: ../meld/resources/gtk/menus.ui.h:1
+#: meld/resources/gtk/menus.ui:7
msgid "Refresh"
msgstr "Aggiorna"
-#: ../meld/resources/gtk/menus.ui.h:2
+#: meld/resources/gtk/menus.ui:12
msgid "Stop"
msgstr "Ferma"
-#: ../meld/resources/gtk/menus.ui.h:3
+#: meld/resources/gtk/menus.ui:17
msgid "Fullscreen"
msgstr "Schermo intero"
-#: ../meld/resources/gtk/menus.ui.h:4
+#: meld/resources/gtk/menus.ui:26
msgid "Save As…"
msgstr "Salva come…"
-#: ../meld/resources/gtk/menus.ui.h:5
+#: meld/resources/gtk/menus.ui:30
msgid "Save A_ll"
msgstr "Sal_va tutti"
-#: ../meld/resources/gtk/menus.ui.h:6
+#: meld/resources/gtk/menus.ui:34
msgid "Revert files…"
msgstr "Ripristina file…"
-#: ../meld/resources/gtk/menus.ui.h:7
+#: meld/resources/gtk/menus.ui:38
msgid "Open Externally"
msgstr "Apri esternamente"
-#: ../meld/resources/gtk/menus.ui.h:8
+#: meld/resources/gtk/menus.ui:45
msgid "_Find…"
msgstr "_Trova…"
-#: ../meld/resources/gtk/menus.ui.h:9
+#: meld/resources/gtk/menus.ui:49
msgid "_Replace…"
msgstr "Sostit_uisci…"
-#: ../meld/resources/gtk/menus.ui.h:10
+#: meld/resources/gtk/menus.ui:55
msgid "View"
msgstr "Vista"
-#: ../meld/resources/gtk/menus.ui.h:11
+#: meld/resources/gtk/menus.ui:59
msgid "Overview Map"
msgstr "Mappa panoramica"
-#: ../meld/resources/gtk/menus.ui.h:12
+#: meld/resources/gtk/menus.ui:63
msgid "Version control console"
msgstr "Console controllo di versione"
-#: ../meld/resources/gtk/menus.ui.h:13
+#: meld/resources/gtk/menus.ui:67
msgid "Lock scrolling"
msgstr "Blocca scorrimento"
-#: ../meld/resources/gtk/menus.ui.h:14
+#: meld/resources/gtk/menus.ui:73
msgid "Comparison"
msgstr "Confronto"
-#: ../meld/resources/gtk/menus.ui.h:15
+#: meld/resources/gtk/menus.ui:77
msgid "Merge All from Left"
msgstr "Unisci tutte da sinistra"
-#: ../meld/resources/gtk/menus.ui.h:16
+#: meld/resources/gtk/menus.ui:81
msgid "Merge All from Right"
msgstr "Unisci tutte da destra"
-#: ../meld/resources/gtk/menus.ui.h:17
+#: meld/resources/gtk/menus.ui:85
msgid "Merge All"
msgstr "Unisci tutte"
-#: ../meld/resources/gtk/menus.ui.h:18
-#: ../meld/resources/ui/filediff-menus.ui.h:10
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
msgid "Add Synchronization Point"
msgstr "Aggiungi punto sincronizzazione"
-#: ../meld/resources/gtk/menus.ui.h:19
-#: ../meld/resources/ui/filediff-menus.ui.h:11
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
msgid "Clear Synchronization Points"
msgstr "Pulisci punti sincronizzazione"
-#: ../meld/resources/gtk/menus.ui.h:20
+#: meld/resources/gtk/menus.ui:103
msgid "Format as Patch…"
msgstr "Formatta come patch…"
-#: ../meld/resources/gtk/menus.ui.h:21
+#: meld/resources/gtk/menus.ui:112
msgid "_Preferences"
msgstr "Preferen_ze"
-#: ../meld/resources/gtk/menus.ui.h:22
+#: meld/resources/gtk/menus.ui:116
msgid "Keyboard Shortcuts"
msgstr "Scorciatoie da tastiera"
-#: ../meld/resources/gtk/menus.ui.h:23
+#: meld/resources/gtk/menus.ui:120
msgid "_Help"
msgstr "A_iuto"
-#: ../meld/resources/gtk/menus.ui.h:24
+#: meld/resources/gtk/menus.ui:125
msgid "_About Meld"
msgstr "I_nformazioni su Meld"
-#: ../meld/resources/gtk/menus.ui.h:25
+#: meld/resources/gtk/menus.ui:138
msgid "File status"
msgstr "Stato del file"
-#: ../meld/resources/gtk/menus.ui.h:26
+#: meld/resources/gtk/menus.ui:140
msgid "Same"
msgstr "Identici"
-#: ../meld/resources/gtk/menus.ui.h:27
+#: meld/resources/gtk/menus.ui:144
msgid "New"
msgstr "Nuovi"
-#: ../meld/resources/gtk/menus.ui.h:28 ../meld/vc/_vc.py:77
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/vc/_vc.py:76
msgid "Modified"
msgstr "Modificati"
-#: ../meld/resources/gtk/menus.ui.h:29
+#: meld/resources/gtk/menus.ui:158
msgid "Ignore filename case"
msgstr "Ignora maiuscole/minuscole nel nome del file"
-#: ../meld/resources/gtk/menus.ui.h:30
+#: meld/resources/gtk/menus.ui:171
msgid "Normal"
msgstr "Normale"
-#: ../meld/resources/gtk/menus.ui.h:31 ../meld/vc/_vc.py:71
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
msgid "Unversioned"
msgstr "Non monitorato"
-#: ../meld/resources/gtk/menus.ui.h:32 ../meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
msgid "Ignored"
msgstr "Ignorati"
-#: ../meld/resources/gtk/menus.ui.h:33
+#: meld/resources/gtk/menus.ui:186
msgid "Flatten folders"
msgstr "Appiattisce le cartelle"
-#: ../meld/resources/ui/about-dialog.ui.h:1
-msgid "About Meld"
-msgstr "Informazioni su Meld"
-
-#: ../meld/resources/ui/about-dialog.ui.h:2
+#: meld/resources/ui/about-dialog.ui:8
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
+"Copyright © 2009-2019 Kai Willadsen"
msgstr ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
+"Copyright © 2009-2019 Kai Willadsen"
-#: ../meld/resources/ui/about-dialog.ui.h:4
-msgid "Website"
-msgstr "Sito web"
-
-#: ../meld/resources/ui/about-dialog.ui.h:5
+#: meld/resources/ui/about-dialog.ui:14
msgid "translator-credits"
msgstr "Milo Casagrande <milo milo name>"
-#: ../meld/resources/ui/appwindow.ui.h:2
+#: meld/resources/ui/appwindow.ui:29
msgid "Start a new comparison"
msgstr "Avvia un nuovo confronto"
-#: ../meld/resources/ui/appwindow.ui.h:3
+#: meld/resources/ui/appwindow.ui:45
msgid "Open a recent comparison"
msgstr "Apre un confronto recente"
-#: ../meld/resources/ui/appwindow.ui.h:4
+#: meld/resources/ui/appwindow.ui:73
msgid "Go to the previous change"
msgstr "Va alla modifica precedente"
-#: ../meld/resources/ui/appwindow.ui.h:5
+#: meld/resources/ui/appwindow.ui:93
msgid "Go to the next change"
msgstr "Va alla modifica successiva"
-#: ../meld/resources/ui/appwindow.ui.h:6
+#: meld/resources/ui/appwindow.ui:123
msgid "Go to the previous conflict"
msgstr "Va al conflitto precedente"
-#: ../meld/resources/ui/appwindow.ui.h:7
+#: meld/resources/ui/appwindow.ui:143
msgid "Go to the next conflict"
msgstr "Va al conflitto successivo"
-#: ../meld/resources/ui/appwindow.ui.h:8
+#: meld/resources/ui/appwindow.ui:191
msgid "Version Filters"
msgstr "Filtri versione"
-#: ../meld/resources/ui/appwindow.ui.h:9
-#: ../meld/resources/ui/preferences.ui.h:40
+#: meld/resources/ui/appwindow.ui:206 meld/resources/ui/preferences.ui:1456
msgid "File Filters"
msgstr "Filtri dei file"
-#: ../meld/resources/ui/appwindow.ui.h:10
-#: ../meld/resources/ui/preferences.ui.h:45
+#: meld/resources/ui/appwindow.ui:221 meld/resources/ui/preferences.ui:1641
msgid "Text Filters"
msgstr "Filtri di testo"
-#: ../meld/resources/ui/column-list.ui.h:1
-#: ../meld/resources/ui/filter-list.ui.h:1
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
msgid "Active"
msgstr "Attivo"
-#: ../meld/resources/ui/column-list.ui.h:2
+#: meld/resources/ui/column-list.ui:50
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-menus.ui.h:5 ../meld/vcview.py:740
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:735
msgid "_Remove"
msgstr "_Rimuovi"
-#: ../meld/resources/ui/column-list.ui.h:4
-#: ../meld/resources/ui/filter-list.ui.h:8
+#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
msgid "Move item up"
msgstr "Sposta elemento in su"
-#: ../meld/resources/ui/column-list.ui.h:5
-#: ../meld/resources/ui/filter-list.ui.h:9
+#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
msgid "Move _Up"
msgstr "Sposta _su"
-#: ../meld/resources/ui/column-list.ui.h:6
-#: ../meld/resources/ui/filter-list.ui.h:10
+#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
msgid "Move item down"
msgstr "Sposta elemento in giù"
-#: ../meld/resources/ui/column-list.ui.h:7
-#: ../meld/resources/ui/filter-list.ui.h:11
+#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
msgid "Move _Down"
msgstr "Sposta _giù"
-#: ../meld/resources/ui/commit-dialog.ui.h:1
+#: meld/resources/ui/commit-dialog.ui:8
msgid "Commit"
msgstr "Commit"
-#: ../meld/resources/ui/commit-dialog.ui.h:2
+#: meld/resources/ui/commit-dialog.ui:36
msgid "Commit Files"
msgstr "Commit dei file"
-#: ../meld/resources/ui/commit-dialog.ui.h:3
+#: meld/resources/ui/commit-dialog.ui:117
msgid "Log Message"
msgstr "Messaggio di registro"
-#: ../meld/resources/ui/commit-dialog.ui.h:4
+#: meld/resources/ui/commit-dialog.ui:181
msgid "Previous logs:"
msgstr "Registri precedenti:"
-#: ../meld/resources/ui/commit-dialog.ui.h:5
+#: meld/resources/ui/commit-dialog.ui:259
msgid "Co_mmit"
msgstr "Co_mmit"
-#: ../meld/resources/ui/dirdiff-actions.ui.h:1
+#: meld/resources/ui/dirdiff-actions.ui:20
msgid "Copy to left"
msgstr "Copia a sinistra"
-#: ../meld/resources/ui/dirdiff-actions.ui.h:2
+#: meld/resources/ui/dirdiff-actions.ui:42
msgid "Copy to right"
msgstr "Copia a destra"
-#: ../meld/resources/ui/dirdiff-actions.ui.h:3
+#: meld/resources/ui/dirdiff-actions.ui:66
msgid "Delete selected"
msgstr "Elimina selezione"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:1
+#: meld/resources/ui/dirdiff-menus.ui:7
msgid "_Compare selected files"
msgstr "_Confronta i file selezionati"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:2
+#: meld/resources/ui/dirdiff-menus.ui:14
msgid "Copy to _left"
msgstr "Copia a _sinistra"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:3
+#: meld/resources/ui/dirdiff-menus.ui:18
msgid "Copy to _right"
msgstr "Copia a _destra"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:4
+#: meld/resources/ui/dirdiff-menus.ui:22
msgid "_Delete selected"
msgstr "_Elimina selezione"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:5
+#: meld/resources/ui/dirdiff-menus.ui:29
msgid "Collapse Recursively"
msgstr "Contrai ricorsivamente"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:6
+#: meld/resources/ui/dirdiff-menus.ui:33
msgid "Expand Recursively"
msgstr "Espandi ricorsivamente"
-#: ../meld/resources/ui/dirdiff-menus.ui.h:7
+#: meld/resources/ui/dirdiff-menus.ui:40
msgid "_Open Externally"
msgstr "_Apri esternamente"
-#: ../meld/resources/ui/encoding-selector.ui.h:1
+#: meld/resources/ui/dirdiff-menus.ui:44
+msgid "_Copy File Paths"
+msgstr "Copia _percorsi file"
+
+#: meld/resources/ui/encoding-selector.ui:31
msgid "Search text encoding…"
msgstr "Codifica testo di ricerca…"
-#: ../meld/resources/ui/filediff-actions.ui.h:1
+#: meld/resources/ui/filediff-actions.ui:20
msgid "Push current change to the left"
msgstr "Invia la modifica corrente a sinistra"
-#: ../meld/resources/ui/filediff-actions.ui.h:2
+#: meld/resources/ui/filediff-actions.ui:42
msgid "Push current change to the right"
msgstr "Invia la modifica corrente a destra"
-#: ../meld/resources/ui/filediff-actions.ui.h:3
+#: meld/resources/ui/filediff-actions.ui:65
msgid "Copy chunks"
msgstr "Copia chunk"
-#: ../meld/resources/ui/filediff-actions.ui.h:4
+#: meld/resources/ui/filediff-actions.ui:87
msgid "Delete change"
msgstr "Elimina la modifica"
-#: ../meld/resources/ui/filediff-menus.ui.h:1
+#: meld/resources/ui/filediff-menus.ui:7
msgid "Copy change above the left chunk"
msgstr "Copia la modifica sopra al pezzo a sinistra"
-#: ../meld/resources/ui/filediff-menus.ui.h:2
+#: meld/resources/ui/filediff-menus.ui:11
msgid "Copy change below the left chunk"
msgstr "Copia la modifica sotto al pezzo a sinistra"
-#: ../meld/resources/ui/filediff-menus.ui.h:3
+#: meld/resources/ui/filediff-menus.ui:15
msgid "Copy change above the right chunk"
msgstr "Copia la modifica sopra al pezzo a destra"
-#: ../meld/resources/ui/filediff-menus.ui.h:4
+#: meld/resources/ui/filediff-menus.ui:19
msgid "Copy change below the right chunk"
msgstr "Copia la modifica sotto al pezzo a destra"
-#: ../meld/resources/ui/filediff-menus.ui.h:5
+#: meld/resources/ui/filediff-menus.ui:28
msgid "_Undo"
msgstr "A_nnulla"
-#: ../meld/resources/ui/filediff-menus.ui.h:6
+#: meld/resources/ui/filediff-menus.ui:32
msgid "_Redo"
msgstr "_Ripeti"
-#: ../meld/resources/ui/filediff-menus.ui.h:7
+#: meld/resources/ui/filediff-menus.ui:39
msgid "Cu_t"
msgstr "Ta_glia"
-#: ../meld/resources/ui/filediff-menus.ui.h:8
+#: meld/resources/ui/filediff-menus.ui:43
msgid "_Copy"
msgstr "_Copia"
-#: ../meld/resources/ui/filediff-menus.ui.h:9
+#: meld/resources/ui/filediff-menus.ui:47
msgid "_Paste"
msgstr "_Incolla"
-#: ../meld/resources/ui/filediff.ui.h:1
+#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
+#: meld/resources/ui/filediff.ui:171
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."
@@ -1102,312 +1063,320 @@ msgstr ""
"sbloccarlo e apportare le modifiche: tali modifiche devono però essere "
"salvata su un nuovo file."
-#: ../meld/resources/ui/filediff.ui.h:2
+#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
+#: meld/resources/ui/filediff.ui:185
+msgid "Open file in this pane"
+msgstr "Apre il file in questo riquadro"
+
+#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
+#: meld/resources/ui/filediff.ui:194
+msgid "Save file in this pane"
+msgstr "Salva il file in questo riquadro"
+
+#: meld/resources/ui/filediff.ui:73
msgid "File 3"
msgstr "File 3"
-#: ../meld/resources/ui/filediff.ui.h:3
+#: meld/resources/ui/filediff.ui:142
msgid "File 2"
msgstr "File 2"
-#: ../meld/resources/ui/filediff.ui.h:4
+#: meld/resources/ui/filediff.ui:207
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:17
-#: ../meld/dirdiff.py:509
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
+#: meld/dirdiff.py:508
msgid "Name"
msgstr "Nome"
-#: ../meld/resources/ui/filter-list.ui.h:3
+#: meld/resources/ui/filter-list.ui:68
msgid "Pattern"
msgstr "Modello"
-#: ../meld/resources/ui/filter-list.ui.h:4
+#: meld/resources/ui/filter-list.ui:110
msgid "Add new filter"
msgstr "Aggiungi nuovo filtro"
-#: ../meld/resources/ui/filter-list.ui.h:5
-#: ../meld/resources/ui/vcview-menus.ui.h:4
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
msgid "_Add"
msgstr "A_ggiungi"
-#: ../meld/resources/ui/filter-list.ui.h:6
+#: meld/resources/ui/filter-list.ui:126
msgid "Remove selected filter"
msgstr "Rimuove il filtro selezionato"
-#: ../meld/resources/ui/findbar.ui.h:1
+#: meld/resources/ui/findbar.ui:103
msgid "_Match case"
msgstr "_Maiuscole/Minuscole"
-#: ../meld/resources/ui/findbar.ui.h:2
+#: meld/resources/ui/findbar.ui:119
msgid "Who_le word"
msgstr "Paro_la intera"
-#: ../meld/resources/ui/findbar.ui.h:3
+#: meld/resources/ui/findbar.ui:135
msgid "Regular e_xpression"
msgstr "Espressione _regolare"
-#: ../meld/resources/ui/findbar.ui.h:4
+#: meld/resources/ui/findbar.ui:175
msgid "Wrapped"
msgstr "A capo"
-#: ../meld/resources/ui/findbar.ui.h:5
+#: meld/resources/ui/findbar.ui:193
msgid "Replace _All"
msgstr "Sostituisci _tutti"
-#: ../meld/resources/ui/findbar.ui.h:6 ../meld/dirdiff.py:1042
-#: ../meld/iohelpers.py:117
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1041 meld/iohelpers.py:115
msgid "_Replace"
msgstr "Sostit_uisci"
-#: ../meld/resources/ui/findbar.ui.h:7
+#: meld/resources/ui/findbar.ui:226
msgid "Switch between Find and Find-and-Replace"
msgstr "Passa tra «Cerca» e «Cerca e sostituisci»"
-#: ../meld/resources/ui/language-selector.ui.h:1
+#: meld/resources/ui/language-selector.ui:31
msgid "Search highlight mode…"
msgstr "Modalità evidenziazione ricerca…"
-#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:341
-#: ../meld/newdifftab.py:52
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:345
+#: meld/newdifftab.py:49
msgid "New comparison"
msgstr "Nuovo confronto"
-#: ../meld/resources/ui/new-diff-tab.ui.h:2
+#: meld/resources/ui/new-diff-tab.ui:72
msgid "File"
msgstr "File"
-#: ../meld/resources/ui/new-diff-tab.ui.h:3
+#: meld/resources/ui/new-diff-tab.ui:121
msgid "Folder"
msgstr "Cartella"
-#: ../meld/resources/ui/new-diff-tab.ui.h:4
+#: meld/resources/ui/new-diff-tab.ui:170
msgid "Version control"
msgstr "Controllo della versione"
-#: ../meld/resources/ui/new-diff-tab.ui.h:5
+#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
msgid "_3-way comparison"
msgstr "Confronto a 3-_vie"
-#: ../meld/resources/ui/new-diff-tab.ui.h:6
+#: meld/resources/ui/new-diff-tab.ui:254
msgid "Select First File"
msgstr "Seleziona primo file"
-#: ../meld/resources/ui/new-diff-tab.ui.h:7
+#: meld/resources/ui/new-diff-tab.ui:267
msgid "Select Second File"
msgstr "Seleziona secondo file"
-#: ../meld/resources/ui/new-diff-tab.ui.h:8
+#: meld/resources/ui/new-diff-tab.ui:281
msgid "Select Third File"
msgstr "Seleziona terzo file"
-#: ../meld/resources/ui/new-diff-tab.ui.h:9
+#: meld/resources/ui/new-diff-tab.ui:316
msgid "Select First Folder"
msgstr "Seleziona prima cartella"
-#: ../meld/resources/ui/new-diff-tab.ui.h:10
+#: meld/resources/ui/new-diff-tab.ui:329
msgid "Select Second Folder"
msgstr "Seleziona seconda cartella"
-#: ../meld/resources/ui/new-diff-tab.ui.h:11
+#: meld/resources/ui/new-diff-tab.ui:343
msgid "Select Third Folder"
msgstr "Seleziona terza cartella"
-#: ../meld/resources/ui/new-diff-tab.ui.h:12
+#: meld/resources/ui/new-diff-tab.ui:393
msgid "Select A Version-Controlled Folder"
msgstr "Seleziona cartella con controllo versione"
-#: ../meld/resources/ui/new-diff-tab.ui.h:13
+#: meld/resources/ui/new-diff-tab.ui:442
msgid "_Blank comparison"
msgstr "Confronta spazi _bianchi"
-#: ../meld/resources/ui/new-diff-tab.ui.h:14
+#: meld/resources/ui/new-diff-tab.ui:459
msgid "C_ompare"
msgstr "C_onfronta"
-#: ../meld/resources/ui/notebook-label.ui.h:1
+#: meld/resources/ui/notebook-label.ui:24
msgid "Close Tab"
msgstr "Chiudi scheda"
-#: ../meld/resources/ui/patch-dialog.ui.h:1
+#: meld/resources/ui/patch-dialog.ui:9
msgid "Format as Patch"
msgstr "Formatta come patch"
-#: ../meld/resources/ui/patch-dialog.ui.h:2
+#: meld/resources/ui/patch-dialog.ui:26
msgid "Copy to Clipboard"
msgstr "Copia negli appunti"
-#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:163
+#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
msgid "Save Patch"
msgstr "Salva patch"
-#: ../meld/resources/ui/patch-dialog.ui.h:4
+#: meld/resources/ui/patch-dialog.ui:88
msgid "Use differences between:"
msgstr "Usare differenze tra:"
-#: ../meld/resources/ui/patch-dialog.ui.h:5
+#: meld/resources/ui/patch-dialog.ui:105
msgid "Left and middle panes"
msgstr "Riquadri sinistro e centrale"
-#: ../meld/resources/ui/patch-dialog.ui.h:6
+#: meld/resources/ui/patch-dialog.ui:123
msgid "Middle and right panes"
msgstr "Riquadri centrale e destro"
-#: ../meld/resources/ui/patch-dialog.ui.h:7
+#: meld/resources/ui/patch-dialog.ui:149
msgid "_Reverse patch direction"
msgstr "Inve_rti direzione patch"
-#: ../meld/resources/ui/preferences.ui.h:1
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
msgid "Preferences"
msgstr "Preferenze"
-#: ../meld/resources/ui/preferences.ui.h:2
+#: meld/resources/ui/preferences.ui:75
msgid "Font"
msgstr "Carattere"
-#: ../meld/resources/ui/preferences.ui.h:3
+#: meld/resources/ui/preferences.ui:112
msgid "_Use the system fixed width font"
msgstr "_Usare il carattere a spaziatura fissa di sistema"
-#: ../meld/resources/ui/preferences.ui.h:4
+#: meld/resources/ui/preferences.ui:136
msgid "_Editor font:"
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:292
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:288
msgid "Display"
msgstr "Visualizzazione"
-#: ../meld/resources/ui/preferences.ui.h:6
+#: meld/resources/ui/preferences.ui:241
msgid "_Tab width:"
msgstr "Ampiezza _tabulazione:"
-#: ../meld/resources/ui/preferences.ui.h:7
+#: meld/resources/ui/preferences.ui:274
msgid "_Insert spaces instead of tabs"
msgstr "Inserire _spazi invece di tabulazioni"
-#: ../meld/resources/ui/preferences.ui.h:8
+#: meld/resources/ui/preferences.ui:290
msgid "Enable text _wrapping"
msgstr "_Attivare a capo automatico"
-#: ../meld/resources/ui/preferences.ui.h:9
+#: meld/resources/ui/preferences.ui:312
msgid "Do not _split words over two lines"
msgstr "Non _dividere le parole su due righe"
-#: ../meld/resources/ui/preferences.ui.h:10
+#: meld/resources/ui/preferences.ui:333
msgid "Highlight _current line"
msgstr "Evidenziare la ri_ga corrente"
-#: ../meld/resources/ui/preferences.ui.h:11
+#: meld/resources/ui/preferences.ui:349
msgid "Show _line numbers"
msgstr "Mostrare i _numeri di riga"
-#: ../meld/resources/ui/preferences.ui.h:12
+#: meld/resources/ui/preferences.ui:365
msgid "Show w_hitespace"
msgstr "Mostrare gli spazi _bianchi"
-#: ../meld/resources/ui/preferences.ui.h:13
+#: meld/resources/ui/preferences.ui:381
msgid "Use s_yntax highlighting"
msgstr "Usare _evidenziazione sintassi"
-#: ../meld/resources/ui/preferences.ui.h:14
+#: meld/resources/ui/preferences.ui:404
msgid "Syntax highlighting color scheme:"
msgstr "Schema colore per evidenziazione sintassi:"
-#: ../meld/resources/ui/preferences.ui.h:15
+#: meld/resources/ui/preferences.ui:469
msgid "Code Overview"
msgstr "Panoramica codice"
-#: ../meld/resources/ui/preferences.ui.h:16
+#: meld/resources/ui/preferences.ui:506
msgid "Show overview map"
msgstr "Mostra mappa panoramica"
-#: ../meld/resources/ui/preferences.ui.h:17
+#: meld/resources/ui/preferences.ui:529
msgid "Overview map style:"
msgstr "Stile della mappa panoramica:"
-#: ../meld/resources/ui/preferences.ui.h:18
+#: meld/resources/ui/preferences.ui:596
msgid "External Editor"
msgstr "Editor esterno"
-#: ../meld/resources/ui/preferences.ui.h:19
+#: meld/resources/ui/preferences.ui:632
msgid "Use _default system editor"
msgstr "Usare editor _predefinito di sistema"
-#: ../meld/resources/ui/preferences.ui.h:20
+#: meld/resources/ui/preferences.ui:655
msgid "Edito_r command:"
msgstr "Comando dell'edito_r:"
-#: ../meld/resources/ui/preferences.ui.h:21
+#: meld/resources/ui/preferences.ui:711
msgid "Editor"
msgstr "Editor"
-#: ../meld/resources/ui/preferences.ui.h:22
+#: meld/resources/ui/preferences.ui:732
msgid "Shallow Comparison"
msgstr "Confronto superficiale"
-#: ../meld/resources/ui/preferences.ui.h:23
+#: meld/resources/ui/preferences.ui:768
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:24
+#: meld/resources/ui/preferences.ui:791
msgid "_Timestamp resolution:"
msgstr "Risoluzione marcatura _temporale:"
-#: ../meld/resources/ui/preferences.ui.h:26
+#: meld/resources/ui/preferences.ui:855
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:27
+#: meld/resources/ui/preferences.ui:904
msgid "Symbolic Links"
msgstr "Collegamenti simbolici"
-#: ../meld/resources/ui/preferences.ui.h:29
+#: meld/resources/ui/preferences.ui:972
msgid "Visible Columns"
msgstr "Colonne visibili"
-#: ../meld/resources/ui/preferences.ui.h:30
+#: meld/resources/ui/preferences.ui:1039
msgid "Folder Comparisons"
msgstr "Confronto cartelle"
-#: ../meld/resources/ui/preferences.ui.h:31
+#: meld/resources/ui/preferences.ui:1061
msgid "Version Comparisons"
msgstr "Confronto versione"
-#: ../meld/resources/ui/preferences.ui.h:32
+#: meld/resources/ui/preferences.ui:1104
msgid "_Order when comparing file revisions:"
msgstr "_Ordine nel confrontare revisioni di file:"
-#: ../meld/resources/ui/preferences.ui.h:33
+#: meld/resources/ui/preferences.ui:1151
msgid "Order when _merging files:"
msgstr "Ordine nell'_unione dei file:"
-#: ../meld/resources/ui/preferences.ui.h:34
+#: meld/resources/ui/preferences.ui:1219
msgid "Commit Messages"
msgstr "Messaggio di commit"
-#: ../meld/resources/ui/preferences.ui.h:35
+#: meld/resources/ui/preferences.ui:1260
msgid "Show _right margin at:"
msgstr "Mostrare _il margine destro a:"
-#: ../meld/resources/ui/preferences.ui.h:36
+#: meld/resources/ui/preferences.ui:1301
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:37
+#: meld/resources/ui/preferences.ui:1351
msgid "Version Control"
msgstr "Controllo della versione"
-#: ../meld/resources/ui/preferences.ui.h:38
+#: meld/resources/ui/preferences.ui:1373
msgid "Filename filters"
msgstr "Filtri sui nomi dei file"
-#: ../meld/resources/ui/preferences.ui.h:39
+#: meld/resources/ui/preferences.ui:1411
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -1417,21 +1386,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:41
+#: meld/resources/ui/preferences.ui:1478
msgid "Change trimming"
msgstr "Modifica eliminazioni"
-#: ../meld/resources/ui/preferences.ui.h:42
+#: meld/resources/ui/preferences.ui:1514
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:43
+#: meld/resources/ui/preferences.ui:1558
msgid "Text filters"
msgstr "Filtri di testo"
-#: ../meld/resources/ui/preferences.ui.h:44
+#: meld/resources/ui/preferences.ui:1596
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -1445,264 +1414,264 @@ 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:46
+#: meld/resources/ui/preferences.ui:1687
msgid "Left is remote, right is local"
msgstr "Sinistra è remoto, destra è locale"
-#: ../meld/resources/ui/preferences.ui.h:47
+#: meld/resources/ui/preferences.ui:1691
msgid "Left is local, right is remote"
msgstr "Sinistra è locale, destra è remoto"
-#: ../meld/resources/ui/preferences.ui.h:48
+#: meld/resources/ui/preferences.ui:1705
msgid "Simple change map"
msgstr "Mappa delle modifiche"
-#: ../meld/resources/ui/preferences.ui.h:49
+#: meld/resources/ui/preferences.ui:1709
msgid "Compact source map"
msgstr "Mappa sorgente compatta"
-#: ../meld/resources/ui/preferences.ui.h:50
+#: meld/resources/ui/preferences.ui:1713
msgid "Full source map"
msgstr "Mappa sorgente completa"
-#: ../meld/resources/ui/preferences.ui.h:51
+#: meld/resources/ui/preferences.ui:1727
msgid "Remote, merge, local"
msgstr "Remoto, unione, locale"
-#: ../meld/resources/ui/preferences.ui.h:52
+#: meld/resources/ui/preferences.ui:1731
msgid "Local, merge, remote"
msgstr "Locale, unione, remoto"
-#: ../meld/resources/ui/preferences.ui.h:53
+#: meld/resources/ui/preferences.ui:1753
msgid "1ns (ext4)"
msgstr "1ns (ext4)"
-#: ../meld/resources/ui/preferences.ui.h:54
+#: meld/resources/ui/preferences.ui:1757
msgid "100ns (NTFS)"
msgstr "100ns (NTFS)"
-#: ../meld/resources/ui/preferences.ui.h:55
+#: meld/resources/ui/preferences.ui:1761
msgid "1s (ext2/ext3)"
msgstr "1s (ext2/ext3)"
-#: ../meld/resources/ui/preferences.ui.h:56
+#: meld/resources/ui/preferences.ui:1765
msgid "2s (VFAT)"
msgstr "2s (VFAT)"
-#: ../meld/resources/ui/push-dialog.ui.h:1
+#: meld/resources/ui/push-dialog.ui:9
msgid "Push local commits to remote?"
msgstr "Inviare i commit locali in remoto?"
-#: ../meld/resources/ui/push-dialog.ui.h:2
+#: meld/resources/ui/push-dialog.ui:10
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."
-#: ../meld/resources/ui/push-dialog.ui.h:3
+#: meld/resources/ui/push-dialog.ui:38
msgid "_Push commits"
msgstr "_Push dei commit"
-#: ../meld/resources/ui/recent-selector.ui.h:1
+#: meld/resources/ui/recent-selector.ui:16
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
+#: meld/resources/ui/revert-dialog.ui:9
msgid "Discard unsaved changes to documents?"
msgstr "Scartare le modifiche non salvate dei documenti?"
-#: ../meld/resources/ui/revert-dialog.ui.h:2
+#: meld/resources/ui/revert-dialog.ui:10
msgid "Changes made to the following documents will be permanently lost:"
msgstr ""
"Le modifiche apportate ai seguenti documenti andranno perse per sempre:"
-#: ../meld/resources/ui/revert-dialog.ui.h:3
+#: meld/resources/ui/revert-dialog.ui:39
msgid "_Discard"
msgstr "_Scarta"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:1
+#: meld/resources/ui/save-confirm-dialog.ui:9
msgid "Save changes to documents before closing?"
msgstr "Salvare le modifiche ai documenti prima di chiudere?"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:2
+#: meld/resources/ui/save-confirm-dialog.ui:10
msgid "If you don’t save, changes will be permanently lost."
msgstr "Se non si salva, le modifiche andranno perse per sempre."
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
+#: meld/resources/ui/save-confirm-dialog.ui:24
msgid "Close _without Saving"
msgstr "Chiudi senza sal_vare"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1041
-#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:116
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1040
+#: meld/iohelpers.py:56 meld/iohelpers.py:114
msgid "_Cancel"
msgstr "A_nnulla"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
+#: meld/resources/ui/save-confirm-dialog.ui:52
msgid "_Save"
msgstr "_Salva"
-#: ../meld/resources/ui/statusbar-menu.ui.h:2
+#: meld/resources/ui/statusbar-menu.ui:9
msgid "Show whitespace"
msgstr "Mostra spazi bianchi"
-#: ../meld/resources/ui/statusbar-menu.ui.h:4
+#: meld/resources/ui/statusbar-menu.ui:17
msgid "Text wrapping"
msgstr "A capo automatico"
-#: ../meld/resources/ui/vcview-menus.ui.h:1
+#: meld/resources/ui/vcview-menus.ui:7
msgid "_Compare"
msgstr "C_onfronta"
-#: ../meld/resources/ui/vcview-menus.ui.h:2
+#: meld/resources/ui/vcview-menus.ui:11
msgid "Co_mmit…"
msgstr "Co_mmit…"
-#: ../meld/resources/ui/vcview-menus.ui.h:3
+#: meld/resources/ui/vcview-menus.ui:15
msgid "_Update"
msgstr "A_ggiorna"
-#: ../meld/resources/ui/vcview-menus.ui.h:6
+#: meld/resources/ui/vcview-menus.ui:30
msgid "Re_vert"
msgstr "_Ripristina"
-#: ../meld/resources/ui/vcview-menus.ui.h:7 ../meld/resources/ui/vcview.ui.h:15
+#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
msgid "Delete"
msgstr "Elimina"
-#: ../meld/resources/ui/vcview-menus.ui.h:8
+#: meld/resources/ui/vcview-menus.ui:41
msgid "Mar_k as Resolved"
msgstr "Marca _risolto"
-#: ../meld/resources/ui/vcview.ui.h:1
+#: meld/resources/ui/vcview.ui:73
msgid "Commit…"
msgstr "Commit…"
-#: ../meld/resources/ui/vcview.ui.h:2
+#: meld/resources/ui/vcview.ui:74
msgid "Commit changes to version control"
msgstr "Esegue il commit delle modifiche"
-#: ../meld/resources/ui/vcview.ui.h:3
+#: meld/resources/ui/vcview.ui:86
msgid "Update"
msgstr "Aggiorna"
-#: ../meld/resources/ui/vcview.ui.h:4
+#: meld/resources/ui/vcview.ui:87
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:5
+#: meld/resources/ui/vcview.ui:99
msgid "Push"
msgstr "Push"
-#: ../meld/resources/ui/vcview.ui.h:6
+#: meld/resources/ui/vcview.ui:100
msgid "Push local changes to remote"
msgstr "Invia le modifiche locali in remoto"
-#: ../meld/resources/ui/vcview.ui.h:7
+#: meld/resources/ui/vcview.ui:112
msgid "Add"
msgstr "Aggiungi"
-#: ../meld/resources/ui/vcview.ui.h:8
+#: meld/resources/ui/vcview.ui:113
msgid "Add to version control"
msgstr "Aggiunge al controllo di versione"
-#: ../meld/resources/ui/vcview.ui.h:9
+#: meld/resources/ui/vcview.ui:125
msgid "Remove"
msgstr "Rimuovi"
-#: ../meld/resources/ui/vcview.ui.h:10
+#: meld/resources/ui/vcview.ui:126
msgid "Remove from version control"
msgstr "Rimuove dal controllo di versione"
-#: ../meld/resources/ui/vcview.ui.h:11
+#: meld/resources/ui/vcview.ui:138
msgid "Mark as Resolved"
msgstr "Marca risolto"
-#: ../meld/resources/ui/vcview.ui.h:12
+#: meld/resources/ui/vcview.ui:139
msgid "Mark as resolved in version control"
msgstr "Marca come risolto nel controllo di versione"
-#: ../meld/resources/ui/vcview.ui.h:13
+#: meld/resources/ui/vcview.ui:151
msgid "Revert"
msgstr "Ripristina"
-#: ../meld/resources/ui/vcview.ui.h:14
+#: meld/resources/ui/vcview.ui:152
msgid "Revert working copy to original state"
msgstr "Riporta la copia di lavoro allo stato originale"
-#: ../meld/resources/ui/vcview.ui.h:16
+#: meld/resources/ui/vcview.ui:165
msgid "Delete from working copy"
msgstr "Elimina dalla copia di lavoro"
-#: ../meld/resources/ui/vcview.ui.h:18 ../meld/vcview.py:415
+#: meld/resources/ui/vcview.ui:220 meld/vcview.py:410
msgid "Location"
msgstr "Posizione"
-#: ../meld/resources/ui/vcview.ui.h:19
+#: meld/resources/ui/vcview.ui:229
msgid "Status"
msgstr "Stato"
-#: ../meld/resources/ui/vcview.ui.h:20
+#: meld/resources/ui/vcview.ui:238
msgid "Extra"
msgstr "Extra"
-#: ../meld/resources/ui/vcview.ui.h:21
+#: meld/resources/ui/vcview.ui:270
msgid "Console output"
msgstr "Output della console"
-#: ../meld/actiongutter.py:250
+#: meld/actiongutter.py:247
msgid "Copy _up"
msgstr "Copia _su"
-#: ../meld/actiongutter.py:251
+#: meld/actiongutter.py:248
msgid "Copy _down"
msgstr "Copia _giù"
-#: ../meld/const.py:25
+#: meld/const.py:30
msgid "UNIX (LF)"
msgstr "UNIX (LF)"
-#: ../meld/const.py:26
+#: meld/const.py:31
msgid "DOS/Windows (CR-LF)"
msgstr "DOS/Windows (CR-LF)"
-#: ../meld/const.py:27
+#: meld/const.py:32
msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:530 ../meld/preferences.py:136
+#: meld/dirdiff.py:529 meld/preferences.py:132
msgid "Size"
msgstr "Dimensione"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:538 ../meld/preferences.py:137
+#: meld/dirdiff.py:537 meld/preferences.py:133
msgid "Modification time"
msgstr "Data e ora di modifica"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:546 ../meld/preferences.py:138
+#: meld/dirdiff.py:545 meld/preferences.py:134
msgid "Permissions"
msgstr "Permessi"
-#: ../meld/dirdiff.py:769 ../meld/dirdiff.py:792
+#: meld/dirdiff.py:768 meld/dirdiff.py:791
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Analisi di %s"
-#: ../meld/dirdiff.py:928
+#: meld/dirdiff.py:927
#, python-format
msgid "[%s] Done"
msgstr "[%s] Fatto"
-#: ../meld/dirdiff.py:935
+#: meld/dirdiff.py:934
msgid "Folders have no differences"
msgstr "Le cartelle non presentano alcuna differenza"
-#: ../meld/dirdiff.py:937
+#: meld/dirdiff.py:936
msgid "Contents of scanned files in folders are identical."
msgstr "Il contenuto dei file analizzati nelle cartelle è identico."
-#: ../meld/dirdiff.py:939
+#: meld/dirdiff.py:938
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
@@ -1710,45 +1679,45 @@ msgstr ""
"I file analizzati nelle cartelle sembrerebbero identici, ma il loro "
"contenuto non è stato analizzato."
-#: ../meld/dirdiff.py:942
+#: meld/dirdiff.py:941
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:944
+#: meld/dirdiff.py:943
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:960 ../meld/filediff.py:1755
+#: meld/dirdiff.py:959 meld/filediff.py:1824
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
+#: meld/dirdiff.py:961 meld/filediff.py:1826 meld/filediff.py:1856
+#: meld/filediff.py:1858 meld/ui/msgarea.py:106 meld/ui/msgarea.py:119
msgid "Hi_de"
msgstr "Nascon_di"
-#: ../meld/dirdiff.py:971
+#: meld/dirdiff.py:970
msgid "Multiple errors occurred while scanning this folder"
msgstr ""
"Si sono verificati molteplici errore durante l'analisi di questa cartella"
-#: ../meld/dirdiff.py:972
+#: meld/dirdiff.py:971
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:974
+#: meld/dirdiff.py:973
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:976
+#: meld/dirdiff.py:975
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:978
+#: meld/dirdiff.py:977
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1756,17 +1725,17 @@ msgstr ""
"Confronto eseguito senza distinzione tra maiuscole/minuscole su un file "
"system che applica tale distinzione. Alcuni file sono nascosti:"
-#: ../meld/dirdiff.py:989
+#: meld/dirdiff.py:988
#, python-format
msgid "“%s” hidden by “%s”"
msgstr "«%s» è nascosto da «%s»"
-#: ../meld/dirdiff.py:1045
+#: meld/dirdiff.py:1044
#, python-format
msgid "Replace folder “%s”?"
msgstr "Sostituire la cartella «%s»?"
-#: ../meld/dirdiff.py:1047
+#: meld/dirdiff.py:1046
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
@@ -1776,11 +1745,11 @@ msgstr ""
"Sostituendo la cartella esistente, tutti i file in essa contenuti saranno "
"persi."
-#: ../meld/dirdiff.py:1060
+#: meld/dirdiff.py:1059
msgid "Error copying file"
msgstr "Errore nel copiare il file"
-#: ../meld/dirdiff.py:1061
+#: meld/dirdiff.py:1060
#, python-format
msgid ""
"Couldn’t copy %s\n"
@@ -1791,21 +1760,21 @@ msgstr ""
"Impossibile copiare %s\n"
"su %s.\n"
"\n"
-"%s."
+"%s"
-#: ../meld/dirdiff.py:1086 ../meld/vcview.py:763
+#: meld/dirdiff.py:1085 meld/vcview.py:758
msgid "Error deleting {}"
msgstr "Errore nell'eliminare {}"
-#: ../meld/dirdiff.py:1565
+#: meld/dirdiff.py:1578
msgid "No folder"
msgstr "Nessuna cartella"
-#: ../meld/filediff.py:1065
+#: meld/filediff.py:1116
msgid "Comparison results will be inaccurate"
msgstr "I risultati del confronto non saranno precisi"
-#: ../meld/filediff.py:1067
+#: meld/filediff.py:1118
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
@@ -1813,65 +1782,70 @@ msgstr ""
"Un filtro ha modificato il numero di righe nel file: ciò non è supportato. "
"Il confronto non sarà corretto."
-#: ../meld/filediff.py:1139
+#: meld/filediff.py:1190
msgid "Mark conflict as resolved?"
msgstr "Marcare il conflitto come risolto?"
-#: ../meld/filediff.py:1141
+#: meld/filediff.py:1192
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:1143
+#: meld/filediff.py:1194
msgid "Cancel"
msgstr "Annulla"
-#: ../meld/filediff.py:1144
+#: meld/filediff.py:1195
msgid "Mark _Resolved"
msgstr "Marca _risolto"
-#: ../meld/filediff.py:1463
+#: meld/filediff.py:1520
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Si è verificato un problema nell'aprire il file «%s»."
-#: ../meld/filediff.py:1471
+#: meld/filediff.py:1528
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Il file «%s» sembra essere un file binario."
-#: ../meld/filediff.py:1473
+#: meld/filediff.py:1530
msgid "Do you want to open the file using the default application?"
msgstr "Aprire il file utilizzando l'applicazione predefinita?"
-#: ../meld/filediff.py:1475
+#: meld/filediff.py:1532
msgid "Open"
msgstr "Apri"
-#: ../meld/filediff.py:1491
+#: meld/filediff.py:1546
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Unione dei file"
+
+#: meld/filediff.py:1560
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Calcolo delle differenze"
-#: ../meld/filediff.py:1550
+#: meld/filediff.py:1619
#, python-format
msgid "File %s has changed on disk"
msgstr "Il file «%s» è stato modificato"
-#: ../meld/filediff.py:1551
+#: meld/filediff.py:1620
msgid "Do you want to reload the file?"
msgstr "Ricaricare il file?"
-#: ../meld/filediff.py:1553
+#: meld/filediff.py:1622
msgid "_Reload"
msgstr "_Ricarica"
-#: ../meld/filediff.py:1720
+#: meld/filediff.py:1789
msgid "Files are identical"
msgstr "I file sono identici"
-#: ../meld/filediff.py:1733
+#: meld/filediff.py:1802
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1879,11 +1853,11 @@ msgstr ""
"Sono in uso filtri sul testo e potrebbero nascondere differenze tra i file. "
"Confrontare i file senza i filtri?"
-#: ../meld/filediff.py:1738
+#: meld/filediff.py:1807
msgid "Files differ in line endings only"
msgstr "I file differiscono solo nelle terminazioni di riga"
-#: ../meld/filediff.py:1740
+#: meld/filediff.py:1809
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1892,16 +1866,16 @@ msgstr ""
"I file sono identici, ma differiscono sono nelle terminazioni di riga:\n"
"%s"
-#: ../meld/filediff.py:1760
+#: meld/filediff.py:1829
msgid "Show without filters"
msgstr "Mostra senza filtri"
-#: ../meld/filediff.py:1782
+#: meld/filediff.py:1851
msgid "Change highlighting incomplete"
msgstr "Evidenziazione modifica incompleta"
# (ndt) un po’ libera…
-#: ../meld/filediff.py:1783
+#: meld/filediff.py:1852
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."
@@ -1910,19 +1884,19 @@ msgstr ""
"possibile fare in modo che anche le modifiche di grandi dimensioni vengano "
"evidenziate, ma potrebbe rallentare il programma."
-#: ../meld/filediff.py:1791
+#: meld/filediff.py:1860
msgid "Keep highlighting"
msgstr "Continua a evidenziare"
-#: ../meld/filediff.py:1793
+#: meld/filediff.py:1862
msgid "_Keep highlighting"
msgstr "Continua _evidenziazione"
-#: ../meld/filediff.py:1806
+#: meld/filediff.py:1875
msgid "Saving failed"
msgstr "Salvataggio non riuscito"
-#: ../meld/filediff.py:1807
+#: meld/filediff.py:1876
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
@@ -1930,43 +1904,43 @@ msgstr ""
"Copiare qualsiasi modifica in un altro programma o file per evitare la "
"perdita di dati."
-#: ../meld/filediff.py:1816
+#: meld/filediff.py:1885
msgid "Save Left Pane As"
msgstr "Salva riquadro sinistro come"
-#: ../meld/filediff.py:1818
+#: meld/filediff.py:1887
msgid "Save Middle Pane As"
msgstr "Salva riquadro centrale come"
-#: ../meld/filediff.py:1820
+#: meld/filediff.py:1889
msgid "Save Right Pane As"
msgstr "Salva riquadro destro come"
-#: ../meld/filediff.py:1831
+#: meld/filediff.py:1900
#, python-format
msgid "File %s has changed on disk since it was opened"
msgstr "Il file «%s» è stato modificato"
-#: ../meld/filediff.py:1833
+#: meld/filediff.py:1902
msgid "If you save it, any external changes will be lost."
msgstr "Salvare il file comporterà la perdita delle modifiche esterne."
-#: ../meld/filediff.py:1836
+#: meld/filediff.py:1905
msgid "Save Anyway"
msgstr "Salva comunque"
-#: ../meld/filediff.py:1837
+#: meld/filediff.py:1906
msgid "Don’t Save"
msgstr "Non salvare"
-#: ../meld/filediff.py:1879
+#: meld/filediff.py:1948
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:1883 ../meld/patchdialog.py:142
+#: meld/filediff.py:1952 meld/patchdialog.py:138
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -1975,20 +1949,20 @@ msgstr ""
"Impossibile salvare il file a causa di:\n"
"%s"
-#: ../meld/filediff.py:1887 ../meld/patchdialog.py:141
+#: meld/filediff.py:1956 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Impossibile salvare il file %s."
-#: ../meld/filediff.py:1948
+#: meld/filediff.py:2017
msgid "Open File"
msgstr "Apri file"
-#: ../meld/filediff.py:2292
+#: meld/filediff.py:2371
msgid "Live comparison updating disabled"
msgstr "Aggiornamento automatico dei confronti disabilitato"
-#: ../meld/filediff.py:2293
+#: meld/filediff.py:2372
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -1999,39 +1973,34 @@ msgstr ""
"manualmente, quello automatico verrà ripristinato quando tutti i punti di "
"sincronizzazione saranno rimossi."
-#: ../meld/filemerge.py:37
-#, python-format
-msgid "[%s] Merging files"
-msgstr "[%s] Unione dei file"
-
-#: ../meld/iohelpers.py:43
+#: meld/iohelpers.py:41
msgid "Deleting remote folders is not supported"
msgstr "L'eliminazione di cartelle remote non è supportata"
-#: ../meld/iohelpers.py:45
+#: meld/iohelpers.py:43
msgid "Not a file or directory"
msgstr "Non è un file né una directory"
-#: ../meld/iohelpers.py:49
+#: meld/iohelpers.py:47
msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
msgstr "Impossibile spostare nel cestino «{}». Eliminarlo immediatamente?"
-#: ../meld/iohelpers.py:54
+#: meld/iohelpers.py:52
msgid "This remote location does not support sending items to the trash."
msgstr ""
"Questa posizione remota non supporta lo spostamento degli elementi nel "
"cestino."
-#: ../meld/iohelpers.py:59
+#: meld/iohelpers.py:57
msgid "_Delete Permanently"
msgstr "Elimina _definitivamente"
-#: ../meld/iohelpers.py:110
+#: meld/iohelpers.py:108
#, python-format
msgid "Replace file “%s”?"
msgstr "Sostituire il file «%s»?"
-#: ../meld/iohelpers.py:112
+#: meld/iohelpers.py:110
#, python-format
msgid ""
"A file with this name already exists in “%s”.\n"
@@ -2040,124 +2009,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:171
+#: meld/meldapp.py:179
msgid "wrong number of arguments supplied to --diff"
msgstr "numero errato di argomenti forniti per --diff"
-#: ../meld/meldapp.py:176
+#: meld/meldapp.py:184
msgid "Start with an empty window"
msgstr "Parte con una finestra vuota"
-#: ../meld/meldapp.py:177 ../meld/meldapp.py:179
+#: meld/meldapp.py:185 meld/meldapp.py:187
msgid "file"
msgstr "file"
-#: ../meld/meldapp.py:177 ../meld/meldapp.py:181
+#: meld/meldapp.py:185 meld/meldapp.py:189
msgid "folder"
msgstr "cartella"
-#: ../meld/meldapp.py:178
+#: meld/meldapp.py:186
msgid "Start a version control comparison"
msgstr "Inizia un confronto da controllo di versione"
-#: ../meld/meldapp.py:180
+#: meld/meldapp.py:188
msgid "Start a 2- or 3-way file comparison"
msgstr "Inizia un confronto file a 2 o 3 vie"
-#: ../meld/meldapp.py:182
+#: meld/meldapp.py:190
msgid "Start a 2- or 3-way folder comparison"
msgstr "Inizia un confronto cartella a 2 o 3 vie"
-#: ../meld/meldapp.py:225
+#: meld/meldapp.py:233
#, python-format
msgid "Error: %s\n"
msgstr "Errore: %s\n"
-#: ../meld/meldapp.py:232
+#: meld/meldapp.py:240
msgid "Meld is a file and directory comparison tool."
msgstr "Meld è uno strumento per confrontare file e directory."
-#: ../meld/meldapp.py:236
+#: meld/meldapp.py:244
msgid "Set label to use instead of file name"
msgstr "Imposta l'etichetta da utilizzare al posto del nome del file"
-#: ../meld/meldapp.py:239
+#: meld/meldapp.py:247
msgid "Open a new tab in an already running instance"
msgstr "Apre una nuova scheda in un'istanza già in esecuzione"
-#: ../meld/meldapp.py:242
+#: meld/meldapp.py:250
msgid "Automatically compare all differing files on startup"
msgstr "Confronta automaticamente all'avvio tutti i file diversi"
-#: ../meld/meldapp.py:245
+#: meld/meldapp.py:253
msgid "Ignored for compatibility"
msgstr "Ignorato per compatibilità"
-#: ../meld/meldapp.py:249
+#: meld/meldapp.py:257
msgid "Set the target file for saving a merge result"
msgstr "Imposta il file destinazione per salvare il risultato dell'unione"
-#: ../meld/meldapp.py:252
+#: meld/meldapp.py:260
msgid "Automatically merge files"
msgstr "Unisce automaticamente i file"
-#: ../meld/meldapp.py:256
+#: meld/meldapp.py:264
msgid "Load a saved comparison from a Meld comparison file"
msgstr "Carica un confronto salvato da un file Meld"
-#: ../meld/meldapp.py:260
+#: meld/meldapp.py:268
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:280
+#: meld/meldapp.py:288
#, 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:283
+#: meld/meldapp.py:291
msgid "can’t auto-merge less than 3 files"
msgstr "impossibile eseguire l'unione automatica con meno di 3 file"
-#: ../meld/meldapp.py:285
+#: meld/meldapp.py:293
msgid "can’t auto-merge directories"
msgstr "impossibile eseguire l'unione automatica di directory"
-#: ../meld/meldapp.py:300
+#: meld/meldapp.py:308
msgid "Error reading saved comparison file"
msgstr "Errore nel leggere il file di confronto salvato"
-#: ../meld/meldapp.py:317
+#: meld/meldapp.py:325
#, python-format
msgid "invalid path or URI “%s”"
msgstr "percorso o URI «%s» non valido"
-#: ../meld/meldapp.py:323
+#: meld/meldapp.py:331
msgid "remote folder “{}” not supported"
msgstr "cartella remota «{}» non supportata"
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:117
+#: meld/meldbuffer.py:114
msgid "<unnamed>"
msgstr "<senza nome>"
-#: ../meld/melddoc.py:64
+#: meld/melddoc.py:60
msgid "untitled"
msgstr "senza nome"
-#: ../meld/meldwindow.py:147
+#: meld/meldwindow.py:151
msgid "Filename"
msgstr "Nome file"
-#: ../meld/meldwindow.py:376
+#: meld/meldwindow.py:380
#, 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:397
+#: meld/meldwindow.py:402
msgid "Cannot compare a mixture of files and directories"
msgstr "Non è possibile confrontare sia file che directory"
-#: ../meld/misc.py:152
+#: meld/misc.py:150
msgid ""
"{}\n"
"\n"
@@ -2169,242 +2138,242 @@ msgstr ""
"Riscontrato un errore critico durante l'esecuzione:\n"
"<tt>{}</tt>"
-#: ../meld/misc.py:203
+#: meld/misc.py:201
msgid "[None]"
msgstr "[Nessuno]"
-#: ../meld/preferences.py:41 ../meld/preferences.py:133
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "label"
msgstr "etichetta"
-#: ../meld/preferences.py:41 ../meld/preferences.py:133
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "pattern"
msgstr "modello"
-#: ../meld/recent.py:106
+#: meld/recent.py:104
msgid "Version control:"
msgstr "Controllo della versione:"
-#: ../meld/style.py:95
+#: meld/style.py:90
#, 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
+#: meld/ui/bufferselectors.py:110
#, python-brace-format
msgid "{name} ({charset})"
msgstr "{name} ({charset})"
-#: ../meld/ui/bufferselectors.py:142 ../meld/ui/bufferselectors.py:150
+#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
msgid "Plain Text"
msgstr "Testo semplice"
-#: ../meld/ui/filechooser.py:70
+#: meld/ui/filechooser.py:68
msgid "Autodetect Encoding"
msgstr "Rilevamento automatico codifica"
-#: ../meld/ui/filechooser.py:73
+#: meld/ui/filechooser.py:71
msgid "Current Locale ({})"
msgstr "Codifica attuale ({})"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/ui/statusbar.py:127
+#: meld/ui/statusbar.py:123
#, python-format
msgid "Ln %i, Col %i"
msgstr "Rg %i, Col %d"
-#: ../meld/ui/statusbar.py:187
+#: meld/ui/statusbar.py:183
msgid "Line you want to move the cursor to"
msgstr "Riga su cui spostare il cursore"
-#: ../meld/ui/vcdialogs.py:53
+#: meld/ui/vcdialogs.py:50
msgid "No files will be committed"
msgstr "Non verrà eseguito il commit di alcun file"
#. Translators: First %s is replaced by translated "%d unpushed
#. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:92
+#: meld/vc/git.py:91
#, python-format
msgid "%s in %s"
msgstr "%s su %s"
#. Translators: These messages cover the case where there is
#. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:93 ../meld/vc/git.py:100
+#: meld/vc/git.py:92 meld/vc/git.py:99
#, python-format
msgid "%d unpushed commit"
msgid_plural "%d unpushed commits"
msgstr[0] "%d commit non inviato"
msgstr[1] "%d commit non inviati"
-#: ../meld/vc/git.py:95
+#: meld/vc/git.py:94
#, python-format
msgid "%d branch"
msgid_plural "%d branches"
msgstr[0] "%d ramo"
msgstr[1] "%d rami"
-#: ../meld/vc/git.py:334
+#: meld/vc/git.py:333
#, python-format
msgid "Mode changed from %s to %s"
msgstr "Modalità cambiata da %s a %s"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
msgid "Partially staged"
msgstr "Indicizzato parzialmente"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
msgid "Staged"
msgstr "Indicizzato"
#. Translators: This is the displayed name of a version control system
#. when no version control system is actually found.
-#: ../meld/vc/_null.py:37
+#: meld/vc/_null.py:37
msgid "None"
msgstr "Nessuno"
-#: ../meld/vc/svn.py:203
+#: meld/vc/svn.py:203
#, python-format
msgid "Rev %s"
msgstr "Rev %s"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Merged"
msgstr "Unito"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Base"
msgstr "Base"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Local"
msgstr "Locale"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Remote"
msgstr "Remoto"
-#: ../meld/vc/_vc.py:74
+#: meld/vc/_vc.py:73
msgid "Error"
msgstr "Errore"
-#: ../meld/vc/_vc.py:76
+#: meld/vc/_vc.py:75
msgid "Newly added"
msgstr "Aggiunto di recente"
-#: ../meld/vc/_vc.py:78
+#: meld/vc/_vc.py:77
msgid "Renamed"
msgstr "Rinominato"
-#: ../meld/vc/_vc.py:79
+#: meld/vc/_vc.py:78
msgid "Conflict"
msgstr "Conflitto"
-#: ../meld/vc/_vc.py:80
+#: meld/vc/_vc.py:79
msgid "Removed"
msgstr "Rimosso"
-#: ../meld/vc/_vc.py:81
+#: meld/vc/_vc.py:80
msgid "Missing"
msgstr "Mancante"
-#: ../meld/vc/_vc.py:82
+#: meld/vc/_vc.py:81
msgid "Not present"
msgstr "Non presente"
#. Translators: This error message is shown when no
#. repository of this type is found.
-#: ../meld/vcview.py:337
+#: meld/vcview.py:332
#, 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:341
+#: meld/vcview.py:336
#, 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:345
+#: meld/vcview.py:340
#, python-format
msgid "%(name)s (invalid repository)"
msgstr "%(name)s (repository non valido)"
-#: ../meld/vcview.py:359
+#: meld/vcview.py:354
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:361
+#: meld/vcview.py:356
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:415
+#: meld/vcview.py:410
#, 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:422
+#: meld/vcview.py:417
msgid "Scanning repository"
msgstr "Analisi repository"
-#: ../meld/vcview.py:451
+#: meld/vcview.py:446
#, python-format
msgid "Scanning %s"
msgstr "Analisi di %s"
-#: ../meld/vcview.py:490
+#: meld/vcview.py:485
msgid "(Empty)"
msgstr "(vuoto)"
-#: ../meld/vcview.py:537
+#: meld/vcview.py:532
#, python-format
msgid "%s — local"
msgstr "%s — locale"
-#: ../meld/vcview.py:538
+#: meld/vcview.py:533
#, python-format
msgid "%s — remote"
msgstr "%s — remoto"
-#: ../meld/vcview.py:546
+#: meld/vcview.py:541
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (locale, unione, remoto)"
-#: ../meld/vcview.py:551
+#: meld/vcview.py:546
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (remoto, unione, locale)"
-#: ../meld/vcview.py:562
+#: meld/vcview.py:557
#, python-format
msgid "%s — repository"
msgstr "%s — repository"
-#: ../meld/vcview.py:568
+#: meld/vcview.py:563
#, python-format
msgid "%s (working, repository)"
msgstr "%s (corrente, repository)"
-#: ../meld/vcview.py:572
+#: meld/vcview.py:567
#, python-format
msgid "%s (repository, working)"
msgstr "%s (repository, corrente)"
-#: ../meld/vcview.py:734
+#: meld/vcview.py:729
msgid "Remove folder and all its files?"
msgstr "Rimuovere la cartella e tutti i suoi file?"
-#: ../meld/vcview.py:736
+#: meld/vcview.py:731
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2412,6 +2381,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:849
+#: meld/vcview.py:844
msgid "Clear"
msgstr "Pulisci"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
