[Jive-Checkins] r9481 - in /7.6/trunk/squeezeplay/src/squeezeplay/share/applets: NowPlaying/strings.txt ScreenSavers/ScreenSaversApplet.lua ScreenSavers/strings.txt

[mherger]

Author: mherger
Date: Mon Aug 15 01:06:59 2011
New Revision: 9481

URL: http://svn.slimdevices.com/jive?rev=9481&view=rev
Log:
Fixed Bug: 17255
Description: de-duplicate string tokens. Revert accidental string changes 
caused by duplicate tokens.

Modified:
    7.6/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt
    
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
    7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/strings.txt

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt?rev=9481&r1=9480&r2=9481&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt 
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt 
Mon Aug 15 01:06:59 2011
@@ -19,18 +19,18 @@
 
 SCREENSAVER_STOPPED
        CS      Při zastavení
-       DA      NÃ¥r den er stoppet
-       DE      Wenn angehalten
-       EN      When stopped
-       ES      Al detener
-       FI      Keskeytettynä
-       FR      A l'arrêt
-       IT      Quando la riproduzione è interrotta
-       NL      Wanneer gestopt
-       NO      Ved stopp
-       PL      Po zatrzymaniu
-       RU      При остановке
-       SV      I stoppat läge
+       DA      Stoppet
+       DE      Angehalten
+       EN      Stopped
+       ES      Detenido
+       FI      Pysäytetty
+       FR      Arrêté
+       IT      Arrestato
+       NL      Gestopt
+       NO      Stoppet
+       PL      Zatrzymane
+       RU      Остановлено
+       SV      Stoppad
 
 SCREENSAVER_PAUSED
        CS      Pozastaveno
@@ -48,19 +48,19 @@
        SV      Pausad
 
 SCREENSAVER_OFF
-       CS      Při vypnutí
-       DA      NÃ¥r den er slukket
-       DE      Wenn aus
-       EN      When off
-       ES      Al apagar
-       FI      Laitteen ollessa pois päältä
-       FR      En état éteint
-       IT      Se disattivato
-       NL      Wanneer uit
+       CS      Vypnuto
+       DA      Fra
+       DE      Aus
+       EN      Off
+       ES      Apagado
+       FI      Ei käytössä
+       FR      Désactivé
+       IT      Disattivato
+       NL      Uit
        NO      NÃ¥r av
-       PL      Po wyłączeniu
-       RU      При выкл.
-       SV      I avstängt läge
+       PL      Wył.
+       RU      Выкл
+       SV      Av
 
 SCREENSAVER_NOWPLAYING_OF
        CS      %s z %s

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua?rev=9481&r1=9480&r2=9481&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
 (original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
 Mon Aug 15 01:06:59 2011
@@ -792,7 +792,7 @@
        local menu = SimpleMenu("menu",
                {
                        { 
-                               text = self:string('SCREENSAVER_PLAYING'),
+                               text = self:string('SCREENSAVER_WHEN_PLAYING'),
                                weight = 1,
                                sound = "WINDOWSHOW",
                                callback = function(event, menu_item)
@@ -800,7 +800,7 @@
                                           end
                        },
                        {
-                               text = self:string("SCREENSAVER_STOPPED"),
+                               text = self:string("SCREENSAVER_WHEN_STOPPED"),
                                weight = 1,
                                sound = "WINDOWSHOW",
                                callback = function(event, menu_item)
@@ -821,7 +821,7 @@
        if Player:getLocalPlayer() then
                menu:addItem(
                        {
-                               text = self:string("SCREENSAVER_OFF"),
+                               text = self:string("SCREENSAVER_WHEN_OFF"),
                                weight = 2,
                                sound = "WINDOWSHOW",
                                callback = function(event, menu_item)

Modified: 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/strings.txt?rev=9481&r1=9480&r2=9481&view=diff
==============================================================================
--- 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/strings.txt 
(original)
+++ 
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/strings.txt 
Mon Aug 15 01:06:59 2011
@@ -17,7 +17,7 @@
        RU      Экранные заставки
        SV      Skärmsläckare
 
-SCREENSAVER_PLAYING
+SCREENSAVER_WHEN_PLAYING
        CS      Při přehrávání
        DA      Under afspilning
        DE      Bei Wiedergabe
@@ -32,7 +32,7 @@
        RU      При воспроизведении
        SV      Vid uppspelning
 
-SCREENSAVER_OFF
+SCREENSAVER_WHEN_OFF
        CS      Při vypnutí
        DA      NÃ¥r den er slukket
        DE      Wenn aus
@@ -47,7 +47,7 @@
        RU      При выкл.
        SV      I avstängt läge
 
-SCREENSAVER_STOPPED
+SCREENSAVER_WHEN_STOPPED
        CS      Při zastavení
        DA      NÃ¥r den er stoppet
        DE      Wenn angehalten

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins