From 0ba7e1141dafcd4bc751fe4f9c47fcac7dd2a474 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 14 Jul 2023 17:15:45 +0200
Subject: [PATCH 1/2] Remove dummy version string

Resolves #3186

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 app/src/main/res/layout/activity_settings.xml | 1 -
 app/src/main/res/values/strings.xml           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 61bcec01b..16aad93cc 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -751,7 +751,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/standard_margin"
-                            android:hint="@string/v0_1"
                             android:textSize="@dimen/supporting_text_text_size"/>
 
                     </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 168299764..776d53777 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -691,6 +691,5 @@ How to translate with transifex:
     <string name="nc_settings_direct_value">8080</string>
     <string name="nc_settings_socks_value">1080</string>
     <string name="this_is_a_test_message">This is a test message</string>
-    <string name="v0_1">v0.1</string>
 
 </resources>

From dcbc1771c656d190e50dc3b068c7d12f97d0aee6 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 14 Jul 2023 17:19:51 +0200
Subject: [PATCH 2/2] remove ports from translatable strings

Resolves #3187

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../java/com/nextcloud/talk/settings/SettingsActivity.kt    | 6 +++---
 app/src/main/res/values/strings.xml                         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
index 0342858c8..fc7a796f6 100644
--- a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
@@ -942,16 +942,16 @@ class SettingsActivity : BaseActivity() {
                 when (newValue) {
                     "HTTP" -> {
                         binding.settingsProxyPortEdit.setText(getString(R.string.nc_settings_http_value))
-                        appPreferences.proxyPort = "3128"
+                        appPreferences.proxyPort = getString(R.string.nc_settings_http_value)
                     }
 
                     "DIRECT" -> {
                         binding.settingsProxyPortEdit.setText(getString(R.string.nc_settings_direct_value))
-                        appPreferences.proxyPort = "8080"
+                        appPreferences.proxyPort = getString(R.string.nc_settings_direct_value)
                     }
                     "SOCKS" -> {
                         binding.settingsProxyPortEdit.setText(getString(R.string.nc_settings_socks_value))
-                        appPreferences.proxyPort = "1080"
+                        appPreferences.proxyPort = getString(R.string.nc_settings_socks_value)
                     }
                     else -> {
                     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 776d53777..f91d48c43 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -687,9 +687,9 @@ How to translate with transifex:
     <string name="nc_filter">Filter Conversations</string>
     <string name="mentioned">Mentioned</string>
     <string name="unread">Unread</string>
-    <string name="nc_settings_http_value">3128</string>
-    <string name="nc_settings_direct_value">8080</string>
-    <string name="nc_settings_socks_value">1080</string>
+    <string name="nc_settings_http_value" translatable="false">3128</string>
+    <string name="nc_settings_direct_value" translatable="false">8080</string>
+    <string name="nc_settings_socks_value" translatable="false">1080</string>
     <string name="this_is_a_test_message">This is a test message</string>
 
 </resources>