pot_merge.

4 files changed, 107 insertions, 92 deletions

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index a25c1fe2b..22a70f813 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDVDOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-26 14:54+0000\n"
+"POT-Creation-Date: 2013-03-28 10:35+0000\n"
 "PO-Revision-Date: 2013-03-23 22:42-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -102,7 +102,7 @@ msgid "Cannot resample audio as libswresample is not present"
 msgstr ""
 "No se puede redimensionar el sonido porque no se encuentra libswresample"
 
-#: src/lib/util.cc:922
+#: src/lib/util.cc:931
 msgid "Centre"
 msgstr ""
 
@@ -134,15 +134,15 @@ msgstr "No se pudo escribir el fichero remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Desentrelazado por interpolación cúbica"
 
-#: src/lib/util.cc:997
+#: src/lib/util.cc:1006
 msgid "DCP and source have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 
-#: src/lib/util.cc:1007
+#: src/lib/util.cc:1016
 msgid "DCP will run at %1%% of the source speed."
 msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente."
 
-#: src/lib/util.cc:1000
+#: src/lib/util.cc:1009
 msgid "DCP will use every other frame of the source.\n"
 msgstr "El DCP usará fotogramas alternos de la fuente.\n"
 
@@ -165,7 +165,7 @@ msgstr ""
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1002
+#: src/lib/util.cc:1011
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
 
@@ -257,15 +257,15 @@ msgstr ""
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:920
+#: src/lib/util.cc:929
 msgid "Left"
 msgstr ""
 
-#: src/lib/util.cc:924
+#: src/lib/util.cc:933
 msgid "Left surround"
 msgstr ""
 
-#: src/lib/util.cc:923
+#: src/lib/util.cc:932
 msgid "Lfe (sub)"
 msgstr ""
 
@@ -315,15 +315,15 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/util.cc:490
+#: src/lib/util.cc:499
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:921
+#: src/lib/util.cc:930
 msgid "Right"
 msgstr ""
 
-#: src/lib/util.cc:925
+#: src/lib/util.cc:934
 msgid "Right surround"
 msgstr ""
 
@@ -475,7 +475,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:531
+#: src/lib/util.cc:540
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -583,7 +583,7 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:674
+#: src/lib/util.cc:683
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -613,7 +613,7 @@ msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/util.cc:488
+#: src/lib/util.cc:497
 msgid "sRGB"
 msgstr "sRGB"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 640d6dc71..f14cdafa1 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/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-26 14:54+0000\n"
+"POT-Creation-Date: 2013-03-28 10:35+0000\n"
 "PO-Revision-Date: 2013-03-20 00:39+0100\n"
 "Last-Translator: FreeDCP.net <freedcp.net@gmail.com>\n"
 "Language-Team: \n"
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Cannot resample audio as libswresample is not present"
 msgstr "Ré-échantillonnage du son impossible : libswresample est absent"
 
-#: src/lib/util.cc:922
+#: src/lib/util.cc:931
 msgid "Centre"
 msgstr ""
 
@@ -132,15 +132,15 @@ msgstr "Écriture vers fichier distant (%1) impossible"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Désentrelacement cubique interpolé"
 
-#: src/lib/util.cc:997
+#: src/lib/util.cc:1006
 msgid "DCP and source have the same rate.\n"
 msgstr "Le DCP et la source ont les mêmes cadences.\n"
 
-#: src/lib/util.cc:1007
+#: src/lib/util.cc:1016
 msgid "DCP will run at %1%% of the source speed."
 msgstr "La cadence du DCP sera %1%% par rapport à la source"
 
-#: src/lib/util.cc:1000
+#: src/lib/util.cc:1009
 msgid "DCP will use every other frame of the source.\n"
 msgstr "Le DCP utilisera une image sur deux de la source.\n"
 
@@ -163,7 +163,7 @@ msgstr "Filtre anti bourdonnement"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1002
+#: src/lib/util.cc:1011
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Chaque image source sera dupliquée dans le DCP.\n"
 
