Merge master.

9 files changed, 205 insertions, 113 deletions

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 2b07dd1dc..2e6f0557f 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -230,7 +230,7 @@ ConfigDialog::make_defaults_panel ()
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_default_j2k_bandwidth = new wxSpinCtrl (_defaults_panel);
 		s->Add (_default_j2k_bandwidth);
-		add_label_to_sizer (s, _defaults_panel, _("MBps"), false);
+		add_label_to_sizer (s, _defaults_panel, _("Mbit/s"), false);
 		table->Add (s, 1);
 	}
 
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index f246e99e9..831a57a02 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -177,7 +177,7 @@ FilmEditor::make_dcp_panel ()
 		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_j2k_bandwidth = new wxSpinCtrl (_dcp_panel, wxID_ANY);
 		s->Add (_j2k_bandwidth, 1);
-		add_label_to_sizer (s, _dcp_panel, _("MBps"), false);
+		add_label_to_sizer (s, _dcp_panel, _("Mbit/s"), false);
 		grid->Add (s, wxGBPosition (r, 1));
 	}
 	++r;
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 26d0f71ac..773ebba71 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
 "PO-Revision-Date: 2014-01-14 20:00+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,6 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
 msgid "%"
 msgstr "%"
 
@@ -507,10 +508,6 @@ msgstr "Linearisiere Eingangs Gamma für niedrige Werte"
 msgid "Ls"
 msgstr "SL"
 
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "MBps"
-msgstr "MBps"
-
 #: src/wx/film_editor.cc:741
 msgid "MISSING: "
 msgstr "FEHLT:"
@@ -531,6 +528,10 @@ msgstr "KDMs erstellen"
 msgid "Matrix"
 msgstr "Matrix"
 
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+msgid "Mbit/s"
+msgstr ""
+
 #: src/wx/config_dialog.cc:67
 msgid "Metadata"
 msgstr "Metadata"
@@ -748,18 +749,24 @@ msgstr "Studio (z.B. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Untertitel Sprache (z.B. EN)"
 
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle Offset"
-msgstr "Untertitel Offset"
-
-#: src/wx/subtitle_panel.cc:53
+#: src/wx/subtitle_panel.cc:62
 msgid "Subtitle Scale"
 msgstr "Untertitel Größe"
 
-#: src/wx/subtitle_panel.cc:61
+#: src/wx/subtitle_panel.cc:70
 msgid "Subtitle Stream"
 msgstr "Untertitel Spur"
 
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "Subtitle X Offset"
+msgstr "Untertitel Offset"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Subtitle Y Offset"
+msgstr "Untertitel Offset"
+
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Untertitel"
@@ -965,3 +972,6 @@ msgstr "Zeiten"
 #: src/wx/timeline.cc:234
 msgid "video"
 msgstr "Bild"
+
+#~ msgid "MBps"
+#~ msgstr "MBps"
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index b0b5d1b5b..f26468f97 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
 "PO-Revision-Date: 2013-11-09 03:00-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -18,6 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.7\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
 msgid "%"
 msgstr "%"
 
@@ -528,10 +529,6 @@ msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "MBps"
-msgstr "MBps"
-
 #: src/wx/film_editor.cc:741
 msgid "MISSING: "
 msgstr ""
@@ -554,6 +551,10 @@ msgstr "Crear KDMs"
 msgid "Matrix"
 msgstr ""
 
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+msgid "Mbit/s"
+msgstr ""
+
 #: src/wx/config_dialog.cc:67
 msgid "Metadata"
 msgstr ""
@@ -781,19 +782,25 @@ msgstr "Estudio (ej. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Idioma del subtítulo (ej. EN)"
 
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle Offset"
-msgstr "Desplazamiento del subtítulo"
-
-#: src/wx/subtitle_panel.cc:53
+#: src/wx/subtitle_panel.cc:62
 msgid "Subtitle Scale"
 msgstr "Escala del subtítulo"
 
