[tuxdroid-svn] r5717 - in software_suite_v3/smart-core/smart-server/branches/user_mode: data/web_interface/user_01/xsl translation/wi_user

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-16 13:56:27 +0200 (Fri, 16 Oct 2009)
New Revision: 5717

Modified:
   software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadget_configuration.xsl
   software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po
   software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/en.po
   software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/fr.po
   software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/nl.po
Log:
* Merged rev 5677 to 5716 from trunk in this branch

Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadget_configuration.xsl
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadget_configuration.xsl	2009-10-16 10:39:52 UTC (rev 5716)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/data/web_interface/user_01/xsl/gadget_configuration.xsl	2009-10-16 11:56:27 UTC (rev 5717)
@@ -107,7 +107,6 @@
                     </div>
                 </xsl:if>
             </xsl:for-each>
-            <!-- GADGET ALERT ATTITUNE -->
             <xsl:if test="root/data/showAlertAttitune = 'True'">
                 <div class="gadgetConfContentFrameMiddle">
                     <div class="gadgetConfContentFrameSep"></div>
@@ -146,7 +145,7 @@
             <xsl:when test="root/data/description/onDemandIsAble = 'true'">
                 <!-- BAR -->
                 <div class="gadgetConfTitleBarOnDemand">
-                    <span class="gadgetConfTitleBarLabel"><xsl:value-of select="root/translations/on_demand_config_section"/></span>
+                    <span class="gadgetConfTitleBarLabel"><xsl:value-of select="root/translations/on_demand"/></span>
                 </div>
                 <div class="gadgetConfTitleBarBottom2"></div>
                 <!-- Content -->
@@ -179,7 +178,7 @@
                 </xsl:element>
                 <!-- BAR -->
                 <div class="gadgetConfTitleBarAlert">
-                    <span class="gadgetConfTitleBarLabel"><xsl:value-of select="translatedName"/></span>
+                    <span class="gadgetConfTitleBarLabel"><xsl:value-of select="../../../translations/alerts"/></span>
                 </div>
                 <div class="gadgetConfTitleBarBottom2"></div>
                 <!-- CONTENT -->

Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po	2009-10-16 10:39:52 UTC (rev 5716)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/de.po	2009-10-16 11:56:27 UTC (rev 5717)
@@ -74,7 +74,7 @@
 msgstr "Abbrechen"
 
 msgid "gadget_settings"
-msgstr "Funktionseinstellungen"
+msgstr "Einstellungen"
 
 msgid "gadget_name"
 msgstr "Funktionsname"

Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/en.po
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/en.po	2009-10-16 10:39:52 UTC (rev 5716)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/en.po	2009-10-16 11:56:27 UTC (rev 5717)
@@ -74,7 +74,7 @@
 msgstr "Cancel"
 
 msgid "gadget_settings"
-msgstr "Gadget settings"
+msgstr "Settings"
 
 msgid "gadget_name"
 msgstr "Gadget name"

Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/fr.po
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/fr.po	2009-10-16 10:39:52 UTC (rev 5716)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/fr.po	2009-10-16 11:56:27 UTC (rev 5717)
@@ -74,7 +74,7 @@
 msgstr "Annuler"
 
 msgid "gadget_settings"
-msgstr "Paramètres du gadget"
+msgstr "Paramètres"
 
 msgid "gadget_name"
 msgstr "Nom du gadget"

Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/nl.po
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/nl.po	2009-10-16 10:39:52 UTC (rev 5716)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/translation/wi_user/nl.po	2009-10-16 11:56:27 UTC (rev 5717)
@@ -74,7 +74,7 @@
 msgstr "Annuleren"
 
 msgid "gadget_settings"
-msgstr "Gadget configuratie"
+msgstr "Configuratie"
 
 msgid "gadget_name"
 msgstr "Gadget naam"