@@ -255,15 +255,15 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:920
+#: src/lib/util.cc:929
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:924
+#: src/lib/util.cc:933
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:923
+#: src/lib/util.cc:932
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -313,15 +313,15 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/util.cc:490
+#: src/lib/util.cc:499
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:921
+#: src/lib/util.cc:930
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:925
+#: src/lib/util.cc:934
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -473,7 +473,7 @@ msgstr "Un autre filtre de désentrelacement"
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:531
+#: src/lib/util.cc:540
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
@@ -577,7 +577,7 @@ msgstr "minute"
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:674
+#: src/lib/util.cc:683
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 non sélectionnée"
 
@@ -607,7 +607,7 @@ msgstr "sous-titres non-bitmap non supportés actuellement"
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/util.cc:488
+#: src/lib/util.cc:497
 msgid "sRGB"
 msgstr "sRGB"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 67f8f4c45..6de01e576 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-26 14:54+0000\n"
+"POT-Creation-Date: 2013-03-28 10:35+0000\n"
 "PO-Revision-Date: 2013-03-20 11:45+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Cannot resample audio as libswresample is not present"
 msgstr "Non posso ricampionare l'audio perchè libswresample non è presente"
 
-#: src/lib/util.cc:922
+#: src/lib/util.cc:931
 msgid "Centre"
 msgstr ""
 
@@ -133,15 +133,15 @@ msgstr "Non posso scrivere il file remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Deinterlacciatore cubico interpolato"
 
-#: src/lib/util.cc:997
+#: src/lib/util.cc:1006
 msgid "DCP and source have the same rate.\n"
 msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
 
-#: src/lib/util.cc:1007
+#: src/lib/util.cc:1016
 msgid "DCP will run at %1%% of the source speed."
 msgstr "Il DCP andrà al %1%% della velocità del sorgente."
 
-#: src/lib/util.cc:1000
+#: src/lib/util.cc:1009
 msgid "DCP will use every other frame of the source.\n"
 msgstr "Il DCP userà ogni altro fotogramma del sorgente.\n"
 
@@ -164,7 +164,7 @@ msgstr "Filtro deringing"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1002
+#: src/lib/util.cc:1011
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà raddoppiato nel DCP.\n"
 
@@ -256,15 +256,15 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:920
+#: src/lib/util.cc:929
 msgid "Left"
 msgstr ""
 
-#: src/lib/util.cc:924
+#: src/lib/util.cc:933
 msgid "Left surround"
 msgstr ""
 
-#: src/lib/util.cc:923
+#: src/lib/util.cc:932
 msgid "Lfe (sub)"
 msgstr ""
 
@@ -314,15 +314,15 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/util.cc:490
+#: src/lib/util.cc:499
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:921
+#: src/lib/util.cc:930
 msgid "Right"
 msgstr ""
 
-#: src/lib/util.cc:925
+#: src/lib/util.cc:934
 msgid "Right surround"
 msgstr ""
 
@@ -474,7 +474,7 @@ msgstr "Ancora un altro filtro di deinterlacciamento"
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:531
+#: src/lib/util.cc:540
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
@@ -582,7 +582,7 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:674
+#: src/lib/util.cc:683
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -612,7 +612,7 @@ msgstr "sottotitoli non-bitmap non ancora supportati"
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/util.cc:488
+#: src/lib/util.cc:497
 msgid "sRGB"
 msgstr "sRGB"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 23c133a81..151e3ef58 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-26 14:07+0000\n"
+"POT-Creation-Date: 2013-03-28 10:35+0000\n"
 "PO-Revision-Date: 2013-03-28 10:40+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,7 +99,12 @@ msgstr "Kan inte hantera pixelformat %1 under %2"
 
 #: src/lib/encoder.cc:101
 msgid "Cannot resample audio as libswresample is not present"
