From 66eb18d1ca67d03a1f6ea611b56215e200d5aeac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schu=CC=88ller?= <stefan.schueller@i-web.ch>
Date: Sat, 2 Mar 2019 18:17:17 +0100
Subject: [PATCH] string cleanup

---
 app/src/main/res/values/strings.xml | 52 ++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c52eae5..35d3730 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name" translatable="false">Thorium</string>
-    <string name="title_activity_video_play">VideoPlayActivity</string>
+    <string name="title_activity_video_play" translatable="false">VideoPlayActivity</string>
     <string name="title_activity_settings">Settings</string>
     <string name="title_activity_login">Sign in</string>
+
     <!-- Strings related to login -->
     <string name="prompt_server">Server</string>
     <string name="prompt_email">Email / Username</string>
@@ -15,11 +16,13 @@
     <string name="error_incorrect_password">This password is incorrect</string>
     <string name="error_field_required">This field is required</string>
     <string name="permission_rationale">Grant contact permission for e-mail completion.</string>
+
     <!-- Action bar -->
     <string name="action_bar_title_search">Search</string>
     <string name="action_bar_title_settings">Settings</string>
     <string name="action_bar_title_logout">Log out</string>
     <string name="action_bar_title_account">Account</string>
+
     <!-- Bottom navigation bar -->
     <string name="bottom_nav_title_overview">Overview</string>
     <string name="bottom_nav_title_trending">Trending</string>
@@ -28,25 +31,15 @@
     <string name="bottom_nav_title_subscriptions">Subscriptions</string>
     <string name="bottom_nav_title_account">Account</string>
     <!-- Strings related to Settings -->
-    <string name="peertube_required_server_version" translatable="false">1.0.0-alpha.7</string>
-    <string name="pref_default_api_base_url" formatted="false" translatable="false">https://troll.tv</string>
-    <string name="pref_title_peertube_server">PeerTube Server</string>
+
     <!-- Strings related to Video meta data -->
     <string name="meta_data_seperator" translatable="false">\u0020-\u0020</string>
     <string name="meta_data_views">\u0020Views</string>
     <string name="meta_data_owner_seperator" translatable="false">\@</string>
     <string name="video_row_video_thumbnail">Video Thumbnail</string>
     <string name="video_row_account_avatar">Account Avatar</string>
-    <string name="pref_title_show_nsfw">NSFW Content</string>
-    <string name="pref_description_show_nsfw">Show NSFW content</string>
-    <string name="pref_language">Language filter</string>
-    <string name="pref_description_language">Select a video language, instead of showing all videos in all languages.</string>
     <string name="title_activity_url_video_play">UrlVideoPlayActivity</string>
-    <string name="pref_title_torrent_player">Torrent Video Player</string>
-    <string name="pref_description_torrent_player">Video playback via a torrent stream. This requires Storage Permissions. (Alpha, not stable!)</string>
-    <string name="pref_title_license">License</string>
-    <string name="pref_description_license">\n<b>GNU Affero General Public License v3.0</b>\n\nPermissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available.</string>
-    <string name="pref_title_version">Version</string>
+
     <string name="search_hint">Search PeerTube</string>
     <string name="title_activity_search">Search</string>
     <string name="no_data_available">No Results</string>
@@ -54,10 +47,29 @@
     <string name="menu_share">Share</string>
     <string name="playback_channel_name" translatable="false">PeerTube</string>
     <string name="invalid_url">Invalid URL.</string>
+
+    <!-- settings/preferences -->
+
     <string name="pref_title_dark_mode">Dark Mode</string>
     <string name="pref_description_dark_mode">Restart App for Dark Mode to take effect.</string>
     <string name="pref_title_app_theme">App Theme</string>
     <string name="pref_description_app_theme">Restart app for theme to take effect.</string>
+    <string name="pref_title_torrent_player">Torrent Video Player</string>
+    <string name="pref_description_torrent_player">Video playback via a torrent stream. This requires Storage Permissions. (Alpha, not stable!)</string>
+    <string name="pref_title_license">License</string>
+    <string name="pref_description_license">\n<b>GNU Affero General Public License v3.0</b>\n\nPermissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available.</string>
+    <string name="pref_title_version">Version</string>
+    <string name="pref_title_show_nsfw">NSFW Content</string>
+    <string name="pref_description_show_nsfw">Show NSFW content</string>
+    <string name="pref_language">Language filter</string>
+    <string name="pref_description_language">Select a video language, instead of showing all videos in all languages.</string>
+    <string name="pref_default_api_base_url" formatted="false" translatable="false">https://troll.tv</string>
+    <string name="pref_title_peertube_server">PeerTube Server</string>
+    <string name="pref_title_background_play">Background Playback</string>
+    <string name="pref_description_background_play">If enabled, continues to play video in background.</string>
+
+    <!-- languages -->
+
     <string name="ab">Abkhazian</string>
     <string name="aa">Afar</string>
     <string name="af">Afrikaans</string>
@@ -250,6 +262,8 @@
     <string name="yo">Yoruba</string>
     <string name="za">Zhuang</string>
     <string name="zu">Zulu</string>
+
+    <!-- colors -->
     <string name="red">Red</string>
     <string name="pink">Pink</string>
     <string name="purple">Purple</string>
@@ -269,10 +283,12 @@
     <string name="brown">Brown</string>
     <string name="gray">Gray</string>
     <string name="bluegray">Bluegray</string>
+
     <string name="video_speed_05">0.5x</string>
     <string name="video_speed_10">Normal</string>
     <string name="video_speed_15">1.5x</string>
     <string name="video_speed_20">2x</string>
+
     <string name="video_option_speed_icon" translatable="false">{faw-play-circle}</string>
     <string name="video_option_quality_icon" translatable="false">{faw-cog}</string>
     <string name="video_speed_active_icon" translatable="false">{faw-check}</string>
@@ -285,8 +301,8 @@
     <string name="video_share_icon" translatable="false">{faw-share}</string>
     <string name="video_download_icon" translatable="false">{faw-download}</string>
     <string name="video_save_icon" translatable="false">{faw-save}</string>
-    <string name="pref_title_background_play">Background Playback</string>
-    <string name="pref_description_background_play">If enabled, continues to play video in background.</string>
+
+
     <string name="title_activity_account">Account</string>
     <string name="menu_video_more_report">Report</string>
     <string name="menu_video_more_blacklist">Blacklist</string>
@@ -310,6 +326,10 @@
     <string name="account_about_description">Description:</string>
     <string name="account_about_joined">Joined:</string>
     <string name="api_error">Something went wrong, please try later!</string>
+
+    <string name="action_bar_title_server_selection">Select Server</string>
+
+
     <!-- Constants, Don't translate -->
     <string name="pref_token_access" translatable="false">pref_token_access</string>
     <string name="pref_token_refresh" translatable="false">pref_token_refresh</string>
@@ -320,6 +340,6 @@
     <string name="video_rating_none" translatable="false">none</string>
     <string name="video_rating_like" translatable="false">like</string>
     <string name="video_rating_dislike" translatable="false">dislike</string>
-    <string name="action_bar_title_server_selection">Select Server</string>
+    <string name="peertube_required_server_version" translatable="false">1.0.0-alpha.7</string>
 
 </resources>
\ No newline at end of file