summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-12-15 02:32:24 +0100
committerRobin Appelman <icewind@owncloud.com>2012-12-15 02:32:24 +0100
commit3e29708f814f7633ddac1c1dc3f6212b402c65e9 (patch)
tree7a7adf20b1585dd55c11f482d585292588d9870d
parent72911f1a1841e1da983de9682566d927cfda3a3a (diff)
parentdef6fada82d8fb51a251bb20a0f736c4beb8b93b (diff)
Merge branch 'master' into filesystem
-rw-r--r--l10n/eu.php1
-rw-r--r--l10n/ru.php1
-rw-r--r--l10n/zh_CN.php1
3 files changed, 3 insertions, 0 deletions
diff --git a/l10n/eu.php b/l10n/eu.php
index 2d5bfa0d4..05204d9e3 100644
--- a/l10n/eu.php
+++ b/l10n/eu.php
@@ -52,6 +52,7 @@
"subscriptions in ownCloud - News" => "ownCloud - News harpidetzak",
"An error occurred" => "Errore bat gertatu da",
"Nice! You have subscribed to " => "Ongi! Harpidetu zara hurrengo iturburutan",
+"You had already subscribed to this feed!" => "Dagoeneko jario honetako harpidedun zara!",
"You don't have any feed in your reader." => "Ez duzu iturbururik.",
"Address" => "Helbidea",
"Subscribe" => "Harpidetu",
diff --git a/l10n/ru.php b/l10n/ru.php
index df3362d51..181c34f09 100644
--- a/l10n/ru.php
+++ b/l10n/ru.php
@@ -52,6 +52,7 @@
"subscriptions in ownCloud - News" => "подписки в ownCloud - Новости",
"An error occurred" => "Произошла ошибка",
"Nice! You have subscribed to " => "Ура! Вы подписаны на ",
+"You had already subscribed to this feed!" => "Вы уже подписаны на эту ленту!",
"You don't have any feed in your reader." => "У вас нет лент.",
"Address" => "Адрес",
"Subscribe" => "Подписаться",
diff --git a/l10n/zh_CN.php b/l10n/zh_CN.php
index 685aaee82..cdabca03f 100644
--- a/l10n/zh_CN.php
+++ b/l10n/zh_CN.php
@@ -52,6 +52,7 @@
"subscriptions in ownCloud - News" => "在owncloud中订阅-新闻",
"An error occurred" => "发生了一个错误",
"Nice! You have subscribed to " => "不错!您已经订阅",
+"You had already subscribed to this feed!" => "您已经订阅过此feed哟。",
"You don't have any feed in your reader." => "您暂时没有Feed",
"Address" => "地址",
"Subscribe" => "订阅",