-msgstr "Kan inte omsampla ljudet eftersom libswresample inte finns tillgängligt"
+msgstr ""
+"Kan inte omsampla ljudet eftersom libswresample inte finns tillgängligt"
+
+#: src/lib/util.cc:931
+msgid "Centre"
+msgstr ""
 
 #: src/lib/scp_dcp_job.cc:109
 msgid "Copy DCP to TMS"
@@ -128,36 +134,26 @@ msgstr "Kunde inte skriva till fjärrfil (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Kubiskt interpolerande avflätare"
 
-#: src/lib/util.cc:997
+#: src/lib/util.cc:1006
 msgid "DCP and source have the same rate.\n"
 msgstr "DCP och källa har samma bildfrekvens.\n"
 
-#: src/lib/util.cc:1007
+#: src/lib/util.cc:1016
 msgid "DCP will run at %1%% of the source speed."
 msgstr "DCP kommer att köras på %1%% av källans hastighet."
 
-#: src/lib/util.cc:1000
+#: src/lib/util.cc:1009
 msgid "DCP will use every other frame of the source.\n"
 msgstr "DCP kommer att använda varannan bild från källan.\n"
 
-#: src/lib/filter.cc:68
-#: src/lib/filter.cc:69
-#: src/lib/filter.cc:70
-#: src/lib/filter.cc:71
-#: src/lib/filter.cc:72
-#: src/lib/filter.cc:73
+#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
+#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
 msgid "De-blocking"
 msgstr "Kantighetsutjämning"
 
-#: src/lib/filter.cc:75
-#: src/lib/filter.cc:76
-#: src/lib/filter.cc:77
-#: src/lib/filter.cc:78
-#: src/lib/filter.cc:79
-#: src/lib/filter.cc:80
-#: src/lib/filter.cc:81
-#: src/lib/filter.cc:82
-#: src/lib/filter.cc:83
+#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:77
+#: src/lib/filter.cc:78 src/lib/filter.cc:79 src/lib/filter.cc:80
+#: src/lib/filter.cc:81 src/lib/filter.cc:82 src/lib/filter.cc:83
 msgid "De-interlacing"
 msgstr "Avflätning"
 
@@ -171,7 +167,7 @@ msgstr "Avringningsfilter"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1002
+#: src/lib/util.cc:1011
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Varje bild från källan kommer att användas två gånger i DCPn.\n"
 
@@ -247,10 +243,13 @@ msgstr "Filter för horisontal kantighetsutjämning"
 msgid "Horizontal deblocking filter A"
 msgstr "Filter för horisontal kantighetsutjämning A"
 
-#: src/lib/job.cc:92
-#: src/lib/job.cc:101
-msgid "It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
-msgstr "Det är inte känt vad som orsakade detta fel. Bästa sättet att rapportera problemet är till DVD-o-matics mejl-lista (dvdomatic@carlh.net)"
+#: src/lib/job.cc:92 src/lib/job.cc:101
+msgid ""
+"It is not known what caused this error.  The best idea is to report the "
+"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+msgstr ""
+"Det är inte känt vad som orsakade detta fel. Bästa sättet att rapportera "
+"problemet är till DVD-o-matics mejl-lista (dvdomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
@@ -260,6 +259,18 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
+#: src/lib/util.cc:929
+msgid "Left"
+msgstr ""
+
+#: src/lib/util.cc:933
+msgid "Left surround"
+msgstr ""
+
+#: src/lib/util.cc:932
+msgid "Lfe (sub)"
+msgstr ""
+
 #: src/lib/filter.cc:75
 msgid "Linear blend deinterlacer"
 msgstr "Linjär blandningsavflätare"
@@ -272,11 +283,8 @@ msgstr "Linjär interpolationsavflätare"
 msgid "Median deinterlacer"
 msgstr "Median-avflätare"
 
-#: src/lib/filter.cc:74
-#: src/lib/filter.cc:85
-#: src/lib/filter.cc:86
-#: src/lib/filter.cc:87
-#: src/lib/filter.cc:90
+#: src/lib/filter.cc:74 src/lib/filter.cc:85 src/lib/filter.cc:86
+#: src/lib/filter.cc:87 src/lib/filter.cc:90
 msgid "Misc"
 msgstr "Diverse"
 
