summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
Diffstat (limited to 'settings')
-rw-r--r--settings/l10n/ja.js2
-rw-r--r--settings/l10n/ja.json2
-rw-r--r--settings/l10n/nl.js2
-rw-r--r--settings/l10n/nl.json2
-rw-r--r--settings/l10n/pt_BR.js2
-rw-r--r--settings/l10n/pt_BR.json2
-rw-r--r--settings/l10n/zh_TW.js2
-rw-r--r--settings/l10n/zh_TW.json2
-rw-r--r--settings/personal.php2
-rw-r--r--settings/users.php2
10 files changed, 16 insertions, 4 deletions
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 65881d30d34..2d092c302d1 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -209,6 +209,8 @@ OC.L10N.register(
"Admin documentation" : "管理者ドキュメント",
"Show description …" : "説明を表示 ...",
"Hide description …" : "説明を隠す ...",
+ "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最小バージョンが指定されていません.ownCloud 11 以降でエラーが発生する可能性があります.",
+ "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最大バージョンが指定されていません.ownCloud 11 以降でエラーが発生する可能性があります.",
"This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係が満たされないためこのアプリをインストールできません:",
"Enable only for specific groups" : "特定のグループのみ有効に",
"Uninstall App" : "アプリをアンインストール",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 05d43d0cd62..996a53df9c5 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -207,6 +207,8 @@
"Admin documentation" : "管理者ドキュメント",
"Show description …" : "説明を表示 ...",
"Hide description …" : "説明を隠す ...",
+ "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最小バージョンが指定されていません.ownCloud 11 以降でエラーが発生する可能性があります.",
+ "This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later." : "このアプリはownCloudの最大バージョンが指定されていません.ownCloud 11 以降でエラーが発生する可能性があります.",
"This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係が満たされないためこのアプリをインストールできません:",
"Enable only for specific groups" : "特定のグループのみ有効に",
"Uninstall App" : "アプリをアンインストール",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 2aead6ae80f..60962c89c61 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -204,6 +204,8 @@ OC.L10N.register(
"Developer documentation" : "Ontwikkelaarsdocumentatie",
"Experimental applications ahead" : "Experimentele applicaties vooraan",
"Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentele apps zijn niet gecontroleerd op beveiligingsproblemen, zijn nieuw of staan bekend als instabiel en worden volop ontwikkeld. Installatie kan leiden tot gegevensverlies of beveiligingsincidenten.",
+ "by %s" : "op %s",
+ "%s-licensed" : "%s-licensed",
"Documentation:" : "Documentatie:",
"User documentation" : "Gebruikersdocumentatie",
"Admin documentation" : "Beheerdocumentatie",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index b72ac4f860c..2c201e83e30 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -202,6 +202,8 @@
"Developer documentation" : "Ontwikkelaarsdocumentatie",
"Experimental applications ahead" : "Experimentele applicaties vooraan",
"Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Experimentele apps zijn niet gecontroleerd op beveiligingsproblemen, zijn nieuw of staan bekend als instabiel en worden volop ontwikkeld. Installatie kan leiden tot gegevensverlies of beveiligingsincidenten.",
+ "by %s" : "op %s",
+ "%s-licensed" : "%s-licensed",
"Documentation:" : "Documentatie:",
"User documentation" : "Gebruikersdocumentatie",
"Admin documentation" : "Beheerdocumentatie",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 7d04bc3c04b..144c4a812f2 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -204,6 +204,8 @@ OC.L10N.register(
"Developer documentation" : "Documentação do desenvolvedor",
"Experimental applications ahead" : "Aplicações experimentais à frente",
"Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Aplicativos experimentais não são marcados por questões de segurança, por serem novos ou conhecidos como instáveis e sob forte desenvolvimento. Instalá-los pode causar perda de dados ou falhas de segurança.",
+ "by %s" : "por %s",
+ "%s-licensed" : "%s-licenciado",
"Documentation:" : "Documentação:",
"User documentation" : "Documentação do usuário",
"Admin documentation" : "Documentação para Administração",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 100b7e60f22..fb06b056b44 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -202,6 +202,8 @@
"Developer documentation" : "Documentação do desenvolvedor",
"Experimental applications ahead" : "Aplicações experimentais à frente",
"Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Aplicativos experimentais não são marcados por questões de segurança, por serem novos ou conhecidos como instáveis e sob forte desenvolvimento. Instalá-los pode causar perda de dados ou falhas de segurança.",
+ "by %s" : "por %s",
+ "%s-licensed" : "%s-licenciado",
"Documentation:" : "Documentação:",
"User documentation" : "Documentação do usuário",
"Admin documentation" : "Documentação para Administração",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 755befc2d5f..14e94ae0f30 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -277,7 +277,7 @@ OC.L10N.register(
"Unlimited" : "無限制",
"Other" : "其他",
"Full Name" : "全名",
- "Group Admin for" : "是以下群組的管理員",
+ "Group Admin for" : "指定群組管理者",
"Quota" : "容量限制",
"Storage Location" : "儲存位置",
"User Backend" : "用戶後端",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index e89a00e338f..0fc46a9ee8f 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -275,7 +275,7 @@
"Unlimited" : "無限制",
"Other" : "其他",
"Full Name" : "全名",
- "Group Admin for" : "是以下群組的管理員",
+ "Group Admin for" : "指定群組管理者",
"Quota" : "容量限制",
"Storage Location" : "儲存位置",
"User Backend" : "用戶後端",
diff --git a/settings/personal.php b/settings/personal.php
index 261a459a921..d2d4fc90f5e 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -149,7 +149,7 @@ $tmpl->assign('activelanguage', $userLang);
$tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
$tmpl->assign('displayName', OC_User::getDisplayName());
-$tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true));
+$tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true) === true);
$tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
$tmpl->assign('certs', $certificateManager->listCertificates());
$tmpl->assign('showCertificates', $enableCertImport);
diff --git a/settings/users.php b/settings/users.php
index 9d89ff65b4a..0dff85c1ade 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -116,7 +116,7 @@ $tmpl->assign('quota_preset', $quotaPreset);
$tmpl->assign('default_quota', $defaultQuota);
$tmpl->assign('defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
$tmpl->assign('recoveryAdminEnabled', $recoveryAdminEnabled);
-$tmpl->assign('enableAvatars', \OC::$server->getConfig()->getSystemValue('enable_avatars', true));
+$tmpl->assign('enableAvatars', \OC::$server->getConfig()->getSystemValue('enable_avatars', true) === true);
$tmpl->assign('show_storage_location', $config->getAppValue('core', 'umgmt_show_storage_location', 'false'));
$tmpl->assign('show_last_login', $config->getAppValue('core', 'umgmt_show_last_login', 'false'));