Merge branch 'master' of https://github.com/owncloud/android into material_fab

diff --git a/res/values-en-rUS/strings.xml b/res/values-en-rUS/strings.xml
new file mode 100644 (file)
index 0000000..37e6152
--- /dev/null
+++ b/res/values-en-rUS/strings.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+       <item>Biggest - Smallest</item>-->
+  <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
+  <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <!--TODO re-enable when "On Device" is available
+    <string name="drawer_item_on_device">On device</string>-->
+  <string name="empty"></string>
+</resources>

diff --git a/res/values-es-rES/strings.xml b/res/values-es-rES/strings.xml
new file mode 100644 (file)
index 0000000..37e6152
--- /dev/null
+++ b/res/values-es-rES/strings.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+       <item>Biggest - Smallest</item>-->
+  <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
+  <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <!--TODO re-enable when "On Device" is available
+    <string name="drawer_item_on_device">On device</string>-->
+  <string name="empty"></string>
+</resources>

diff --git a/res/values-hi-rIN/strings.xml b/res/values-hi-rIN/strings.xml
index 56e55a1..37e6152 100644 (file)
--- a/res/values-hi-rIN/strings.xml
+++ b/res/values-hi-rIN/strings.xml
@@ -1,4 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+       <item>Biggest - Smallest</item>-->
+  <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
+  <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <!--TODO re-enable when "On Device" is available
+    <string name="drawer_item_on_device">On device</string>-->
   <string name="empty"></string>
 </resources>

diff --git a/res/values-oc/strings.xml b/res/values-oc/strings.xml
index 3e17598..ec864a1 100644 (file)
--- a/res/values-oc/strings.xml
+++ b/res/values-oc/strings.xml
@@ -19,6 +19,7 @@
   <string name="prefs_accounts">Comptes</string>
   <string name="prefs_manage_accounts">Maneja comptes</string>
   <string name="prefs_help">Ajuda</string>
+  <string name="prefs_feedback">Notificacions</string>
   <string name="prefs_imprint">Mencions legalas</string>
   <string name="auth_username">Nom d\'usancièr</string>
   <string name="auth_password">Senhal</string>
@@ -64,7 +65,9 @@
   <string name="prefs_category_accounts">Comptes</string>
   <string name="saml_authentication_required_text">Autentificacion requesida</string>
   <string name="saml_authentication_wrong_pass">Senhal incorrècte</string>
+  <string name="actionbar_move">Desplaçar</string>
   <string name="folder_picker_choose_button_text">Causís</string>
+  <string name="shared_subject_header">partejat</string>
   <string name="auth_host_address">Adreça del servidor</string>
   <string name="username">Nom d\'utilizaire</string>
 </resources>

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
new file mode 100644 (file)
index 0000000..37e6152
--- /dev/null
+++ b/res/values-rm/strings.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--TODO re-enable when server-side folder size calculation is available   
+       <item>Biggest - Smallest</item>-->
+  <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
+  <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <!--TODO re-enable when "On Device" is available
+    <string name="drawer_item_on_device">On device</string>-->
+  <string name="empty"></string>
+</resources>