Author: bklaas
Date: Wed Jan 20 10:41:01 2010
New Revision: 8383
URL: http://svn.slimdevices.com/jive?rev=8383&view=rev
Log:
r38...@daddymac-520 (orig r8380): michael | 2010-01-20 00:48:22 -0500
Bug: n/a
Description: add some more SLT comments, based on SLT feedback/queries. Fix
typo.
r38...@daddymac-520 (orig r8382): bklaas | 2010-01-20 12:40:46 -0500
r38...@daddymac-520 (orig r8381): bklaas | 2010-01-20 10:53:43 -0500
Bug: 14870
Description: with removal of 59 second automatic window hide, time should
again be updated in the alarm window as minutes change
Modified:
7.6/trunk/ (props changed)
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/strings.txt
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
Propchange: 7.6/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jan 20 10:41:01 2010
@@ -12,8 +12,8 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-autoswitch:5831
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-skin:4552
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8376
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8377
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8381
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8382
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/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=8383&r1=8382&r2=8383&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Wed Jan 20 10:41:01 2010
@@ -502,7 +502,25 @@
end
)
+ window:addTimer(1000,
+ function()
+ self:_updateTime()
+ end
+ )
+
self.alarmWindow = window
+ self.timeWidget = label
+
+end
+
+
+function _updateTime(self)
+ local time = datetime:getCurrentTime()
+ if time ~= self.time then
+ log:debug('updating time in alarm window')
+ self.time = time
+ self.timeWidget:setValue(time)
+ end
end
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/strings.txt
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/strings.txt?rev=8383&r1=8382&r2=8383&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/strings.txt
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/strings.txt
Wed Jan 20 10:41:01 2010
@@ -193,21 +193,27 @@
SV Svep åt vänster
SHORTCUTS_INPUT_IR_HOLD
+# SLT: placeholder stands for a button which is to be pressed/held
EN IR Hold %s
SHORTCUTS_INPUT_IR_PRESS
+# SLT: placeholder stands for a button which is to be pressed/held
EN IR Press %s
SHORTCUTS_INPUT_KEY_HOLD
+# SLT: placeholder stands for a button which is to be pressed/held
EN Key Hold %s
SHORTCUTS_INPUT_KEY_PRESS
+# SLT: placeholder stands for a button which is to be pressed/held
EN Key Press %s
SHORTCUTS_INPUT_KEY_PRESET_PRESS
+# SLT: placeholder stands for a button which is to be pressed/held
EN Preset Key Press %s
SHORTCUTS_INPUT_KEY_PRESET_HOLD
+# SLT: placeholder stands for a button which is to be pressed/held
EN Preset Key Hold %s
SHORTCUTS_OUTPUT_BACK
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt?rev=8383&r1=8382&r2=8383&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
Wed Jan 20 10:41:01 2010
@@ -631,9 +631,11 @@
EN Battery voltage\n%s
BATTERY_VMON1
+# SLT: no need to translate vmon1
EN Battery vmon1\n%s
BATTERY_VMON2
+# SLT: no need to translate vmon2
EN Battery vmon2\n%s
WALL_VOLTAGE
@@ -643,6 +645,7 @@
EN Battery temperature\n%s
POWER_MODE
+# SLT: power mode refers to either AC or battery
EN Power mode\n%s
POWER_ON_AC
@@ -660,8 +663,8 @@
BATT_DISCHARGING
EN Battery discharging
-BATT_DISCHARGING_WANRING
- EN Battery discharging battery is low
+BATT_DISCHARGING_WARNING
+ EN Battery discharging. Battery is low
BATT_CHARGING
EN Battery charging
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
