From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 21 Nov 2015 08:36:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into beta
X-Git-Tag: beta-20151122~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2c2a4321610402ffdf9d287db181c784463d0a56?hp=45e95d494dca25b857d15d384d6d0e1d4cbf2899

Merge remote-tracking branch 'remotes/upstream/master' into beta
---

diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 1ed55167..ef78c1f3 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -8,10 +8,12 @@
     	<item>Biggest - Smallest</item>-->
   <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
   <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <string name="drawer_item_all_files">Բոլոր ֆայլերը</string>
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
   <string name="drawer_close">Փակել</string>
   <string name="drawer_open">Բացել</string>
+  <string name="auth_username">Օգտանուն</string>
   <string name="auth_password">Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼</string>
   <string name="sync_string_files">Ֆայլեր</string>
   <string name="uploader_btn_new_folder_text">Նոր պանակ</string>
@@ -22,6 +24,8 @@
   <string name="common_yes">Ô±ÕµÕ¸</string>
   <string name="common_no">Ոչ</string>
   <string name="common_cancel">Չեղարկել</string>
+  <string name="common_error">Սխալ</string>
+  <string name="uploader_info_dirname">Պանակի անուն</string>
   <string name="common_rename">Վերանվանել</string>
   <string name="ssl_validator_label_C">Երկիր.</string>
   <string name="ssl_validator_label_validity_from">Ումից.</string>
@@ -29,6 +33,7 @@
   <string name="placeholder_filesize">389 Ô¿Ô²</string>
   <string name="activity_chooser_send_file_title">Ուղարկել</string>
   <string name="empty"></string>
+  <string name="username">Օգտանուն</string>
   <string name="file_list__footer__folder">1 ÕºÕ¡Õ¶Õ¡Õ¯</string>
   <string name="file_list__footer__folders">%1$d ÕºÕ¡Õ¶Õ¡Õ¯</string>
   <string name="file_list__footer__file">1 ֆայլ</string>