From 269e8554ae7b07e64f346224a7fe73cc8c14ba69 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Thu, 1 Jun 2017 12:37:05 +0300
Subject: [PATCH] comment out some unused string resources, remove circle_bg
 drawable

---
 .../src/main/res/drawable/circle_bg.xml       | 12 ------
 org.fox.ttrss/src/main/res/values/strings.xml | 40 +++++++++----------
 .../src/main/res/xml/preferences.xml          |  2 +-
 3 files changed, 21 insertions(+), 33 deletions(-)
 delete mode 100644 org.fox.ttrss/src/main/res/drawable/circle_bg.xml

diff --git a/org.fox.ttrss/src/main/res/drawable/circle_bg.xml b/org.fox.ttrss/src/main/res/drawable/circle_bg.xml
deleted file mode 100644
index 404de097..00000000
--- a/org.fox.ttrss/src/main/res/drawable/circle_bg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <solid
-        android:color="@android:color/white"/>
-
-    <size
-        android:width="48dp"
-        android:height="48dp"/>
-</shape>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 10a89d51..87120eb3 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -2,11 +2,11 @@
 <resources>
 
     <string name="login_in_progress">Logging in…</string>
-    <string name="app_name">Tiny Tiny RSS</string>
+    <string name="app_name" translatable="false">Tiny Tiny RSS</string>
     <string name="login_need_configure">Please configure the application first.</string>
     <string name="login_ready">Ready to login.</string>
     <string name="login_login">Log in</string>
-    <string name="logout">Log out</string>
+    <!-- <string name="logout">Log out</string> -->
     <string name="login">Login</string>
     <string name="debugging">Debugging</string>
     <string name="password">Password</string>
@@ -18,13 +18,13 @@
     <string name="theme_dark">Dark</string>
     <string name="preferences">Settings</string>
     <string name="connection">Connection</string>
-    <string name="headline_context_multiple">Selected articles</string>
+    <!-- <string name="headline_context_multiple">Selected articles</string> -->
     <string name="http_authentication">HTTP Authentication</string>
     <string name="loading_message">Loading, please wait…</string>
-    <string name="menu_unread_feeds">Show unread feeds</string>
-    <string name="menu_all_feeds">Show all feeds</string>
+    <!-- <string name="menu_unread_feeds">Show unread feeds</string> -->
+    <!-- <string name="menu_all_feeds">Show all feeds</string> -->
     <string name="unread_only">Unread only</string>
-    <string name="update_feeds">Refresh</string>
+    <!-- <string name="update_feeds">Refresh</string> -->
     <string name="share_article">Share article</string>
     <string name="catchup">Mark read</string>
     <string name="sort_feeds_by_unread">Sort feeds by unread count</string>
@@ -43,8 +43,8 @@
     <string name="selection_toggle_marked">(Un)Star</string>
     <string name="selection_toggle_published">(Un)Publish</string>
     <string name="selection_toggle_unread">(Un)Read</string>
-    <string name="context_selection_toggle_marked">(Un)Star</string>
-    <string name="context_selection_toggle_published">(Un)Publish</string>
+    <!-- <string name="context_selection_toggle_marked">(Un)Star</string>
+    <string name="context_selection_toggle_published">(Un)Publish</string> -->
     <string name="context_selection_toggle_unread">(Un)Read</string>
     <string name="article_mark_read_above">Mark above read</string>
     <string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication</string>
@@ -73,7 +73,7 @@
     <string name="go_offline">Go offline</string>
     <string name="go_online">Go online</string>
     <string name="offline_switch_error">Failed to prepare offline mode (see log)</string>
-    <string name="no_feeds">No feeds to display</string>
+    <!-- <string name="no_feeds">No feeds to display</string> -->
     <string name="dialog_offline_prompt">Login failed, but you have stored offline data. Would you like to go offline?</string>
     <string name="dialog_offline_success">Offline mode is ready</string>
     <string name="dialog_offline_go">Go offline</string>
@@ -108,7 +108,7 @@
     <string name="article_set_note">Publish with note</string>
     <string name="dialog_open_preferences">Settings</string>
     <string name="dialog_need_configure_prompt">Please fill in your tt-rss server information such as URL, login, and password.</string>
-    <string name="update_headlines">Refresh</string>
+    <!-- <string name="update_headlines">Refresh</string> -->
     <string name="error_network_unavailable">Error: network unavailable</string>
     <string name="category_browse_headlines">Browse headlines</string>
     <string name="use_volume_keys">Use volume buttons</string>
