Target pot_merge to merge new .pot files with existing .po; update translations accordingly.

3 files changed, 114 insertions, 119 deletions

diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 55732911c..f91279213 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-05 13:49+0000\n"
+"POT-Creation-Date: 2013-03-20 10:29+0000\n"
 "PO-Revision-Date: 2013-03-20 00:34+0100\n"
 "Last-Translator: FreeDCP.net <freedcp.net@gmail.com>\n"
 "Language-Team: \n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/wx/film_editor.cc:441
+#: src/wx/film_editor.cc:440
 msgid "%"
 msgstr "%"
 
-#: src/wx/film_editor.cc:1226
+#: src/wx/film_editor.cc:1229
 msgid "1 channel"
 msgstr "1 canal"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:184
 msgid "A/B"
 msgstr "A/B"
 
@@ -32,16 +32,15 @@ msgstr "A/B"
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/wx/audio_dialog.cc:32
-#: src/wx/film_editor.cc:78
+#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:382
+#: src/wx/film_editor.cc:381
 msgid "Audio Delay"
 msgstr "D??lai audio"
 
-#: src/wx/film_editor.cc:370
+#: src/wx/film_editor.cc:369
 msgid "Audio Gain"
 msgstr "Gain audio"
 
@@ -54,7 +53,7 @@ msgstr "Langue audio (ex. FR)"
 msgid "Bad setting for %s (%s)"
 msgstr "Mauvais param??tre pour %s (%s)"
 
-#: src/wx/film_editor.cc:297
+#: src/wx/film_editor.cc:296
 msgid "Bottom crop"
 msgstr "D??coupe bas"
 
@@ -66,7 +65,7 @@ msgstr "Parcourir..."
 msgid "But I have to use fader"
 msgstr "Je souhaite utiliser ce volume"
 
-#: src/wx/film_editor.cc:375
+#: src/wx/film_editor.cc:374
 msgid "Calculate..."
 msgstr "Calcul..."
 
@@ -74,15 +73,15 @@ msgstr "Calcul..."
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/wx/film_editor.cc:326
+#: src/wx/film_editor.cc:325
 msgid "Colour look-up table"
 msgstr "Espace colorim??trique"
 
-#: src/wx/film_editor.cc:121
+#: src/wx/film_editor.cc:120
 msgid "Content"
 msgstr "Contenu"
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:130
 msgid "Content Type"
 msgstr "Type de Contenu"
 
@@ -101,7 +100,7 @@ msgstr "Impossible de cr??er le DCP : %s"
 msgid "Could not open content file (%s)"
 msgstr "Ouverture du contenu impossible (%s)"
 
-#: src/wx/film_editor.cc:505
+#: src/wx/film_editor.cc:504
 #, c-format
 msgid "Could not set content: %s"
 msgstr "S??lectionner du contenu impossible : %s"
@@ -114,11 +113,11 @@ msgstr "Cr??er dans le dossier"
 msgid "DCI name"
 msgstr "Nom DCI"
 
-#: src/wx/film_editor.cc:142
+#: src/wx/film_editor.cc:141
 msgid "DCP Frame Rate"
 msgstr "Cadence image du DCP"
 
-#: src/wx/film_editor.cc:110
+#: src/wx/film_editor.cc:109
 msgid "DCP Name"
 msgstr "Nom du DCP"
 
@@ -142,8 +141,7 @@ msgstr "D??tails du nom DCI par d??faut"
 msgid "Default directory for new films"
 msgstr "Dossier par d??faut des nouveaux films"
 
-#: src/wx/film_editor.cc:117
-#: src/wx/job_manager_view.cc:88
+#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:88
 msgid "Details..."
 msgstr "D??tails..."
 
@@ -151,7 +149,7 @@ msgstr "D??tails..."
 msgid "Disk space required"
 msgstr "Espace disque requis"
 
-#: src/wx/film_editor.cc:192
+#: src/wx/film_editor.cc:191
 msgid "Duration"
 msgstr "Dur??e"
 
