From 37a197bd4cd414f52de856f36b3e77bde1317eeb Mon Sep 17 00:00:00 2001
From: Owen <owen.sessiecq@ecomail.fr>
Date: Wed, 30 Aug 2023 22:16:33 +0200
Subject: [PATCH 1/3] WIP: Add french language translations

---
 widget/manifest.xml                      |  1 +
 widget/resources-fre/layouts/layout.xml  | 25 +++++++++++++++
 widget/resources-fre/properties.xml      | 40 ++++++++++++++++++++++++
 widget/resources-fre/strings/strings.xml | 30 ++++++++++++++++++
 widget/resources/strings/strings.xml     | 11 ++++++-
 widget/source/Entities/EntityListView.mc |  2 +-
 widget/source/ErrorView.mc               |  2 +-
 widget/source/Menu/MenuController.mc     |  8 ++---
 widget/source/ViewController.mc          |  2 +-
 9 files changed, 113 insertions(+), 8 deletions(-)
 create mode 100644 widget/resources-fre/layouts/layout.xml
 create mode 100644 widget/resources-fre/properties.xml
 create mode 100644 widget/resources-fre/strings/strings.xml

diff --git a/widget/manifest.xml b/widget/manifest.xml
index 87307af..c8568b9 100644
--- a/widget/manifest.xml
+++ b/widget/manifest.xml
@@ -85,6 +85,7 @@
         </iq:permissions>
         <iq:languages>
             <iq:language>eng</iq:language>
+            <iq:language>fre</iq:language>
         </iq:languages>
         <iq:barrels/>
     </iq:application>
