Merge pull request #198 from nightscout/fix/wear-gradle-semilocalised

downgrade gradle and fix mixed localisation comparison

build.gradle

@@ -37,7 +37,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java

@@ -39,8 +39,8 @@ public class MainMenuActivity extends MenuListActivity {
 
         if(!sharedPreferences.getBoolean("wearcontrol", false)){
             return new String[] {
-                    "Settings",
-                    "Re-Sync"};
+                    aaps.gs(R.string.menu_settings),
+                    aaps.gs(R.string.menu_resync)};
         }
 
 

wear/src/main/res/values/strings.xml

@@ -77,6 +77,7 @@
     <string name="menu_ecarb">eCarb</string>
     <string name="menu_settings">Settings</string>
     <string name="menu_status">Status</string>
+    <string name="menu_resync">Re-Sync</string>
     <string name="menu_prime_fill">Prime/Fill</string>
     <string name="menu_none">None</string>
     <string name="menu_default">Default</string>