@@ -159,9 +157,8 @@ msgstr "Dur??e"
 msgid "Edit"
 msgstr "??dition"
 
-#: src/wx/config_dialog.cc:84
-#: src/wx/config_dialog.cc:103
-#: src/wx/film_editor.cc:309
+#: src/wx/config_dialog.cc:84 src/wx/config_dialog.cc:103
+#: src/wx/film_editor.cc:308
 msgid "Edit..."
 msgstr "??diter..."
 
@@ -169,7 +166,7 @@ msgstr "??diter..."
 msgid "Encoding Servers"
 msgstr "Serveurs d'encodage"
 
-#: src/wx/film_editor.cc:177
+#: src/wx/film_editor.cc:176
 msgid "End"
 msgstr "Fin"
 
@@ -177,7 +174,7 @@ msgstr "Fin"
 msgid "Facility (e.g. DLA)"
 msgstr "Laboratoire (ex. DLA)"
 
-#: src/wx/film_editor.cc:74
+#: src/wx/film_editor.cc:73
 msgid "Film"
 msgstr "Film"
 
@@ -189,12 +186,11 @@ msgstr "Propri??t??s du film"
 msgid "Film name"
 msgstr "Nom du Film"
 
-#: src/wx/film_editor.cc:304
-#: src/wx/filter_dialog.cc:32
+#: src/wx/film_editor.cc:303 src/wx/filter_dialog.cc:32
 msgid "Filters"
 msgstr "Filtres"
 
-#: src/wx/film_editor.cc:269
+#: src/wx/film_editor.cc:268
 msgid "Format"
 msgstr "Format"
 
@@ -218,7 +214,7 @@ msgstr "Gb"
 msgid "Host name or IP address"
 msgstr "Nom de l'h??te ou adresse IP"
 
-#: src/wx/film_editor.cc:1230
+#: src/wx/film_editor.cc:1233
 msgid "Hz"
 msgstr "Hz"
 
@@ -230,19 +226,19 @@ msgstr "Je veux le jouer ?? ce volume"
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: src/wx/film_editor.cc:336
+#: src/wx/film_editor.cc:335
 msgid "JPEG2000 bandwidth"
 msgstr "Qualit?? JPEG2000"
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:281
 msgid "Left crop"
 msgstr "D??coupe gauche"
 
-#: src/wx/film_editor.cc:165
+#: src/wx/film_editor.cc:164
 msgid "Length"
 msgstr "Longueur"
 
-#: src/wx/film_editor.cc:340
+#: src/wx/film_editor.cc:339
 msgid "MBps"
 msgstr "MBps"
 
@@ -250,7 +246,7 @@ msgstr "MBps"
 msgid "My Documents"
 msgstr "Mes Documents"
 
-#: src/wx/film_editor.cc:105
+#: src/wx/film_editor.cc:104
 msgid "Name"
 msgstr "Nom"
 
@@ -258,16 +254,15 @@ msgstr "Nom"
 msgid "New Film"
 msgstr "Nouveau Film"
 
-#: src/wx/film_editor.cc:306
-#: src/wx/film_editor.cc:663
+#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:664
 msgid "None"
 msgstr "Aucun"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:135
 msgid "Original Frame Rate"
 msgstr "Cadence d'images originale"
 
-#: src/wx/film_editor.cc:160
+#: src/wx/film_editor.cc:159
 msgid "Original Size"
 msgstr "Taille Originale"
 
@@ -307,7 +302,7 @@ msgstr "??chelle de r??f??rence pour A7B"
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/wx/film_editor.cc:287
+#: src/wx/film_editor.cc:286
 msgid "Right crop"
 msgstr "D??coupe droite"
 
@@ -315,15 +310,15 @@ msgstr "D??coupe droite"
 msgid "Running"
 msgstr "Progression"
 
-#: src/wx/film_editor.cc:316
+#: src/wx/film_editor.cc:315
 msgid "Scaler"
 msgstr "Mise ?? l'??chelle"
 
