Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption

Conflicts:
	apps/files/l10n/ar.php
	apps/files/l10n/bn_BD.php
	apps/files/l10n/de.php
	apps/files/l10n/de_DE.php
	apps/files/l10n/el.php
	apps/files/l10n/es.php
	apps/files/l10n/fa.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/id.php
	apps/files/l10n/ko.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/pl.php
	apps/files/l10n/pt_BR.php
	apps/files/l10n/pt_PT.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/sl.php
	apps/files/l10n/uk.php
	apps/files/l10n/vi.php
	apps/files_encryption/l10n/ca.php
	apps/files_sharing/lib/cache.php
	apps/files_sharing/lib/sharedstorage.php
	apps/user_ldap/l10n/tr.php
	core/l10n/cs_CZ.php
	core/l10n/de.php
	core/l10n/de_DE.php
	core/l10n/ru.php
	core/l10n/sk_SK.php
	core/l10n/tr.php
	core/l10n/vi.php
	core/l10n/zh_CN.php
	l10n/af_ZA/files.po
	l10n/ar/files.po
	l10n/be/files.po
	l10n/bg_BG/files.po
	l10n/bn_BD/files.po
	l10n/ca/files.po
	l10n/ca/files_encryption.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/da/files.po
	l10n/da/settings.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/files_encryption.po
	l10n/de/files_external.po
	l10n/de/files_sharing.po
	l10n/de/files_trashbin.po
	l10n/de/files_versions.po
	l10n/de/lib.po
	l10n/de/settings.po
	l10n/de/user_ldap.po
	l10n/de_DE/files.po
	l10n/de_DE/files_encryption.po
	l10n/de_DE/files_external.po
	l10n/de_DE/files_sharing.po
	l10n/de_DE/files_trashbin.po
	l10n/de_DE/lib.po
	l10n/de_DE/settings.po
	l10n/de_DE/user_ldap.po
	l10n/el/files.po
	l10n/eo/files.po
	l10n/es/files.po
	l10n/es/lib.po
	l10n/es/settings.po
	l10n/es_AR/files.po
	l10n/eu/files.po
	l10n/fa/files.po
	l10n/fi/files.po
	l10n/fi_FI/files.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/gl/files.po
	l10n/gl/settings.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/user_ldap.po
	l10n/hi/files.po
	l10n/hr/files.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/files_external.po
	l10n/hu_HU/settings.po
	l10n/hy/files.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/files_trashbin.po
	l10n/ia/settings.po
	l10n/id/files.po
	l10n/is/files.po
	l10n/it/files.po
	l10n/ja_JP/files.po
	l10n/ja_JP/user_ldap.po
	l10n/ka/files.po
	l10n/ka_GE/files.po
	l10n/kn/files.po
	l10n/ko/files.po
	l10n/ko/files_trashbin.po
	l10n/ko/settings.po
	l10n/ku_IQ/files.po
	l10n/lb/files.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lv/files.po
	l10n/mk/files.po
	l10n/ms_MY/files.po
	l10n/my_MM/files.po
	l10n/nb_NO/files.po
	l10n/ne/files.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nn_NO/files.po
	l10n/oc/files.po
	l10n/pl/files.po
	l10n/pl_PL/files.po
	l10n/pt_BR/files.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/files_external.po
	l10n/pt_PT/settings.po
	l10n/ro/files.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/si_LK/files.po
	l10n/sk/files.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sq/files.po
	l10n/sr/files.po
	l10n/sr@latin/files.po
	l10n/sv/files.po
	l10n/sw_KE/files.po
	l10n/ta_LK/files.po
	l10n/te/files.po
	l10n/th_TH/files.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/lib.po
	l10n/tr/settings.po
	l10n/tr/user_ldap.po
	l10n/uk/files.po
	l10n/ur_PK/files.po
	l10n/vi/core.po
	l10n/vi/files.po
	l10n/vi/files_external.po
	l10n/zh_CN.GB2312/files.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/settings.po
	l10n/zh_HK/files.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/files_versions.po
	l10n/zh_TW/settings.po
	l10n/zh_TW/user_ldap.po
	lib/base.php
	lib/files/filesystem.php
	lib/files/view.php
	lib/public/share.php
	settings/l10n/es.php
	settings/l10n/pt_PT.php
	settings/l10n/tr.php
	settings/l10n/zh_CN.php
	settings/personal.php

