Author: titmuss
Date: Mon Aug 18 01:19:18 2008
New Revision: 2855
URL: http://svn.slimdevices.com?rev=2855&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2838): bklaas | 2008-08-14 22:11:05 +0100
Bug: 8773
Description: dump playerstatus and serverstatus info when log level for
'player' is set to debug
fix for udap setup
[EMAIL PROTECTED] (orig r2847): mherger | 2008-08-15 13:27:11 +0100
Bug: n/a
Description: translation updates from SLT
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/strings.txt
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/strings.txt
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/strings.txt
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/strings.txt
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/strings.txt
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/strings.txt
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Aug 18 01:19:18 2008
@@ -1,6 +1,6 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2502
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2827
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2847
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.2/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/strings.txt?rev=2855&root=Jive&r1=2854&r2=2855&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/strings.txt
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/strings.txt
Mon Aug 18 01:19:18 2008
@@ -3,4 +3,14 @@
# http://en.wikipedia.org/wiki/List_of_ISO_639_codes
SCREENSAVER_BLANKSCREEN
+ DA Ingen pauseskærm
+ DE LCD aus
EN Screen off
+ ES Pantalla desactivada
+ FI Näyttö pois päältä
+ FR Affichage éteint
+ IT Schermo spento
+ NL Scherm uit
+ NO Skjerm av
+ SV Display av
+
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/strings.txt?rev=2855&root=Jive&r1=2854&r2=2855&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/strings.txt
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/strings.txt Mon
Aug 18 01:19:18 2008
@@ -135,7 +135,16 @@
SV Mina egna bilder
SCREENSAVER_FLICKR_DISPLAY_FAVORITES
+ DA Favoritter
+ DE Meine Favoriten
EN My favorites
+ ES Mis favoritos
+ FI Suosikit
+ FR Mes favoris
+ IT I miei Preferiti
+ NL Mijn favorieten
+ NO Mine favoritter
+ SV Mina favoriter
SCREENSAVER_FLICKR_DISPLAY_CONTACTS
DA Mine kontakters billeder
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/strings.txt?rev=2855&root=Jive&r1=2854&r2=2855&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/strings.txt
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/InfoBrowser/strings.txt
Mon Aug 18 01:19:18 2008
@@ -2,21 +2,49 @@
INFOBROWSER
DA Informationsaflæser
- DE Informations-Browser
+ DE Info-Browser
EN Information Browser
ES Navegador de información
FI Informaatioselain
- FR Navigateur d'informations
+ FR Navigateur info
IT Browser informazioni
- NL Informatiebrowser
+ NL Infobrowser
NO Informasjonsleser
- SV Informationswebbläsare
+ SV Infoläsaren
INFOBROWSER_NORESPONSE
+ DA Der blev ikke fundet nogen informationsfeeds. Kontroller at
udvidelsesmodulet Informationsaflæser er slået til på serveren.
+ DE Keine Info-Feeds gefunden. Prüfen Sie, ob das Plug-In
'Info-Browser' auf dem Server aktiviert ist.
EN No information feeds found. Please check the Information
Browser plugin is enabled on your server.
+ ES No se ha encontrado ninguna fuente de información. Compruebe
si el complemento Navegador de información está activado en el servidor.
+ FI Informaatiosyötteitä ei löytynyt. Tarkista, että
informaatioselaimen laajennus on käytössä palvelimessa.
+ FR Aucun flux d'informations n'a été trouvé. Vérifiez que le
plugin Navigateur info est activé sur votre serveur.
+ IT Nessun feed di informazioni trovato. Verificare che il plugin
del Browser informazioni sia attivato nel server.
+ NL Geen informatiekanalen gevonden. Controleer of de plug-in
Infobrowser op je server is ingeschakeld.
+ NO Fant ingen informasjonsfeeder. Kontroller at plugin-modulen
Informasjonsleser er aktivert på serveren.
+ SV Inga informationsflöden hittades. Kontrollera att
plugin-programmet Infoläsaren har aktiverats på servern.
INFOBROWSER_NOINFO_SN
+ DA Der blev ikke fundet nogen informationsfeeds. Log på
SqueezeNetwork-konto, og tilføj nogen.
+ DE Keine Info-Feeds gefunden. Melden Sie sich bei Ihrem
SqueezeNetwork-Konto an und fügen Sie Info-Feeds hinzu.
EN No information feeds found. Please login to your
SqueezeNetwork account and add information feeds.
+ ES No se ha encontrado ninguna fuente de información. Inicie
sesión en su cuenta de SqueezeNetwork y agregue fuentes de información.
+ FI Informaatiosyötteitä ei löytynyt. Kirjaudu
SqueezeNetwork-tiliisi ja lisää syötteitä.
+ FR Aucun flux d'informations n'a été trouvé. Utilisez votre
compte SqueezeNetwork et ajoutez des flux d'informations.
+ IT Nessun feed di informazioni trovato. Accedere all'account
SqueezeNetwork e aggiungere i feed di informazioni.
+ NL Geen informatiekanalen gevonden. Meld je aan bij je
SqueezeNetwork-account en voeg informatiekanalen toe.
+ NO Fant ingen informasjonsfeeder. Logg på SqueezeNetwork-kontoen
og legg til informasjonsfeeder.
+ SV Inga informationsflöden hittades. Logga in på
SqueezeNetwork-kontot och lägg till informationsflöden.
INFOBROWSER_NOINFO_SC
+ DA Der blev ikke fundet nogen informationsfeeds. Du kan tilføje
nogen via den webbaserede brugerflade til SqueezeCenter under
Ekstra/Informationsaflæser.
+ DE Keine Info-Feeds gefunden. In der
SqueezeCenter-Web-Benutzeroberfläche können Sie unter Extras/Info-Browser
Info-Feeds hinzufügen.
EN No information feeds found. Please use the SqueezeCenter web
interface to add information feeds under Extras/Info Browser.
+ ES No se ha encontrado ninguna fuente de información. Utilice la
interfaz Web de SqueezeCenter para agregar fuentes de información (vaya a
Extras/Navegador de información).
+ FI Informaatiosyötteitä ei löytynyt. Lisää syötteitä
SqueezeCenterin internet-käyttöliittymän kohdassa Muut/Informaatioselain.
+ FR Aucun flux d'informations n'a été trouvé. Utilisez
l'interface Web SqueezeCenter pour ajouter des flux d'informations sous
Extras/Navigateur info.
+ IT Nessun feed di informazioni trovato. Utilizzare l'interfaccia
Web di SqueezeCenter per aggiungere i feed di informazioni in Extra/Browser
informazioni.
+ NL Geen informatiekanalen gevonden. Gebruik de
SqueezeCenter-webinterface om informatiekanalen onder 'Extra's/Infobrowser' toe
te voegen.
+ NO Fant ingen informasjonsfeeder. Bruk
SqueezeCenter-webgrensesnittet for å legge til informasjonsfeeder under
Tillegg/Informasjonsleser.
+ SV Inga informationsflöden hittades. Använd SqueezeCenters
webbgränssnitt för att lägga till informationsflöden under
Extrafunktioner/Infoläsaren.
+
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt?rev=2855&root=Jive&r1=2854&r2=2855&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/strings.txt
Mon Aug 18 01:19:18 2008
@@ -12,7 +12,7 @@
IT Riproduzione in corso
NL Speelt nu
NO Spilles nå
- SV Aktuellt spår
+ SV Nu spelas
SCREENSAVER_PAUSED
DA Pause
@@ -48,7 +48,7 @@
IT Impostazioni della riproduzione in corso
NL Instellingen Speelt nu
NO Innstillinger for Spilles nå
- SV Inställningar för Aktuellt spår
+ SV Nu spelas-inställningar
SCREENSAVER_NOWPLAYING_OF
DA %s af %s
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/strings.txt?rev=2855&root=Jive&r1=2854&r2=2855&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/strings.txt
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/strings.txt
Mon Aug 18 01:19:18 2008
@@ -15,13 +15,13 @@
SV Välj spelare
SQUEEZEBOX_SETUP
- DA Konfiguration af Receiver
- DE Receiver einrichten
+ DA Konfiguration af Squeezebox
+ DE Squeezebox einrichten
EN Set Up Squeezebox
ES Configuración del receptor
FI Ota vastaanotin käyttöön
- FR Configuration du Squeezebox Receiver
- IT Configura Receiver
+ FR Configuration de la Squeezebox
+ IT Configura Squeezebox
NL Ontvanger instellen
NO Konfigurer mottaker
SV Konfigurera mottagare
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/strings.txt?rev=2855&root=Jive&r1=2854&r2=2855&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/strings.txt
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/strings.txt
Mon Aug 18 01:19:18 2008
@@ -3,7 +3,7 @@
SETUPNETTEST
DA Test af netværk
DE Netzwerktest
- EN Network Test
+ EN Network Test
ES Prueba de red
FI Verkkotesti
FR Test réseau
@@ -39,7 +39,7 @@
SETUPNETTEST_CURRENT
DA Nuværende
DE Aktuell
- EN Current
+ EN Current
ES Actual
FI Nykyinen
FR En cours
@@ -63,7 +63,7 @@
SETUPNETTEST_TESTINGTO
DA Tester
DE Test für
- EN Testing to
+ EN Testing to
ES Probando a
FI Testataan
FR Test de
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/strings.txt?rev=2855&root=Jive&r1=2854&r2=2855&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/strings.txt
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/strings.txt
Mon Aug 18 01:19:18 2008
@@ -59,7 +59,7 @@
FR Volume
IT Volume
NL Volume
- NO Lydstyrke
+ NO Volum
SV Volym
SOUND_CHARGING
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt?rev=2855&root=Jive&r1=2854&r2=2855&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/strings.txt
Mon Aug 18 01:19:18 2008
@@ -3,13 +3,16 @@
# http://en.wikipedia.org/wiki/List_of_ISO_639_codes
SLIMBROWSER_PLAYLIST
- DA Spilleliste
+ DA Afspilningsliste
DE Wiedergabeliste
EN Playlist
ES Lista de reproducción
+ FI Soittoluettelo
FR Liste de lecture
IT Elenco di riproduzione
NL Playlist
+ NO Spilleliste
+ SV Spellista
SLIMBROWSER_NOW_PLAYING
DA Nu spiller
@@ -21,7 +24,7 @@
IT Riproduzione in corso
NL Speelt nu
NO Spilles nå
- SV Aktuellt spår
+ SV Nu spelas
SLIMBROWSER_CURRENT_PLAYLIST
DA Nuværende afspilningsliste
@@ -176,7 +179,7 @@
FR Volume
IT Volume
NL Volume
- NO Lydstyrke
+ NO Volum
SV Volym
SLIMBROWSER_VOLUME_MUTED
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2855&root=Jive&r1=2854&r2=2855&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Mon Aug 18
01:19:18 2008
@@ -81,6 +81,7 @@
[4] = "squeezebox2",
[5] = "transporter",
[7] = "receiver",
+ [10] = "b",
}
@@ -275,6 +276,12 @@
return
end
+ if log:isDebug() then
+ log:debug('Serverstatus update: ')
+ log:debug('--------------------')
+ debug.dump(playerInfo, 8)
+ log:debug('--------------------')
+ end
-- Save old player info
local oldInfo = self.info
self.info = {}
@@ -647,7 +654,8 @@
function getMacAddress(self)
if self.info.model == "squeezebox2"
or self.info.model == "receiver"
- or self.info.model == "transporter" then
+ or self.info.model == "transporter"
+ or self.info.model == "b" then
return string.gsub(self.id, "[^%x]", "")
end
@@ -817,6 +825,13 @@
-- processes the playerstatus data and calls associated functions for
notification
function _process_status(self, event)
log:debug("Player:_process_playerstatus()")
+
+ if log:isDebug() then
+ log:debug('Playerstatus update: ')
+ log:debug('--------------------')
+ debug.dump(event.data, 8)
+ log:debug('--------------------')
+ end
if event.data.error then
-- ignore player status sent with an error
@@ -1141,6 +1156,7 @@
return self.info.model == "squeezebox2"
or self.info.model == "receiver"
or self.info.model == "transporter"
+ or self.info.model == "b"
end
@@ -1149,6 +1165,7 @@
return self.info.model == "squeezebox2"
or self.info.model == "receiver"
or self.info.model == "transporter"
+ or self.info.model == "b"
end
Modified:
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt?rev=2855&root=Jive&r1=2854&r2=2855&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/strings.txt
Mon Aug 18 01:19:18 2008
@@ -6,13 +6,13 @@
BSP_SCREEN_LOCKED
DA LÃ¥st
- DE Gesperrt
+ DE LCD gesperrt. Drücken Sie HINZUFÃGEN und WIEDERGABE.
EN Locked
- ES Bloqueda
+ ES Pantalla bloqueada. Pulse AGREGAR y REPRODUCIR para desbloquear.
FI Lukittu
- FR Verrouillé
- IT Bloccato
- NL Vergrendeld
+ FR Ecran verrouillé. Appuyez sur ADD et PLAY pour le
déverrouiller.
+ IT Schermo bloccato. Premere AGGIUNGI e RIPRODUCI per sbloccarlo.
+ NL Scherm vergrendeld. Druk op TOEVOEGEN en AFSPELEN om het te
ontgrendelen.
NO LÃ¥st
SV LÃ¥st
@@ -20,10 +20,10 @@
DA Du låser op ved at trykke samtidig på ADD og PLAY (tilføj og
afspil).
DE Drücken Sie zum Aufheben der Sperre gleichzeitig ADD und PLAY.
EN To unlock, press the add and play buttons at the same time.
- ES Para desbloquear, pulse los botones ADD y PLAY simultáneamente.
+ ES Para desbloquear, pulse los botones de agregación y
reproducción simultáneamente.
FI Vapauta lukitus painamalla lisäys- ja toistopainikkeita samaan
aikaan.
- FR Pour déverrouiller, appuyez sur les boutons ADD et PLAY
simultanément.
- IT Per sbloccare premere contemporaneamente i pulsanti ADD e PLAY.
+ FR Pour déverrouiller, appuyez sur les boutons AJOUTER et LECTURE
simultanément.
+ IT Per sbloccare, premere contemporaneamente i pulsanti di
aggiunta e di riproduzione.
NL Druk de knoppen ADD en PLAY tegelijk in voor ontgrendeling.
NO Trykk på Legg til- og Spill av-knappene samtidig for å låse
opp.
SV Tryck på plusknappen och uppspelningsknappen samtidigt när du
vill avaktivera låset.
@@ -281,7 +281,16 @@
SV Avbryt
POWER_DOWN_SLEEP
+ DA Slumre
+ DE Schlafmodus
EN Sleep
+ ES Suspender
+ FI Lepotila
+ FR Veille
+ IT Sospendi
+ NL Sluimermodus
+ NO Hvilemodus
+ SV Viloläge
POWER_DOWN_CONFIRM
DA Bekræft
@@ -308,7 +317,16 @@
SV \nHej då!
SLEEPING
+ DA \nSlumrer
+ DE \nSchlafmodus aktiv
EN \nSleeping
+ ES \nSuspensión
+ FI \nUnitilassa
+ FR \nMise en veille
+ IT \nSospensione
+ NL \nSluimermodus
+ NO \nHviler
+ SV \nI viloläge
POWER_DOWN_HELP
DA Annuller eller Bekræft at controlleren skal slukkes
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