-#: src/wx/subtitle_panel.cc:61
+#: src/wx/subtitle_panel.cc:70
 #, fuzzy
 msgid "Subtitle Stream"
 msgstr "Escala del subtítulo"
 
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "Subtitle X Offset"
+msgstr "Desplazamiento del subtítulo"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Subtitle Y Offset"
+msgstr "Desplazamiento del subtítulo"
+
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Subtítulos"
@@ -999,6 +1006,9 @@ msgstr ""
 msgid "video"
 msgstr "Vídeo"
 
+#~ msgid "MBps"
+#~ msgstr "MBps"
+
 #~ msgid "Length"
 #~ msgstr "Longitud"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 9aa9539c4..a7f5f8c7f 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,17 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
-"PO-Revision-Date: 2013-11-25 19:28+0100\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
+"PO-Revision-Date: 2014-01-25 16:56+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
-"Language: \n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
 msgid "%"
 msgstr "%"
 
@@ -30,7 +31,7 @@ msgstr ""
 
 #: src/wx/config_dialog.cc:131
 msgid "(password will be stored on disk in plaintext)"
-msgstr ""
+msgstr "(le mot de passe sera enregistré sur le disque au format texte)"
 
 #: src/wx/config_dialog.cc:108
 msgid "(restart DCP-o-matic to see language changes)"
@@ -39,11 +40,11 @@ msgstr ""
 
 #: src/wx/audio_mapping_view.cc:135
 msgid "-3dB"
-msgstr ""
+msgstr "-3dB"
 
 #: src/wx/colour_conversion_editor.cc:83
 msgid "1 / "
-msgstr ""
+msgstr "1/"
 
 #: src/wx/audio_panel.cc:236
 msgid "1 channel"
@@ -51,15 +52,15 @@ msgstr "1 canal"
 
 #: src/wx/video_panel.cc:200
 msgid "2D"
-msgstr ""
+msgstr "2D"
 
 #: src/wx/film_editor.cc:218
 msgid "2K"
-msgstr ""
+msgstr "2K"
 
 #: src/wx/film_editor.cc:166
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/wx/video_panel.cc:201
 msgid "3D left/right"
@@ -67,15 +68,15 @@ msgstr "3D gauche/droite"
 
 #: src/wx/video_panel.cc:202
 msgid "3D top/bottom"
-msgstr ""
+msgstr "3D dessus/dessous"
 
 #: src/wx/film_editor.cc:219
 msgid "4K"
-msgstr ""
+msgstr "4K"
 
 #: src/wx/update_dialog.cc:34
 msgid "A new version of DCP-o-matic is available."
-msgstr ""
+msgstr "Une nouvelle version de DCP-o-matic est disponible"
 
 #: src/wx/about_dialog.cc:30
 msgid "About DCP-o-matic"
@@ -130,6 +131,8 @@ msgstr "Canaux audios"
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
+"Le son du canal audio %d sera transféré au canal audio du DCP %d sans "
+"modification."
 
 #: src/wx/audio_mapping_view.cc:328
 #, c-format
@@ -137,6 +140,8 @@ msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
 "%.1fdB."
 msgstr ""
+"Le son du canal audio %d sera transféré au canal audio du DCP %d avec un "
+"gain de %.1fdB."
 
 #: src/wx/job_wrapper.cc:38
 #, c-format
@@ -178,11 +183,11 @@ msgstr "Canaux"
 
 #: src/wx/config_dialog.cc:143
 msgid "Check for testing updates as well as stable ones"
-msgstr ""
+msgstr "Recherche de mises à jour en test aussi bien que stables."
 
 #: src/wx/config_dialog.cc:139
 msgid "Check for updates on startup"
-msgstr ""
+msgstr "Recherche de mises à jour au démarrage."
 
 #: src/wx/content_menu.cc:182
 #, fuzzy
