Merge branch 'master' of https://github.com/owncloud/News-Android-App

2 files changed, 15 insertions, 14 deletions

diff --git a/News-Android-App/src/main/res/values-sk-rSK/strings.xml b/News-Android-App/src/main/res/values-sk-rSK/strings.xml
index 515ee6bf..f78a2caa 100644
--- a/News-Android-App/src/main/res/values-sk-rSK/strings.xml
+++ b/News-Android-App/src/main/res/values-sk-rSK/strings.xml
@@ -19,7 +19,7 @@
   <string name="message_bar_reload">Znovu načítať</string>
   <string name="allUnreadFeeds">Všetky neprečítané položky</string>
   <string name="starredFeeds">Položky s hviezdičkou</string>
-  <string name="title_activity_new_feed">Pridať kanál</string>
+  <string name="title_activity_new_feed">Pridať nový kanál</string>
   <!--<string name="non_sorted_articles">Nicht zugeordnete Artikel</string>-->
   <string name="menu_update">Obnoviť</string>
   <string name="menu_About_Changelog">O aplikácii / Zoznam zmien</string>
@@ -27,6 +27,7 @@
   <string name="menu_StartImageCaching">Stiahnuť obrázky</string>
   <string name="menu_downloadMoreItems">Stiahnuť viac položiek</string>
   <!--Import Accounts-->
+  <string name="import_account_dialog_title">Importný účet</string>
   <!--EMAIL-->
   <string name="email_sourceCode">Zdrojový kód položky - Správa o chybe</string>
   <string name="email_sendMail">Odoslať email</string>
@@ -40,7 +41,7 @@
   <string name="action_save">Uložiť</string>
   <string name="action_settings">Nastavenia</string>
   <string name="action_sync_settings">Nastavenia synchronizácie</string>
-  <string name="action_add_new_feed">Pridať kanál</string>
+  <string name="action_add_new_feed">Pridať nový kanál</string>
   <string name="notification_new_items_ticker">Máte X nových neprečítaných položiek</string>
   <string name="notification_new_items_text">X nových neprečítaných položiek k dispozícii</string>
   <!--Strings related to login-->
@@ -181,16 +182,16 @@
     <item>10000</item>
   </string-array>
   <string-array name="array_sync_interval">
-    <item>5 Minutes</item>
-    <item>15 Minutes</item>
-    <item>30 Minutes</item>
-    <item>45 Minutes</item>
-    <item>1 Hour</item>
-    <item>2 Hours</item>
-    <item>3 Hours</item>
-    <item>6 Hours</item>
-    <item>12 Hours</item>
-    <item>24 Hours</item>
+    <item>5 minút</item>
+    <item>15 minút</item>
+    <item>30 minút</item>
+    <item>45 minút</item>
+    <item>1 hodina</item>
+    <item>2 hodiny</item>
+    <item>3 hodiny</item>
+    <item>6 hodín</item>
+    <item>12 hodín</item>
+    <item>24 hodín</item>
   </string-array>
   <string-array name="array_sync_interval_values">
     <item>5</item>
diff --git a/News-Android-App/src/main/res/values-zh-rCN/strings.xml b/News-Android-App/src/main/res/values-zh-rCN/strings.xml
index a4eb8c44..0869bfc4 100644
--- a/News-Android-App/src/main/res/values-zh-rCN/strings.xml
+++ b/News-Android-App/src/main/res/values-zh-rCN/strings.xml
@@ -19,7 +19,7 @@
   <string name="message_bar_reload">刷新</string>
   <string name="allUnreadFeeds">未读内容</string>
   <string name="starredFeeds">标星内容</string>
-  <string name="title_activity_new_feed">添加新Feed</string>
+  <string name="title_activity_new_feed">增加新 Feed</string>
   <!--<string name="non_sorted_articles">Nicht zugeordnete Artikel</string>-->
   <string name="menu_update">刷新</string>
   <string name="menu_About_Changelog">关于/变更日志</string>
@@ -40,7 +40,7 @@
   <string name="action_save">保存</string>
   <string name="action_settings">设置</string>
   <string name="action_sync_settings">同步设置</string>
-  <string name="action_add_new_feed">添加新Feed</string>
+  <string name="action_add_new_feed">增加新 Feed</string>
   <string name="notification_new_items_ticker">你有X条未读消息</string>
   <string name="notification_new_items_text">有X条未读消息</string>
   <!--Strings related to login-->