From 468c2f9de2162a24244dae0a03597179f9d9a344 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Tue, 10 Nov 2020 19:55:49 +0100
Subject: [PATCH] fixed translation

---
 .../twidda/activity/UserDetail.java           |   2 +-
 .../twidda/activity/UserProfile.java          |   4 +-
 app/src/main/res/layout/page_tweet.xml        |   2 +-
 app/src/main/res/values-de-rDE/strings.xml    |  20 ++--
 app/src/main/res/values/strings.xml           | 109 +++++++++---------
 5 files changed, 67 insertions(+), 70 deletions(-)

diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/UserDetail.java b/app/src/main/java/org/nuclearfog/twidda/activity/UserDetail.java
index 896bb1e1..d55d7c9e 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/UserDetail.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/UserDetail.java
@@ -74,7 +74,7 @@ public class UserDetail extends AppCompatActivity {
                     break;
 
                 case USERLIST_RETWEETS:
-                    toolbar.setTitle(R.string.userlist_retweet);
+                    toolbar.setTitle(R.string.toolbar_userlist_retweet);
                     adapter.setupRetweeterPage(id);
                     break;
             }
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
index a140a00d..403bf327 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
@@ -278,12 +278,12 @@ public class UserProfile extends AppCompatActivity implements OnClickListener, O
                 MenuItem followIcon = m.findItem(R.id.profile_follow);
                 MenuItem listItem = m.findItem(R.id.profile_lists);
                 followIcon.setIcon(R.drawable.follow_enabled);