@@ -336,7 +341,7 @@ msgstr "Espace disque requis"
 
 #: src/wx/film_editor.cc:280
 msgid "Down"
-msgstr ""
+msgstr "Descendre"
 
 #: src/wx/kdm_dialog.cc:68
 msgid "Edit Cinema..."
@@ -354,7 +359,7 @@ msgstr "Éditer..."
 
 #: src/wx/cinema_dialog.cc:35
 msgid "Email address for KDM delivery"
-msgstr ""
+msgstr "Adresse email pour l'envoi de KDM"
 
 #: src/wx/servers_list_dialog.cc:30
 #, fuzzy
@@ -367,7 +372,7 @@ msgstr "Serveurs d'encodage"
 
 #: src/wx/film_editor.cc:157
 msgid "Encrypted"
-msgstr ""
+msgstr "Crypté"
 
 #: src/wx/dci_metadata_dialog.cc:59
 msgid "Facility (e.g. DLA)"
@@ -387,7 +392,7 @@ msgstr "Filtres"
 
 #: src/wx/content_menu.cc:52
 msgid "Find missing..."
-msgstr ""
+msgstr "Recherche de l'élément manquant..."
 
 #: src/wx/film_editor.cc:143
 msgid "Frame Rate"
@@ -411,15 +416,15 @@ msgstr "À partir du"
 
 #: src/wx/config_dialog.cc:135
 msgid "From address for KDM emails"
-msgstr ""
+msgstr "Email expéditeur pour les envoi de KDM"
 
 #: src/wx/audio_mapping_view.cc:134
 msgid "Full"
-msgstr ""
+msgstr "Plein"
 
 #: src/wx/timing_panel.cc:42
 msgid "Full length"
-msgstr ""
+msgstr "Durée totale"
 
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
@@ -428,7 +433,7 @@ msgstr "Calculateur de gain"
 #: src/wx/audio_gain_dialog.cc:31
 #, c-format
 msgid "Gain for content channel %d in DCP channel %d"
-msgstr ""
+msgstr "Gain pour le canal audio %d dans le canal du DCP %d"
 
 #: src/wx/properties_dialog.cc:57
 msgid "Gb"
@@ -436,11 +441,11 @@ msgstr "Gb"
 
 #: src/wx/hints_dialog.cc:26
 msgid "Hints"
-msgstr ""
+msgstr "Avertissements"
 
 #: src/wx/servers_list_dialog.cc:40
 msgid "Host"
-msgstr ""
+msgstr "Hôtes"
 
 #: src/wx/server_dialog.cc:41
 msgid "Host name or IP address"
@@ -469,7 +474,7 @@ msgstr "Gamma d'entrée"
 
 #: src/wx/film_editor.cc:222
 msgid "Interop"
-msgstr ""
+msgstr "MXF-Interop"
 
 #: src/wx/config_dialog.cc:340
 msgid "Issuer"
@@ -481,7 +486,7 @@ msgstr "Qualité JPEG2000"
 
 #: src/wx/content_menu.cc:51
 msgid "Join"
-msgstr ""
+msgstr "Ajouter"
 
 #: src/wx/config_dialog.cc:71
 msgid "KDM email"
@@ -511,13 +516,9 @@ msgstr "Linéariser la courbe gamma d'entrée pour les bas niveaux"
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "MBps"
-msgstr "MBps"
-
 #: src/wx/film_editor.cc:741
 msgid "MISSING: "
-msgstr ""
+msgstr "MANQUANT:"
 
 #: src/wx/config_dialog.cc:127
 #, fuzzy
@@ -537,6 +538,10 @@ msgstr "Générer les KDMs"
 msgid "Matrix"
 msgstr "Matrice"
 
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+msgid "Mbit/s"
+msgstr ""
+
 #: src/wx/config_dialog.cc:67
 msgid "Metadata"
 msgstr "Métadonnées"
