Add program support for ru_RU and fix a couple of translations using the |.

diff --git a/ChangeLog b/ChangeLog
index b7234bc7975d3e3f05eede6b9224b79f69ad82a2..9ed5bee2d19555d8d7c88b501806b160dd9a8a76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-06-13  Carl Hetherington  <cth@carlh.net>
 
+       * Make ru_RU translation actually work.
+
        * Update progress bar (sort-of) when finding subtitles (#603).
 
        * Make sure audio mapping view is scrollable when necessary (#597).

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 96c801e303e1728adefda689db4f7e03e8f5d73b..042b7a8fd2da2a6f54290fbe8d6e603dfb5d9e0b 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -160,6 +160,7 @@ private:
                _language->Append (wxT ("Italiano"));
                _language->Append (wxT ("Nederlands"));
                _language->Append (wxT ("Svenska"));
+               _language->Append (wxT ("русский"));
                table->Add (_language);
                
                wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see language changes)"), false);
@@ -209,6 +210,8 @@ private:
                        _language->SetSelection (0);
                } else if (config->language().get_value_or ("") == "nl") {
                        _language->SetSelection (5);
+               } else if (config->language().get_value_or ("") == "ru") {
+                       _language->SetSelection (7);
                } else {
                        _language->SetSelection (1);
                }
@@ -259,6 +262,9 @@ private:
                case 6:
                        Config::instance()->set_language ("sv");
                        break;
+               case 7:
+                       Config::instance()->set_language ("ru");
+                       break;
                }
        }
        

diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index c60d7bd7b2a481c553f1c5d32c1dafe4a8c4ddc3..aed55a3acef5e1755e411c021d063fbb0c0ad8b8 100644 (file)
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/po/ru_RU.po
@@ -334,7 +334,7 @@ msgstr "Преобразование цвета"
 
 #: src/wx/config_dialog.cc:1153
 msgid "Config|Timing"
-msgstr "��онфигурация | ��айминг"
+msgstr "Тайминг"
 
 #: src/wx/report_problem_dialog.cc:64
 msgid "Contact email"
@@ -728,7 +728,7 @@ msgstr "Тип KDM"
 
 #: src/wx/kdm_dialog.cc:99
 msgid "KDM|Timing"
-msgstr "KDM | Тайминг"
+msgstr "Тайминг"
 
 #: src/wx/timeline_dialog.cc:42
 msgid "Keep video in sequence"
@@ -1270,7 +1270,7 @@ msgstr "Линейка..."
 
 #: src/wx/timing_panel.cc:37
 msgid "Timing|Timing"
-msgstr "Тайминг | Тайминг"
+msgstr "Тайминг"
 
 #: src/wx/video_panel.cc:118
 msgid "Top"