@@ -133,8 +133,8 @@
     <string name="trial_purchase">Unlock full version</string>
     <string name="trial_expired">Trial expired</string>
     <string name="trial_expired_message">To continue using Tiny Tiny RSS please unlock the full version by purchasing the key.</string>
-    <string name="theme_sepia">Sepia</string>
-    <string name="theme_amber">Amber</string>
+    <!-- <string name="theme_sepia">Sepia</string>
+    <string name="theme_amber">Amber</string> -->
     <string name="reading">Reading</string>
     <string name="offline_articles_to_download">Amount of articles to download</string>
     <string name="offline_articles_to_download_long">How many articles to download for offline mode (newest first)</string>
@@ -155,7 +155,7 @@
     <string name="error_feed_already_exists_">Error: feed already exists.</string>
     <string name="error_invalid_url">Error: Invalid URL.</string>
     <string name="error_url_is_an_html_page_no_feeds_found">Error: URL is an HTML page, no feeds found.</string>
-    <string name="error_url_contains_multiple_feeds">Error: URL contains multiple feeds</string>
+    <!-- <string name="error_url_contains_multiple_feeds">Error: URL contains multiple feeds</string> -->
     <string name="error_could_not_download_url">Error: Could not download URL</string>
     <string name="headlines_view_mode">Set view mode</string>
     <string name="headlines_set_view_mode">Set view mode</string>
@@ -196,7 +196,7 @@
     <string name="server_function_not_available">Sorry, this function is not available on your tt-rss version.</string>
     <string name="unsubscribe">Unsubscribe</string>
     <string name="unsubscribe_from_prompt">Unsubscribe from %1$s?</string>
-    <string name="open_article_in_web_browser">Open in web browser</string>
+    <!-- <string name="open_article_in_web_browser">Open in web browser</string> -->
     <string name="error_loading_image">Error loading image.</string>
     <string name="toggle_sort_order">Toggle oldest first</string>
     <string name="headlines_sort_default">Default</string>
@@ -225,19 +225,19 @@
     <string name="prefs_widget">Widget</string>
     <string name="title_activity_video_player">Video Player</string>
 
-    <string name="hello_world">Hello world!</string>
+    <!-- <string name="hello_world">Hello world!</string> -->
     <string name="action_settings">Settings</string>
     <string name="video_player_share">Share video</string>
-    <string name="video_player_open">Open video</string>
+    <!-- <string name="video_player_open">Open video</string> -->
 
-    <string name="flavor_image_prompt">(more images…)</string>
+    <!-- <string name="flavor_image_prompt">(more images…)</string> -->
     <string name="headlines_row_top_changed">New articles found, reload feed to continue.</string>
     <string name="prefs_custom_tabs_summary">Open external links with Chrome custom tabs (faster, used if available)</string>
     <string name="prefs_use_custom_tabs">Use quick preview</string>
     <string name="ask_me_every_time">Ask me every time</string>
-    <string name="open_link">Open link</string>
+    <!-- <string name="open_link">Open link</string> -->
     <string name="quick_preview">Quick preview</string>
-    <string name="open_with_app">Open with app</string>
+    <!-- <string name="open_with_app">Open with app</string> -->
     <string name="prefs_opening_links">Opening links</string>
     <string name="open_with">Open with…</string>
     <string name="confirm_catchup_above">Mark articles as read?</string>
@@ -251,7 +251,7 @@
     <string name="widget_background_light">Light</string>
     <string name="widget_background_dark">Dark</string>
     <string name="widget_background_transparent">Transparent</string>
-    <string name="pref_widget_background">Background color</string>
+    <string name="pref_widget_background">Widget theme</string>
     <string name="pref_widget_update_interval_summary">This interval is imprecise due to Android limitations</string>
     <string name="prefs_offline_sort_by_feed">Group headlines by feeds</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 3b354740..2e3d339e 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -215,7 +215,7 @@
             android:entries="@array/pref_widget_bgs"
             android:entryValues="@array/pref_widget_bgs_values"
             android:key="widget_background"
-            android:title="@string/pref_theme" />
+            android:title="@string/pref_widget_background" />
 
         <org.fox.ttrss.util.LessBrokenSwitchPreference
             android:defaultValue="true"