diff --git a/widget/resources-fre/layouts/layout.xml b/widget/resources-fre/layouts/layout.xml
new file mode 100644
index 0000000..d979c0c
--- /dev/null
+++ b/widget/resources-fre/layouts/layout.xml
@@ -0,0 +1,25 @@
+<layouts>
+    <layout id="ErrorLayout">
+        <label id="Title" x="center" y="60" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_LARGE"/>
+        <label id="Message" x="center" y="110" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_TINY"/>
+    </layout>
+    <layout id="LoginLayout">
+        <label id="Message" x="center" y="90" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_TINY" text="Log in on\nyour phone"/>
+    </layout>
+    <layout id="EntityLayout">
+        <label id="PreviousEntity" x="center" y="10%" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_TINY"/>
+        <!-- <text-area id="FocusedEntity" text="" x="center" y="center" width="70%" height="40%" justification="Gfx.TEXT_JUSTIFY_CENTER"> -->
+        <text-area id="FocusedEntity" text="" x="20%" y="center" width="80%" height="15%" justification="Gfx.TEXT_JUSTIFY_CENTER">
+            <fonts>
+                <font>Gfx.FONT_MEDIUM</font>
+                <font>Gfx.FONT_XTINY</font>
+            </fonts>
+        </text-area>
+        <label id="NextEntity" x="center" y="77%" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_TINY"/>
+    </layout>
+    <layout id="SceneLayout">
+        <label id="PreviousScene" x="center" y="10%" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_TINY"/>
+        <label id="FocusedScene" x="center" y="center" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_SYSTEM_LARGE"/>
+        <label id="NextScene" x="center" y="77%" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_TINY"/>
+    </layout>
+</layouts>
\ No newline at end of file
diff --git a/widget/resources-fre/properties.xml b/widget/resources-fre/properties.xml
new file mode 100644
index 0000000..7bc7370
--- /dev/null
+++ b/widget/resources-fre/properties.xml
@@ -0,0 +1,40 @@
+<resources>
+    <properties>
+        <property id="host" type="string">https://hassio.url</property>
+        <!-- <property id="port" type="number">443</property> -->
+        <property id="accessToken" type="string"></property>
+        <property id="scenes" type="string"></property>
+        <property id="group" type="string">Garmin</property>
+        <property id="refresh" type="boolean"></property>
+    </properties>
+
+    <strings>
+       <string id="host_title">Hôte: (exemple: https://hassio.url)</string>
+       <!-- <string id="port_title">Port: (443 is default for https)</string> -->
+       <string id="access_token">Token d'accès longue durée (Optionnel)</string>
+       <string id="scenes_title">Scènes: (scene1,scene2,scene3)</string>
+       <string id="group_title">Groupe: (Groupe utilisé pour importer des entités)</string>
+       <string id="refresh_title">Rafraichir dés l'affichage (Utilise plus de batterie et de ressource réseau)</string>
+    </strings>
+
+    <settings>
+        <setting propertyKey="@Properties.host" title="@Strings.host_title">
+            <settingConfig type="alphaNumeric" />
+        </setting>
+        <!-- <setting propertyKey="@Properties.port" title="@Strings.port_title">
+            <settingConfig min="1" max="65535" type="numeric" />
+        </setting> -->
+        <setting propertyKey="@Properties.accessToken" title="@Strings.access_token">
+            <settingConfig type="alphaNumeric" />
+        </setting>
+        <setting propertyKey="@Properties.scenes" title="@Strings.scenes_title">
+            <settingConfig type="alphaNumeric" />
+        </setting>
+        <setting propertyKey="@Properties.group" title="@Strings.group_title">
+            <settingConfig type="alphaNumeric" />
+        </setting>
+        <setting propertyKey="@Properties.refresh" title="@Strings.refresh_title">
+            <settingConfig type="boolean" />
+        </setting>
+    </settings>
+</resources>
\ No newline at end of file
diff --git a/widget/resources-fre/strings/strings.xml b/widget/resources-fre/strings/strings.xml
new file mode 100644
index 0000000..5efc4ea
--- /dev/null
+++ b/widget/resources-fre/strings/strings.xml
@@ -0,0 +1,30 @@
+<strings>
+    <string id="AppName">HassControl</string>
+
+
+    <!-- Entity List -->
+    <string id="NoEntities">Aucune entité configurée</string>
+
+    <!-- Root Widget Menu -->
+    
+    <string id="RootMenu_Entities">Entités</string>
+    <string id="RootMenu_Scenes">Scènes</string>
+    <string id="RootMenu_Settings">Paramètres</string>
+    <string id="RootMenu_Login">Se connecter</string>
+
+    <!-- ERROR -->
+    <string id="Error_Failed">Échec</string>
+    <string id="Error_Unknown">Erreur inconnue</string>
+    <string id="Error_PhoneNotConnected">Téléphone non connecté</string>
+
+    <string id="Error_Request_InvalidUrl">Vérifier les paramètres du widget, URL invalide</string>
+    <string id="Error_Request_NotFound">Ressource non trouvée</string>
+    <string id="Error_Request_NotAuthorized">Authentification échouée</string>
+
+    <string id="Error_Auth_NotReachable">Serveur non joignable</string>
+    <string id="Error_Auth_Revoked">Identifiant révoqué</string>
+
+    <string id="Error_No_Entity_Toggle_1">Aucune entité à ajuster,</string>
+    <string id="Error_No_Entity_Toggle_2">actualisez le groupe depuis</string>
+    <string id="Error_No_Entity_Toggle_3">les paramètres du widget</string>
+</strings>
\ No newline at end of file
diff --git a/widget/resources/strings/strings.xml b/widget/resources/strings/strings.xml
index ed14acb..1206735 100644
--- a/widget/resources/strings/strings.xml
+++ b/widget/resources/strings/strings.xml
@@ -5,9 +5,14 @@
     <!-- Entity List -->
     <string id="NoEntities">No entities configured</string>
 
-
+    <!-- Root Widget Menu -->
+    <string id="RootMenu_Entities">Entities</string>
+    <string id="RootMenu_Scenes">Scenes</string>
+    <string id="RootMenu_Settings">Settings</string>
+    <string id="RootMenu_Login">Login</string>
 
     <!-- ERROR -->
+    <string id="Error_Failed">Failed</string>
     <string id="Error_Unknown">Unknown error</string>
     <string id="Error_PhoneNotConnected">Phone not connected</string>
 
@@ -17,4 +22,8 @@
 
     <string id="Error_Auth_NotReachable">Server not reachable</string>
     <string id="Error_Auth_Revoked">Login Revoked</string>
+
+    <string id="Error_No_Entity_Toggle_1">No entity to toggle,</string>
+    <string id="Error_No_Entity_Toggle_2">please refresh group</string>
+    <string id="Error_No_Entity_Toggle_3">from settings</string>
 </strings>
\ No newline at end of file
diff --git a/widget/source/Entities/EntityListView.mc b/widget/source/Entities/EntityListView.mc
index 80755bd..075beba 100644
--- a/widget/source/Entities/EntityListView.mc
+++ b/widget/source/Entities/EntityListView.mc
@@ -79,7 +79,7 @@ class EntityListDelegate extends Ui.BehaviorDelegate {
       _mController.toggleEntity(entity);
     } else {
       App.getApp().menu.showRootMenu();
-      App.getApp().viewController.showError("No entity to toggle,\nplease refresh group\nfrom settings");
+      App.getApp().viewController.showError(Lang.format("$1$\r\n$2$\r\n$3$", [Ui.loadResource(Rez.Strings.Error_No_Entity_Toggle_1),Ui.loadResource(Rez.Strings.Error_No_Entity_Toggle_2),Ui.loadResource(Rez.Strings.Error_No_Entity_Toggle_3)]));
     }
 
     return true;
diff --git a/widget/source/ErrorView.mc b/widget/source/ErrorView.mc
index 1a23c75..635adcb 100644
--- a/widget/source/ErrorView.mc
+++ b/widget/source/ErrorView.mc
@@ -50,7 +50,7 @@ class ErrorView extends Ui.View {
         var titleEl = View.findDrawableById("Title");
         var messageEl = View.findDrawableById("Message");
 
-        titleEl.setText("Failed");
+        titleEl.setText(Rez.Strings.Error_Failed);
         messageEl.setText(_message.toString());
 
         View.onUpdate(dc);
diff --git a/widget/source/Menu/MenuController.mc b/widget/source/Menu/MenuController.mc
index a1cfebb..e4796bb 100644
--- a/widget/source/Menu/MenuController.mc
+++ b/widget/source/Menu/MenuController.mc
@@ -32,26 +32,26 @@ class MenuController {
 
         if (App.getApp().isLoggedIn()) {
             menu.addItem(new Ui.MenuItem(
-                "Scenes",
+                Rez.Strings.RootMenu_Scenes,
                 "",
                 MenuController.MENU_SWITCH_TO_SCENES,
                 {}
             ));
             menu.addItem(new Ui.MenuItem(
-                "Entities",
+                Rez.Strings.RootMenu_Entities,
                 "",
                 MenuController.MENU_SWITCH_TO_ENTITIES,
                 {}
             ));
             menu.addItem(new Ui.MenuItem(
-                "Settings",
+                Rez.Strings.RootMenu_Settings,
                 "",
                 MenuController.MENU_ENTER_SETTINGS,
                 {}
             ));
         } else {
             menu.addItem(new Ui.MenuItem(
-                "Login",
+                Rez.Strings.RootMenu_Login,
                 "",
                 MenuController.MENU_LOGIN,
                 {}
diff --git a/widget/source/ViewController.mc b/widget/source/ViewController.mc
index 643e4da..bc3f9a9 100644
--- a/widget/source/ViewController.mc
+++ b/widget/source/ViewController.mc
@@ -168,7 +168,7 @@ class ViewController {
   function showError(error) {
     removeLoaderImmediate();
 
-    var message = "Unknown Error";
+    var message = Rez.Strings.Error_Unknown;
 
     if (error instanceof Error) {
       message = error.toShortString();

From f1663808eb1c7f03deeaf7c2c397093d81f6785a Mon Sep 17 00:00:00 2001
From: Owen SESSIECQ <o.sessiecq@otaree.com>
Date: Thu, 31 Aug 2023 08:12:38 +0200
Subject: [PATCH 2/3] Continue translation of menu items

---
 widget/resources-fre/layouts/layout.xml  |  2 +-
 widget/resources-fre/strings/strings.xml | 17 +++++++++++------
 widget/resources/strings/strings.xml     | 16 +++++++++++-----
 widget/source/Menu/MenuController.mc     | 24 ++++++++++++------------
 4 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/widget/resources-fre/layouts/layout.xml b/widget/resources-fre/layouts/layout.xml
index d979c0c..a3985de 100644
--- a/widget/resources-fre/layouts/layout.xml
+++ b/widget/resources-fre/layouts/layout.xml
@@ -4,7 +4,7 @@
         <label id="Message" x="center" y="110" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_TINY"/>
     </layout>
     <layout id="LoginLayout">
-        <label id="Message" x="center" y="90" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_TINY" text="Log in on\nyour phone"/>
+        <label id="Message" x="center" y="90" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_TINY" text="Connectez-vous\nsur votre téléphone"/>
     </layout>
     <layout id="EntityLayout">
         <label id="PreviousEntity" x="center" y="10%" justification="Gfx.TEXT_JUSTIFY_CENTER" color="FFFFFF" font="Gfx.FONT_TINY"/>
diff --git a/widget/resources-fre/strings/strings.xml b/widget/resources-fre/strings/strings.xml
index 5efc4ea..c4f15cc 100644
--- a/widget/resources-fre/strings/strings.xml
+++ b/widget/resources-fre/strings/strings.xml
@@ -5,12 +5,17 @@
     <!-- Entity List -->
     <string id="NoEntities">Aucune entité configurée</string>
 
-    <!-- Root Widget Menu -->
-    
-    <string id="RootMenu_Entities">Entités</string>
-    <string id="RootMenu_Scenes">Scènes</string>
-    <string id="RootMenu_Settings">Paramètres</string>
-    <string id="RootMenu_Login">Se connecter</string>
+    <!-- Generic terms -->
+    <string id="Generic_Login">Se connecter</string>
+    <string id="Generic_Logout">Se déconnecter</string>
+    <string id="Generic_Settings">Paramètres</string>
+    <string id="Generic_Scenes">Scènes</string>
+    <string id="Generic_Entities">Entités</string>
+    <string id="Generic_Back">Retour</string>
+
+    <!-- Settings Menu -->
+    <string id="SettingsMenu_Start_View">Start View</string>
+    <string id="SettingsMenu_Refresh_Entities">Refresh entities</string>
 
     <!-- ERROR -->
     <string id="Error_Failed">Échec</string>
diff --git a/widget/resources/strings/strings.xml b/widget/resources/strings/strings.xml
index 1206735..75d82aa 100644
--- a/widget/resources/strings/strings.xml
+++ b/widget/resources/strings/strings.xml
@@ -5,11 +5,17 @@
     <!-- Entity List -->
     <string id="NoEntities">No entities configured</string>
 
-    <!-- Root Widget Menu -->
-    <string id="RootMenu_Entities">Entities</string>
-    <string id="RootMenu_Scenes">Scenes</string>
-    <string id="RootMenu_Settings">Settings</string>
-    <string id="RootMenu_Login">Login</string>
+    <!-- Generic terms -->
+    <string id="Generic_Login">Login</string>
+    <string id="Generic_Logout">Logout</string>
+    <string id="Generic_Settings">Settings</string>
+    <string id="Generic_Scenes">Scenes</string>
+    <string id="Generic_Entities">Entities</string>
+    <string id="Generic_Back">Back</string>
+
+    <!-- Settings Menu -->
+    <string id="SettingsMenu_Start_View">Start View</string>
+    <string id="SettingsMenu_Refresh_Entities">Refresh entities</string>
 
     <!-- ERROR -->
     <string id="Error_Failed">Failed</string>
diff --git a/widget/source/Menu/MenuController.mc b/widget/source/Menu/MenuController.mc
index e4796bb..0d93c5d 100644
--- a/widget/source/Menu/MenuController.mc
+++ b/widget/source/Menu/MenuController.mc
@@ -32,26 +32,26 @@ class MenuController {
 
         if (App.getApp().isLoggedIn()) {
             menu.addItem(new Ui.MenuItem(
-                Rez.Strings.RootMenu_Scenes,
+                Rez.Strings.Generic_Scenes,
                 "",
                 MenuController.MENU_SWITCH_TO_SCENES,
                 {}
             ));
             menu.addItem(new Ui.MenuItem(
-                Rez.Strings.RootMenu_Entities,
+                Rez.Strings.Generic_Entities,
                 "",
                 MenuController.MENU_SWITCH_TO_ENTITIES,
                 {}
             ));
             menu.addItem(new Ui.MenuItem(
-                Rez.Strings.RootMenu_Settings,
+                Rez.Strings.Generic_Settings,
                 "",
                 MenuController.MENU_ENTER_SETTINGS,
                 {}
             ));
         } else {
             menu.addItem(new Ui.MenuItem(
-                Rez.Strings.RootMenu_Login,
+                Rez.Strings.Generic_Login,
                 "",
                 MenuController.MENU_LOGIN,
                 {}
@@ -63,23 +63,23 @@ class MenuController {
 
     function showSettingsMenu() {
         var menu = new Ui.Menu2({
-            :title => "Settings"
+            :title => Rez.Strings.Generic_Settings
         });
 
         menu.addItem(new Ui.MenuItem(
-            "Start View",
+            Rez.Strings.SettingsMenu_Start_View,
             App.getApp().getStartView(),
             MenuController.MENU_SELECT_START_VIEW,
             {}
         ));
         menu.addItem(new Ui.MenuItem(
-            "Refresh entities",
+            Rez.Strings.SettingsMenu_Refresh_Entities,
             Hass.getGroup(),
             MenuController.MENU_REFRESH_ENTITIES,
             {}
         ));
         menu.addItem(new Ui.MenuItem(
-            "Logout",
+            Rez.Strings.Generic_Logout,
             "",
             MenuController.MENU_LOGOUT,
             {}
@@ -90,7 +90,7 @@ class MenuController {
 
     function showSelectStartViewMenu() {
         var menu = new Ui.Menu2({
-            :title => "Start view"
+            :title => Rez.Strings.SettingsMenu_Start_View
         });
 
         var currentStartView = App.getApp().getStartView();
@@ -106,21 +106,21 @@ class MenuController {
         }
 
         menu.addItem(new Ui.MenuItem(
-            "Entities",
+            Rez.Strings.Generic_Entities,
             entitiesSubtitle,
             MenuController.MENU_SELECT_START_VIEW_ENTITIES,
             {}
         ));
 
         menu.addItem(new Ui.MenuItem(
-            "Scenes",
+            Rez.Strings.Generic_Scenes,
             scenesSubtitle,
             MenuController.MENU_SELECT_START_VIEW_SCENES,
             {}
         ));
 
         menu.addItem(new Ui.MenuItem(
-            "Back",
+            Rez.Strings.Generic_Back,
             "",
             MenuController.MENU_BACK,
             {}

From 2d41325e298c6432a8daeecf70abdbd8cbf12f0f Mon Sep 17 00:00:00 2001
From: Owen SESSIECQ <o.sessiecq@otaree.com>
Date: Thu, 31 Aug 2023 08:32:59 +0200
Subject: [PATCH 3/3] Translation of loading texts

---
 widget/resources-fre/strings/strings.xml | 21 ++++++++++++++++-----
 widget/resources/strings/strings.xml     | 17 ++++++++++++++---
 widget/source/Entities/EntityListView.mc |  2 +-
 widget/source/hass/Hass.mc               | 20 ++++++++++----------
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/widget/resources-fre/strings/strings.xml b/widget/resources-fre/strings/strings.xml
index c4f15cc..0406456 100644
--- a/widget/resources-fre/strings/strings.xml
+++ b/widget/resources-fre/strings/strings.xml
@@ -12,10 +12,21 @@
     <string id="Generic_Scenes">Scènes</string>
     <string id="Generic_Entities">Entités</string>
     <string id="Generic_Back">Retour</string>
+    <string id="Generic_Refreshing">Rafraîchissement en cours</string>
+
+    <!-- Loading Texts -->
+    <string id="LoadingText_Running">En cours d'éxécution</string>
+    <string id="LoadingText_Locking">Verouillage</string>
+    <string id="LoadingText_Unlocking">Déverouillage</string>
+    <string id="LoadingText_Closing">Fermeture</string>
+    <string id="LoadingText_Opening">Ouverture</string>
+    <string id="LoadingText_Pressing">Pression</string>
+    <string id="LoadingText_Turning_Off">Extinction</string>
+    <string id="LoadingText_Turning_On">Allumage</string>
 
     <!-- Settings Menu -->
-    <string id="SettingsMenu_Start_View">Start View</string>
-    <string id="SettingsMenu_Refresh_Entities">Refresh entities</string>
+    <string id="SettingsMenu_Start_View">Vue de départ</string>
+    <string id="SettingsMenu_Refresh_Entities">Rafraîchir les entités</string>
 
     <!-- ERROR -->
     <string id="Error_Failed">Échec</string>
@@ -29,7 +40,7 @@
     <string id="Error_Auth_NotReachable">Serveur non joignable</string>
     <string id="Error_Auth_Revoked">Identifiant révoqué</string>
 
-    <string id="Error_No_Entity_Toggle_1">Aucune entité à ajuster,</string>
-    <string id="Error_No_Entity_Toggle_2">actualisez le groupe depuis</string>
-    <string id="Error_No_Entity_Toggle_3">les paramètres du widget</string>
+    <string id="Error_No_Entity_Toggle">Aucune entité à basculer,\nactualisez le groupe depuis\nles paramètres du widget</string>
+
+    <string id="Error_Group_Not_Configured">Groupe\nnon\nconfiguré</string>
 </strings>
\ No newline at end of file
diff --git a/widget/resources/strings/strings.xml b/widget/resources/strings/strings.xml
index 75d82aa..8d0c23c 100644
--- a/widget/resources/strings/strings.xml
+++ b/widget/resources/strings/strings.xml
@@ -12,6 +12,17 @@
     <string id="Generic_Scenes">Scenes</string>
     <string id="Generic_Entities">Entities</string>
     <string id="Generic_Back">Back</string>
+    <string id="Generic_Refreshing">Refreshing</string>
+
+    <!-- Loading Texts -->
+    <string id="LoadingText_Running">Running</string>
+    <string id="LoadingText_Locking">Locking</string>
+    <string id="LoadingText_Unlocking">Unlocking</string>
+    <string id="LoadingText_Closing">Closing</string>
+    <string id="LoadingText_Opening">Opening</string>
+    <string id="LoadingText_Pressing">Pressing</string>
+    <string id="LoadingText_Turning_Off">Turning off</string>
+    <string id="LoadingText_Turning_On">Turning on</string>
 
     <!-- Settings Menu -->
     <string id="SettingsMenu_Start_View">Start View</string>
@@ -29,7 +40,7 @@
     <string id="Error_Auth_NotReachable">Server not reachable</string>
     <string id="Error_Auth_Revoked">Login Revoked</string>
 
-    <string id="Error_No_Entity_Toggle_1">No entity to toggle,</string>
-    <string id="Error_No_Entity_Toggle_2">please refresh group</string>
-    <string id="Error_No_Entity_Toggle_3">from settings</string>
+    <string id="Error_No_Entity_Toggle">No entity to toggle,\nplease refresh group\nfrom settings</string>
+
+    <string id="Error_Group_Not_Configured">Group\nnot\nconfigured</string>
 </strings>
\ No newline at end of file
diff --git a/widget/source/Entities/EntityListView.mc b/widget/source/Entities/EntityListView.mc
index 075beba..ec84e85 100644
--- a/widget/source/Entities/EntityListView.mc
+++ b/widget/source/Entities/EntityListView.mc
@@ -79,7 +79,7 @@ class EntityListDelegate extends Ui.BehaviorDelegate {
       _mController.toggleEntity(entity);
     } else {
       App.getApp().menu.showRootMenu();
-      App.getApp().viewController.showError(Lang.format("$1$\r\n$2$\r\n$3$", [Ui.loadResource(Rez.Strings.Error_No_Entity_Toggle_1),Ui.loadResource(Rez.Strings.Error_No_Entity_Toggle_2),Ui.loadResource(Rez.Strings.Error_No_Entity_Toggle_3)]));
+      App.getApp().viewController.showError(Ui.loadResource(Rez.Strings.Error_No_Entity_Toggle));
     }
 
     return true;
diff --git a/widget/source/hass/Hass.mc b/widget/source/hass/Hass.mc
index e83003a..d80f05d 100644
--- a/widget/source/hass/Hass.mc
+++ b/widget/source/hass/Hass.mc
@@ -282,11 +282,11 @@ module Hass {
     var group = getGroup();
 
     if (group == null) {
-      App.getApp().viewController.showError("Group\nnot\nconfigured");
+      App.getApp().viewController.showError(Ui.loadResource(Rez.Strings.Error_Group_Not_Configured));
       return;
     }
 
-    App.getApp().viewController.showLoader("Refreshing");
+    App.getApp().viewController.showLoader(Rez.Strings.Generic_Refreshing);
 
     client.getEntity(group, null, Utils.method(Hass, :_onReceiveEntities));
   }
@@ -336,33 +336,33 @@ module Hass {
 
     if (entity.getType() == Entity.TYPE_SCRIPT) {
       action = Client.ENTITY_ACTION_TURN_ON;
-      loadingText = "Running";
+      loadingText = Rez.Strings.LoadingText_Running;
     } else if (entity.getType() == Entity.TYPE_LOCK) {
       if (currentState == Entity.STATE_UNLOCKED) {
         action = Client.ENTITY_ACTION_LOCK;
-        loadingText = "Locking";
+        loadingText = Rez.Strings.LoadingText_Locking;
       } else if (currentState == Entity.STATE_LOCKED) {
         action = Client.ENTITY_ACTION_UNLOCK;
-        loadingText = "Unlocking";
+        loadingText = Rez.Strings.LoadingText_Unlocking;
       }
     } else if (entity.getType() == Entity.TYPE_COVER) {
       if (currentState == Entity.STATE_OPEN) {
         action = Client.ENTITY_ACTION_CLOSE_COVER;
-        loadingText = "Closing";
+        loadingText = Rez.Strings.LoadingText_Closing;
       } else if (currentState == Entity.STATE_CLOSED) {
         action = Client.ENTITY_ACTION_OPEN_COVER;
-        loadingText = "Opening";
+        loadingText = Rez.Strings.LoadingText_Opening;
       }
     } else if (entity.getType() == Entity.TYPE_BUTTON || entity.getType() == Entity.TYPE_INPUT_BUTTON) {
       action = Client.ENTITY_ACTION_PRESS;
-      loadingText = "Pressing";
+      loadingText = Rez.Strings.LoadingText_Pressing;
     } else {
       if (currentState == Entity.STATE_ON) {
         action = Client.ENTITY_ACTION_TURN_OFF;
-        loadingText = "Turning off";
+        loadingText = Rez.Strings.LoadingText_Turning_Off;
       } else if (currentState == Entity.STATE_OFF) {
         action = Client.ENTITY_ACTION_TURN_ON;
-        loadingText = "Turning on";
+        loadingText = Rez.Strings.LoadingText_Turning_On;
       }
     }