-#: src/wx/film_editor.cc:408
+#: src/wx/film_editor.cc:407
 msgid "Select Audio File"
 msgstr "S??lectionner le fichier son"
 
-#: src/wx/film_editor.cc:122
+#: src/wx/film_editor.cc:121
 msgid "Select Content File"
 msgstr "S??lectionner le fichier vid??o"
 
@@ -331,7 +326,7 @@ msgstr "S??lectionner le fichier vid??o"
 msgid "Server"
 msgstr "Serveur"
 
-#: src/wx/film_editor.cc:365
+#: src/wx/film_editor.cc:364
 msgid "Show Audio..."
 msgstr "Montrer le son..."
 
@@ -339,7 +334,7 @@ msgstr "Montrer le son..."
 msgid "Smoothing"
 msgstr "Lissage"
 
-#: src/wx/film_editor.cc:174
+#: src/wx/film_editor.cc:173
 msgid "Start"
 msgstr "D??but"
 
@@ -351,15 +346,15 @@ msgstr "Studio (ex. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Langue de sous-titres (ex. FR)"
 
-#: src/wx/film_editor.cc:432
+#: src/wx/film_editor.cc:431
 msgid "Subtitle Offset"
 msgstr "D??calage du sous-titre"
 
-#: src/wx/film_editor.cc:437
+#: src/wx/film_editor.cc:436
 msgid "Subtitle Scale"
 msgstr "Taille du sous-titre"
 
-#: src/wx/film_editor.cc:80
+#: src/wx/film_editor.cc:79
 msgid "Subtitles"
 msgstr "Sous-titres"
 
@@ -399,15 +394,15 @@ msgstr "Nombre de processus ?? utiliser sur cet h??te"
 msgid "Time"
 msgstr "Dur??e"
 
-#: src/wx/film_editor.cc:292
+#: src/wx/film_editor.cc:291
 msgid "Top crop"
 msgstr "D??coupe haut"
 
-#: src/wx/film_editor.cc:172
+#: src/wx/film_editor.cc:171
 msgid "Trim frames"
 msgstr "Images coup??es"
 
-#: src/wx/film_editor.cc:126
+#: src/wx/film_editor.cc:125
 msgid "Trust content's header"
 msgstr "Faire confiance ?? l'en-t??te"
 
@@ -415,31 +410,31 @@ msgstr "Faire confiance ?? l'en-t??te"
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:114
 msgid "Use DCI name"
 msgstr "Utiliser le nom DCI"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/film_editor.cc:145
 msgid "Use best"
 msgstr "Automatique"
 
-#: src/wx/film_editor.cc:392
+#: src/wx/film_editor.cc:391
 msgid "Use content's audio"
 msgstr "Utiliser le son int??gr??"
 
-#: src/wx/film_editor.cc:402
+#: src/wx/film_editor.cc:401
 msgid "Use external audio"
 msgstr "Utiliser une source audio externe"
 
-#: src/wx/film_editor.cc:76
+#: src/wx/film_editor.cc:75
 msgid "Video"
 msgstr "Vid??o"
 
-#: src/wx/film_editor.cc:425
+#: src/wx/film_editor.cc:424
 msgid "With Subtitles"
 msgstr "Avec sous-titres"
 
-#: src/wx/film_editor.cc:1228
+#: src/wx/film_editor.cc:1231
 msgid "channels"
 msgstr "canaux"
 
@@ -447,27 +442,24 @@ msgstr "canaux"
 msgid "counting..."
 msgstr "calcul..."
 
-#: src/wx/film_editor.cc:374
+#: src/wx/film_editor.cc:373
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/film_editor.cc:689
-#: src/wx/film_editor.cc:691
+#: src/wx/film_editor.cc:690 src/wx/film_editor.cc:692
 msgid "frames"
 msgstr "images"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:387
+#: src/wx/film_editor.cc:386
 msgid "ms"
 msgstr "ms"
 
 #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
-#: src/wx/film_editor.cc:198
+#: src/wx/film_editor.cc:197
 msgid "s"
 msgstr "s"
 
