aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------3rdparty0
-rw-r--r--apps/files/l10n/ru.js4
-rw-r--r--apps/files/l10n/ru.json4
-rw-r--r--apps/twofactor_backupcodes/l10n/fr.js5
-rw-r--r--apps/twofactor_backupcodes/l10n/fr.json5
-rw-r--r--apps/user_ldap/lib/Access.php1
-rw-r--r--apps/user_ldap/lib/Command/ShowConfig.php3
-rw-r--r--apps/user_ldap/lib/Command/ShowRemnants.php3
-rw-r--r--core/css/share.css13
-rw-r--r--core/js/sharedialogview.js23
-rw-r--r--core/l10n/de.js1
-rw-r--r--core/l10n/de.json1
-rw-r--r--core/l10n/de_DE.js1
-rw-r--r--core/l10n/de_DE.json1
-rw-r--r--core/l10n/hu_HU.js1
-rw-r--r--core/l10n/hu_HU.json1
-rw-r--r--core/l10n/it.js2
-rw-r--r--core/l10n/it.json2
-rw-r--r--lib/l10n/ja.js14
-rw-r--r--lib/l10n/ja.json14
-rw-r--r--settings/js/users/users.js21
-rw-r--r--settings/l10n/ja.js10
-rw-r--r--settings/l10n/ja.json10
23 files changed, 101 insertions, 39 deletions
diff --git a/3rdparty b/3rdparty
-Subproject 106b98063b183a721c2863daea519d55a5da1d0
+Subproject 8575a38d0dbbc59166f2d7ceddea50d0d120fc4
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index e69a8321c1f..449b4c486d9 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -109,9 +109,13 @@ OC.L10N.register(
"%2$s deleted %1$s" : "%2$s удалил %1$s",
"You restored %1$s" : "Вы восстановили %1$s",
"%2$s restored %1$s" : "%2$s восстановил %1$s",
+ "You renamed %2$s to %1$s" : "Вы переименовали %2$s в %1$s",
+ "You moved %2$s to %1$s" : "Вы переместили %2$s в %1$s",
"Changed by %2$s" : "Изменено %2$s",
"Deleted by %2$s" : "Удалено %2$s",
"Restored by %2$s" : "Восстановлено %2$s",
+ "Renamed by %2$s" : "Переименовано %2$s",
+ "Moved by %2$s" : "Перемещено %2$s",
"Upload (max. %s)" : "Загрузка (максимум %s)",
"File handling" : "Управление файлами",
"Maximum upload size" : "Максимальный размер загружаемого файла",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index 599f0d4d216..cbf4b95a394 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -107,9 +107,13 @@
"%2$s deleted %1$s" : "%2$s удалил %1$s",
"You restored %1$s" : "Вы восстановили %1$s",
"%2$s restored %1$s" : "%2$s восстановил %1$s",
+ "You renamed %2$s to %1$s" : "Вы переименовали %2$s в %1$s",
+ "You moved %2$s to %1$s" : "Вы переместили %2$s в %1$s",
"Changed by %2$s" : "Изменено %2$s",
"Deleted by %2$s" : "Удалено %2$s",
"Restored by %2$s" : "Восстановлено %2$s",
+ "Renamed by %2$s" : "Переименовано %2$s",
+ "Moved by %2$s" : "Перемещено %2$s",
"Upload (max. %s)" : "Загрузка (максимум %s)",
"File handling" : "Управление файлами",
"Maximum upload size" : "Максимальный размер загружаемого файла",
diff --git a/apps/twofactor_backupcodes/l10n/fr.js b/apps/twofactor_backupcodes/l10n/fr.js
index 89c7420b867..56b14ae0f6a 100644
--- a/apps/twofactor_backupcodes/l10n/fr.js
+++ b/apps/twofactor_backupcodes/l10n/fr.js
@@ -3,12 +3,15 @@ OC.L10N.register(
{
"Generate backup codes" : "Générer des codes de récupération",
"Backup codes have been generated. {{used}} of {{total}} codes have been used." : "Les codes de récupération ont été générés. {{used}} codes sur {{total}} ont été utilisés.",
+ "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later" : "Voici vos codes de récupération. Veuillez les sauvegarder et/ou les imprimer car vous ne pouvez plus y avoir accès ultérieurement",
"Save backup codes" : "Sauvegarder les codes de récupération",
"Print backup codes" : "Imprimer les codes de récupération",
"Regenerate backup codes" : "Régénérer les codes de récupération",
+ "If you regenerate backup codes, you automatically invalidate old codes." : "Si vous régénérez les codes de récupération, vous invalidez automatiquement les anciens codes.",
"An error occurred while generating your backup codes" : "Une erreur est survenue lors de la génération de vos codes de récupération",
"Nextcloud backup codes" : "Codes de récupération Nextcloud",
"Backup code" : "Code de récupération",
- "Use backup code" : "Utiliser un code de récupération"
+ "Use backup code" : "Utiliser un code de récupération",
+ "Second-factor backup codes" : "Codes de récupération pour l'authentification en deux étapes"
},
"nplurals=2; plural=(n > 1);");
diff --git a/apps/twofactor_backupcodes/l10n/fr.json b/apps/twofactor_backupcodes/l10n/fr.json
index 9d7dbf03e5d..275fbb7e2f2 100644
--- a/apps/twofactor_backupcodes/l10n/fr.json
+++ b/apps/twofactor_backupcodes/l10n/fr.json
@@ -1,12 +1,15 @@
{ "translations": {
"Generate backup codes" : "Générer des codes de récupération",
"Backup codes have been generated. {{used}} of {{total}} codes have been used." : "Les codes de récupération ont été générés. {{used}} codes sur {{total}} ont été utilisés.",
+ "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later" : "Voici vos codes de récupération. Veuillez les sauvegarder et/ou les imprimer car vous ne pouvez plus y avoir accès ultérieurement",
"Save backup codes" : "Sauvegarder les codes de récupération",
"Print backup codes" : "Imprimer les codes de récupération",
"Regenerate backup codes" : "Régénérer les codes de récupération",
+ "If you regenerate backup codes, you automatically invalidate old codes." : "Si vous régénérez les codes de récupération, vous invalidez automatiquement les anciens codes.",
"An error occurred while generating your backup codes" : "Une erreur est survenue lors de la génération de vos codes de récupération",
"Nextcloud backup codes" : "Codes de récupération Nextcloud",
"Backup code" : "Code de récupération",
- "Use backup code" : "Utiliser un code de récupération"
+ "Use backup code" : "Utiliser un code de récupération",
+ "Second-factor backup codes" : "Codes de récupération pour l'authentification en deux étapes"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
} \ No newline at end of file
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index 96b6bae64bd..40bae8d7b41 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -304,7 +304,6 @@ class Access extends LDAPUtility implements IUserTools {
}
/**
- public function ocname2dn($name, $isUser) {
* returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
* @param string $fdn the dn of the group object
* @param string $ldapName optional, the display name of the object
diff --git a/apps/user_ldap/lib/Command/ShowConfig.php b/apps/user_ldap/lib/Command/ShowConfig.php
index ac70468b1c4..7a24889eb09 100644
--- a/apps/user_ldap/lib/Command/ShowConfig.php
+++ b/apps/user_ldap/lib/Command/ShowConfig.php
@@ -26,6 +26,7 @@
namespace OCA\User_LDAP\Command;
use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
@@ -91,7 +92,7 @@ class ShowConfig extends Command {
$configuration = $configHolder->getConfiguration();
ksort($configuration);
- $table = $this->getHelperSet()->get('table');
+ $table = new Table($output);
$table->setHeaders(array('Configuration', $id));
$rows = array();
foreach($configuration as $key => $value) {
diff --git a/apps/user_ldap/lib/Command/ShowRemnants.php b/apps/user_ldap/lib/Command/ShowRemnants.php
index df38d6f650d..0e6aea6a5ab 100644
--- a/apps/user_ldap/lib/Command/ShowRemnants.php
+++ b/apps/user_ldap/lib/Command/ShowRemnants.php
@@ -26,6 +26,7 @@
namespace OCA\User_LDAP\Command;
use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
@@ -64,7 +65,7 @@ class ShowRemnants extends Command {
*/
protected function execute(InputInterface $input, OutputInterface $output) {
/** @var \Symfony\Component\Console\Helper\Table $table */
- $table = $this->getHelperSet()->get('table');
+ $table = new Table($output);
$table->setHeaders(array(
'ownCloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
'Dir', 'Sharer'));
diff --git a/core/css/share.css b/core/css/share.css
index 6ccb82a09ff..042c4ddf2ae 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -50,6 +50,19 @@
height: 32px;
}
+.share-autocomplete-item {
+ display: flex;
+}
+.share-autocomplete-item .autocomplete-item-text {
+ margin-left: 10px;
+ margin-right: 10px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ line-height: 32px;
+ vertical-align: middle;
+}
+
#shareWithList {
list-style-type:none;
padding:8px;
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index dce4a60bc9a..7efb361f512 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -251,7 +251,7 @@
},
autocompleteRenderItem: function(ul, item) {
- var insert = $("<a>");
+
var text = item.label;
if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
text = t('core', '{sharee} (group)', {
@@ -269,15 +269,20 @@
});
}
}
- insert.text(text);
- insert.attr('title', item.value.shareWith);
- if(item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
- insert = insert.wrapInner('<strong></strong>');
+ var insert = $("<div class='share-autocomplete-item'/>");
+ var avatar = $("<div class='avatardiv'></div>").appendTo(insert);
+ if (item.value.shareType === OC.Share.SHARE_TYPE_USER) {
+ avatar.avatar(item.value.shareWith, 32, undefined, undefined, undefined, item.label);
+ } else {
+ avatar.imageplaceholder(text, undefined, 32);
}
- insert.tooltip({
- placement: 'bottom',
- container: 'body'
- });
+
+ $("<div class='autocomplete-item-text'></div>")
+ .text(text)
+ .appendTo(insert);
+ insert.attr('title', item.value.shareWith);
+ insert = $("<a>")
+ .append(insert);
return $("<li>")
.addClass((item.value.shareType === OC.Share.SHARE_TYPE_GROUP) ? 'group' : 'user')
.append(insert)
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 67c893af4b5..62b7d5ca61a 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -185,6 +185,7 @@ OC.L10N.register(
"{sharee} (at {server})" : "{sharee} (auf {server})",
"{sharee} (remote)" : "{sharee} (remote)",
"Share" : "Teilen",
+ "Share with people on other Nextclouds using the syntax username@example.com/nextcloud" : "Teile es mit Nutzern in anderen Nextclouds. Die Syntax hierfür lautet: username@beispiel.de/nextcloud",
"Share with users…" : "Mit Benutzern teilen…",
"Share with users, groups or remote users…" : "Mit Benutzern, Gruppen oder externen Benutzern teilen…",
"Share with users or groups…" : "Mit Benutzern oder Gruppen teilen…",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index c0873f3557a..8b6cc64b22f 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -183,6 +183,7 @@
"{sharee} (at {server})" : "{sharee} (auf {server})",
"{sharee} (remote)" : "{sharee} (remote)",
"Share" : "Teilen",
+ "Share with people on other Nextclouds using the syntax username@example.com/nextcloud" : "Teile es mit Nutzern in anderen Nextclouds. Die Syntax hierfür lautet: username@beispiel.de/nextcloud",
"Share with users…" : "Mit Benutzern teilen…",
"Share with users, groups or remote users…" : "Mit Benutzern, Gruppen oder externen Benutzern teilen…",
"Share with users or groups…" : "Mit Benutzern oder Gruppen teilen…",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 8cbc127e809..cb20599fe14 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -185,6 +185,7 @@ OC.L10N.register(
"{sharee} (at {server})" : "{sharee} (auf {server})",
"{sharee} (remote)" : "{sharee} (entfernt)",
"Share" : "Teilen",
+ "Share with people on other Nextclouds using the syntax username@example.com/nextcloud" : "Teilen Sie es mit Nutzern in anderen Nextclouds. Die Syntax hierfür lautet: username@beispiel.de/nextcloud",
"Share with users…" : "Mit Benutzern teilen…",
"Share with users, groups or remote users…" : "Mit Benutzern, Gruppen oder externen Benutzern teilen…",
"Share with users or groups…" : "Mit Benutzern oder Gruppen teilen…",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 8603b2960d7..c016fdf64c0 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -183,6 +183,7 @@
"{sharee} (at {server})" : "{sharee} (auf {server})",
"{sharee} (remote)" : "{sharee} (entfernt)",
"Share" : "Teilen",
+ "Share with people on other Nextclouds using the syntax username@example.com/nextcloud" : "Teilen Sie es mit Nutzern in anderen Nextclouds. Die Syntax hierfür lautet: username@beispiel.de/nextcloud",
"Share with users…" : "Mit Benutzern teilen…",
"Share with users, groups or remote users…" : "Mit Benutzern, Gruppen oder externen Benutzern teilen…",
"Share with users or groups…" : "Mit Benutzern oder Gruppen teilen…",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 6e8b7c8b15c..eeed2bbd2d3 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -185,6 +185,7 @@ OC.L10N.register(
"{sharee} (at {server})" : "{sharee} ({server} szerveren)",
"{sharee} (remote)" : "{sharee} (távoli)",
"Share" : "Megosztás",
+ "Share with people on other Nextclouds using the syntax username@example.com/nextcloud" : "Megosztás más Nextcloud-ot használó emberekkel, a következő szintaxissal: felhasznalo@pelda.hu/nextcloud",
"Share with users…" : "Megosztás felhasználókkal",
"Share with users, groups or remote users…" : "Megosztás felhasználókkal, csoportokkal vagy távoli felhasználókkal...",
"Share with users or groups…" : "Megosztás felhasználókkal vagy csoportokkal...",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 7801a7987fb..6bba1e09c60 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -183,6 +183,7 @@
"{sharee} (at {server})" : "{sharee} ({server} szerveren)",
"{sharee} (remote)" : "{sharee} (távoli)",
"Share" : "Megosztás",
+ "Share with people on other Nextclouds using the syntax username@example.com/nextcloud" : "Megosztás más Nextcloud-ot használó emberekkel, a következő szintaxissal: felhasznalo@pelda.hu/nextcloud",
"Share with users…" : "Megosztás felhasználókkal",
"Share with users, groups or remote users…" : "Megosztás felhasználókkal, csoportokkal vagy távoli felhasználókkal...",
"Share with users or groups…" : "Megosztás felhasználókkal vagy csoportokkal...",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 26a356d9372..9add07a2b29 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -165,6 +165,7 @@ OC.L10N.register(
"Send link via email" : "Invia collegamento tramite email",
"Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
"Shared with you by {owner}" : "Condiviso con te da {owner}",
+ "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} ha condiviso tramite collegamento",
"group" : "gruppo",
"remote" : "remota",
"notify by email" : "notifica tramite email",
@@ -184,6 +185,7 @@ OC.L10N.register(
"{sharee} (at {server})" : "{sharee} (su {server})",
"{sharee} (remote)" : "{sharee} (remote)",
"Share" : "Condividi",
+ "Share with people on other Nextclouds using the syntax username@example.com/nextcloud" : "Condividi con persone su altri Nextcloud utilizzando la sintassi nomeutente@esempio.com/nextcloud",
"Share with users…" : "Condividi con utenti...",
"Share with users, groups or remote users…" : "Condividi con utenti, gruppi o utenti remoti...",
"Share with users or groups…" : "Condividi con utenti o gruppi...",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index b0e3fcf3025..1e86981f42f 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -163,6 +163,7 @@
"Send link via email" : "Invia collegamento tramite email",
"Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
"Shared with you by {owner}" : "Condiviso con te da {owner}",
+ "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} ha condiviso tramite collegamento",
"group" : "gruppo",
"remote" : "remota",
"notify by email" : "notifica tramite email",
@@ -182,6 +183,7 @@
"{sharee} (at {server})" : "{sharee} (su {server})",
"{sharee} (remote)" : "{sharee} (remote)",
"Share" : "Condividi",
+ "Share with people on other Nextclouds using the syntax username@example.com/nextcloud" : "Condividi con persone su altri Nextcloud utilizzando la sintassi nomeutente@esempio.com/nextcloud",
"Share with users…" : "Condividi con utenti...",
"Share with users, groups or remote users…" : "Condividi con utenti, gruppi o utenti remoti...",
"Share with users or groups…" : "Condividi con utenti o gruppi...",
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index 1ed9d5d513d..357637e40a2 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -52,6 +52,11 @@ OC.L10N.register(
"App can't be installed because it is not compatible with this version of the server" : "アプリは、このバージョンのサーバーと互換性がないためインストールされませんでした。",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。",
"App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "info.xmlのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません",
+ "APCu" : "APCu",
+ "Redis" : "Redis",
+ "Server settings" : "サーバー設定",
+ "Logging" : "ロギング",
+ "Additional settings" : "追加設定",
"%s enter the database username and name." : "%s データベース名とデータベースのユーザー名を入力してください。",
"%s enter the database username." : "%s のデータベースのユーザー名を入力してください。",
"%s enter the database name." : "%s のデータベース名を入力してください。",
@@ -115,6 +120,7 @@ OC.L10N.register(
"The username is already being used" : "ユーザー名はすでに使われています",
"Login canceled by app" : "アプリによりログインが中止されました",
"User disabled" : "ユーザーは無効です",
+ "Help" : "ヘルプ",
"Personal" : "個人",
"Users" : "ユーザー",
"Admin" : "管理",
@@ -131,8 +137,8 @@ OC.L10N.register(
"Token expired. Please reload page." : "トークンが無効になりました。ページを再読込してください。",
"Unknown user" : "不明なユーザー",
"No database drivers (sqlite, mysql, or postgresql) installed." : "データベースドライバー (sqlite, mysql, postgresql) がインストールされていません。",
- "Microsoft Windows Platform is not supported" : "Microsoft Windows サーバーはサポートしていません。",
- "Running Nextcloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself." : "マイクロソフト Windowsサーバー上で Nextcloudを動かすのをサポートしていません。サーバー丸ごと移行する方式をとれない場合は仮想マシンで Linux を動かすことをお勧めします。",
+ "Microsoft Windows Platform is not supported" : "Microsoft Windows プラットフォームはサポートしていません。",
+ "Running Nextcloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself." : "マイクロソフト Windowsプラットフォーム上での Nextcloudの動作をサポートしていません。サーバー丸ごと移行する方式をとれない場合は仮想マシンで Linux を動かすことをお勧めします。",
"Cannot write into \"config\" directory" : "\"config\" ディレクトリに書き込みができません",
"Cannot write into \"apps\" directory" : "\"apps\" ディレクトリに書き込みができません",
"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "多くの場合、これは %s Webサーバーにappsディレクトリ %s への書き込み権限を与えるか、設定ファイルでアプリストアを無効化することで解決できます。",
@@ -166,6 +172,8 @@ OC.L10N.register(
"Storage incomplete configuration. %s" : "設定が未完了のストレージです。 %s",
"Storage connection error. %s" : "ストレージへの接続エラー｡ %s",
"Storage not available" : "ストレージが利用できません",
- "Storage connection timeout. %s" : "ストレージへの接続がタイムアウト。 %s"
+ "Storage connection timeout. %s" : "ストレージへの接続がタイムアウト。 %s",
+ "ownCloud %s or higher is required." : "ownCloud %s 以上が必要です",
+ "ownCloud %s or lower is required." : "ownCloud %s 以下が必要です"
},
"nplurals=1; plural=0;");
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index 9ba57f9d10e..5fa2bcffe91 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -50,6 +50,11 @@
"App can't be installed because it is not compatible with this version of the server" : "アプリは、このバージョンのサーバーと互換性がないためインストールされませんでした。",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。",
"App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "info.xmlのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません",
+ "APCu" : "APCu",
+ "Redis" : "Redis",
+ "Server settings" : "サーバー設定",
+ "Logging" : "ロギング",
+ "Additional settings" : "追加設定",
"%s enter the database username and name." : "%s データベース名とデータベースのユーザー名を入力してください。",
"%s enter the database username." : "%s のデータベースのユーザー名を入力してください。",
"%s enter the database name." : "%s のデータベース名を入力してください。",
@@ -113,6 +118,7 @@
"The username is already being used" : "ユーザー名はすでに使われています",
"Login canceled by app" : "アプリによりログインが中止されました",
"User disabled" : "ユーザーは無効です",
+ "Help" : "ヘルプ",
"Personal" : "個人",
"Users" : "ユーザー",
"Admin" : "管理",
@@ -129,8 +135,8 @@
"Token expired. Please reload page." : "トークンが無効になりました。ページを再読込してください。",
"Unknown user" : "不明なユーザー",
"No database drivers (sqlite, mysql, or postgresql) installed." : "データベースドライバー (sqlite, mysql, postgresql) がインストールされていません。",
- "Microsoft Windows Platform is not supported" : "Microsoft Windows サーバーはサポートしていません。",
- "Running Nextcloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself." : "マイクロソフト Windowsサーバー上で Nextcloudを動かすのをサポートしていません。サーバー丸ごと移行する方式をとれない場合は仮想マシンで Linux を動かすことをお勧めします。",
+ "Microsoft Windows Platform is not supported" : "Microsoft Windows プラットフォームはサポートしていません。",
+ "Running Nextcloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself." : "マイクロソフト Windowsプラットフォーム上での Nextcloudの動作をサポートしていません。サーバー丸ごと移行する方式をとれない場合は仮想マシンで Linux を動かすことをお勧めします。",
"Cannot write into \"config\" directory" : "\"config\" ディレクトリに書き込みができません",
"Cannot write into \"apps\" directory" : "\"apps\" ディレクトリに書き込みができません",
"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "多くの場合、これは %s Webサーバーにappsディレクトリ %s への書き込み権限を与えるか、設定ファイルでアプリストアを無効化することで解決できます。",
@@ -164,6 +170,8 @@
"Storage incomplete configuration. %s" : "設定が未完了のストレージです。 %s",
"Storage connection error. %s" : "ストレージへの接続エラー｡ %s",
"Storage not available" : "ストレージが利用できません",
- "Storage connection timeout. %s" : "ストレージへの接続がタイムアウト。 %s"
+ "Storage connection timeout. %s" : "ストレージへの接続がタイムアウト。 %s",
+ "ownCloud %s or higher is required." : "ownCloud %s 以上が必要です",
+ "ownCloud %s or lower is required." : "ownCloud %s 以下が必要です"
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 271188875da..d25f9d92db2 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -48,10 +48,8 @@ var UserList = {
* 'email': 'username@example.org'
* 'isRestoreDisabled':false
* }
- * @param sort
- * @returns table row created for this user
*/
- add: function (user, sort) {
+ add: function (user) {
if (this.currentGid && this.currentGid !== '_everyone' && _.indexOf(user.groups, this.currentGid) < 0) {
return;
}
@@ -170,20 +168,12 @@ var UserList = {
UserList.checkUsersToLoad();
}
- /**
- * sort list
- */
- if (sort) {
- UserList.doSort();
- }
-
$quotaSelect.on('change', UserList.onQuotaSelect);
// defer init so the user first sees the list appear more quickly
window.setTimeout(function(){
$quotaSelect.singleSelect();
}, 0);
- return $tr;
},
// From http://my.opera.com/GreyWyvern/blog/show.dml/1671288
alphanum: function(a, b) {
@@ -389,8 +379,6 @@ var UserList = {
OC.generateUrl('/settings/users/users'),
{ offset: UserList.offset, limit: limit, gid: gid, pattern: pattern },
function (result) {
- var loadedUsers = 0;
- var trs = [];
//The offset does not mirror the amount of users available,
//because it is backend-dependent. For correct retrieval,
//always the limit(requested amount of users) needs to be added.
@@ -398,9 +386,7 @@ var UserList = {
if(UserList.has(user.name)) {
return true;
}
- var $tr = UserList.add(user, false);
- trs.push($tr);
- loadedUsers++;
+ UserList.add(user);
});
if (result.length > 0) {
UserList.doSort();
@@ -867,7 +853,8 @@ $(document).ready(function () {
}
}
if(!UserList.has(username)) {
- UserList.add(result, true);
+ UserList.add(result);
+ UserList.doSort();
}
$('#newusername').focus();
GroupList.incEveryoneCount();
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 774938dfdea..3ca023b5efd 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -60,7 +60,7 @@ OC.L10N.register(
"_You have %n app update pending_::_You have %n app updates pending_" : ["%n 個のアプリのアップデートを保留中"],
"Please wait...." : "しばらくお待ちください...",
"Error while disabling app" : "アプリ無効化中にエラーが発生",
- "Disable" : "無効",
+ "Disable" : "無効にする",
"Enable" : "有効にする",
"Error while enabling app" : "アプリを有効にする際にエラーが発生",
"Error: this app cannot be enabled because it makes the server unstable" : "エラー：このアプリは、サーバーを不安定にするため、有効にすることができません。",
@@ -76,6 +76,12 @@ OC.L10N.register(
"App update" : "アプリのアップデート",
"No apps found for {query}" : "{query} に対応するアプリはありません",
"Disconnect" : "切断",
+ "Internet Explorer" : "Internet Explorer",
+ "Edge" : "Edge",
+ "Firefox" : "Firefox",
+ "Google Chrome" : "Google Chrome",
+ "Safari" : "Safari",
+ "iPhone" : "iPhone",
"Error while loading browser sessions and device tokens" : "ブラウザセッションとデバイストークンの読み込みにおけるエラー",
"Error while creating device token" : "デバイストークンの作成におけるエラー",
"Error while deleting the token" : "トークンの削除におけるエラー",
@@ -99,6 +105,7 @@ OC.L10N.register(
"deleted {userName}" : "{userName} を削除しました",
"Invalid quota value \"{val}\"" : "クオータ値 \"{val}\" は不正な値です。",
"Changing the password will result in data loss, because data recovery is not available for this user" : "このユーザーのデータ復旧が無効になっていますので、パスワードを変更するとユーザーはデータに二度とアクセスできません。",
+ "Password successfully changed" : "パスワードは変更されました",
"A valid username must be provided" : "有効なユーザー名を指定する必要があります",
"Error creating user: {message}" : "ユーザ作成エラー {message}",
"A valid password must be provided" : "有効なパスワードを指定する必要があります",
@@ -288,6 +295,7 @@ OC.L10N.register(
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
"Other" : "その他",
"Quota" : "クオータ",
+ "Last login" : "最終ログイン",
"change full name" : "名前を変更",
"set new password" : "新しいパスワードを設定",
"change email address" : "メールアドレスを変更",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 2e78eac1edb..b0249deb324 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -58,7 +58,7 @@
"_You have %n app update pending_::_You have %n app updates pending_" : ["%n 個のアプリのアップデートを保留中"],
"Please wait...." : "しばらくお待ちください...",
"Error while disabling app" : "アプリ無効化中にエラーが発生",
- "Disable" : "無効",
+ "Disable" : "無効にする",
"Enable" : "有効にする",
"Error while enabling app" : "アプリを有効にする際にエラーが発生",
"Error: this app cannot be enabled because it makes the server unstable" : "エラー：このアプリは、サーバーを不安定にするため、有効にすることができません。",
@@ -74,6 +74,12 @@
"App update" : "アプリのアップデート",
"No apps found for {query}" : "{query} に対応するアプリはありません",
"Disconnect" : "切断",
+ "Internet Explorer" : "Internet Explorer",
+ "Edge" : "Edge",
+ "Firefox" : "Firefox",
+ "Google Chrome" : "Google Chrome",
+ "Safari" : "Safari",
+ "iPhone" : "iPhone",
"Error while loading browser sessions and device tokens" : "ブラウザセッションとデバイストークンの読み込みにおけるエラー",
"Error while creating device token" : "デバイストークンの作成におけるエラー",
"Error while deleting the token" : "トークンの削除におけるエラー",
@@ -97,6 +103,7 @@
"deleted {userName}" : "{userName} を削除しました",
"Invalid quota value \"{val}\"" : "クオータ値 \"{val}\" は不正な値です。",
"Changing the password will result in data loss, because data recovery is not available for this user" : "このユーザーのデータ復旧が無効になっていますので、パスワードを変更するとユーザーはデータに二度とアクセスできません。",
+ "Password successfully changed" : "パスワードは変更されました",
"A valid username must be provided" : "有効なユーザー名を指定する必要があります",
"Error creating user: {message}" : "ユーザ作成エラー {message}",
"A valid password must be provided" : "有効なパスワードを指定する必要があります",
@@ -286,6 +293,7 @@
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
"Other" : "その他",
"Quota" : "クオータ",
+ "Last login" : "最終ログイン",
"change full name" : "名前を変更",
"set new password" : "新しいパスワードを設定",
"change email address" : "メールアドレスを変更",
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-30 16:05:46 +0000