From 69f0acff1ab01c0a9bc1d57b15ce03f73712c801 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Sun, 14 Jun 2015 12:43:03 +0200
Subject: Finishing localization ru,nl,fr

---
 app/src/main/res/values/feeds.xml                  | 18 ++++----
 app/src/main/res/values/feeds_list.xml             | 29 ++++++++++++
 app/src/main/res/values/strings.xml                | 24 +++++-----
 .../main/res/values/strings_activity_settings.xml  | 52 ----------------------
 4 files changed, 49 insertions(+), 74 deletions(-)
 create mode 100644 app/src/main/res/values/feeds_list.xml
 delete mode 100644 app/src/main/res/values/strings_activity_settings.xml

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/feeds.xml b/app/src/main/res/values/feeds.xml
index 720e029..cc8f778 100755
--- a/app/src/main/res/values/feeds.xml
+++ b/app/src/main/res/values/feeds.xml
@@ -19,14 +19,14 @@
 <resources>
     <!-- These feeds are loaded into the reader by default -->
     <string-array name="default_feeds">
-        <item>http://feeds.bbci.co.uk/news/politics/rss.xml</item>
-        <item>http://feeds.bbci.co.uk/news/science_and_environment/rss.xml</item>
-        <item>http://feeds.bbci.co.uk/news/technology/rss.xml</item>
-        <item>http://feeds.bbci.co.uk/news/world/rss.xml</item>
-        <item>http://feeds.bbci.co.uk/sport/0/rss.xml</item>
-        <item>http://pcworld.com/index.rss</item>
-        <item>http://feeds.reuters.com/reuters/environment</item>
-        <item>http://feeds.reuters.com/reuters/financialsNews</item>
-        <item>http://feeds.reuters.com/reuters/worldNews</item>
+        <item>@string/feed_0</item>
+        <item>@string/feed_1</item>
+        <item>@string/feed_2</item>
+        <item>@string/feed_3</item>
+        <item>@string/feed_4</item>
+        <item>@string/feed_5</item>
+        <item>@string/feed_6</item>
+        <item>@string/feed_7</item>
+        <item>@string/feed_8</item>
     </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/feeds_list.xml b/app/src/main/res/values/feeds_list.xml
new file mode 100644
index 0000000..b53050f
--- /dev/null
+++ b/app/src/main/res/values/feeds_list.xml
@@ -0,0 +1,29 @@
+<!--
+    RSSin - Clever RSS reader for Android
+    Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
+<resources>
+    <string name="feed_0" translatable="false">http://feeds.bbci.co.uk/news/politics/rss.xml</string>
+    <string name="feed_1" translatable="false">http://feeds.bbci.co.uk/news/science_and_environment/rss.xml</string>
+    <string name="feed_2" translatable="false">http://feeds.bbci.co.uk/news/technology/rss.xml</string>
+    <string name="feed_3" translatable="false">http://feeds.bbci.co.uk/news/world/rss.xml</string>
+    <string name="feed_4" translatable="false">http://feeds.bbci.co.uk/sport/0/rss.xml</string>
+    <string name="feed_5" translatable="false">http://pcworld.com/index.rss</string>
+    <string name="feed_6" translatable="false">http://feeds.reuters.com/reuters/environment</string>
+    <string name="feed_7" translatable="false">http://feeds.reuters.com/reuters/financialsNews</string>
+    <string name="feed_8" translatable="false">http://feeds.reuters.com/reuters/worldNews</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 cc9abdb..1165db0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@
 -->
 <resources>
     <string name="app_name">RSSin</string>
-    <string name="app_info"><![CDATA[
+    <string name="app_info" translatable="false"><![CDATA[
         <h1>RSSin</h1>
         <em>Clever RSS reader for Android</em>
         <p>Copyright &copy; Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps</p>
@@ -66,7 +66,7 @@
     <string name="error_net_load">Internet problem</string>
     <string name="error_save_feedsorter">Couldn\'t store personal preferences</string>
     <string name="error_load_article">Couldn\'t load article</string>
-    <string name="error_unknown">An unknown error occured</string>
+    <string name="error_unknown">An unknown error occurred</string>
 
     <string name="feeds">feeds</string>
 
@@ -77,20 +77,18 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
-    <string name="loading">Loading...</string>
-
-    <string name="action_example">Example action</string>
+    <string name="loading">Loading&#8230;</string>
 
     <string name="article_author">Written by:</string>
     <string name="article_author_unknown">Unknown author</string>
     <string name="article_published_on">Published on:</string>
-    <string name="article_published_on_unknown"/>
-    <string name="walkthrough_text_1">Use the menu on the left to find all your feeds and filters.</string>
-    <string name="walkthrough_text_2">All the latest posts will show up in your unified inbox.</string>
-    <string name="walkthrough_text_3">You can import your favourite RSS feeds directly from other apps.</string>
-    <string name="walkthrough_text_4">You can add your own custom filters to sort your feeds any way you want.</string>
-    <string name="walkthrough_text_5">Rate articles so the app learns exactly which ones you\'ll like in the future.</string>
-    <string name="walkthrough_text_button">Skip tutorial</string>
+    <string name="article_published_on_unknown">Unknown publication date</string>
+    <string name="walkthrough_text_1" translatable="false">Use the menu on the left to find all your feeds and filters.</string>
+    <string name="walkthrough_text_2" translatable="false">All the latest posts will show up in your unified inbox.</string>
+    <string name="walkthrough_text_3" translatable="false">You can import your favourite RSS feeds directly from other apps.</string>
+    <string name="walkthrough_text_4" translatable="false">You can add your own custom filters to sort your feeds any way you want.</string>
+    <string name="walkthrough_text_5" translatable="false">Rate articles so the app learns exactly which ones you\'ll like in the future.</string>
+    <string name="walkthrough_text_button" translatable="false">Skip tutorial</string>
     <string name="navigation_drawer_all_feeds">All feeds</string>
     <string name="navigation_drawer_start">Start</string>
     <string name="navigation_drawer_edit_filters">Filters</string>
@@ -102,5 +100,5 @@
     <string name="filter_settings_new_title">New title:</string>
     <string name="menu_article_share">Share</string>
     <string name="navigation_drawer_edit_text">EDIT</string>
-    <string name="article_link_to_website">Go to article website</string>
+    <string name="article_link_to_website">Open in the browser</string>
 </resources>
diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml
deleted file mode 100644
index cad1872..0000000
--- a/app/src/main/res/values/strings_activity_settings.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-    RSSin - Clever RSS reader for Android
-    Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by 
-    the Free Software Foundation; either version 2 of the License, or 
-    (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of 
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--->
-<resources>
-    <string name="title_activity_settings">Settings</string>
-
-    <!-- Example General settings -->
-    <string name="pref_header_general">General</string>
-
-    <!-- Example settings for Data & Sync -->
-    <string name="pref_header_data_sync">Data &amp; sync</string>
-
-    <string name="pref_title_sync_frequency">Sync frequency</string>
-    <string-array name="pref_sync_frequency_titles">
-        <item>1 minute</item>
-        <item>2 minutes</item>
-        <item>5 minutes</item>
-        <item>10 minutes</item>
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_sync_frequency_values">
-        <item>1</item>
-        <item>2</item>
-        <item>5</item>
-        <item>10</item>
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>-1</item>
-    </string-array>
-
-    <string name="pref_title_system_sync_settings">System sync settings</string>
-
-</resources>
-- 
cgit v1.2.3