-#: src/wx/properties_dialog.cc:62
-#: src/wx/properties_dialog.cc:63
+#: src/wx/properties_dialog.cc:62 src/wx/properties_dialog.cc:63
 msgid "unknown"
 msgstr "inconnu"
-
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index c8fa5815a..7a9e22634 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,25 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-15 08:39+0000\n"
+"POT-Creation-Date: 2013-03-20 10:29+0000\n"
 "PO-Revision-Date: 2013-03-18 17:51+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
+"Language: Italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
-"Language: Italiano\n"
 
-#: src/wx/film_editor.cc:441
+#: src/wx/film_editor.cc:440
 msgid "%"
 msgstr "%"
 
-#: src/wx/film_editor.cc:1230
+#: src/wx/film_editor.cc:1229
 msgid "1 channel"
 msgstr "Canale 1"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:184
 msgid "A/B"
 msgstr "A/B"
 
@@ -33,15 +33,15 @@ msgstr "A/B"
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:78
+#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/film_editor.cc:382
+#: src/wx/film_editor.cc:381
 msgid "Audio Delay"
 msgstr "Ritardo dell'audio"
 
-#: src/wx/film_editor.cc:370
+#: src/wx/film_editor.cc:369
 msgid "Audio Gain"
 msgstr "Guadagno dell'audio"
 
@@ -54,7 +54,7 @@ msgstr "Lingua dell'audio (es. EN)"
 msgid "Bad setting for %s (%s)"
 msgstr "Valore sbagliato per %s (%s)"
 
-#: src/wx/film_editor.cc:297
+#: src/wx/film_editor.cc:296
 msgid "Bottom crop"
 msgstr "Taglio inferiore"
 
@@ -66,7 +66,7 @@ msgstr "Sfoglia..."
 msgid "But I have to use fader"
 msgstr "Ma devo usare il fader"
 
-#: src/wx/film_editor.cc:375
+#: src/wx/film_editor.cc:374
 msgid "Calculate..."
 msgstr "Calcola..."
 
@@ -74,15 +74,15 @@ msgstr "Calcola..."
 msgid "Channels"
 msgstr "Canali"
 
-#: src/wx/film_editor.cc:326
+#: src/wx/film_editor.cc:325
 msgid "Colour look-up table"
 msgstr "Tabella per ricerca del colore"
 
-#: src/wx/film_editor.cc:121
+#: src/wx/film_editor.cc:120
 msgid "Content"
 msgstr "Contenuto"
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:130
 msgid "Content Type"
 msgstr "Tipo di contenuto"
 
@@ -101,7 +101,7 @@ msgstr "Non posso creare il DCP: %s"
 msgid "Could not open content file (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
 
-#: src/wx/film_editor.cc:505
+#: src/wx/film_editor.cc:504
 #, c-format
 msgid "Could not set content: %s"
 msgstr "Non posso regolare il contenuto: %s"
@@ -114,11 +114,11 @@ msgstr "Crea nella cartella"
 msgid "DCI name"
 msgstr "Nome del DCP"
 
-#: src/wx/film_editor.cc:142
+#: src/wx/film_editor.cc:141
 msgid "DCP Frame Rate"
 msgstr "Frequenza fotogrammi del DCP"
 
-#: src/wx/film_editor.cc:110
+#: src/wx/film_editor.cc:109
 msgid "DCP Name"
 msgstr "Nome del DCP"
 
@@ -142,7 +142,7 @@ msgstr "Dettagli del nome di default DCI"
 msgid "Default directory for new films"
 msgstr "Directory di default per i nuovi films"
 
-#: src/wx/film_editor.cc:117 src/wx/job_manager_view.cc:88
+#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:88
 msgid "Details..."
 msgstr "Dettagli"
 
@@ -150,7 +150,7 @@ msgstr "Dettagli"
 msgid "Disk space required"
 msgstr "Spazio su disco rischiesto"
 
-#: src/wx/film_editor.cc:192
+#: src/wx/film_editor.cc:191
 msgid "Duration"
 msgstr "Durata"
 