@@ -565,12 +570,12 @@ msgstr "Nouveau Film"
 
 #: src/wx/update_dialog.cc:36
 msgid "New versions of DCP-o-matic are available."
-msgstr ""
+msgstr "De nouvelles versions de DCP-o-matic sont disponibles."
 
 #: src/wx/audio_mapping_view.cc:323
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
-msgstr ""
+msgstr "Aucun son ne passera du canal audio %d au canal du DCP %d."
 
 #: src/wx/video_panel.cc:198
 msgid "No stretch"
@@ -582,7 +587,7 @@ msgstr "Aucun"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "Off"
-msgstr ""
+msgstr "Eteint"
 
 #: src/wx/config_dialog.cc:119
 msgid "Outgoing mail server"
@@ -619,7 +624,7 @@ msgstr "Lecture"
 
 #: src/wx/timing_panel.cc:51
 msgid "Play length"
-msgstr ""
+msgstr "Durée de lecture"
 
 #: src/wx/audio_plot.cc:43
 msgid "Please wait; audio is being analysed..."
@@ -676,7 +681,7 @@ msgstr "Reprendre"
 
 #: src/wx/audio_mapping_view.cc:331
 msgid "Right click to change gain."
-msgstr ""
+msgstr "Cliquez droit pour modifier le gain."
 
 #: src/wx/video_panel.cc:101
 msgid "Right crop"
@@ -688,7 +693,7 @@ msgstr "Rs"
 
 #: src/wx/film_editor.cc:221
 msgid "SMPTE"
-msgstr ""
+msgstr "SMPTE"
 
 #: src/wx/video_panel.cc:134
 msgid "Scale to"
@@ -729,7 +734,7 @@ msgstr "Analyser le son..."
 
 #: src/wx/film_editor.cc:153
 msgid "Signed"
-msgstr ""
+msgstr "Signé"
 
 #: src/wx/audio_dialog.cc:71
 msgid "Smoothing"
@@ -737,7 +742,7 @@ msgstr "Lissage"
 
 #: src/wx/timeline_dialog.cc:38
 msgid "Snap"
-msgstr ""
+msgstr "Echnager"
 
 #: src/wx/update_dialog.cc:43
 #, fuzzy
@@ -756,18 +761,24 @@ msgstr "Studio (ex. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Langue de sous-titres (ex. FR)"
 
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle Offset"
-msgstr "Décalage du sous-titre"
-
-#: src/wx/subtitle_panel.cc:53
+#: src/wx/subtitle_panel.cc:62
 msgid "Subtitle Scale"
 msgstr "Taille du sous-titre"
 
-#: src/wx/subtitle_panel.cc:61
+#: src/wx/subtitle_panel.cc:70
 msgid "Subtitle Stream"
 msgstr "Flux de sous-titre"
 
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "Subtitle X Offset"
+msgstr "Décalage du sous-titre"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Subtitle Y Offset"
+msgstr "Décalage du sous-titre"
+
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Sous-titres"
@@ -799,10 +810,13 @@ msgid ""
 "missing.  Either try again with the correct content file or remove the "
 "missing content."
 msgstr ""
+"Les fichiers de contenu que vous avez spécifiés ne sont pas les mêmes que "
+"ceux detectés comme manquants. Vous pouvez réessayer avec les contenus "
+"corrects ou supprimer les contenus manquants."
 
 #: src/wx/hints_dialog.cc:97
 msgid "There are no hints: everything looks good!"
-msgstr ""
+msgstr "Il n'y a aucun avertissement: tout semble correct!"
 
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
@@ -826,7 +840,7 @@ msgstr "Timeline..."
 
 #: src/wx/timing_panel.cc:34
 msgid "Timing"
-msgstr ""
+msgstr "Durée"
 
 #: src/wx/video_panel.cc:112
 msgid "Top crop"
