summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files_external/l10n/fr.js4
-rw-r--r--apps/files_external/l10n/fr.json4
-rw-r--r--apps/user_ldap/l10n/fr.js1
-rw-r--r--apps/user_ldap/l10n/fr.json1
-rw-r--r--apps/user_ldap/l10n/ja.js4
-rw-r--r--apps/user_ldap/l10n/ja.json4
-rw-r--r--apps/user_ldap/l10n/nl.js1
-rw-r--r--apps/user_ldap/l10n/nl.json1
-rw-r--r--l10n/templates/core.pot2
-rw-r--r--l10n/templates/files.pot2
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot2
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_trashbin.pot2
-rw-r--r--l10n/templates/files_versions.pot2
-rw-r--r--l10n/templates/lib.pot2
-rw-r--r--l10n/templates/private.pot2
-rw-r--r--l10n/templates/settings.pot2
-rw-r--r--l10n/templates/user_ldap.pot2
-rw-r--r--l10n/templates/user_webdavauth.pot2
-rw-r--r--settings/l10n/fr.js1
-rw-r--r--settings/l10n/fr.json1
-rw-r--r--settings/l10n/nl.js1
-rw-r--r--settings/l10n/nl.json1
24 files changed, 32 insertions, 16 deletions
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 65ca0ac02d6..bdaf0a19b01 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -39,7 +39,7 @@ OC.L10N.register(
"URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)",
"Timeout of HTTP requests in seconds" : "Temps maximal de requête HTTP en seconde",
"Share" : "Partager",
- "SMB / CIFS using OC login" : "SMB / CIFS utilise le nom d'utilisateur OC",
+ "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
"Username as share" : "Nom d'utilisateur du partage",
"URL" : "URL",
"Secure https://" : "Sécurisation https://",
@@ -68,7 +68,7 @@ OC.L10N.register(
"Available for" : "Disponible pour",
"Add storage" : "Ajouter un support de stockage",
"Delete" : "Supprimer",
- "Enable User External Storage" : "Activer le stockage externe pour les utilisateurs",
+ "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes",
"Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants"
},
"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 02abcba6dde..e9f1c91b30d 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -37,7 +37,7 @@
"URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)",
"Timeout of HTTP requests in seconds" : "Temps maximal de requête HTTP en seconde",
"Share" : "Partager",
- "SMB / CIFS using OC login" : "SMB / CIFS utilise le nom d'utilisateur OC",
+ "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
"Username as share" : "Nom d'utilisateur du partage",
"URL" : "URL",
"Secure https://" : "Sécurisation https://",
@@ -66,7 +66,7 @@
"Available for" : "Disponible pour",
"Add storage" : "Ajouter un support de stockage",
"Delete" : "Supprimer",
- "Enable User External Storage" : "Activer le stockage externe pour les utilisateurs",
+ "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes",
"Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
} \ No newline at end of file
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index 2433d051d83..74bc9533eb4 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -76,6 +76,7 @@ OC.L10N.register(
"Saving" : "Enregistrement...",
"Back" : "Retour",
"Continue" : "Poursuivre",
+ "LDAP" : "LDAP",
"Expert" : "Expert",
"Advanced" : "Avancé",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 11a4844add6..777376eced0 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -74,6 +74,7 @@
"Saving" : "Enregistrement...",
"Back" : "Retour",
"Continue" : "Poursuivre",
+ "LDAP" : "LDAP",
"Expert" : "Expert",
"Advanced" : "Avancé",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index 79315a055f1..6494fbb5142 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -48,6 +48,7 @@ OC.L10N.register(
"Edit raw filter instead" : "フィルタを編集",
"Raw LDAP filter" : "LDAP フィルタ",
"The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+ "Test Filter" : "フィルターをテスト",
"groups found" : "グループが見つかりました",
"Users login with this attribute:" : "この属性でユーザーログイン:",
"LDAP Username:" : "LDAPユーザー名:",
@@ -67,9 +68,12 @@ OC.L10N.register(
"For anonymous access, leave DN and Password empty." : "匿名アクセスの場合は、DNとパスワードを空にしてください。",
"One Base DN per line" : "1行に1つのベースDN",
"You can specify Base DN for users and groups in the Advanced tab" : "拡張タブでユーザーとグループのベースDNを指定することができます。",
+ "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。",
+ "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
"Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
"The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
"users found" : "ユーザーが見つかりました",
+ "Saving" : "保存中",
"Back" : "戻る",
"Continue" : "続ける",
"LDAP" : "LDAP",
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index da903e15d17..2e714112f19 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -46,6 +46,7 @@
"Edit raw filter instead" : "フィルタを編集",
"Raw LDAP filter" : "LDAP フィルタ",
"The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+ "Test Filter" : "フィルターをテスト",
"groups found" : "グループが見つかりました",
"Users login with this attribute:" : "この属性でユーザーログイン:",
"LDAP Username:" : "LDAPユーザー名:",
@@ -65,9 +66,12 @@
"For anonymous access, leave DN and Password empty." : "匿名アクセスの場合は、DNとパスワードを空にしてください。",
"One Base DN per line" : "1行に1つのベースDN",
"You can specify Base DN for users and groups in the Advanced tab" : "拡張タブでユーザーとグループのベースDNを指定することができます。",
+ "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。",
+ "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
"Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
"The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
"users found" : "ユーザーが見つかりました",
+ "Saving" : "保存中",
"Back" : "戻る",
"Continue" : "続ける",
"LDAP" : "LDAP",
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index c74584f7512..77646a90a88 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -76,6 +76,7 @@ OC.L10N.register(
"Saving" : "Opslaan",
"Back" : "Terug",
"Continue" : "Verder",
+ "LDAP" : "LDAP",
"Expert" : "Expert",
"Advanced" : "Geavanceerd",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index af6246ba39d..6f0a9ec1c01 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -74,6 +74,7 @@
"Saving" : "Opslaan",
"Back" : "Terug",
"Continue" : "Verder",
+ "LDAP" : "LDAP",
"Expert" : "Expert",
"Advanced" : "Geavanceerd",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index ebe80ad8474..72862a21690 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 6ecabf891f3..455bbf0e3d6 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index bf284821772..2e4d031a46d 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index e31d628a483..c4ce2ccdbe3 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index caa1fbec3f8..db6c9a98fe5 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index ded0d7847c0..0b6f1544ca4 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index d43952c5197..d1913eb573a 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index ddeca8d08a2..bcdc7f0f009 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index f3db3159c5e..ae5ba798e19 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c90804dcd61..75000585a1b 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 49443caa423..c69c23d50ff 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index ee3a6ec2bb4..2f1e2e17426 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 8.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 07fecc6e3bd..f2269b78eae 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -1,6 +1,7 @@
OC.L10N.register(
"settings",
{
+ "Security & Setup Warnings" : "Alertes de sécurité ou de configuration",
"Cron" : "Cron",
"Sharing" : "Partage",
"Security" : "Sécurité",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index f473adc4f1b..55fcf7a42e3 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -1,4 +1,5 @@
{ "translations": {
+ "Security & Setup Warnings" : "Alertes de sécurité ou de configuration",
"Cron" : "Cron",
"Sharing" : "Partage",
"Security" : "Sécurité",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index ef4613cb4eb..950f8ead76d 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -1,6 +1,7 @@
OC.L10N.register(
"settings",
{
+ "Security & Setup Warnings" : "Beveiligings- en instellingswaarschuwingen",
"Cron" : "Cron",
"Sharing" : "Delen",
"Security" : "Beveiliging",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index fc060810daa..d23d84847a3 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -1,4 +1,5 @@
{ "translations": {
+ "Security & Setup Warnings" : "Beveiligings- en instellingswaarschuwingen",
"Cron" : "Cron",
"Sharing" : "Delen",
"Security" : "Beveiliging",