Many localization fixes.

iiordanov · May 12, 2020 · cbf4e52 · cbf4e52
1 parent e319636
commit cbf4e52
Show file tree

Hide file tree

Showing 25 changed files with 247 additions and 203 deletions.
diff --git a/CustomVnc-app/src/main/AndroidManifest.xml b/CustomVnc-app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="com.iiordanov.CUSTOM_APP_PACKAGE_NAME"
           android:installLocation="auto"
-          android:versionCode="114200" android:versionName="v4.2.0">
+          android:versionCode="114201" android:versionName="v4.2.0">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>

diff --git a/Opaque-app/src/main/AndroidManifest.xml b/Opaque-app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.undatech.opaque"
-    android:versionCode="114200" android:versionName="v4.2.0">
+    android:versionCode="114201" android:versionName="v4.2.0">
 
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
     <uses-permission android:name="android.permission.VIBRATE" />

diff --git a/aRDP-app/src/main/AndroidManifest.xml b/aRDP-app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.iiordanov.aRDP" android:installLocation="auto"
-          android:versionCode="114200" android:versionName="v4.2.0">
+          android:versionCode="114201" android:versionName="v4.2.0">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>

diff --git a/aSPICE-app/src/main/AndroidManifest.xml b/aSPICE-app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.iiordanov.aSPICE" android:installLocation="auto"
-          android:versionCode="114200" android:versionName="v4.2.0">
+          android:versionCode="114201" android:versionName="v4.2.0">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>

diff --git a/bVNC-app/src/main/AndroidManifest.xml b/bVNC-app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.iiordanov.bVNC" android:installLocation="auto"
-          android:versionCode="114200" android:versionName="v4.2.0">
+          android:versionCode="114201" android:versionName="v4.2.0">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>

diff --git a/bVNC/CHANGELOG-aRDP b/bVNC/CHANGELOG-aRDP
@@ -1,3 +1,5 @@
+v4.2.0
+- Many localization fixes
 v4.1.0
 - Option to disable cursor
 - Fixes to cursor shape handling

diff --git a/bVNC/CHANGELOG-aSPICE b/bVNC/CHANGELOG-aSPICE
@@ -1,3 +1,5 @@
+v4.2.0
+- Many localization fixes
 v4.1.0
 - Option to disable cursor
 - Fixes to cursor shape handling

diff --git a/bVNC/CHANGELOG-bVNC b/bVNC/CHANGELOG-bVNC
@@ -1,3 +1,5 @@
+v4.2.0
+- Many localization fixes
 v4.1.0
 - Option to disable cursor
 - Fixes to cursor shape handling

diff --git a/bVNC/src/main/java/com/iiordanov/bVNC/App.java b/bVNC/src/main/java/com/iiordanov/bVNC/App.java
@@ -1,19 +1,28 @@
 package com.iiordanov.bVNC;
 
 import android.app.Application;
+import android.content.Context;
+
+import java.lang.ref.WeakReference;
 
 public class App extends Application {
 
     private Database database;
+    private static WeakReference<Context> context;
 
     @Override
     public void onCreate() {
         super.onCreate();
         Constants.DEFAULT_PROTOCOL_PORT = Utils.getDefaultPort(this);
         database = new Database(this);
+        context = new WeakReference<Context>(this);
     }
 
     public Database getDatabase() {
         return database;
     }
+
+    public static Context getContext() {
+        return context.get();
+    }
 }
diff --git a/bVNC/src/main/java/com/iiordanov/bVNC/COLORMODEL.java b/bVNC/src/main/java/com/iiordanov/bVNC/COLORMODEL.java
@@ -21,6 +21,7 @@
 package com.iiordanov.bVNC;
 
 import com.undatech.opaque.RfbConnectable;
+import com.undatech.remoteClientUi.R;
 
 import java.io.IOException;
 
@@ -93,19 +94,19 @@ public void setPixelFormat(RfbConnectable rfb) throws IOException {
     public String toString() {
         switch (this) {
         case C24bit:
-            return "24-bit color (24 bpp)";
+            return App.getContext().getString(R.string.color_24_bit);
         case C256:
-            return "256 colors (8 bpp)";
+            return App.getContext().getString(R.string.color_256);
         case C64:
-            return "64 colors (4 bpp)";
+            return App.getContext().getString(R.string.color_64);
         case C8:
-            return "8 colors (2 bpp)";
+            return App.getContext().getString(R.string.color_8);
         case C4:
-            return "Greyscale (1 bpp)";
+            return App.getContext().getString(R.string.color_greyscale);
         case C2:
-            return "Black & White (1 bpp)";
+            return App.getContext().getString(R.string.color_black_and_white);
         default:
-            return "24-bit color (24 bpp)";
+            return App.getContext().getString(R.string.color_24_bit);
         }
     }
 }
diff --git a/bVNC/src/main/res/layout-large/main.xml b/bVNC/src/main/res/layout-large/main.xml
@@ -327,8 +327,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textOn="@android:string/no"
-                android:textOff="@android:string/yes" />
+                android:textOn="@string/hide"
+                android:textOff="@string/show" />
 
             <TextView
                 android:layout_width="wrap_content"

diff --git a/bVNC/src/main/res/layout-large/main_rdp.xml b/bVNC/src/main/res/layout-large/main_rdp.xml
@@ -315,8 +315,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textOn="@android:string/no"
-                android:textOff="@android:string/yes" />
+                android:textOn="@string/hide"
+                android:textOff="@string/show" />
 
             <TextView
                 android:layout_width="wrap_content"

diff --git a/bVNC/src/main/res/layout-large/main_spice.xml b/bVNC/src/main/res/layout-large/main_spice.xml
@@ -322,8 +322,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textOn="@android:string/no"
-                android:textOff="@android:string/yes" />
+                android:textOn="@string/hide"
+                android:textOff="@string/show" />
 
             <TextView
                 android:layout_width="wrap_content"

diff --git a/bVNC/src/main/res/layout/main.xml b/bVNC/src/main/res/layout/main.xml
@@ -327,8 +327,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textOn="@android:string/no"
-                android:textOff="@android:string/yes" />
+                android:textOn="@string/hide"
+                android:textOff="@string/show" />
 
             <TextView
                 android:layout_width="wrap_content"

diff --git a/bVNC/src/main/res/layout/main_rdp.xml b/bVNC/src/main/res/layout/main_rdp.xml
@@ -315,8 +315,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textOn="@android:string/no"
-                android:textOff="@android:string/yes" />
+                android:textOn="@string/hide"
+                android:textOff="@string/show" />
 
             <TextView
                 android:layout_width="wrap_content"

diff --git a/bVNC/src/main/res/layout/main_spice.xml b/bVNC/src/main/res/layout/main_spice.xml
@@ -322,8 +322,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textOn="@android:string/no"
-                android:textOff="@android:string/yes" />
+                android:textOn="@string/hide"
+                android:textOff="@string/show" />
 
             <TextView
                 android:layout_width="wrap_content"