@@ -159,7 +159,7 @@ msgid "Edit"
 msgstr "Modifica"
 
 #: src/wx/config_dialog.cc:84 src/wx/config_dialog.cc:103
-#: src/wx/film_editor.cc:309
+#: src/wx/film_editor.cc:308
 msgid "Edit..."
 msgstr "Modifica..."
 
@@ -167,7 +167,7 @@ msgstr "Modifica..."
 msgid "Encoding Servers"
 msgstr "Servers di codifica"
 
-#: src/wx/film_editor.cc:177
+#: src/wx/film_editor.cc:176
 msgid "End"
 msgstr "Fine"
 
@@ -175,7 +175,7 @@ msgstr "Fine"
 msgid "Facility (e.g. DLA)"
 msgstr "Facility (es. DLA)"
 
-#: src/wx/film_editor.cc:74
+#: src/wx/film_editor.cc:73
 msgid "Film"
 msgstr "Film"
 
@@ -187,11 +187,11 @@ msgstr "Proprietà del film"
 msgid "Film name"
 msgstr "Nome del film"
 
-#: src/wx/film_editor.cc:304 src/wx/filter_dialog.cc:32
+#: src/wx/film_editor.cc:303 src/wx/filter_dialog.cc:32
 msgid "Filters"
 msgstr "Filtri"
 
-#: src/wx/film_editor.cc:269
+#: src/wx/film_editor.cc:268
 msgid "Format"
 msgstr "Formato"
 
@@ -215,7 +215,7 @@ msgstr "Gb"
 msgid "Host name or IP address"
 msgstr "Nome dell'Host o indirizzo IP"
 
-#: src/wx/film_editor.cc:1234
+#: src/wx/film_editor.cc:1233
 msgid "Hz"
 msgstr "Hz"
 
@@ -227,19 +227,19 @@ msgstr "Voglio riprodurrlo back at fader"
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: src/wx/film_editor.cc:336
+#: src/wx/film_editor.cc:335
 msgid "JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:281
 msgid "Left crop"
 msgstr "Taglio sinistro"
 
-#: src/wx/film_editor.cc:165
+#: src/wx/film_editor.cc:164
 msgid "Length"
 msgstr "Lunghezza"
 
-#: src/wx/film_editor.cc:340
+#: src/wx/film_editor.cc:339
 msgid "MBps"
 msgstr "MBps"
 
@@ -247,7 +247,7 @@ msgstr "MBps"
 msgid "My Documents"
 msgstr "Documenti"
 
-#: src/wx/film_editor.cc:105
+#: src/wx/film_editor.cc:104
 msgid "Name"
 msgstr "Nome"
 
@@ -255,15 +255,15 @@ msgstr "Nome"
 msgid "New Film"
 msgstr "Nuovo Film"
 
-#: src/wx/film_editor.cc:306 src/wx/film_editor.cc:665
+#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:664
 msgid "None"
 msgstr "Nessuno"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:135
 msgid "Original Frame Rate"
 msgstr "Frequenza Fotogrammi Originale"
 
-#: src/wx/film_editor.cc:160
+#: src/wx/film_editor.cc:159
 msgid "Original Size"
 msgstr "Dimensione Originale"
 
@@ -303,7 +303,7 @@ msgstr "Scalatura di riferimento per A/B"
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: src/wx/film_editor.cc:287
+#: src/wx/film_editor.cc:286
 msgid "Right crop"
 msgstr "Taglio destro"
 
@@ -311,15 +311,15 @@ msgstr "Taglio destro"
 msgid "Running"
 msgstr "In corso"
 
-#: src/wx/film_editor.cc:316
+#: src/wx/film_editor.cc:315
 msgid "Scaler"
 msgstr "Scaler"
 
-#: src/wx/film_editor.cc:408
+#: src/wx/film_editor.cc:407
 msgid "Select Audio File"
 msgstr "Seleziona File Audio"
 
-#: src/wx/film_editor.cc:122
+#: src/wx/film_editor.cc:121
 msgid "Select Content File"
 msgstr "Seleziona FIle del Contenuto"
 
