From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 19 Oct 2015 10:59:39 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~26
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d0e73f432133bdbe3c46e12beff15059769eff37?hp=0e6920c8787c16791f737f28bad678f806c7e5c7

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

diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml
index f702afa7..5147a57a 100644
--- a/res/values-cs-rCZ/strings.xml
+++ b/res/values-cs-rCZ/strings.xml
@@ -71,6 +71,7 @@
   <string name="file_list_seconds_ago">před pár sekundami</string>
   <string name="file_list_empty">Žádný obsah. Nahrajte něco!</string>
   <string name="file_list_loading">Načítání...</string>
+  <string name="file_list_no_app_for_file_type">Nebyla nalezena aplikace pro tento typ souboru!</string>
   <string name="local_file_list_empty">V tomto adresáři nejsou žádné soubory.</string>
   <string name="filedetails_select_file">Více informací získáte klepnutím na soubor.</string>
   <string name="filedetails_size">Velikost:</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8a75e6d5..562ee84e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -71,6 +71,7 @@
   <string name="file_list_seconds_ago">Gerade eben</string>
   <string name="file_list_empty">Alles leer. Lade etwas hoch!</string>
   <string name="file_list_loading">Lade…</string>
+  <string name="file_list_no_app_for_file_type">Es wurden keine Apps für den Dateityp gefunden!</string>
   <string name="local_file_list_empty">Es befinden sich keine Dateien in diesem Ordner.</string>
   <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
   <string name="filedetails_size">Größe:</string>
diff --git a/res/values-ia/strings.xml b/res/values-ia/strings.xml
index efb3d3d5..3685fdff 100644
--- a/res/values-ia/strings.xml
+++ b/res/values-ia/strings.xml
@@ -37,6 +37,7 @@
   <string name="common_cancel">Cancellar</string>
   <string name="common_error">Error</string>
   <string name="common_error_unknown">Error Incognite</string>
+  <string name="about_title">A proposito</string>
   <string name="change_password">Cambiar contrasigno</string>
   <string name="delete_account">Deler conto</string>
   <string name="uploader_info_dirname">Nomine de dossier</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 41cd97d0..1876c657 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -71,6 +71,7 @@
   <string name="file_list_seconds_ago">초 지남</string>
   <string name="file_list_empty">내용이 없습니다. 업로드할 수 있습니다!</string>
   <string name="file_list_loading">불러오는 중...</string>
+  <string name="file_list_no_app_for_file_type">파일 형식을 열 수 있는 앱이 없습니다!</string>
   <string name="local_file_list_empty">이 폴더에 파일이 없습니다.</string>
   <string name="filedetails_select_file">파일을 누르면 추가 정보가 표시됩니다.</string>
   <string name="filedetails_size">크기:</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 88eef421..5d35f019 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -72,6 +72,7 @@ Download hier: %2$s</string>
   <string name="file_list_seconds_ago">seconden geleden</string>
   <string name="file_list_empty">Er bevindt zich hier niets. Upload een bestand!</string>
   <string name="file_list_loading">Laden...</string>
+  <string name="file_list_no_app_for_file_type">Geen app gevonden voor het bestandstype!</string>
   <string name="local_file_list_empty">Er staan geen bestanden in deze map.</string>
   <string name="filedetails_select_file">Druk op een bestand om extra informatie weer te geven</string>
   <string name="filedetails_size">Grootte:</string>