11 files changed, 11 insertions, 11 deletions

diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index bcf0ca5ad63..cdcd8a40b23 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "Dateiverschlüsselung ist aktiviert",
 "The following file types will not be encrypted:" => "Die folgenden Dateitypen werden nicht verschlüsselt:",
 "Exclude the following file types from encryption:" => "Schließe die folgenden Dateitypen von der Verschlüsselung aus:",
-"None" => "Nichts"
+"None" => "Keine"
 );
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 71fd7d96711..4f08b98eb29 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "Datei-Verschlüsselung ist aktiviert",
 "The following file types will not be encrypted:" => "Die folgenden Dateitypen werden nicht verschlüsselt:",
 "Exclude the following file types from encryption:" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:",
-"None" => "Nichts"
+"None" => "Keine"
 );
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 82a4c92ec28..0031a731944 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "Η κρυπτογράφηση αρχείων είναι ενεργή.",
 "The following file types will not be encrypted:" => "Οι παρακάτω τύποι αρχείων δεν θα κρυπτογραφηθούν:",
 "Exclude the following file types from encryption:" => "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση:",
-"None" => "Τίποτα"
+"None" => "Καμία"
 );
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 7e3b7611ff2..5a22b65728e 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "Fitxategien enkriptazioa gaituta dago.",
 "The following file types will not be encrypted:" => "Hurrengo fitxategi motak ez dira enkriptatuko:",
 "Exclude the following file types from encryption:" => "Baztertu hurrengo fitxategi motak enkriptatzetik:",
-"None" => "Ezer"
+"None" => "Bat ere ez"
 );
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index c7171345269..9ab9bc492a0 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "La cifratura dei file è abilitata.",
 "The following file types will not be encrypted:" => "I seguenti tipi di file non saranno cifrati:",
 "Exclude the following file types from encryption:" => "Escludi i seguenti tipi di file dalla cifratura:",
-"None" => "Nessuno"
+"None" => "Nessuna"
 );
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 836f5453596..2fa86f454f9 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "Szyfrowanie plików jest włączone",
 "The following file types will not be encrypted:" => "Poniższe typy plików nie będą szyfrowane:",
 "Exclude the following file types from encryption:" => "Wyłącz poniższe typy plików z szyfrowania:",
-"None" => "Nic"
+"None" => "Brak"
 );
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index b41c6ed3153..28807db72ce 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "A criptografia de arquivos está ativada.",
 "The following file types will not be encrypted:" => "Os seguintes tipos de arquivo não serão criptografados:",
 "Exclude the following file types from encryption:" => "Excluir os seguintes tipos de arquivo da criptografia:",
-"None" => "Nada"
+"None" => "Nenhuma"
 );
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index f07dec621d7..22c1e3da374 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "Шифрование файла включено.",
 "The following file types will not be encrypted:" => "Следующие типы файлов не будут зашифрованы:",
 "Exclude the following file types from encryption:" => "Исключить следующие типы файлов из шифрованных:",
-"None" => "Нет новостей"
+"None" => "Ничего"
 );
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index aaea9da21b4..bebb6234710 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "Šifrovanie súborov nastavené.",
 "The following file types will not be encrypted:" => "Uvedené typy súborov nebudú šifrované:",
 "Exclude the following file types from encryption:" => "Nešifrovať uvedené typy súborov",
-"None" => "Žiadny"
+"None" => "Žiadne"
 );
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index 30c0324a988..e46d2491186 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "การเข้ารหัส",
-"None" => "ไม่มี"
+"None" => "ไม่ต้อง"
 );
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 40d4b1d0fec..0a88d1b2db6 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -3,5 +3,5 @@
 "File encryption is enabled." => "Mã hóa file đã mở",
 "The following file types will not be encrypted:" => "Loại file sau sẽ không được mã hóa",
 "Exclude the following file types from encryption:" => "Việc mã hóa không bao gồm loại file sau",
-"None" => "Không gì cả"
+"None" => "Không có gì hết"
 );