aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-06-14 15:12:16 -0700
committerfriendica <info@friendica.com>2014-06-14 15:12:16 -0700
commit3714bdfc546af73a595a410fcdb0b10982a728ed (patch)
treed10b2b74c613108195d735737d7030f4e004094f /view
parent64a370056c5cb4e65274145d6dd02c35530be0f3 (diff)
parentaea19a5b3a48475e3d4a12ae889bb633d969faa0 (diff)
downloadvolse-hubzilla-3714bdfc546af73a595a410fcdb0b10982a728ed.tar.gz
volse-hubzilla-3714bdfc546af73a595a410fcdb0b10982a728ed.tar.bz2
volse-hubzilla-3714bdfc546af73a595a410fcdb0b10982a728ed.zip
Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master
Diffstat (limited to 'view')
-rw-r--r--view/ru/messages.po4
-rw-r--r--view/ru/strings.php11
2 files changed, 8 insertions, 7 deletions
diff --git a/view/ru/messages.po b/view/ru/messages.po
index ead5ae192..7ce5afdf8 100644
--- a/view/ru/messages.po
+++ b/view/ru/messages.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: Red Matrix\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-06-06 00:02-0700\n"
-"PO-Revision-Date: 2014-06-12 14:26+0000\n"
+"PO-Revision-Date: 2014-06-14 08:09+0000\n"
"Last-Translator: Alex <info@pixelbits.de>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/red-matrix/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -481,7 +481,7 @@ msgstr ""
#: ../../include/conversation.php:1400
msgid "Commented Order"
-msgstr "По комментириям"
+msgstr "По комментариям"
#: ../../include/conversation.php:1403
msgid "Sort by Comment Date"
diff --git a/view/ru/strings.php b/view/ru/strings.php
index 8c7f2b291..af74e8368 100644
--- a/view/ru/strings.php
+++ b/view/ru/strings.php
@@ -26,7 +26,7 @@ $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s нравится %2\$s's %3\$s
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s не нравится %2\$s's %3\$s";
$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s теперь соединен с %2\$s";
$a->strings["%1\$s poked %2\$s"] = "%1\$s подпихнул %2\$s";
-$a->strings["poked"] = "подпихнулmsgctxt "mood";
+$a->strings["poked"] = "подпихнул";
$a->strings["%1\$s is %2\$s"] = "";
$a->strings["Select"] = "Выбрать";
$a->strings["Delete"] = "Удалить";
@@ -110,7 +110,7 @@ $a->strings["OK"] = "OK";
$a->strings["Cancel"] = "Отменить";
$a->strings["Discover"] = "Обнаруженные";
$a->strings["Imported public streams"] = "";
-$a->strings["Commented Order"] = "По комментириям";
+$a->strings["Commented Order"] = "По комментариям";
$a->strings["Sort by Comment Date"] = "Сортировка по дате создания комментариев";
$a->strings["Posted Order"] = "По добавлениям";
$a->strings["Sort by Post Date"] = "Сортировка по дате создания сообщения";
@@ -674,7 +674,7 @@ $a->strings["Chat Rooms"] = "Чаты";
$a->strings["Bookmarked Chatrooms"] = "Закладки чатов";
$a->strings["Suggested Chatrooms"] = "Рекомендуемые чаты";
$a->strings["Save to Folder"] = "";
-$a->strings["View all"] = "msgctxt "noun";
+$a->strings["View all"] = "";
$a->strings["Like"] = array(
0 => "",
1 => "",
@@ -700,8 +700,8 @@ $a->strings["via"] = "через";
$a->strings["Wall-to-Wall"] = "Стена-к-Стене";
$a->strings["via Wall-To-Wall:"] = "через Стена-к-Стене:";
$a->strings["Save Bookmarks"] = "";
-$a->strings["Add to Calendar"] = "msgctxt "noun";
-$a->strings["Likes"] = "msgctxt "noun";
+$a->strings["Add to Calendar"] = "";
+$a->strings["Likes"] = "";
$a->strings["Dislikes"] = "";
$a->strings["%d comment"] = array(
0 => "%d комментарий",
@@ -1851,3 +1851,4 @@ $a->strings["Forgot your password?"] = "Забыли пароль или лог
$a->strings["permission denied"] = "доступ запрещен";
$a->strings["Got Zot?"] = "Got Zot?";
$a->strings["toggle mobile"] = "мобильное подключение";
+