@@ -327,7 +327,7 @@ msgstr "Seleziona FIle del Contenuto"
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/film_editor.cc:365
+#: src/wx/film_editor.cc:364
 msgid "Show Audio..."
 msgstr "Mostra Audio..."
 
@@ -335,7 +335,7 @@ msgstr "Mostra Audio..."
 msgid "Smoothing"
 msgstr "Levigatura"
 
-#: src/wx/film_editor.cc:174
+#: src/wx/film_editor.cc:173
 msgid "Start"
 msgstr "Avvio"
 
@@ -347,15 +347,15 @@ msgstr "Studio (es. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Lingua dei Sottotitoli (es. FR)"
 
-#: src/wx/film_editor.cc:432
+#: src/wx/film_editor.cc:431
 msgid "Subtitle Offset"
 msgstr "Sfalsamento dei Sottotitoli"
 
-#: src/wx/film_editor.cc:437
+#: src/wx/film_editor.cc:436
 msgid "Subtitle Scale"
 msgstr "Scala dei Sottotitoli"
 
-#: src/wx/film_editor.cc:80
+#: src/wx/film_editor.cc:79
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
@@ -395,15 +395,15 @@ msgstr "Threads da usare per codificare su questo host"
 msgid "Time"
 msgstr "Tempo"
 
-#: src/wx/film_editor.cc:292
+#: src/wx/film_editor.cc:291
 msgid "Top crop"
 msgstr "Taglio superiore"
 
-#: src/wx/film_editor.cc:172
+#: src/wx/film_editor.cc:171
 msgid "Trim frames"
 msgstr "Taglia fotogrammi"
 
-#: src/wx/film_editor.cc:126
+#: src/wx/film_editor.cc:125
 msgid "Trust content's header"
 msgstr "Conferma l'intestazione del contenuto"
 
@@ -411,31 +411,31 @@ msgstr "Conferma l'intestazione del contenuto"
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:114
 msgid "Use DCI name"
 msgstr "Usa nome DCI"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/film_editor.cc:145
 msgid "Use best"
 msgstr "Usa il migliore"
 
-#: src/wx/film_editor.cc:392
+#: src/wx/film_editor.cc:391
 msgid "Use content's audio"
 msgstr "Usa l'audio del contenuto"
 
-#: src/wx/film_editor.cc:402
+#: src/wx/film_editor.cc:401
 msgid "Use external audio"
 msgstr "Usa l'audio esterno"
 
-#: src/wx/film_editor.cc:76
+#: src/wx/film_editor.cc:75
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/film_editor.cc:425
+#: src/wx/film_editor.cc:424
 msgid "With Subtitles"
 msgstr "Con Sottotitoli"
 
-#: src/wx/film_editor.cc:1232
+#: src/wx/film_editor.cc:1231
 msgid "channels"
 msgstr "canali"
 
@@ -443,21 +443,21 @@ msgstr "canali"
 msgid "counting..."
 msgstr "conteggio..."
 
-#: src/wx/film_editor.cc:374
+#: src/wx/film_editor.cc:373
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/film_editor.cc:691 src/wx/film_editor.cc:693
+#: src/wx/film_editor.cc:690 src/wx/film_editor.cc:692
 msgid "frames"
 msgstr "fotogrammi"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/film_editor.cc:387
+#: src/wx/film_editor.cc:386
 msgid "ms"
 msgstr "ms"
 
 #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
-#: src/wx/film_editor.cc:198
+#: src/wx/film_editor.cc:197
 msgid "s"
 msgstr "s"
 
diff --git a/src/wx/wscript b/src/wx/wscript
index cc303f5e8..42bb8ca88 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -44,3 +44,6 @@ def build(bld):
 
 def pot(bld):
     i18n.pot(os.path.join('src', 'wx'), sources, 'libdvdomatic-wx')
+
+def pot_merge(bld):
+    i18n.pot_merge(os.path.join('src', 'wx'), 'libdvdomatic-wx')