[Jive-Checkins] r9465 - in /7.6/branches/usb-audio: ./ squeezeos/poky/meta-squeezeos/packages/perl/ squeezeos/poky/meta-squeezeos/packages/squeezecenter/ squeezeplay/src/ squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ squeezeplay/src/squeezeplay/share/applets/NowPlaying/ squeezeplay/src/squeezeplay/share/applets/SetupDateTime/ squeezeplay/src/squeezeplay/share/applets/SlimBrowser/ squeezeplay/src/squeezeplay/share/applets/SlimMenus/ squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/ squeezeplay/src/squeezeplay/share/jive/ui/ squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/ squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/ squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/ squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/ squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/ squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/

Fri, 05 Aug 2011 08:15:04 -0700 

Author: agrundman
Date: Fri Aug  5 08:15:01 2011
New Revision: 9465

URL: http://svn.slimdevices.com/jive?rev=9465&view=rev
Log:
 r78792@andy-imac (orig r9454):  mherger | 2011-07-14 03:15:13 -0400
 Fixed Bug: 15439
 Description: pcall's parameter must be a function
 
 Kuno - this indeed was broken again. But please not that it only had been 
implemented in 7.6 firmware, not in 7.5.x. What you've seen in 7.5.4 wasn't the 
regression, even though this regressed ;-)
 r78793@andy-imac (orig r9455):  mherger | 2011-07-14 08:28:10 -0400
 Bug: n/a
 Description: translation updates
 r78794@andy-imac (orig r9456):  andy | 2011-07-22 13:24:41 -0400
 Bump TinySBS Audio::Scan to 0.88
 r78836@andy-imac (orig r9457):  andy | 2011-07-25 12:59:27 -0400
 Add Orange to included plugins and bump rev
 r78837@andy-imac (orig r9458):  andy | 2011-07-25 13:44:56 -0400
 We can save a few MB by removing the big-endian ICU file
 r78981@andy-imac (orig r9460):  fmueller | 2011-07-27 07:57:06 -0400
 Bug: n/a 
 Description: Fix issue with text on second line not showing in Network Health 
label 
 
 r78982@andy-imac (orig r9461):  ayoung | 2011-07-28 03:10:29 -0400
 bug 17317: SBT will not remain powered off when synced to other SB devices in 
7.6 
 Fix typo that could be related (but probably not).
 r78983@andy-imac (orig r9462):  ayoung | 2011-07-28 03:11:57 -0400
 bug 17317: SBT will not remain powered off when synced to other SB devices in 
7.6 
 Only go to NP on playlist change if ON.
 r78984@andy-imac (orig r9463):  andy | 2011-08-03 16:59:38 -0400
 Bump Audio::Scan for Fab4 to 0.90
 r79019@andy-imac (orig r9464):  mherger | 2011-08-05 03:44:30 -0400
 Bug: n/a
 Description: bump SP version number

Modified:
    7.6/branches/usb-audio/   (props changed)
    
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/perl/libaudio-scan-perl_svn.bb
    
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
    7.6/branches/usb-audio/squeezeplay/src/squeezeplay.version
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/strings.txt
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimMenus/strings.txt
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/strings.txt
    7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/strings.txt
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/strings.txt
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/strings.txt
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/strings.txt
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
    
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/strings.txt

Propchange: 7.6/branches/usb-audio/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug  5 08:15:01 2011
@@ -15,6 +15,7 @@
 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9408
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9464
 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
 bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378

Modified: 
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/perl/libaudio-scan-perl_svn.bb
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/perl/libaudio-scan-perl_svn.bb?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/perl/libaudio-scan-perl_svn.bb
 (original)
+++ 
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/perl/libaudio-scan-perl_svn.bb
 Fri Aug  5 08:15:01 2011
@@ -2,7 +2,7 @@
 SECTION = "libs"
 LICENSE = "GPL"
 PV = "svnr${SRCREV}"
-PR = "r25"
+PR = "r27"
 
 # We want Perl to be as fast as possible, reset the default optimization flags
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer 
-frename-registers -O2 -ggdb -feliminate-unused-debug-types"
@@ -10,9 +10,9 @@
 ARM_INSTRUCTION_SET = "arm"
 
 # This should match the version currently listed in SBS's modules.conf file
-SRC_URI = 
"svn://svn.slimdevices.com/repos/opensource/tags/Audio-Scan;proto=http;module=0.87"
+SRC_URI = 
"svn://svn.slimdevices.com/repos/opensource/tags/Audio-Scan;proto=http;module=0.90"
 
-S = "${WORKDIR}/0.87"
+S = "${WORKDIR}/0.90"
 
 inherit cpan
 

Modified: 
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
 (original)
