From 813cf2fc4e88f82791c3da8030ebefc9ca307f14 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Tue, 2 Jun 2015 19:45:44 -0400
Subject: [PATCH] merged changes to translation files fixing prior tx pull mess
 up

---
 core/src/main/res/values-it-rIT/strings.xml | 7 +++++++
 core/src/main/res/values-zh-rCN/strings.xml | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 849ba2c7a..33d7d6b4d 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -67,6 +67,8 @@
   <string name="podcastdirectories_descr">Puoi cercare dei nuovi podcast in base al nome, alla categoria o alla popolarità nella directory di gpodder.net.</string>
   <string name="browse_gpoddernet_label">Esplora gpodder.net</string>
   <!--Actions on feeds-->
+  <string name="mark_all_read_label">Segna tutti come letti</string>
+  <string name="mark_all_read_msg">Segnati tutti gli episodi come letti</string>
   <string name="show_info_label">Informazioni</string>
   <string name="remove_feed_label">Rimuovi un podcast</string>
   <string name="share_link_label">Condividi il link al sito</string>
@@ -82,6 +84,9 @@
   <string name="stream_label">Stream</string>
   <string name="remove_label">Rimuovi</string>
   <string name="remove_episode_lable">Rimuovi l\'episodio</string>
+  <string name="mark_read_label">Segna come letto</string>
+  <string name="mark_unread_label">Segna come non letto</string>
+  <string name="marked_as_read_label">Segnato come letto</string>
   <string name="add_to_queue_label">Aggiungi alla coda</string>
   <string name="remove_from_queue_label">Rimuovi dalla coda</string>
   <string name="visit_website_label">Visita il sito</string>
@@ -105,6 +110,8 @@
   <string name="download_error_unknown_host">Host sconosciuto</string>
   <string name="download_error_unauthorized">Errore di autenticazione</string>
   <string name="cancel_all_downloads_label">Annulla tutti i download</string>
+  <string name="download_canceled_msg">Download annullato</string>
+  <string name="download_report_title">Download completati</string>
   <string name="download_error_malformed_url">URL malformato</string>
   <string name="download_error_io_error">Errore IO</string>
   <string name="download_error_request_error">Errore della richiesta</string>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index 20caf6c67..594249a31 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -67,6 +67,8 @@
   <string name="podcastdirectories_descr">您可以在 gpodder.net 通过名称、类别或热门来搜索新播客</string>
   <string name="browse_gpoddernet_label">浏览 gpodder.net</string>
   <!--Actions on feeds-->
+  <string name="mark_all_read_label">全部标识已读</string>
+  <string name="mark_all_read_msg">将所有曲目标记为已读</string>
   <string name="show_info_label">查看信息</string>
   <string name="remove_feed_label">删除播客</string>
   <string name="share_link_label">分享网站链接</string>
@@ -82,6 +84,8 @@
   <string name="stream_label">流媒体</string>
   <string name="remove_label">删除</string>
   <string name="remove_episode_lable">移除曲目</string>
+  <string name="mark_read_label">标记已读</string>
+  <string name="mark_unread_label">标记未读</string>
   <string name="add_to_queue_label">添加到播放列表</string>
   <string name="remove_from_queue_label">从播放列表中删除</string>
   <string name="visit_website_label">访问网站</string>
@@ -105,6 +109,8 @@
   <string name="download_error_unknown_host">未知主机</string>
   <string name="download_error_unauthorized">认证错误</string>
   <string name="cancel_all_downloads_label">取消所有下载</string>
+  <string name="download_canceled_msg">已取消下载</string>
+  <string name="download_report_title">下载完成</string>
   <string name="download_error_malformed_url">畸形 URL</string>
   <string name="download_error_io_error">IO 错误</string>
   <string name="download_error_request_error">请求出错</string>