@@ -854,11 +868,11 @@ msgstr "Jusqu'au"
 
 #: src/wx/film_editor.cc:278
 msgid "Up"
-msgstr ""
+msgstr "Monter"
 
 #: src/wx/update_dialog.cc:27
 msgid "Update"
-msgstr ""
+msgstr "Mise à jour."
 
 #: src/wx/film_editor.cc:126
 msgid "Use DCI name"
@@ -866,7 +880,7 @@ msgstr "Utiliser le nom DCI"
 
 #: src/wx/config_dialog.cc:369
 msgid "Use all servers"
-msgstr ""
+msgstr "Utiliser tous les serveurs."
 
 #: src/wx/film_editor.cc:147
 msgid "Use best"
@@ -895,7 +909,7 @@ msgstr "Avec sous-titres"
 
 #: src/wx/kdm_dialog.cc:122
 msgid "Write to"
-msgstr ""
+msgstr "Ecrire à"
 
 #: src/wx/about_dialog.cc:91
 msgid "Written by"
@@ -907,6 +921,8 @@ msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
 "join them to ensure smooth joins between the files."
 msgstr ""
+"%d fichiers ressemblent à des fichiers VOB de DVD. Vous devriez les ajouter "
+"afin de vous assurer d'une jonction correcte entre vos fichiers."
 
 #: src/wx/hints_dialog.cc:76
 #, c-format
@@ -914,18 +930,25 @@ msgid ""
 "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
 "projectors.  Use 24 or 48 frames per second to be on the safe side."
 msgstr ""
+"La cadence image de votre DCP (%d ips) peut créer des problèmes avec "
+"quelques projecteurs (anciens).  Utilisez plutôt une cadence de 24 ou 48 "
+"images par seconde pour assurer une plus grande compatibilité."
 
 #: src/wx/hints_dialog.cc:66
 msgid ""
 "Your DCP has an odd number of audio channels.  This is very likely to cause "
 "problems on playback."
 msgstr ""
+"Votre DCP posséde un nombre impair de canaux audio.  Cela peut créer des "
+"problèmes de lecture."
 
 #: src/wx/hints_dialog.cc:70
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
 msgstr ""
+"Votre DCP a moins de 6 canaux audio.  Cela peut créer des problèmes de "
+"lecture sur certains projecteurs."
 
 #: src/wx/timeline.cc:213
 msgid "audio"
@@ -954,16 +977,19 @@ msgstr "s"
 
 #: src/wx/timeline.cc:236
 msgid "still"
-msgstr ""
+msgstr "fixe"
 
 #: src/wx/repeat_dialog.cc:37
 msgid "times"
-msgstr ""
+msgstr "fois"
 
 #: src/wx/timeline.cc:234
 msgid "video"
 msgstr "vidéo"
 
+#~ msgid "MBps"
+#~ msgstr "MBps"
+
 #~ msgid "Length"
 #~ msgstr "Longueur / durée"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 4898658f6..08852b886 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
 "PO-Revision-Date: 2013-04-28 10:27+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -18,6 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.5\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
 msgid "%"
 msgstr "%"
 
@@ -524,10 +525,6 @@ msgstr ""
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "MBps"
-msgstr "MBps"
-
 #: src/wx/film_editor.cc:741
 msgid "MISSING: "
 msgstr ""
@@ -550,6 +547,10 @@ msgstr ""
 msgid "Matrix"
 msgstr ""
 
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+msgid "Mbit/s"
+msgstr ""
+
 #: src/wx/config_dialog.cc:67
 msgid "Metadata"
 msgstr ""
@@ -777,19 +778,25 @@ msgstr "Studio (es. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Lingua dei Sottotitoli (es. FR)"
 
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle Offset"
-msgstr "Sfalsamento dei Sottotitoli"
-
-#: src/wx/subtitle_panel.cc:53
+#: src/wx/subtitle_panel.cc:62
 msgid "Subtitle Scale"
 msgstr "Scala dei Sottotitoli"
 
