From b7dfea89bd923a43368cad604536710a9a405193 Mon Sep 17 00:00:00 2001
From: Max Lapan <max.lapan@gmail.com>
Date: Fri, 19 Mar 2010 14:44:10 +0300
Subject: [PATCH] Extend update intervals with 1 hour and 2 hours.

---
 settings.cpp                |   18 ++++++++++++------
 yandex-traffic-widget_ru.qm |  Bin 3363 -> 3515 bytes
 yandex-traffic-widget_ru.ts |   38 +++++++++++++++++++++++++++++++++-----
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/settings.cpp b/settings.cpp
index fd78526..4a7cac3 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -109,11 +109,13 @@ QStringList Settings::updateIntervals () const
     QStringList res;
 
     res.append (tr ("Never"));
-    res.append (tr ("1 min"));
-    res.append (tr ("2 min"));
-    res.append (tr ("5 min"));
-    res.append (tr ("15 min"));
-    res.append (tr ("30 min"));
+    res.append (tr ("1 minute"));
+    res.append (tr ("2 minutes"));
+    res.append (tr ("5 minutes"));
+    res.append (tr ("15 minutes"));
+    res.append (tr ("30 minutes"));
+    res.append (tr ("1 hour"));
+    res.append (tr ("2 hours"));
 
     return res;
 }
@@ -121,7 +123,7 @@ QStringList Settings::updateIntervals () const
 
 int Settings::intervalIndex2Minutes (int index) const
 {
-    int int2min[] = { -1, 1, 2, 5, 15, 30 };
+    int int2min[] = { -1, 1, 2, 5, 15, 30, 60, 120 };
 
     if (index < 0 || sizeof (int2min) / sizeof (int2min[0]) <= (unsigned int)index)
         return -1;
@@ -145,6 +147,10 @@ int Settings::minutes2IntervalIndex (int minutes) const
             return 4;
         case 30:
             return 5;
+        case 60:
+            return 6;
+        case 120:
+            return 7;
         default:
             return 0;
     }
diff --git a/yandex-traffic-widget_ru.qm b/yandex-traffic-widget_ru.qm
index e3e7c865ae7eba162eb7e1e027fc416f68c4aec8..a2ffec0187819a0e009f62f4d01f39cff03b68b4 100644
GIT binary patch
delta 701
zcmZ21wOe|Eh-3u=gHJ631KS1$mJcBe3=9hySmlo~Ft8k%s4G{`DagPE66JJYVDIn-
z(i<4qH<$wHhYViarx+Mme=`LA{Q}f=pCRPTAs}CdVYyBf(6oGJvu{8?(?jO7GR8o9
z77Od&%|KJdSy=x8Y35ZdY`q}bnT2fyh<?D5pR*W9SFwt%_{hM(_=(kRRyspH1It_1
zbx%bY7&un2ZdkP!Xu&bo{ogVf7`Sy=kF8h=G&mJPbI7v3%+LgC>|--{FU-KeRlxS@
zLpe}=9lQR0paq=e><;l$ffn$wuby7Qz`&l%k!#cfG^dyI)O<alIv+0Wr9cmHL~%vG
zI}6l*f$QY-Rh~eF`rKSaCxJfF=bp}d8R%169#=7UpijJc{0wdY=^mcljKx5Q=s;-p
z2mET=?f?xC;y21E1?sy4bS;ng<|fA1O!e+81}u&oKtmYVK-f?rBfqqW9mwPePAw_P
z%u6q3WCrpC7z`N{SZr7<SZrCGS)5o5;958g6>>B4N=s6)YcfUF2G_)8XbREAlv+Hw
zkwv852&fF~6eN?`jlhm6#%3@`J;F8KaDzFGpsvBH%b39cSsz>%mz}WzZhd?V*ge4s
N^+Rg$W^>jz>;SyWmJ9#@

delta 509
zcmdljy;y33h-3x>gHJ631Dgf|%ZCsK28M+Utn$Yg7+7p3>dMt~bTY7kL^*aauy=Sf
zFmP%xux~I0(vb|t#s3%>m>x2ifM{kL26HeyoxzLy6axcmF+<SbFF@1oGlZNu1T<|5
z!*ZP}p!joUcd$BM<|Htk!F*Q67--HcR<RWy85kHpvAWGl2dYnHUH4Rkp`L+5fpx>G
zy+Dn2toy%ZGB9v0Wj(fHDNsWygl3=0`Z7ZksIiaD;Jq-=VK3NTeJBSS@Qq#n{$`-V
z-?OitUIO&qQ;uAt76t}xR?buN^?>q6xU`o79m;-*EBf78pt&AgC#SChs$0&@Rdf<)
z-*WEh%$F^JKCtC+6>|sr@Gy^`!405B7M|UV#Xtw>Kxp;|ezk3PfEIW08|9P&4G00c
zlDmKNB*xcF!Zs`xEVdj#Lm1eAnAK1rH*+#0yRZxogCT<{g8~bxJe#2@RDmQHgAs-_
ds}VxGF@phyJe#orLOZ7EtT4kjKV-ed4ge>8Z<GK4

diff --git a/yandex-traffic-widget_ru.ts b/yandex-traffic-widget_ru.ts
index 62bdc8e..d61114f 100644
--- a/yandex-traffic-widget_ru.ts
+++ b/yandex-traffic-widget_ru.ts
@@ -90,23 +90,23 @@
     </message>
     <message>
         <source>1 min</source>
-        <translation>1 мин</translation>
+        <translation type="obsolete">1 мин</translation>
     </message>
     <message>
         <source>2 min</source>
-        <translation>2 мин</translation>
+        <translation type="obsolete">2 мин</translation>
     </message>
     <message>
         <source>5 min</source>
-        <translation>5 мин</translation>
+        <translation type="obsolete">5 мин</translation>
     </message>
     <message>
         <source>15 min</source>
-        <translation>15 мин</translation>
+        <translation type="obsolete">15 мин</translation>
     </message>
     <message>
         <source>30 min</source>
-        <translation>30 мин</translation>
+        <translation type="obsolete">30 мин</translation>
     </message>
     <message>
         <source>System</source>
@@ -120,6 +120,34 @@
         <source>Russian</source>
         <translation>Русский</translation>
     </message>
+    <message>
+        <source>1 minute</source>
+        <translation>1 минута</translation>
+    </message>
+    <message>
+        <source>2 minutes</source>
+        <translation>2 минуты</translation>
+    </message>
+    <message>
+        <source>5 minutes</source>
+        <translation>5 минут</translation>
+    </message>
+    <message>
+        <source>15 minutes</source>
+        <translation>15 минут</translation>
+    </message>
+    <message>
+        <source>30 minutes</source>
+        <translation>30 минут</translation>
+    </message>
+    <message>
+        <source>1 hour</source>
+        <translation>1 час</translation>
+    </message>
+    <message>
+        <source>2 hours</source>
+        <translation>2 часа</translation>
+    </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-- 
1.7.9.5