From 2c76a6514546a447c2e5daafded2c102aa01f3d5 Mon Sep 17 00:00:00 2001
From: Vavassor <copernicus-@hotmail.com>
Date: Tue, 21 Mar 2017 01:13:08 -0400
Subject: [PATCH] Second bugfix release. Also fixes localization build issues.

---
 app/build.gradle                           |  4 ++--
 app/src/main/res/values-de/strings.xml     | 10 +---------
 app/src/main/res/values/array.xml          |  6 +++---
 app/src/main/res/values/donottranslate.xml | 10 ++++++++++
 app/src/main/res/values/strings.xml        | 13 +++----------
 5 files changed, 19 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/values/donottranslate.xml

diff --git a/app/build.gradle b/app/build.gradle
index c43d67e0..cac5c8c6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.keylesspalace.tusky"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 10
-        versionName "1.0.1"
+        versionCode 11
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary true
     }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 23f3feee..6216f89d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,11 +1,4 @@
 <resources>
-    <string name="app_name">Tusky</string>
-    <string name="app_website">http://tusky.keylesspalace.com</string>
-
-    <string name="oauth_scheme">com.keylesspalace.tusky</string>
-    <string name="oauth_redirect_host">oauth2redirect</string>
-    <string name="preferences_file_key">com.keylesspalace.tusky.PREFERENCES</string>
-
     <string name="error_authorization_unknown">Ein undefinierbarer Autorisierungsfehler ist aufgetreten.</string>
     <string name="error_fetching_notifications">Benachrichtigungen konnten nicht empfangen werden.</string>
     <string name="error_compose_character_limit">Der Status ist zu lang!</string>
@@ -54,7 +47,7 @@
     <string name="notification_favourite_format">%s favorisierte deinen Status</string>
     <string name="notification_follow_format">%s ist dir gefolgt</string>
 
-    <string name="report_username_format">@%s melden</string>
+    <string name="report_username_format">\@%s melden</string>
     <string name="report_comment_hint">Irgendwelche Anmerkungen?</string>
 
     <string name="action_compose">Schreiben</string>
@@ -126,7 +119,6 @@
     <string name="search">Suche Accounts…</string>
     <string name="toggle_nsfw">NSFW</string>
     <string name="action_mention">Erwähnen</string>
-    <string name="tusky_api_url">https://tuskynotifier.keylesspalace.com</string>
     <string name="notification_mention_format">%s hat dich erwähnt</string>
     <string name="error_invalid_domain">Ungültige Domain angegeben</string>
     <string name="error_failed_app_registration">Diese App konnte sich auf dem Server nicht authentifizieren.</string>
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index fb487328..48d6a0ce 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     
-    <string-array name="pull_notification_check_interval_names">
+    <string-array name="pull_notification_check_interval_names" tools:ignore="MissingTranslation">
         <item>5 minutes</item>
         <item>10 minutes</item>
         <item>15 minutes</item>
@@ -13,7 +13,7 @@
         <item>2 hours</item>
     </string-array>
 
-    <string-array name="pull_notification_check_intervals" inputType="integer">
+    <string-array name="pull_notification_check_intervals" inputType="integer" translatable="false">
         <item>5</item>
         <item>10</item>
         <item>15</item>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
new file mode 100644
index 00000000..dd336a03
--- /dev/null
+++ b/app/src/main/res/values/donottranslate.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Tusky</string>
+    <string name="app_website">http://tusky.keylesspalace.com</string>
+    <string name="tusky_api_url">https://tuskynotifier.keylesspalace.com</string>
+
+    <string name="oauth_scheme">com.keylesspalace.tusky</string>
+    <string name="oauth_redirect_host">oauth2redirect</string>
+    <string name="preferences_file_key">com.keylesspalace.tusky.PREFERENCES</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 860429ab..9522cb0f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,14 +1,8 @@
-<resources>
-    <string name="app_name">Tusky</string>
-    <string name="app_website">http://tusky.keylesspalace.com</string>
-
-    <string name="oauth_scheme">com.keylesspalace.tusky</string>
-    <string name="oauth_redirect_host">oauth2redirect</string>
-    <string name="preferences_file_key">com.keylesspalace.tusky.PREFERENCES</string>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="error_authorization_unknown">An unidentified authorization error occurred.</string>
-    <string name="error_authorization_denied">Authorization was denied.</string>
-    <string name="error_retrieving_oauth_token">Failed getting a login token.</string>
+    <string name="error_authorization_denied" tools:ignore="MissingTranslation">Authorization was denied.</string>
+    <string name="error_retrieving_oauth_token" tools:ignore="MissingTranslation">Failed getting a login token.</string>
     <string name="error_fetching_notifications">Notifications could not be fetched.</string>
     <string name="error_compose_character_limit">The status is too long!</string>
     <string name="error_sending_status">The status failed to be sent.</string>
@@ -128,7 +122,6 @@
     <string name="search">Search accounts…</string>
     <string name="toggle_nsfw">NSFW</string>
     <string name="action_mention">Mention</string>
-    <string name="tusky_api_url">https://tuskynotifier.keylesspalace.com</string>
     <string name="notification_mention_format">%s mentioned you</string>
     <string name="error_invalid_domain">Invalid domain entered</string>
     <string name="error_failed_app_registration">This app could not obtain authentication from that server instance.</string>