Author: titmuss
Date: Wed Mar 12 07:07:19 2008
New Revision: 2102
URL: http://svn.slimdevices.com?rev=2102&root=Jive&view=rev
Log:
Bug: 7022
Description:
Remove extra /'s from allowed character strings.
Also made the WPA passphrase a seperate string, the allowed characters strings
are being localized
and this is not valid for WPA.
Modified:
trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessApplet.lua
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/strings.txt
Modified: trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt?rev=2102&root=Jive&r1=2101&r2=2102&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt (original)
+++ trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt Wed Mar 12
07:07:19 2008
@@ -111,22 +111,22 @@
NL Verwijderen
ALLOWEDCHARS_NOCAPS
- DA [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
- DE [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
- EN [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
- ES [EMAIL PROTECTED]&*()_+{}:\\\"'<>¿?-=,./~`[];0123456789
- FR [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
- IT [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
- NL [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
+ DA [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ DE [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ EN [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ ES [EMAIL PROTECTED]&*()_+{}:\"'<>¿?-=,./~`[];0123456789
+ FR [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ IT [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ NL [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
ALLOWEDCHARS_CAPS
- DA [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
- DE [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
- EN [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
- ES [EMAIL PROTECTED]&*()_+{}:\\\"'<>¿?-=,./~`[];0123456789
- FR [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
- IT [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
- NL [EMAIL PROTECTED]&*()_+{}:\\\"'<>?-=,./~`[];0123456789
+ DA [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ DE [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ EN [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ ES [EMAIL PROTECTED]&*()_+{}:\"'<>¿?-=,./~`[];0123456789
+ FR [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ IT [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ NL [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
ALLOWEDCHARS_WITHCAPS
DA [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
Modified:
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessApplet.lua?rev=2102&root=Jive&r1=2101&r2=2102&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessApplet.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/SetupWirelessApplet.lua
Wed Mar 12 07:07:19 2008
@@ -645,7 +645,8 @@
createAndConnect(self)
return true
- end
+ end,
+ self:string("ALLOWEDCHARS_WPA")
)
window:addWidget(Textarea("softHelp",
self:string("NETWORK_WIRELESS_PASSWORD_HELP")))
Modified:
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/strings.txt
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/strings.txt?rev=2102&root=Jive&r1=2101&r2=2102&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/strings.txt
(original)
+++
trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWireless/strings.txt
Wed Mar 12 07:07:19 2008
@@ -701,3 +701,12 @@
IT Problema di connessione del telecomando a %s
NL Deze afstandsbediening kan geen verbinding maken met %s.
+ALLOWEDCHARS_WPA
+ DA [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ DE [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ EN [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ ES [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ FR [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ IT [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+ NL [EMAIL PROTECTED]&*()_+{}:\"'<>?-=,./~`[];0123456789
+
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins