From 961df9984c213fcc01722e37ad83bb99c1b870e2 Mon Sep 17 00:00:00 2001
From: Dayona Joseph <dayonajsph8@gmail.com>
Date: Fri, 24 Apr 2020 18:55:44 +0530
Subject: [PATCH 1/4] Add language translation for buttons

---
 app/src/main/AndroidManifest.xml    | 4 ++--
 app/src/main/res/values/strings.xml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a4ddcad26e..abc340ba90 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -101,7 +101,7 @@
             android:name=".features.widgets.WidgetsActivity"
             android:autoRemoveFromRecents="true"
             android:excludeFromRecents="true"
-            android:label="Widgets"
+            android:label="@string/widgets"
             android:theme="@style/AppTheme" />
 
         <activity
@@ -168,4 +168,4 @@
             android:name="android.nfc.disable_beam_default"
             android:value="true" />
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9dd419248c..c97d9dd19c 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,10 @@
 
     <string name="unknown">Unknown</string>
     <string name="cancel">Cancel</string>
+    <string name="edit">EDIT</string>
+    <string name="add_widget">Add Widget</string>
+    <string name="widgets">Widgets</string>
+    <string name="choose_widget">Choose widget</string>
 
     <!-- Weather - Weather codes -->
     <string name="weather_0">Tornado</string>
-- 
GitLab


From 1f167d0c344b588a5709ae1588e4f243e382ee28 Mon Sep 17 00:00:00 2001
From: Dayona Joseph <dayonajsph8@gmail.com>
Date: Mon, 27 Apr 2020 11:29:24 +0530
Subject: [PATCH 2/4] For a better world

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c97d9dd19c..b5b7809f2c 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
 
     <string name="unknown">Unknown</string>
     <string name="cancel">Cancel</string>
-    <string name="edit">EDIT</string>
+    <string name="edit">Edit</string>
     <string name="add_widget">Add Widget</string>
     <string name="widgets">Widgets</string>
     <string name="choose_widget">Choose widget</string>
-- 
GitLab


From 81ca999f6b19b56f67cce54590c43a2a6c2ffd4c Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Wed, 20 May 2020 16:23:12 +0200
Subject: [PATCH 3/4] Move string

---
 app/src/main/res/values/strings.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b5b7809f2c..2311d686ee 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,10 +10,6 @@
 
     <string name="unknown">Unknown</string>
     <string name="cancel">Cancel</string>
-    <string name="edit">Edit</string>
-    <string name="add_widget">Add Widget</string>
-    <string name="widgets">Widgets</string>
-    <string name="choose_widget">Choose widget</string>
 
     <!-- Weather - Weather codes -->
     <string name="weather_0">Tornado</string>
@@ -177,5 +173,7 @@
     <string name="choose_widget">Choose widget</string>
     <string name="add_widget">Add Widget</string>
     <string name="edit">Edit</string>
+    <string name="widgets">Widgets</string>
+    <string name="edit">Edit</string>
 
 </resources>
-- 
GitLab


From 64be3bec4d5088cb715c1afbe01295952c4c1294 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Wed, 20 May 2020 16:23:33 +0200
Subject: [PATCH 4/4] Fix

---
 app/src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2311d686ee..0feea703a9 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,6 +174,5 @@
     <string name="add_widget">Add Widget</string>
     <string name="edit">Edit</string>
     <string name="widgets">Widgets</string>
-    <string name="edit">Edit</string>
 
 </resources>
-- 
GitLab