+++ 
7.6/branches/usb-audio/squeezeos/poky/meta-squeezeos/packages/squeezecenter/squeezecenter_svn.bb
 Fri Aug  5 08:15:01 2011
@@ -2,7 +2,7 @@
 LICENSE = "GPL"
 
 PV = "7.6+svnr${SRCREV}"
-PR = "r39"
+PR = "r41"
 
 RDEPENDS += "perl perl-modules libcompress-raw-zlib-perl 
libclass-xsaccessor-perl"
 RDEPENDS += "libdbi-perl sqlite3 libdbd-sqlite-perl"
@@ -33,7 +33,7 @@
 INCLUDED_PLUGINS += "Amazon Classical Deezer"
 INCLUDED_PLUGINS += "LMA Mediafly MP3tunes Napster Pandora Slacker"
 INCLUDED_PLUGINS += "Facebook Flickr LastFM Live365 RadioTime RhapsodyDirect"
-INCLUDED_PLUGINS += "Sirius Sounds WiMP SpotifyLogi"
+INCLUDED_PLUGINS += "Sirius Sounds WiMP SpotifyLogi Orange"
 EXCLUDED_PLUGING += "RSSNews Podcast InfoBrowser"
 
 # Core features
@@ -160,6 +160,9 @@
        rm -r ${D}/${prefix}/squeezecenter/*.html
        find ${D}/${prefix}/squeezecenter/Slim/Plugin -name '*.html' -exec rm 
-r {} \;
 
+       # ICU big-endian file
+       rm -r ${D}/${prefix}/squeezecenter/icudt46b.dat
+
        echo "rev: ${SRCREV}" > ${D}/${prefix}/squeezecenter/build.txt
        echo "repo: ${SRC_URI}" >> ${D}/${prefix}/squeezecenter/build.txt
        

Modified: 7.6/branches/usb-audio/squeezeplay/src/squeezeplay.version
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay.version?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 7.6/branches/usb-audio/squeezeplay/src/squeezeplay.version (original)
+++ 7.6/branches/usb-audio/squeezeplay/src/squeezeplay.version Fri Aug  5 
08:15:01 2011
@@ -1,1 +1,1 @@
-7.6.0
+7.6.1

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/strings.txt?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/strings.txt
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/strings.txt
 Fri Aug  5 08:15:01 2011
@@ -41,7 +41,7 @@
        FI      Vaihda kirjastoa
        FR      Changer de collection
        IT      Cambia libreria
-       NL      Bibliotheek veranderen
+       NL      Collectie wisselen
        NO      Bytt bibliotek
        PL      Przełącz bibliotekę
        RU      Сменить медиатеку
@@ -313,7 +313,7 @@
        FI      Vaihda kirjastoa
        FR      Changer de collection
        IT      Cambia libreria
-       NL      Bibliotheek veranderen
+       NL      Collectie wisselen
        NO      Bytt bibliotek
        PL      Przełącz bibliotekę
        RU      Сменить медиатеку

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt
 Fri Aug  5 08:15:01 2011
@@ -19,18 +19,18 @@
 
 SCREENSAVER_STOPPED
        CS      Při zastavení
-       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
+       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
 
 SCREENSAVER_PAUSED
        CS      Pozastaveno
@@ -48,19 +48,19 @@
        SV      Pausad
 
 SCREENSAVER_OFF
-       CS      Vypnuto
-       DA      Fra
-       DE      Aus
-       EN      Off
-       ES      Apagado
-       FI      Ei käytössä
-       FR      Désactivé
-       IT      Disattivato
-       NL      Uit
+       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
        NO      NÃ¥r av
-       PL      Wył.
-       RU      Выкл
-       SV      Av
+       PL      Po wyłączeniu
+       RU      При выкл.
+       SV      I avstängt läge
 
 SCREENSAVER_NOWPLAYING_OF
        CS      %s z %s

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
 Fri Aug  5 08:15:01 2011
@@ -20,7 +20,7 @@
 local ipairs, pairs, io, string, tostring, pcall = ipairs, pairs, io, string, 
tostring, pcall
 
 local oo               = require("loop.simple")
-local hasSqueezeos, squeezeos        = pcall('require', "squeezeos_bsp")
+local hasSqueezeos, squeezeos = pcall(function() return 
require("squeezeos_bsp") end)
 
 local Applet           = require("jive.Applet")
 local Choice          = require("jive.ui.Choice")

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
 Fri Aug  5 08:15:01 2011
@@ -3662,7 +3662,7 @@
 
                return
        -- make sure we have step.window replace emptyStep.window when there 
are tracks and emptyStep exists
-       elseif playlistSize then
+       elseif _player:isPowerOn() and playlistSize then
                -- only move into NowPlaying if screensaver is allowed
                if Window:getTopNonTransientWindow():canActivateScreensaver() 
then
                        _goNowPlaying(nil, true)

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimMenus/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimMenus/strings.txt?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimMenus/strings.txt
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimMenus/strings.txt
 Fri Aug  5 08:15:01 2011
@@ -71,7 +71,7 @@
        FI      Vaihda kirjastoa
        FR      Changer de collection
        IT      Cambia libreria
-       NL      Bibliotheek veranderen
+       NL      Collectie wisselen
        NO      Bytt bibliotek
        PL      Przełącz bibliotekę
        RU      Сменить медиатеку

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/strings.txt?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/strings.txt
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/strings.txt
 Fri Aug  5 08:15:01 2011
@@ -57,7 +57,7 @@
        FI      Valmis
        FR      Terminé
        IT      Fatto
-       NL      Klaar
+       NL      Gereed
        NO      Fullført
        PL      Gotowe
        RU      Готово

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua 
(original)
+++ 7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua 
Fri Aug  5 08:15:01 2011
@@ -1105,7 +1105,7 @@
 function canActivateScreensaver(self)
        if self.allowScreensaver == nil then
                return true
-       elseif self.allowScreensaver == "function" then
+       elseif type(self.allowScreensaver) == "function" then
                return self.allowScreensaver()
        else
                return self.allowScreensaver

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/strings.txt?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/strings.txt
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/strings.txt
 Fri Aug  5 08:15:01 2011
@@ -52,11 +52,11 @@
        DA      Det var det!
        DE      Fertig!
        EN      That's it!
-       ES      Y esto es todo!
+       ES      ¡Ya está!
        FI      Siinä kaikki!
        FR      Vous avez terminé!
        IT      Fatto!
-       NL      Dat is het!
+       NL      Klaar!
        NO      Ferdig!
        PL      To już wszystko!
        RU      Сделано!

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/strings.txt?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/strings.txt
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/strings.txt
 Fri Aug  5 08:15:01 2011
@@ -70,7 +70,7 @@
        EN      Use the wheel to adjust the brightness.
        ES      Use la rueda para ajustar el brillo.
        FI      Voit säätää kirkkautta kiekolla.
-       FR      Utilisez la molette pour ajuster la luminosité.
+       FR      Utilisez la molette pour régler la luminosité.
        IT      Usare la rotellina per regolare la luminosità.
        NL      Gebruik het wiel om de helderheid aan te passen.
        NO      Bruk hjulet til å justere lysstyrken.
@@ -145,7 +145,7 @@
        EN      Use the wheel to adjust the minimal brightness.
        ES      Use la rueda para ajustar el brillo al mínimo.
        FI      Voit säätää kirkkautta kiekolla.
-       FR      Utilisez la molette pour ajuster la luminosité.
+       FR      Utilisez la molette pour régler la luminosité minimale.
        IT      Usare la rotellina per regolare la luminosità minima.
        NL      Gebruik het wiel om de minimale helderheid aan te passen.
        NO      Bruk hjulet til å justere minimal lysstyrke.

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/strings.txt?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/strings.txt
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/strings.txt
 Fri Aug  5 08:15:01 2011
@@ -56,7 +56,7 @@
        FI      Siinä kaikki!
        FR      Vous avez terminé!
        IT      Fatto!
-       NL      Dat is het!
+       NL      Klaar!
        NO      Ferdig!
        PL      To już wszystko!
        RU      Сделано!

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/strings.txt?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/strings.txt
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_jive/share/applets/TestKeypad/strings.txt
 Fri Aug  5 08:15:01 2011
@@ -25,7 +25,7 @@
        EN      Press all keys and scroll the wheel to complete.
        ES      Pulse todos los botones y gire la rueda para completar la 
operación.
        FI      Suorita loppuun painamalla kaikkia näppäimiä ja 
vierittämällä kiekolla.
-       FR      Appuyez sur tous les boutons et sur la molette pour terminer le 
test.
+       FR      Appuyez sur toutes les touches et faites défiler la molette 
pour terminer.
        IT      Premere tutti i tasti e far scorrere la rotellina per 
completare.
        NL      Druk op alle toetsen en scroll met het wiel om te voltooien.
        NO      Trykk ned alle tastene og rull med hjulet for å fullføre.

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
 Fri Aug  5 08:15:01 2011
@@ -861,8 +861,10 @@
 
        self.labels = {}
        self.labels["NETWORK_STATUS"] = {
---             text = self:string("NETWORK_STATUS", '-'),
-               text = self:string("NETWORK_STATUS", 
tostring(self:string("NET_HEALTH_HINT"))),
+-- For some reason (I have no idea why) the second line is not show anymore in 
this label
+--  and since the second line is the important one the quick fix is to swap 
the two lines
+--             text = self:string("NETWORK_STATUS", 
tostring(self:string("NET_HEALTH_HINT"))),
+               text = self:string(tostring(self:string("NET_HEALTH_HINT")), 
''),
                style = 'item_info',
        }
        menu:addItem(self.labels["NETWORK_STATUS"])
@@ -930,7 +932,10 @@
                myItem.style = "item_info_red"
        end
 
-       self.networkHealthMenu:setText(self.labels[index], self:string(index, 
msgStr))
+-- For some reason (I have no idea why) the second line is not show anymore in 
this label
+--  and since the second line is the important one the quick fix is to swap 
the two lines
+--     self.networkHealthMenu:setText(self.labels[index], self:string(index, 
msgStr))
+       self.networkHealthMenu:setText(self.labels[index], self:string(msgStr, 
''))
        self.networkHealthMenu:setSelectedIndex(1)
 
 -- TODO: needed?

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
 Fri Aug  5 08:15:01 2011
@@ -1040,19 +1040,19 @@
        SV      Serverinformation
 
 NETWORK_STATUS
-       CS      Stav sítě\n%s
-       DA      Netværksstatus\n%s
-       DE      Netzwerkstatus\n%s
-       EN      Network Status\n%s
-       ES      Estado de red\n%s
-       FI      Verkon tila\n%s
-       FR      Etat du réseau\n%s
-       IT      Stato della rete\n%s
-       NL      Netwerkstatus\n%s
-       NO      Nettverksstatus\n%s
-       PL      Stan sieci\n%s
-       RU      Статус сети\n%s
-       SV      Nätverksstatus\n%s
+       CS      Stav sítě
+       DA      Netværksstatus
+       DE      Netzwerkstatus
+       EN      Network Status
+       ES      Estado de red
+       FI      Verkon tila
+       FR      Etat du réseau
+       IT      Stato della rete
+       NL      Netwerkstatus
+       NO      Nettverksstatus
+       PL      Stan sieci
+       RU      Статус сети
+       SV      Nätverksstatus
 
 REPAIR_NETWORK
        CS      Opravit síť
@@ -1088,7 +1088,7 @@
        CS      Zkontrolovat síť (část)
        DA      Kontroller netværk (delvist)
        DE      Netzwerk prüfen (teilweise)
-       EN      Partial Network Check
+       EN      Check Network (part)
        ES      Comprobación de red parcial
        FI      Tarkista verkko (osittain)
        FR      Vérifier partiellement le réseau

Modified: 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/strings.txt
URL: 
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/strings.txt?rev=9465&r1=9464&r2=9465&view=diff
==============================================================================
--- 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/strings.txt
 (original)
+++ 
7.6/branches/usb-audio/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupNetworking/strings.txt
 Fri Aug  5 08:15:01 2011
@@ -1419,11 +1419,11 @@
        DA      Der blev ikke fundet en kableforbindelse. Kontroller 
Ethernet-kablet, at netværket er i drift og at der kan etableres forbindelse 
til det.
        DE      Es konnte keine verkabelte Verbindung erkannt werden. Prüfen 
Sie das Ethernet-Kabel und vergewissern Sie sich, dass das Netzwerk verfügbar 
und aktiviert ist.
        EN      We can't detect a wired connection. Please check your Ethernet 
cable, and make sure your network is running and available.
-       ES      No se puede detectar una conexión con cable. Compruebe el 
cable cable Ethernet y asegúrese de que la red funciona correctamente y está 
disponible.
+       ES      No se puede detectar una conexión con cable. Compruebe el 
cable Ethernet y asegúrese de que la red funciona correctamente y está 
disponible.
        FI      Langallista yhteyttä ei havaita. Tarkista ethernet-kaapeli ja 
varmista, että verkko on käytössä ja että se on saatavilla.
        FR      Nous ne détectons aucune connexion filaire. Veuillez vérifier 
votre câble Ethernet et contrôler que le réseau est disponible et 
opérationnel.
        IT      Impossibile rilevare una connessione cablata. Verificare il 
cavo Ethernet e accertarsi che la rete sia in esecuzione e accessibile.
-       NL      Er kan geen bedrade aansluiting worden gedetecteerd. Controleer 
je ethernetkabel en zorg ervoor dat je netwerk actief en beschikbaar is.
+       NL      Er is geen bedrade aansluiting gedetecteerd. Controleer je 
ethernetdraad en zorg ervoor dat je netwerk actief en beschikbaar is.
        NO      Finner ikke en trådet tilkopling. Kontroller Ethernet-kabelen, 
og forsikre
        PL      Nie można wykryć połączenia przewodowego. Sprawdź, czy 
kabel Ethernet jest prawidłowo podłączony oraz czy sieć działa i jest 
dostępna.
        RU      Не удалось обнаружить проводное 
подключение. Проверьте кабель ethernet и 
убедитесь, что сеть работает нормально.

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

Reply via email to