Update translation.

diff --git a/globals.hpp b/globals.hpp
index 797942e..61530f5 100644 (file)
--- a/globals.hpp
+++ b/globals.hpp
@@ -4,7 +4,7 @@
 
 // Will widget check for internet connection presence?
 // For debuggin in scratchbox must be set to 0, for real device, set 1
-#define CHECK_FOR_CONNECTION 0
+#define CHECK_FOR_CONNECTION 1
 
 
 #endif // __GLOBALS_H__

diff --git a/main.cpp b/main.cpp
index f8ffb69..e453c2c 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -10,6 +10,11 @@ int main(int argc, char *argv[])
     QApplication::setApplicationName ("yandex-traffic-widget");
 
     QApplication app (argc, argv);
+    QTranslator translator;
+
+    translator.load (QString ("yandex-traffic-widget") + "_ru", "/usr/share/yandex-traffic-widget/");
+    app.installTranslator (&translator);
+
     MainWidget w;
     QMaemo5HomescreenAdaptor *adaptor = new QMaemo5HomescreenAdaptor (&w);
 

diff --git a/mainwidget.cpp b/mainwidget.cpp
index 187602f..902aa02 100644 (file)
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -32,7 +32,7 @@ MainWidget::MainWidget ()
     applySettings ();
 
     connect (_traffic, SIGNAL (updated ()), SLOT (trafficUpdated ()));
-    connect (_timer, SIGNAL (timeout ()), SLOT (updateDate ()));
+    connect (_timer, SIGNAL (timeout ()), SLOT (updateData ()));
 
     updateData ();
 }
@@ -73,7 +73,7 @@ void MainWidget::trafficUpdated ()
 
         if (_settings->check (Settings::C_ShowRank)) {
             data.append (QString::number (info.level ()));
-            data.append (info.level () > 1 ? tr (" points") : tr (" point"));
+            data.append (tr ("%n point(s)", "", info.level ()));
             first = false;
         }
 

diff --git a/settings.cpp b/settings.cpp
index 6831ecb..fb95c54 100644 (file)
--- a/settings.cpp
+++ b/settings.cpp
@@ -24,7 +24,8 @@ void Settings::load ()
     _checks[C_UpdateOnGSM] = settings.value ("checks/updateOnGSM", _checks[C_UpdateOnGSM]).toBool ();
     _checks[C_UpdateWhenLocked] = settings.value ("checks/updateWhenLocked", _checks[C_UpdateWhenLocked]).toBool ();
 
-    loadCities (&settings);
+    // Do we really need to cache cities?
+    // loadCities (&settings);
 
     _updateIntervalIndex = minutes2IntervalIndex (settings.value ("updateInterval", intervalIndex2Minutes (_updateIntervalIndex)).toInt ());
 }
@@ -46,7 +47,7 @@ void Settings::save ()
 
     settings.setValue ("updateInterval", intervalIndex2Minutes (_updateIntervalIndex));
 
-    saveCities (&settings);
+//    saveCities (&settings);
 }
 
 

diff --git a/settingsDialog.cpp b/settingsDialog.cpp
index 7dac9e7..f65fe36 100644 (file)
--- a/settingsDialog.cpp
+++ b/settingsDialog.cpp
@@ -55,7 +55,7 @@ void SettingsDialog::updateDisplayButtonValue ()
     QString val;
     QStringList list;
 
-    val = tr ("City: ") + _settings->cities ()[_settings->regionID ()] + ", " + tr ("Data: ");
+    val = tr ("City:") + " " + _settings->cities ()[_settings->regionID ()] + ", " + tr ("Display:") + " ";
 
     if (_settings->check (Settings::C_ShowLight))
         list.append (tr ("lights"));
@@ -75,7 +75,7 @@ void SettingsDialog::updateUpdateButtonValue ()
     QStringList list, intervals = _settings->updateIntervals ();
     QString val;
 
-    val = tr ("Interval: ") + intervals[_settings->getUpdateIntervalIndex ()] + ", " + tr ("Update via: ");
+    val = tr ("Interval:") + " " + intervals[_settings->getUpdateIntervalIndex ()] + ", " + tr ("Update via:") + " ";
 
     if (_settings->check (Settings::C_UpdateOnWiFi))
         list.append (tr ("WiFi"));

diff --git a/yandex-traffic-widget_ru.qm b/yandex-traffic-widget_ru.qm
index cee2179..60c4547 100644 (file)
Binary files a/yandex-traffic-widget_ru.qm and b/yandex-traffic-widget_ru.qm differ

diff --git a/yandex-traffic-widget_ru.ts b/yandex-traffic-widget_ru.ts
index a69d2e7..7198d3f 100644 (file)
--- a/yandex-traffic-widget_ru.ts
+++ b/yandex-traffic-widget_ru.ts
@@ -35,11 +35,11 @@
     <name>MainWidget</name>
     <message>
         <source> points</source>
-        <translation>баллов</translation>
+        <translation type="obsolete">баллов</translation>
     </message>
     <message>
         <source> point</source>
-        <translation>балл</translation>
+        <translation type="obsolete">балл</translation>
     </message>
     <message>
         <source>No data</source>
@@ -53,6 +53,14 @@
         <source>Update</source>
         <translation>Обновить</translation>
     </message>
+    <message numerus="yes">
+        <source>%n point(s)</source>
+        <translation>
+            <numerusform>%n балл</numerusform>
+            <numerusform>%n балла</numerusform>
+            <numerusform>%n баллов</numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>Settings</name>
@@ -113,11 +121,11 @@
     </message>
     <message>
         <source>City: </source>
-        <translation>Город: </translation>
+        <translation type="obsolete">Город: </translation>
     </message>
     <message>
         <source>Data: </source>
-        <translation>Данные: </translation>
+        <translation type="obsolete">Данные: </translation>
     </message>
     <message>
         <source>lights</source>
@@ -137,11 +145,11 @@
     </message>
     <message>
         <source>Interval: </source>
-        <translation>Интервал: </translation>
+        <translation type="obsolete">Интервал: </translation>
     </message>
     <message>
         <source>Update via: </source>
-        <translation>Обновлять через: </translation>
+        <translation type="obsolete">Обновлять через: </translation>
     </message>
     <message>
         <source>WiFi</source>
@@ -159,6 +167,22 @@
         <source>Not update when locked</source>
         <translation>Не обновлять когда телефон неактивен</translation>
     </message>
+    <message>
+        <source>City:</source>
+        <translation>Город:</translation>
+    </message>
+    <message>
+        <source>Display:</source>
+        <translation>Отображать:</translation>
+    </message>
+    <message>
+        <source>Interval:</source>
+        <translation>Интервал:</translation>
+    </message>
+    <message>
+        <source>Update via:</source>
+        <translation>Обновлять через:</translation>
+    </message>
 </context>
 <context>
     <name>UpdateSettingsDialog</name>