-                followIcon.setTitle(R.string.user_unfollow);
+                followIcon.setTitle(R.string.menu_user_unfollow);
                 listItem.setVisible(true);
             }
             if (relation.isBlocked()) {
                 MenuItem blockIcon = m.findItem(R.id.profile_block);
-                blockIcon.setTitle(R.string.user_unblock);
+                blockIcon.setTitle(R.string.menu_user_unblock);
             }
             if (relation.isMuted()) {
                 MenuItem muteIcon = m.findItem(R.id.profile_mute);
diff --git a/app/src/main/res/layout/page_tweet.xml b/app/src/main/res/layout/page_tweet.xml
index 907d51ac..1db909be 100644
--- a/app/src/main/res/layout/page_tweet.xml
+++ b/app/src/main/res/layout/page_tweet.xml
@@ -124,7 +124,7 @@
                             android:layout_gravity="center"
                             android:layout_margin="@dimen/tweet_media_button_margin"
                             android:background="@drawable/button"
-                            android:contentDescription="@string/image_preview_button"
+                            android:contentDescription="@string/image_preview"
                             android:visibility="gone" />
 
                         <TextView
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 26d9e65e..d4e85cbf 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -12,11 +12,11 @@
     <string name="settings">Einstellungen</string>
     <string name="settings_image">Bilder laden</string>
     <string name="settings_clear_data">App Daten löschen</string>
-    <string name="userlist_retweet">Tweet retweetet von</string>
+    <string name="toolbar_userlist_retweet">Tweet retweetet von</string>
     <string name="background">Hintergrund</string>
     <string name="confirm_delete_tweet">Tweet löschen?</string>
     <string name="error_enter_pin">PIN eingeben!</string>
-    <string name="confirm_delete_database">Datenbank löschen?</string>
+    <string name="confirm_delete_database">App Daten Löschen?</string>
     <string name="error_limit_exceeded">"Anfragelimit erreicht! Entsperrung nach:"</string>
     <string name="error_sending_tweet">Fehler beim Senden!</string>
     <string name="info_tweet_sent">Tweet gesendet</string>
@@ -24,15 +24,15 @@
     <string name="menu_tweet_delete">Tweet löschen</string>
     <string name="menu_tweet_open_browser">Im Browser öffnen</string>
     <string name="error_not_found">night gefunden!</string>
-    <string name="user_unfollow">entfolgen</string>
-    <string name="menu_block_user">blocken</string>
-    <string name="user_unblock">entblocken</string>
+    <string name="menu_user_unfollow">Entfolgen</string>
+    <string name="menu_block_user">Blocken</string>
+    <string name="menu_user_unblock">entblocken</string>
     <string name="info_followed">gefolgt!</string>
     <string name="info_user_blocked">geblockt!</string>
     <string name="info_user_unblocked">entblockt!</string>
     <string name="info_tweet_removed">Tweet gelöscht!</string>
     <string name="tweet_answering">"an "</string>
-    <string name="tweet_sent_from">"gesendet von:"</string>
+    <string name="tweet_sent_from">"gesendet von: "</string>
     <string name="menu_mute_user">Stummschalten</string>
     <string name="user_unmute">Stummschaltung aufheben</string>
     <string name="info_user_muted">stummgeschaltet!</string>
@@ -52,14 +52,13 @@
     <string name="confirm_unfollow">User entfolgen?</string>
     <string name="confirm_block">user sperren?</string>
     <string name="info_image_saved">Bild gespeichert!</string>
-    <string name="tweet_close">Tweetfenster schließen</string>
+    <string name="tweet_close">Editor schließen</string>
     <string name="send_tweet">Tweet senden</string>
     <string name="tweet_add_image">Bild hinzufügen</string>
     <string name="image_preview">Bildvorschau</string>
     <string name="menu_link_to_clipboard">Tweet Link kopieren</string>
     <string name="info_clipboard">Link in Zwischenablage kopiert!</string>
     <string name="profile_link">Link</string>
-    <string name="image_preview_button">Bildvorschau Button</string>
     <string name="close_dm">Direktnachricht schließen</string>
     <string name="error_user_not_found">Nutzer nicht gefunden!</string>
     <string name="error_send_dm_to_user">Nachricht kann nicht an den User gesendet werden!</string>
@@ -82,7 +81,7 @@
     <string name="error_image_save">Fehler beim Speichern!</string>
     <string name="error_not_authorized">Keine Berechtigung!</string>
     <string name="error_file_format">Dateiformat nicht unterstützt!</string>
-    <string name="settings_enable_ans_load">Antworten laden</string>
+    <string name="settings_enable_ans_load">Antworten automatisch laden</string>
     <string name="info_tweet_retweeted">Tweet retweeted!</string>
     <string name="info_tweet_unretweeted">Retweet entfernt!</string>
     <string name="info_tweet_favored">Tweet favorisiert!</string>
@@ -137,7 +136,7 @@
     <string name="info_wrong_proxy_settings">Falsche Proxy Einstellungen</string>
     <string name="confirm_discard_proxy_changes">verwerfen</string>
     <string name="error_open_link">Link konnte nicht geöffnet werden!</string>
-    <string name="tweet_sensitive_media">sensible inhalte</string>
+    <string name="tweet_sensitive_media">Sensible Inhalte</string>
     <string name="error_image_exists">Fehler, Bild ist bereits vorhanden!</string>
     <string name="info_phone_tls_support">TLS 1.2 wird nicht unterstützt. Die App wird möglicherweise nicht funktionieren!</string>
     <string name="login_info">3 Schritte zum Login</string>
@@ -167,7 +166,6 @@
     <string name="menu_write_message">Direktnachricht</string>
     <string name="menu_follow_user">Nutzer folgen</string>
     <string name="menu_goto_lists">Nutzerlisten</string>
-    <string name="settings_enable_hq_img">hochauflösend</string>
     <string name="list_following_indicator">Liste gefolgt</string>
     <string name="info_list_removed">Liste gelöscht!</string>
     <string name="menu_list_follow">Liste folgen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c40dd28d..66ced3ee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name" translatable="false">Shitter</string>
-    <string name="profile_image">profile image</string>
+    <string name="profile_image">Profile Image</string>
     <string name="login_pin">Enter PIN</string>
     <string name="login_verifier">login</string>
     <string name="tweet" translatable="false">Tweet</string>
     <string name="settings">Settings</string>
     <string name="userlist_following" translatable="false">Following</string>
     <string name="userlist_follower" translatable="false">Follower</string>
-    <string name="userlist_retweet">Tweet retweeted by</string>
+    <string name="toolbar_userlist_retweet">Tweet retweeted by</string>
     <string name="background">Background</string>
     <string name="settings_font">Font</string>
     <string name="settings_button_popup">Popup</string>
@@ -16,23 +16,23 @@
     <string name="settings_list_size">List size</string>
     <string name="confirm_retry">retry</string>
     <string name="color_settings">Color settings</string>
-    <string name="data_consumption">data consumption</string>
+    <string name="data_consumption">Data Consumption</string>
     <string name="trend_setting">Trend location</string>
     <string name="register_link">get PIN</string>
-    <string name="settings_image">load images</string>
+    <string name="settings_image">Enable Images</string>
     <string name="settings_clear_data">Clear app data</string>
     <string name="confirm_delete_tweet">delete tweet?</string>
-    <string name="confirm_delete_database">delete database?</string>
-    <string name="user_unfollow">unfollow</string>
-    <string name="user_unblock">unblock user</string>
+    <string name="confirm_delete_database">Clear App Data?</string>
+    <string name="menu_user_unfollow">Unfollow</string>
+    <string name="menu_user_unblock">Unblock</string>
     <string name="tweet_answering">"to "</string>
-    <string name="tweet_sent_from">sent from:</string>
-    <string name="user_unmute">un-mute user</string>
-    <string name="directmessage">Direct Message</string>
-    <string name="username">username</string>
+    <string name="tweet_sent_from">"sent from: "</string>
+    <string name="user_unmute">Unmute user</string>
+    <string name="directmessage">Directmessage</string>
+    <string name="username">Username</string>
     <string name="dm_message">Message</string>
     <string name="confirm_cancel_message">cancel message?</string>
-    <string name="settings_logout">log out</string>
+    <string name="settings_logout">Log Out</string>
     <string name="dm_answer">answer</string>
     <string name="delete_dm">delete</string>
     <string name="confirm_unfollow">unfollow user?</string>
@@ -40,24 +40,23 @@
     <string name="confirm_log_lout">log out?</string>
     <string name="confirm_cancel_tweet">cancel tweet?</string>
     <string name="image_preview">Image preview</string>
-    <string name="tweet_add_image">add new image</string>
-    <string name="send_tweet">send Tweet</string>
-    <string name="tweet_close">close tweet</string>
-    <string name="profile_link">link</string>
-    <string name="image_preview_button">image preview button</string>
+    <string name="tweet_add_image">Add new image</string>
+    <string name="send_tweet">Send Tweet</string>
+    <string name="tweet_close">Close editor</string>
+    <string name="profile_link">Link</string>
     <string name="close_dm">close direct message</string>
     <string name="follow_requested">follow requested</string>
-    <string name="profile_location">location</string>
+    <string name="profile_location">Location</string>
     <string name="profile_bio">Bio</string>
     <string name="confirm_discard">discard changes?</string>
     <string name="user_data">User data</string>
     <string name="follows_you">follows you</string>
-    <string name="settings_enable_ans_load">answer load</string>
+    <string name="settings_enable_ans_load">Load answers automatically</string>
     <string name="proxy_settings">Proxy settings</string>
     <string name="enter_proxy">Proxy IP address</string>
     <string name="proxy_port">Port</string>
     <string name="edit_proxyuser">username</string>
-    <string name="proxy_password">password</string>
+    <string name="proxy_password">Password</string>
     <string name="settings_info_link" translatable="false">https://github.com/nuclearfog/Shitter</string>
     <string name="confirm_mute">mute user?</string>
     <string name="item_list_pb_desc">owner profile</string>
@@ -66,26 +65,26 @@
     <string name="edit_hint_link">enter internetlink</string>
     <string name="edit_hint_enter_descr">enter profile description</string>
     <string name="settins_font">Font style</string>
-    <string name="page_profile_edior">Edit profile</string>
-    <string name="delete_list">delete list</string>
-    <string name="confirm_delete_list">Delete list?</string>
+    <string name="page_profile_edior">Edit Profile</string>
+    <string name="delete_list">Delete List</string>
+    <string name="confirm_delete_list">Delete User list?</string>
     <string name="confirm_delete_message">Delete message?</string>
     <string name="confirm_unfollow_list">Unfollow list?</string>
     <string name="trend_range">Tweets</string>
     <string name="enter_username">Enter username</string>
-    <string name="profile_banner">Profile banner image</string>
+    <string name="profile_banner">Banner Image</string>
     <string name="editprofile_add_banner">add banner</string>
     <string name="settings_3rd_party_license">App and 3rd party license:</string>
-    <string name="settings_enable_hq_img">high resolution</string>
+    <string name="settings_enable_hq_img" translatable="false">High Quality</string>
     <string name="settings_info_license_link" translatable="false">http://www.apache.org/licenses/LICENSE-2.0</string>
     <string name="settings_info_github">App on GitHub:</string>
     <string name="badge_twitter4j" translatable="false">Twitter4J Badge</string>
     <string name="item_load_more">Load more</string>
     <string name="item_image_save">save image</string>
-    <string name="settings_enable_proxy">enable proxy</string>
-    <string name="settings_enable_proxy_auth">enable proxy authentication</string>
+    <string name="settings_enable_proxy">Enable Proxy</string>
+    <string name="settings_enable_proxy_auth">Enable Proxy authentication</string>
     <string name="confirm_discard_proxy_changes">discard</string>
-    <string name="tweet_sensitive_media">sensitive media</string>
+    <string name="tweet_sensitive_media">Potentially Sensitive Content</string>
     <string name="login_info">3 steps to login</string>
     <string name="login_first_opt" translatable="false">1.</string>
     <string name="login_sec_opt" translatable="false">2.</string>
@@ -95,7 +94,7 @@
     <string name="userlist_enter_descr">Enter list description</string>
     <string name="userlist_create">Create list</string>
     <string name="userlist_create_new_list">Create a new userlist</string>
-    <string name="update_list">update list</string>
+    <string name="update_list">Update List</string>
     <string name="confirm_remove_user_from_list">remove user from list?</string>
     <string name="descr_remove_user">remove user from list</string>
 
@@ -105,7 +104,7 @@
     <string name="info_list_updated">Userlist updated</string>
     <string name="info_list_created">Userlist created</string>
     <string name="info_fetching_link">opening twitter login site</string>
-    <string name="info_login_to_twitter">login to Twitter</string>
+    <string name="info_login_to_twitter">Login to Twitter</string>
     <string name="info_twitter_login_link">Please click the link below to login</string>
     <string name="info_phone_tls_support">Phone does not support TLS 1.2. App will probably not work!</string>
     <string name="info_wrong_proxy_settings">Wrong Proxy settings!</string>
@@ -129,7 +128,7 @@
     <string name="info_user_blocked">blocked!</string>
     <string name="info_user_unblocked">unblocked</string>
     <string name="info_tweet_removed">Tweet removed!</string>
-    <string name="info_tweet_sent">tweet sent</string>
+    <string name="info_tweet_sent">Tweet sent</string>
     <string name="info_error">Error!</string>
 
     <!-- toast messages for error information -->
@@ -148,48 +147,48 @@
     <string name="error_no_card_app">No card app found!</string>
     <string name="error_no_media_app">No gallery app found!</string>
     <string name="error_connection_failed">Connection failed!</string>
-    <string name="error_invalid_link">invalid link!</string>
-    <string name="error_location">could not fetch location!</string>
-    <string name="error_cant_copy_clipboard">can\'t copy link to clipboard!</string>
-    <string name="error_gps">could not fetch GPS data!</string>
+    <string name="error_invalid_link">Invalid link!</string>
+    <string name="error_location">Could not fetch location!</string>
+    <string name="error_cant_copy_clipboard">Can\'t copy link to clipboard!</string>
+    <string name="error_gps">Could not fetch GPS data!</string>
     <string name="error_token_not_set">Please get link first!</string>
     <string name="error_dm_send">Cannot send direct message to this user!</string>
-    <string name="error_image_save">image save failed!</string>
+    <string name="error_image_save">Could not save Image</string>
     <string name="error_not_authorized">Not authorized!</string>
-    <string name="error_file_format">file format not supported!</string>
-    <string name="error_request_token">request token expired! please update app.</string>
+    <string name="error_file_format">File format not supported!</string>
+    <string name="error_request_token">Request token expired! please update app.</string>
     <string name="error_empty_name">Empty user name!</string>
-    <string name="error_user_not_found">user not found!</string>
+    <string name="error_user_not_found">User not found!</string>
     <string name="error_send_dm_to_user">cannot send dm to user!</string>
     <string name="error_accesstoken">Invalid access! Please re-login!</string>
     <string name="error_status_length">Tweet needs to be shorter!</string>
     <string name="error_duplicate_status">Duplicate Status!</string>
-    <string name="error_dm_length">direct message text is over the limit!</string>
+    <string name="error_dm_length">Directmessage exceeds the limit!</string>
     <string name="error_empty_list_information">Title must be set!</string>
 
     <!-- menu icon strings -->
-    <string name="menu_tweet">tweet</string>
-    <string name="menu_open_home_profile">go to profile</string>
-    <string name="menu_open_twitter_search">open twitter search</string>
-    <string name="menu_open_settings">open settings</string>
-    <string name="menu_create_list">create userlist</string>
-    <string name="menu_write_message">direct message</string>
-    <string name="menu_follow_user">follow user</string>
+    <string name="menu_tweet">Write Tweet</string>
+    <string name="menu_open_home_profile">Open Profile</string>
+    <string name="menu_open_twitter_search">Twitter Search</string>
+    <string name="menu_open_settings">Open Settings</string>
+    <string name="menu_create_list">Create Cserlist</string>
+    <string name="menu_write_message">Directmessage</string>
+    <string name="menu_follow_user">Follow</string>
     <string name="menu_goto_lists">Userlists</string>
     <string name="menu_app_info" translatable="false">App info</string>
-    <string name="menu_block_user">block user</string>
+    <string name="menu_block_user">Block User</string>
     <string name="menu_tweet_delete">Delete</string>
     <string name="menu_tweet_open_browser">Open in Browser</string>
-    <string name="menu_mute_user">mute user</string>
-    <string name="menu_edit_profile">edit profile</string>
-    <string name="menu_edit_save">save</string>
+    <string name="menu_mute_user">Mute</string>
+    <string name="menu_edit_profile">Edit Profile</string>
+    <string name="menu_edit_save">Save</string>
     <string name="menu_add_user">add user to list</string>
-    <string name="menu_edit_list">edit list</string>
-    <string name="menu_link_to_clipboard">copy tweet link</string>
+    <string name="menu_edit_list">Edit List</string>
+    <string name="menu_link_to_clipboard">Copy Tweet Link</string>
     <string name="list_following_indicator">followed by you</string>
     <string name="info_list_removed">Userlist removed!</string>
-    <string name="menu_list_follow">follow list</string>
-    <string name="menu_unfollow_list">unfollow list</string>
+    <string name="menu_list_follow">Follow</string>
+    <string name="menu_unfollow_list">Unfollow</string>
     <string name="info_list_followed">Userlist followed</string>
     <string name="info_list_unfollowed">Userlist unfollowed</string>
     <string name="descr_add_profile_image">Change profile image</string>