@@ -284,9 +292,7 @@ msgstr "Diverse"
 msgid "Motion compensating deinterlacer"
 msgstr "Rörelsekompenserande avflätare"
 
-#: src/lib/filter.cc:84
-#: src/lib/filter.cc:88
-#: src/lib/filter.cc:89
+#: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
 #: src/lib/filter.cc:91
 msgid "Noise reduction"
 msgstr "Brusreducering"
@@ -311,10 +317,18 @@ msgstr "Offentligt Servicemeddelande"
 msgid "Rating"
 msgstr "Klassificering"
 
-#: src/lib/util.cc:490
+#: src/lib/util.cc:499
 msgid "Rec 709"
 msgstr "Rec 709"
 
+#: src/lib/util.cc:930
+msgid "Right"
+msgstr ""
+
+#: src/lib/util.cc:934
+msgid "Right surround"
+msgstr ""
+
 #: src/lib/scp_dcp_job.cc:133
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
@@ -385,7 +399,8 @@ msgstr "Källan skalad för att rymmas inom Flat utan att ändra bildförhållan
 
 #: src/lib/format.cc:136
 msgid "Source scaled to fit Scope preserving its aspect ratio"
-msgstr "Källan skalad för att rymmas inom Scope utan att ändra bildförhållandet"
+msgstr ""
+"Källan skalad för att rymmas inom Scope utan att ändra bildförhållandet"
 
 #: src/lib/scaler.cc:68
 msgid "Spline"
@@ -410,8 +425,12 @@ msgid "Test"
 msgstr "Test"
 
 #: src/lib/job.cc:77
-msgid "The drive that the film is stored on is low in disc space.  Free some more space and try again."
-msgstr "Enheten som filmen lagras på har för lite ledigt utrymme. Frigör utrymme och försök igen."
+msgid ""
+"The drive that the film is stored on is low in disc space.  Free some more "
+"space and try again."
+msgstr ""
+"Enheten som filmen lagras på har för lite ledigt utrymme. Frigör utrymme och "
+"försök igen."
 
 #: src/lib/dcp_content_type.cc:46
 msgid "Trailer"
@@ -466,7 +485,7 @@ msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # mer svengelska
-#: src/lib/util.cc:531
+#: src/lib/util.cc:540
 #, fuzzy
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
@@ -523,8 +542,7 @@ msgstr "kunde inte öppna fil för läsning"
 msgid "could not read from file %1 (%2)"
 msgstr "kunde inte läsa från fil %1 (%2)"
 
-#: src/lib/encoder.cc:137
-#: src/lib/encoder.cc:314
+#: src/lib/encoder.cc:137 src/lib/encoder.cc:314
 msgid "could not run sample-rate converter"
 msgstr "kunde inte köra sampelhastighetskonverteraren"
 
@@ -560,8 +578,7 @@ msgstr "bilder per sekund"
 msgid "hour"
 msgstr "timme"
 
-#: src/lib/util.cc:112
-#: src/lib/util.cc:117
+#: src/lib/util.cc:112 src/lib/util.cc:117
 msgid "hours"
 msgstr "timmar"
 
@@ -573,7 +590,7 @@ msgstr "minut"
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:674
+#: src/lib/util.cc:683
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -585,8 +602,7 @@ msgstr "saknad nödvändig inställning %1"
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:263
-#: src/lib/film.cc:308
+#: src/lib/film.cc:263 src/lib/film.cc:308
 msgid "name"
 msgstr "namn"
 
@@ -604,7 +620,7 @@ msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/util.cc:488
+#: src/lib/util.cc:497
 msgid "sRGB"
 msgstr "sRGB"
 
@@ -619,4 +635,3 @@ msgstr "stillbild"
 #: src/lib/film.cc:274
 msgid "video"
 msgstr "video"
-