-#: src/wx/subtitle_panel.cc:61
+#: src/wx/subtitle_panel.cc:70
 #, fuzzy
 msgid "Subtitle Stream"
 msgstr "Scala dei Sottotitoli"
 
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "Subtitle X Offset"
+msgstr "Sfalsamento dei Sottotitoli"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Subtitle Y Offset"
+msgstr "Sfalsamento dei Sottotitoli"
+
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Sottotitoli"
@@ -995,6 +1002,9 @@ msgstr ""
 msgid "video"
 msgstr "Video"
 
+#~ msgid "MBps"
+#~ msgstr "MBps"
+
 #~ msgid "Length"
 #~ msgstr "Lunghezza"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 765d82e6a..6d1977d57 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 00:18+0000\n"
+"POT-Creation-Date: 2014-01-30 21:51+0000\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -18,6 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.3\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
 msgid "%"
 msgstr "%"
 
@@ -510,10 +511,6 @@ msgstr "Linjärisera indatas gammakurva för låga värden"
 msgid "Ls"
 msgstr "Vs"
 
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "MBps"
-msgstr "MBps"
-
 #: src/wx/film_editor.cc:741
 msgid "MISSING: "
 msgstr "SAKNAS:"
@@ -534,6 +531,10 @@ msgstr "Skapa KDM:er"
 msgid "Matrix"
 msgstr "Matris"
 
+#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+msgid "Mbit/s"
+msgstr ""
+
 #: src/wx/config_dialog.cc:67
 msgid "Metadata"
 msgstr "Metadata"
@@ -756,18 +757,24 @@ msgstr "Studio (ex. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Undertextspråk (ex. SV)"
 
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle Offset"
-msgstr "Undertext Förskjutning"
-
-#: src/wx/subtitle_panel.cc:53
+#: src/wx/subtitle_panel.cc:62
 msgid "Subtitle Scale"
 msgstr "Undertext Skalning"
 
-#: src/wx/subtitle_panel.cc:61
+#: src/wx/subtitle_panel.cc:70
 msgid "Subtitle Stream"
 msgstr "Undertextström"
 
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "Subtitle X Offset"
+msgstr "Undertext Förskjutning"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Subtitle Y Offset"
+msgstr "Undertext Förskjutning"
+
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Undertexter"
@@ -975,6 +982,9 @@ msgstr "tider"
 msgid "video"
 msgstr "video"
 
+#~ msgid "MBps"
+#~ msgstr "MBps"
+
 #~ msgid "Length"
 #~ msgstr "Längd"
 
diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index 0e3f2e89d..02c8776d6 100644
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -41,15 +41,24 @@ SubtitlePanel::SubtitlePanel (FilmEditor* e)
 	grid->AddSpacer (0);
 	
 	{
-		add_label_to_sizer (grid, this, _("Subtitle Offset"), true);
+		add_label_to_sizer (grid, this, _("Subtitle X Offset"), true);
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_offset = new wxSpinCtrl (this);
-		s->Add (_offset);
+		_x_offset = new wxSpinCtrl (this);
+		s->Add (_x_offset);
 		add_label_to_sizer (s, this, _("%"), false);
 		grid->Add (s);
 	}
 
 	{
+		add_label_to_sizer (grid, this, _("Subtitle Y Offset"), true);
+		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_y_offset = new wxSpinCtrl (this);
+		s->Add (_y_offset);
+		add_label_to_sizer (s, this, _("%"), false);
+		grid->Add (s);
+	}
+	
+	{
 		add_label_to_sizer (grid, this, _("Subtitle Scale"), true);
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_scale = new wxSpinCtrl (this);
@@ -62,12 +71,14 @@ SubtitlePanel::SubtitlePanel (FilmEditor* e)
 	_stream = new wxChoice (this, wxID_ANY);
 	grid->Add (_stream, 1, wxEXPAND);
 	
-	_offset->SetRange (-100, 100);
+	_x_offset->SetRange (-100, 100);
+	_y_offset->SetRange (-100, 100);
 	_scale->SetRange (1, 1000);
 	_scale->SetValue (100);
 
 	_with_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::with_subtitles_toggled, this));
-	_offset->Bind         (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::offset_changed, this));
+	_x_offset->Bind       (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_offset_changed, this));
+	_y_offset->Bind       (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_offset_changed, this));
 	_scale->Bind          (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::scale_changed, this));
 	_stream->Bind         (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&SubtitlePanel::stream_changed, this));
 }
@@ -119,8 +130,10 @@ SubtitlePanel::film_content_changed (int property)
 			}
 		}
 		setup_sensitivity ();
-	} else if (property == SubtitleContentProperty::SUBTITLE_OFFSET) {
-		checked_set (_offset, scs ? (scs->subtitle_offset() * 100) : 0);
+	} else if (property == SubtitleContentProperty::SUBTITLE_X_OFFSET) {
+		checked_set (_x_offset, scs ? (scs->subtitle_x_offset() * 100) : 0);
+	} else if (property == SubtitleContentProperty::SUBTITLE_Y_OFFSET) {
+		checked_set (_y_offset, scs ? (scs->subtitle_y_offset() * 100) : 0);
 	} else if (property == SubtitleContentProperty::SUBTITLE_SCALE) {
 		checked_set (_scale, scs ? (scs->subtitle_scale() * 100) : 100);
 	}
@@ -147,7 +160,8 @@ SubtitlePanel::setup_sensitivity ()
 	}
 	
 	_with_subtitles->Enable (h);
-	_offset->Enable (j);
+	_x_offset->Enable (j);
+	_y_offset->Enable (j);
 	_scale->Enable (j);
 	_stream->Enable (j);
 }
@@ -175,11 +189,20 @@ SubtitlePanel::stream_changed ()
 }
 
 void
-SubtitlePanel::offset_changed ()
+SubtitlePanel::x_offset_changed ()
+{
+	SubtitleContentList c = _editor->selected_subtitle_content ();
+	if (c.size() == 1) {
+		c.front()->set_subtitle_x_offset (_x_offset->GetValue() / 100.0);
+	}
+}
+
+void
+SubtitlePanel::y_offset_changed ()
 {
 	SubtitleContentList c = _editor->selected_subtitle_content ();
 	if (c.size() == 1) {
-		c.front()->set_subtitle_offset (_offset->GetValue() / 100.0);
+		c.front()->set_subtitle_y_offset (_y_offset->GetValue() / 100.0);
 	}
 }
 
@@ -196,6 +219,7 @@ void
 SubtitlePanel::content_selection_changed ()
 {
 	film_content_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
-	film_content_changed (SubtitleContentProperty::SUBTITLE_OFFSET);
+	film_content_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET);
+	film_content_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET);
 	film_content_changed (SubtitleContentProperty::SUBTITLE_SCALE);
 }
diff --git a/src/wx/subtitle_panel.h b/src/wx/subtitle_panel.h
index 19df26436..20d7c40c2 100644
--- a/src/wx/subtitle_panel.h
+++ b/src/wx/subtitle_panel.h
@@ -33,14 +33,16 @@ public:
 	
 private:
 	void with_subtitles_toggled ();
-	void offset_changed ();
+	void x_offset_changed ();
+	void y_offset_changed ();
 	void scale_changed ();
 	void stream_changed ();
 
 	void setup_sensitivity ();
 	
 	wxCheckBox* _with_subtitles;
-	wxSpinCtrl* _offset;
+	wxSpinCtrl* _x_offset;
+	wxSpinCtrl* _y_offset;
 	wxSpinCtrl* _scale;
 	wxChoice* _stream;
 };