aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.scrutinizer.yml4
-rw-r--r--apps/encryption/l10n/es.js8
-rw-r--r--apps/encryption/l10n/es.json8
-rw-r--r--apps/encryption/l10n/sl.js2
-rw-r--r--apps/encryption/l10n/sl.json2
-rw-r--r--apps/encryption_dummy/appinfo/app.php8
-rw-r--r--apps/encryption_dummy/appinfo/info.xml20
-rw-r--r--apps/encryption_dummy/appinfo/version1
-rw-r--r--apps/encryption_dummy/img/app.svg51
-rw-r--r--apps/encryption_dummy/lib/dummymodule.php138
-rw-r--r--apps/files/l10n/es.js2
-rw-r--r--apps/files/l10n/es.json2
-rw-r--r--apps/files/l10n/ja.js2
-rw-r--r--apps/files/l10n/ja.json2
-rw-r--r--apps/files/l10n/sl.js1
-rw-r--r--apps/files/l10n/sl.json1
-rw-r--r--apps/files_external/l10n/id.js9
-rw-r--r--apps/files_external/l10n/id.json9
-rw-r--r--apps/files_sharing/l10n/es.js2
-rw-r--r--apps/files_sharing/l10n/es.json2
-rw-r--r--apps/files_sharing/l10n/id.js1
-rw-r--r--apps/files_sharing/l10n/id.json1
-rw-r--r--apps/files_sharing/l10n/ja.js2
-rw-r--r--apps/files_sharing/l10n/ja.json2
-rw-r--r--apps/files_sharing/l10n/sl.js1
-rw-r--r--apps/files_sharing/l10n/sl.json1
-rw-r--r--apps/files_versions/lib/storage.php29
-rw-r--r--apps/files_versions/tests/versions.php96
-rw-r--r--apps/user_ldap/l10n/da.js4
-rw-r--r--apps/user_ldap/l10n/da.json4
-rw-r--r--apps/user_ldap/l10n/de.js1
-rw-r--r--apps/user_ldap/l10n/de.json1
-rw-r--r--apps/user_ldap/l10n/de_DE.js1
-rw-r--r--apps/user_ldap/l10n/de_DE.json1
-rw-r--r--apps/user_ldap/l10n/el.js1
-rw-r--r--apps/user_ldap/l10n/el.json1
-rw-r--r--apps/user_ldap/l10n/es.js12
-rw-r--r--apps/user_ldap/l10n/es.json12
-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/gl.js1
-rw-r--r--apps/user_ldap/l10n/gl.json1
-rw-r--r--apps/user_ldap/l10n/id.js28
-rw-r--r--apps/user_ldap/l10n/id.json28
-rw-r--r--apps/user_ldap/l10n/ja.js3
-rw-r--r--apps/user_ldap/l10n/ja.json3
-rw-r--r--apps/user_ldap/l10n/nl.js1
-rw-r--r--apps/user_ldap/l10n/nl.json1
-rw-r--r--apps/user_ldap/l10n/sl.js12
-rw-r--r--apps/user_ldap/l10n/sl.json12
-rw-r--r--apps/user_ldap/l10n/sr.js1
-rw-r--r--apps/user_ldap/l10n/sr.json1
-rw-r--r--core/ajax/share.php2
-rw-r--r--core/css/multiselect.css2
-rw-r--r--core/js/multiselect.js3
-rw-r--r--core/l10n/id.js30
-rw-r--r--core/l10n/id.json30
-rw-r--r--core/l10n/ja.js6
-rw-r--r--core/l10n/ja.json6
-rw-r--r--core/search/css/results.css10
-rw-r--r--lib/base.php9
-rw-r--r--lib/l10n/ja.js4
-rw-r--r--lib/l10n/ja.json4
-rw-r--r--lib/private/backgroundjob/job.php5
-rw-r--r--lib/private/backgroundjob/queuedjob.php5
-rw-r--r--lib/private/backgroundjob/timedjob.php5
-rw-r--r--lib/private/defaults.php2
-rw-r--r--lib/private/l10n/string.php2
-rw-r--r--lib/private/lock/memcachelockingprovider.php86
-rw-r--r--lib/private/log/errorhandler.php6
-rw-r--r--lib/private/memcache/apc.php60
-rw-r--r--lib/private/memcache/arraycache.php72
-rw-r--r--lib/private/memcache/castrait.php56
-rw-r--r--lib/private/memcache/memcached.php41
-rw-r--r--lib/private/memcache/redis.php55
-rw-r--r--lib/private/memcache/xcache.php70
-rw-r--r--lib/private/share/searchresultsorter.php6
-rw-r--r--lib/private/updater.php7
-rw-r--r--lib/public/backgroundjob/ijob.php5
-rw-r--r--lib/public/imemcache.php78
-rw-r--r--lib/public/lock/ilockingprovider.php47
-rw-r--r--lib/public/lock/lockedexception.php46
-rw-r--r--settings/css/settings.css7
-rw-r--r--settings/l10n/az.js1
-rw-r--r--settings/l10n/az.json1
-rw-r--r--settings/l10n/bg_BG.js1
-rw-r--r--settings/l10n/bg_BG.json1
-rw-r--r--settings/l10n/bs.js1
-rw-r--r--settings/l10n/bs.json1
-rw-r--r--settings/l10n/ca.js1
-rw-r--r--settings/l10n/ca.json1
-rw-r--r--settings/l10n/cs_CZ.js3
-rw-r--r--settings/l10n/cs_CZ.json3
-rw-r--r--settings/l10n/da.js3
-rw-r--r--settings/l10n/da.json3
-rw-r--r--settings/l10n/de.js3
-rw-r--r--settings/l10n/de.json3
-rw-r--r--settings/l10n/de_AT.js1
-rw-r--r--settings/l10n/de_AT.json1
-rw-r--r--settings/l10n/de_DE.js3
-rw-r--r--settings/l10n/de_DE.json3
-rw-r--r--settings/l10n/el.js3
-rw-r--r--settings/l10n/el.json3
-rw-r--r--settings/l10n/en_GB.js3
-rw-r--r--settings/l10n/en_GB.json3
-rw-r--r--settings/l10n/es.js11
-rw-r--r--settings/l10n/es.json11
-rw-r--r--settings/l10n/et_EE.js1
-rw-r--r--settings/l10n/et_EE.json1
-rw-r--r--settings/l10n/eu.js1
-rw-r--r--settings/l10n/eu.json1
-rw-r--r--settings/l10n/fi_FI.js3
-rw-r--r--settings/l10n/fi_FI.json3
-rw-r--r--settings/l10n/fr.js3
-rw-r--r--settings/l10n/fr.json3
-rw-r--r--settings/l10n/gl.js3
-rw-r--r--settings/l10n/gl.json3
-rw-r--r--settings/l10n/he.js1
-rw-r--r--settings/l10n/he.json1
-rw-r--r--settings/l10n/id.js54
-rw-r--r--settings/l10n/id.json54
-rw-r--r--settings/l10n/it.js3
-rw-r--r--settings/l10n/it.json3
-rw-r--r--settings/l10n/ja.js13
-rw-r--r--settings/l10n/ja.json13
-rw-r--r--settings/l10n/ko.js3
-rw-r--r--settings/l10n/ko.json3
-rw-r--r--settings/l10n/lt_LT.js1
-rw-r--r--settings/l10n/lt_LT.json1
-rw-r--r--settings/l10n/lv.js1
-rw-r--r--settings/l10n/lv.json1
-rw-r--r--settings/l10n/nb_NO.js1
-rw-r--r--settings/l10n/nb_NO.json1
-rw-r--r--settings/l10n/nl.js3
-rw-r--r--settings/l10n/nl.json3
-rw-r--r--settings/l10n/pl.js3
-rw-r--r--settings/l10n/pl.json3
-rw-r--r--settings/l10n/pt_BR.js3
-rw-r--r--settings/l10n/pt_BR.json3
-rw-r--r--settings/l10n/pt_PT.js3
-rw-r--r--settings/l10n/pt_PT.json3
-rw-r--r--settings/l10n/ru.js3
-rw-r--r--settings/l10n/ru.json3
-rw-r--r--settings/l10n/sk_SK.js1
-rw-r--r--settings/l10n/sk_SK.json1
-rw-r--r--settings/l10n/sl.js49
-rw-r--r--settings/l10n/sl.json49
-rw-r--r--settings/l10n/sr.js3
-rw-r--r--settings/l10n/sr.json3
-rw-r--r--settings/l10n/sv.js1
-rw-r--r--settings/l10n/sv.json1
-rw-r--r--settings/l10n/tr.js3
-rw-r--r--settings/l10n/tr.json3
-rw-r--r--settings/l10n/uk.js3
-rw-r--r--settings/l10n/uk.json3
-rw-r--r--settings/l10n/zh_CN.js1
-rw-r--r--settings/l10n/zh_CN.json1
-rw-r--r--settings/l10n/zh_HK.js1
-rw-r--r--settings/l10n/zh_HK.json1
-rw-r--r--settings/l10n/zh_TW.js1
-rw-r--r--settings/l10n/zh_TW.json1
-rw-r--r--settings/templates/admin.php11
-rw-r--r--settings/templates/apps.php3
-rw-r--r--tests/lib/lock/lockingprovider.php137
-rw-r--r--tests/lib/lock/memcachelockingprovider.php45
-rw-r--r--tests/lib/memcache/cache.php48
-rw-r--r--tests/lib/memcache/castrait.php73
-rw-r--r--version.php4
168 files changed, 1565 insertions, 462 deletions
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 78e878a42a4..0185adab870 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -18,3 +18,7 @@ filter:
imports:
- javascript
- php
+
+tools:
+ external_code_coverage:
+ timeout: 1200 # Timeout in seconds. 20 minutes
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index 6a682d1a209..a1c86efad2f 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -5,19 +5,19 @@ OC.L10N.register(
"Please repeat the recovery key password" : "Por favor, repita la contraseña de recuperación",
"Repeated recovery key password does not match the provided recovery key password" : "La contraseña de recuperación reintroducida no coincide con la contraseña de recuperación proporcionada",
"Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
- "Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la contraseña de recuperación. Por favor compruebe su contraseña de recuperación!",
+ "Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la contraseña de recuperación. Por favor, ¡compruebe su contraseña de recuperación!",
"Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
"Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor, ¡compruebe su contraseña!",
"Please provide the old recovery password" : "Por favor, ingrese su antigua contraseña de recuperación",
- "Please provide a new recovery password" : "Por favor, ingrese una nueva contraseña de recuperación",
+ "Please provide a new recovery password" : "Por favor, provea una nueva contraseña de recuperación",
"Please repeat the new recovery password" : "Por favor, repita su nueva contraseña de recuperación",
"Password successfully changed." : "Su contraseña ha sido cambiada",
"Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
"Recovery Key enabled" : "Recuperación de clave habilitada",
"Could not enable the recovery key, please try again or contact your administrator" : "No se pudo habilitar la clave de recuperación, por favor vuelva a intentarlo o póngase en contacto con el administrador",
"Could not update the private key password." : "No se pudo actualizar la contraseña de la clave privada.",
- "The old password was not correct, please try again." : "La antigua contraseña no es correcta, por favor intente de nuevo.",
- "The current log-in password was not correct, please try again." : "La contraseña de inicio de sesión actual no es correcto, por favor intente de nuevo.",
+ "The old password was not correct, please try again." : "La antigua contraseña no es correcta, por favor inténtelo de nuevo.",
+ "The current log-in password was not correct, please try again." : "La contraseña de inicio de sesión actual no es correcta, por favor inténtelo de nuevo.",
"Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 9aaedac1f10..172205a7a1f 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -3,19 +3,19 @@
"Please repeat the recovery key password" : "Por favor, repita la contraseña de recuperación",
"Repeated recovery key password does not match the provided recovery key password" : "La contraseña de recuperación reintroducida no coincide con la contraseña de recuperación proporcionada",
"Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
- "Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la contraseña de recuperación. Por favor compruebe su contraseña de recuperación!",
+ "Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la contraseña de recuperación. Por favor, ¡compruebe su contraseña de recuperación!",
"Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
"Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor, ¡compruebe su contraseña!",
"Please provide the old recovery password" : "Por favor, ingrese su antigua contraseña de recuperación",
- "Please provide a new recovery password" : "Por favor, ingrese una nueva contraseña de recuperación",
+ "Please provide a new recovery password" : "Por favor, provea una nueva contraseña de recuperación",
"Please repeat the new recovery password" : "Por favor, repita su nueva contraseña de recuperación",
"Password successfully changed." : "Su contraseña ha sido cambiada",
"Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
"Recovery Key enabled" : "Recuperación de clave habilitada",
"Could not enable the recovery key, please try again or contact your administrator" : "No se pudo habilitar la clave de recuperación, por favor vuelva a intentarlo o póngase en contacto con el administrador",
"Could not update the private key password." : "No se pudo actualizar la contraseña de la clave privada.",
- "The old password was not correct, please try again." : "La antigua contraseña no es correcta, por favor intente de nuevo.",
- "The current log-in password was not correct, please try again." : "La contraseña de inicio de sesión actual no es correcto, por favor intente de nuevo.",
+ "The old password was not correct, please try again." : "La antigua contraseña no es correcta, por favor inténtelo de nuevo.",
+ "The current log-in password was not correct, please try again." : "La contraseña de inicio de sesión actual no es correcta, por favor inténtelo de nuevo.",
"Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js
index e10a9b302da..a5e1818a0cb 100644
--- a/apps/encryption/l10n/sl.js
+++ b/apps/encryption/l10n/sl.js
@@ -14,7 +14,7 @@ OC.L10N.register(
"Password successfully changed." : "Geslo je uspešno spremenjeno.",
"Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
"Could not update the private key password." : "Ni mogoče posodobiti gesla zasebnega ključa.",
- "The old password was not correct, please try again." : "Staro geslo ni vpisana pravilno. Poskusite znova.",
+ "The old password was not correct, please try again." : "Staro geslo ni vpisano pravilno. Poskusite znova.",
"The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.",
"Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json
index 55a40653bd7..184e932da9d 100644
--- a/apps/encryption/l10n/sl.json
+++ b/apps/encryption/l10n/sl.json
@@ -12,7 +12,7 @@
"Password successfully changed." : "Geslo je uspešno spremenjeno.",
"Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
"Could not update the private key password." : "Ni mogoče posodobiti gesla zasebnega ključa.",
- "The old password was not correct, please try again." : "Staro geslo ni vpisana pravilno. Poskusite znova.",
+ "The old password was not correct, please try again." : "Staro geslo ni vpisano pravilno. Poskusite znova.",
"The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.",
"Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
diff --git a/apps/encryption_dummy/appinfo/app.php b/apps/encryption_dummy/appinfo/app.php
deleted file mode 100644
index 51a535a9820..00000000000
--- a/apps/encryption_dummy/appinfo/app.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$manager = \OC::$server->getEncryptionManager();
-$module = new \OCA\Encryption_Dummy\DummyModule();
-$manager->registerEncryptionModule('OC_DUMMY_MODULE', 'Dummy Encryption Module', function() use ($module) {
- return $module;
-});
-
diff --git a/apps/encryption_dummy/appinfo/info.xml b/apps/encryption_dummy/appinfo/info.xml
deleted file mode 100644
index f62f6fb5dd6..00000000000
--- a/apps/encryption_dummy/appinfo/info.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<info>
- <id>encryption_dummy</id>
- <name>dummy encryption module</name>
- <description>
- This module does nothing, it is used for testing purpose only
- </description>
- <licence>AGPL</licence>
- <author>Bjoern Schiessle</author>
- <requiremin>8</requiremin>
- <shipped>true</shipped>
- <rememberlogin>false</rememberlogin>
- <types>
- <filesystem/>
- </types>
- <ocsid>166047</ocsid>
- <dependencies>
- <lib>openssl</lib>
- </dependencies>
-</info>
diff --git a/apps/encryption_dummy/appinfo/version b/apps/encryption_dummy/appinfo/version
deleted file mode 100644
index 8acdd82b765..00000000000
--- a/apps/encryption_dummy/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.0.1
diff --git a/apps/encryption_dummy/img/app.svg b/apps/encryption_dummy/img/app.svg
deleted file mode 100644
index 1157c71c66e..00000000000
--- a/apps/encryption_dummy/img/app.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xml:space="preserve"
- height="16px"
- width="16px"
- version="1.1"
- y="0px"
- x="0px"
- viewBox="0 0 71 100"
- id="svg2"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="app.svg"><metadata
- id="metadata10"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs8" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1014"
- id="namedview6"
- showgrid="false"
- inkscape:zoom="14.75"
- inkscape:cx="-21.423729"
- inkscape:cy="8"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2" /><path
- d="m8 1c-2.2091 0-4 1.7909-4 4v2h-1v7h10v-7h-1v-2c0-2.2091-1.791-4-4-4zm0 2c1.1046 0 2 0.89543 2 2v2h-4v-2c0-1.1046 0.8954-2 2-2z"
- transform="matrix(6.25,0,0,6.25,-14.5,0)"
- id="path4"
- style="fill:#ffffff;fill-opacity:1" /><path
- style="fill:none"
- d="m 3.0644068,10.508475 0,-3.4576275 0.4655371,0 0.465537,0 0.049537,-1.2033899 C 4.1094633,4.2818838 4.1578923,4.0112428 4.4962182,3.3259708 4.7075644,2.8978935 4.9002217,2.6327599 5.2605792,2.2740624 6.7855365,0.75613022 8.9920507,0.69157582 10.623172,2.1171729 c 0.384104,0.3357058 0.882069,1.0763131 1.054177,1.5678422 0.147302,0.4206856 0.262873,1.6086448 0.266436,2.7387137 l 0.002,0.6271187 0.508474,0 0.508475,0 0,3.4576275 0,3.457627 -4.9491527,0 -4.9491525,0 0,-3.457627 z M 10.065882,6.3559322 c -0.02012,-0.3822034 -0.04774,-0.7076271 -0.0614,-0.7231639 -0.013653,-0.015537 -0.024824,0.281921 -0.024824,0.661017 l 0,0.6892655 -1.9630041,0 -1.963004,0 -0.023717,-0.4576271 -0.023717,-0.4576271 -0.013279,0.4915254 -0.013279,0.4915255 2.0613978,0 2.0613972,0 -0.03657,-0.6949153 0,0 z M 6.5396275,3.7118644 C 6.648082,3.5720339 6.7197092,3.4576271 6.6987988,3.4576271 c -0.062956,0 -0.5835446,0.6841947 -0.5835446,0.7669359 0,0.042237 0.051116,0.00136 0.1135916,-0.090834 0.062475,-0.092195 0.2023271,-0.2820343 0.3107817,-0.4218648 z M 9.7498983,4.0169492 C 9.6961899,3.9144068 9.5352369,3.723769 9.392225,3.5933098 L 9.1322034,3.356111 9.3784249,3.6272081 c 0.1354218,0.1491033 0.2814105,0.3397411 0.3244192,0.4236394 0.043009,0.083898 0.093162,0.1525423 0.1114515,0.1525423 0.01829,0 -0.010689,-0.083898 -0.064397,-0.1864406 l 0,0 z M 7.3032896,3.1315382 C 7.2704731,3.0987216 6.877102,3.3089557 6.8306315,3.3841466 6.8091904,3.4188389 6.911918,3.3813452 7.0589148,3.300827 7.2059117,3.2203088 7.3158803,3.1441289 7.3032896,3.1315382 l 0,0 z"
- id="path3007"
- inkscape:connector-curvature="0"
- transform="matrix(6.25,0,0,6.25,-14.5,0)" /></svg> \ No newline at end of file
diff --git a/apps/encryption_dummy/lib/dummymodule.php b/apps/encryption_dummy/lib/dummymodule.php
deleted file mode 100644
index 141edfb58f9..00000000000
--- a/apps/encryption_dummy/lib/dummymodule.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/**
- * ownCloud
- *
- * @copyright (C) 2015 ownCloud, Inc.
- *
- * @author Bjoern Schiessle <schiessle@owncloud.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace OCA\Encryption_Dummy;
-
-use OCP\Encryption\IEncryptionModule;
-
-class DummyModule implements IEncryptionModule {
-
- /** @var boolean */
- protected $isWriteOperation;
-
- /**
- * @return string defining the technical unique id
- */
- public function getId() {
- return "OC_DUMMY_MODULE";
- }
-
- /**
- * In comparison to getKey() this function returns a human readable (maybe translated) name
- *
- * @return string
- */
- public function getDisplayName() {
- return "Dummy Encryption Module";
- }
-
- /**
- * start receiving chunks from a file. This is the place where you can
- * perform some initial step before starting encrypting/decrypting the
- * chunks
- *
- * @param string $path to the file
- * @param string $user who read/write the file (null for public access)
- * @param string $mode php stream open mode
- * @param array $header contains the header data read from the file
- * @param array $accessList who has access to the file contains the key 'users' and 'public'
- *
- * @return array $header contain data as key-value pairs which should be
- * written to the header, in case of a write operation
- * or if no additional data is needed return a empty array
- */
- public function begin($path, $user, $mode, array $header, array $accessList) {
- return array();
- }
-
- /**
- * last chunk received. This is the place where you can perform some final
- * operation and return some remaining data if something is left in your
- * buffer.
- *
- * @param string $path to the file
- * @return string remained data which should be written to the file in case
- * of a write operation
- */
- public function end($path) {
-
- if ($this->isWriteOperation) {
- $storage = \OC::$server->getEncryptionKeyStorage();
- $storage->setFileKey($path, 'fileKey', 'foo', $this->getId());
- }
- return '';
- }
-
- /**
- * encrypt data
- *
- * @param string $data you want to encrypt
- * @return mixed encrypted data
- */
- public function encrypt($data) {
- $this->isWriteOperation = true;
- return $data;
- }
-
- /**
- * decrypt data
- *
- * @param string $data you want to decrypt
- * @param string $user decrypt as user (null for public access)
- * @return mixed decrypted data
- */
- public function decrypt($data) {
- $this->isWriteOperation=false;
- return $data;
- }
-
- /**
- * should the file be encrypted or not
- *
- * @param string $path
- * @return boolean
- */
- public function shouldEncrypt($path) {
- if (strpos($path, '/'. \OCP\User::getUser() . '/files/') === 0) {
- return true;
- }
-
- return false;
- }
-
- public function getUnencryptedBlockSize() {
- return 6126;
- }
-
- /**
- * update encrypted file, e.g. give additional users access to the file
- *
- * @param string $path path to the file which should be updated
- * @param string $uid of the user who performs the operation
- * @param array $accessList who has access to the file contains the key 'users' and 'public'
- * @return boolean
- */
- public function update($path, $uid, array $accessList) {
- return true;
- }
-}
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index bd3a645c693..bb1beafc12a 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -42,7 +42,7 @@ OC.L10N.register(
"Delete" : "Eliminar",
"Disconnect storage" : "Desconectar almacenamiento",
"Unshare" : "Dejar de compartir",
- "No permission to delete" : "Ninguna autorización a borrar",
+ "No permission to delete" : "Ninguna autorización que borrar",
"Download" : "Descargar",
"Select" : "Seleccionar",
"Pending" : "Pendiente",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index 010430d9b3b..d2cef744146 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -40,7 +40,7 @@
"Delete" : "Eliminar",
"Disconnect storage" : "Desconectar almacenamiento",
"Unshare" : "Dejar de compartir",
- "No permission to delete" : "Ninguna autorización a borrar",
+ "No permission to delete" : "Ninguna autorización que borrar",
"Download" : "Descargar",
"Select" : "Seleccionar",
"Pending" : "Pendiente",
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 80e1f478509..c8a8ddcbd48 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -51,7 +51,7 @@ OC.L10N.register(
"Error" : "エラー",
"Could not rename file" : "ファイルの名前変更ができませんでした",
"Error deleting file." : "ファイルの削除エラー。",
- "No entries in this folder match '{filter}'" : "このフォルダで '{filter}' にマッチするものはありません",
+ "No entries in this folder match '{filter}'" : "このフォルダー内で '{filter}' にマッチするものはありません",
"Name" : "名前",
"Size" : "サイズ",
"Modified" : "更新日時",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index f3868ed14cf..2a127e347e5 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -49,7 +49,7 @@
"Error" : "エラー",
"Could not rename file" : "ファイルの名前変更ができませんでした",
"Error deleting file." : "ファイルの削除エラー。",
- "No entries in this folder match '{filter}'" : "このフォルダで '{filter}' にマッチするものはありません",
+ "No entries in this folder match '{filter}'" : "このフォルダー内で '{filter}' にマッチするものはありません",
"Name" : "名前",
"Size" : "サイズ",
"Modified" : "更新日時",
diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js
index 712346c3cf9..a4a15c932e0 100644
--- a/apps/files/l10n/sl.js
+++ b/apps/files/l10n/sl.js
@@ -42,6 +42,7 @@ OC.L10N.register(
"Delete" : "Izbriši",
"Disconnect storage" : "Odklopi shrambo",
"Unshare" : "Prekini souporabo",
+ "No permission to delete" : "Nimate pravic za brisanje",
"Download" : "Prejmi",
"Select" : "Izberi",
"Pending" : "V čakanju ...",
diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json
index 75f96fcc1e4..9c6ed85e9a9 100644
--- a/apps/files/l10n/sl.json
+++ b/apps/files/l10n/sl.json
@@ -40,6 +40,7 @@
"Delete" : "Izbriši",
"Disconnect storage" : "Odklopi shrambo",
"Unshare" : "Prekini souporabo",
+ "No permission to delete" : "Nimate pravic za brisanje",
"Download" : "Prejmi",
"Select" : "Izberi",
"Pending" : "V čakanju ...",
diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js
index c4b262945ea..81d243b12ae 100644
--- a/apps/files_external/l10n/id.js
+++ b/apps/files_external/l10n/id.js
@@ -44,6 +44,9 @@ OC.L10N.register(
"URL" : "URL",
"Secure https://" : "Secure https://",
"Public key" : "Kunci Public",
+ "Storage with id \"%i\" not found" : "Penyimpanan dengan id \"%i\" tidak ditemukan",
+ "Invalid mount point" : "Mount point salah",
+ "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
"Access granted" : "Akses diberikan",
"Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
"Grant access" : "Berikan hak akses",
@@ -53,10 +56,15 @@ OC.L10N.register(
"All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
"(group)" : "(grup)",
"Saved" : "Disimpan",
+ "Generate keys" : "Hasilkan kunci",
+ "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
"<b>Note:</b> " : "<b>Catatan:</b> ",
+ "and" : "dan",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
+ "No external storage configured" : "Penyimpanan eksternal tidak dikonfigurasi",
+ "You can add external storages in the personal settings" : "Anda dapat menambahkan penyimpanan eksternal di pengaturan pribadi",
"Name" : "Nama",
"Storage type" : "Tipe penyimpanan",
"Scope" : "Skop",
@@ -65,6 +73,7 @@ OC.L10N.register(
"Configuration" : "Konfigurasi",
"Available for" : "Tersedia untuk",
"Add storage" : "Tambahkan penyimpanan",
+ "Advanced settings" : "Pengaturan Lanjutan",
"Delete" : "Hapus",
"Enable User External Storage" : "Aktifkan Penyimpanan Eksternal Pengguna",
"Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json
index da9f676d772..b8acdedfd2d 100644
--- a/apps/files_external/l10n/id.json
+++ b/apps/files_external/l10n/id.json
@@ -42,6 +42,9 @@
"URL" : "URL",
"Secure https://" : "Secure https://",
"Public key" : "Kunci Public",
+ "Storage with id \"%i\" not found" : "Penyimpanan dengan id \"%i\" tidak ditemukan",
+ "Invalid mount point" : "Mount point salah",
+ "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
"Access granted" : "Akses diberikan",
"Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
"Grant access" : "Berikan hak akses",
@@ -51,10 +54,15 @@
"All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
"(group)" : "(grup)",
"Saved" : "Disimpan",
+ "Generate keys" : "Hasilkan kunci",
+ "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
"<b>Note:</b> " : "<b>Catatan:</b> ",
+ "and" : "dan",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
+ "No external storage configured" : "Penyimpanan eksternal tidak dikonfigurasi",
+ "You can add external storages in the personal settings" : "Anda dapat menambahkan penyimpanan eksternal di pengaturan pribadi",
"Name" : "Nama",
"Storage type" : "Tipe penyimpanan",
"Scope" : "Skop",
@@ -63,6 +71,7 @@
"Configuration" : "Konfigurasi",
"Available for" : "Tersedia untuk",
"Add storage" : "Tambahkan penyimpanan",
+ "Advanced settings" : "Pengaturan Lanjutan",
"Delete" : "Hapus",
"Enable User External Storage" : "Aktifkan Penyimpanan Eksternal Pengguna",
"Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index c361a450343..e77217a8427 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -21,7 +21,7 @@ OC.L10N.register(
"Remote share password" : "Contraseña del compartido remoto",
"Cancel" : "Cancelar",
"Add remote share" : "Añadir recurso compartido remoto",
- "You can upload into this folder" : "Usted puede cargar a este folder",
+ "You can upload into this folder" : "Usted puede cargar en esta carpeta",
"No ownCloud installation (7 or higher) found at {remote}" : "No se encontró una instalación de ownCloud (7 o mayor) en {remote}",
"Invalid ownCloud url" : "URL de ownCloud inválida",
"Share" : "Compartir",
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index dfe9367fef1..c3c414dcaba 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -19,7 +19,7 @@
"Remote share password" : "Contraseña del compartido remoto",
"Cancel" : "Cancelar",
"Add remote share" : "Añadir recurso compartido remoto",
- "You can upload into this folder" : "Usted puede cargar a este folder",
+ "You can upload into this folder" : "Usted puede cargar en esta carpeta",
"No ownCloud installation (7 or higher) found at {remote}" : "No se encontró una instalación de ownCloud (7 o mayor) en {remote}",
"Invalid ownCloud url" : "URL de ownCloud inválida",
"Share" : "Compartir",
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index 7ffd5fdd4cf..fd8b3dd810e 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -56,6 +56,7 @@ OC.L10N.register(
"Download %s" : "Unduh %s",
"Direct link" : "Tautan langsung",
"Federated Cloud Sharing" : "Federated Cloud Sharing",
+ "Open documentation" : "Buka dokumentasi",
"Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.",
"Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya."
},
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index 724f86139bc..e82b6966d24 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -54,6 +54,7 @@
"Download %s" : "Unduh %s",
"Direct link" : "Tautan langsung",
"Federated Cloud Sharing" : "Federated Cloud Sharing",
+ "Open documentation" : "Buka dokumentasi",
"Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.",
"Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya."
},"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index 1118713257b..af8c0bdbcef 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -32,7 +32,7 @@ OC.L10N.register(
"%1$s accepted remote share %2$s" : "%1$s は %2$s のリモート共有を承認しました。",
"%1$s declined remote share %2$s" : "%1$s は %2$s のリモート共有を拒否しました。",
"%1$s unshared %2$s from you" : "%1$s は あなたと%2$s の共有を止めました。",
- "Public shared folder %1$s was downloaded" : "公開共有フォルダ %1$s がダウンロードされました",
+ "Public shared folder %1$s was downloaded" : "公開共有フォルダー %1$s がダウンロードされました",
"Public shared file %1$s was downloaded" : "公開共有ファイル %1$s がダウンロードされました",
"You shared %1$s with %2$s" : "あなたは %1$s を %2$s と共有しました",
"You shared %1$s with group %2$s" : "あなたは %1$s をグループ %2$s と共有しました",
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index 960cc59e0ed..ee1f81e8e0a 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -30,7 +30,7 @@
"%1$s accepted remote share %2$s" : "%1$s は %2$s のリモート共有を承認しました。",
"%1$s declined remote share %2$s" : "%1$s は %2$s のリモート共有を拒否しました。",
"%1$s unshared %2$s from you" : "%1$s は あなたと%2$s の共有を止めました。",
- "Public shared folder %1$s was downloaded" : "公開共有フォルダ %1$s がダウンロードされました",
+ "Public shared folder %1$s was downloaded" : "公開共有フォルダー %1$s がダウンロードされました",
"Public shared file %1$s was downloaded" : "公開共有ファイル %1$s がダウンロードされました",
"You shared %1$s with %2$s" : "あなたは %1$s を %2$s と共有しました",
"You shared %1$s with group %2$s" : "あなたは %1$s をグループ %2$s と共有しました",
diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js
index 0e16dfaf48c..2666c8e3eaa 100644
--- a/apps/files_sharing/l10n/sl.js
+++ b/apps/files_sharing/l10n/sl.js
@@ -56,6 +56,7 @@ OC.L10N.register(
"Download %s" : "Prejmi %s",
"Direct link" : "Neposredna povezava",
"Federated Cloud Sharing" : "Upravljana souporaba oblaka",
+ "Open documentation" : "Odprta dokumentacija",
"Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.",
"Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov."
},
diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json
index 6bd7181561a..a301a495cf1 100644
--- a/apps/files_sharing/l10n/sl.json
+++ b/apps/files_sharing/l10n/sl.json
@@ -54,6 +54,7 @@
"Download %s" : "Prejmi %s",
"Direct link" : "Neposredna povezava",
"Federated Cloud Sharing" : "Upravljana souporaba oblaka",
+ "Open documentation" : "Odprta dokumentacija",
"Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.",
"Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov."
},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index 125fb5d983c..4a5b47d2c2b 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -262,11 +262,16 @@ class Storage {
}
/**
- * rollback to an old version of a file.
+ * Rollback to an old version of a file.
+ *
+ * @param string $file file name
+ * @param int $revision revision timestamp
*/
public static function rollback($file, $revision) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+ // add expected leading slash
+ $file = '/' . ltrim($file, '/');
list($uid, $filename) = self::getUidAndFilename($file);
$users_view = new \OC\Files\View('/'.$uid);
$files_view = new \OC\Files\View('/'.\OCP\User::getUser().'/files');
@@ -282,12 +287,11 @@ class Storage {
}
// rollback
- if( @$users_view->rename('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
+ if (self::copyFileContents($users_view, 'files_versions' . $filename . '.v' . $revision, 'files' . $filename)) {
$files_view->touch($file, $revision);
Storage::scheduleExpire($file);
return true;
-
- }else if ( $versionCreated ) {
+ } else if ($versionCreated) {
self::deleteVersion($users_view, $version);
}
}
@@ -295,6 +299,23 @@ class Storage {
}
+ /**
+ * Stream copy file contents from $path1 to $path2
+ *
+ * @param \OC\Files\View $view view to use for copying
+ * @param string $path1 source file to copy
+ * @param string $path2 target file
+ *
+ * @return bool true for success, false otherwise
+ */
+ private static function copyFileContents($view, $path1, $path2) {
+ list($storage1, $internalPath1) = $view->resolvePath($path1);
+ list($storage2, $internalPath2) = $view->resolvePath($path2);
+
+ $result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
+
+ return ($result !== false);
+ }
/**
* get a list of all available versions of a file in descending chronological order
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index ff088ffdad3..5ea6d9ee5b9 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -25,6 +25,8 @@
require_once __DIR__ . '/../appinfo/app.php';
+use OC\Files\Storage\Temporary;
+
/**
* Class Test_Files_versions
* this class provide basic files versions test
@@ -420,6 +422,100 @@ class Test_Files_Versioning extends \Test\TestCase {
$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
}
+ public function testRestoreSameStorage() {
+ \OC\Files\Filesystem::mkdir('sub');
+ $this->doTestRestore();
+ }
+
+ public function testRestoreCrossStorage() {
+ $storage2 = new Temporary(array());
+ \OC\Files\Filesystem::mount($storage2, array(), self::TEST_VERSIONS_USER . '/files/sub');
+
+ $this->doTestRestore();
+ }
+
+ private function doTestRestore() {
+ $filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
+ $this->rootView->file_put_contents($filePath, 'test file');
+
+ $t0 = $this->rootView->filemtime($filePath);
+
+ // not exactly the same timestamp as the file
+ $t1 = time() - 60;
+ // second version is two weeks older
+ $t2 = $t1 - 60 * 60 * 24 * 14;
+
+ // create some versions
+ $v1 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t1;
+ $v2 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t2;
+
+ $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/sub');
+ $this->rootView->file_put_contents($v1, 'version1');
+ $this->rootView->file_put_contents($v2, 'version2');
+
+ $oldVersions = \OCA\Files_Versions\Storage::getVersions(
+ self::TEST_VERSIONS_USER, '/sub/test.txt'
+ );
+
+ $this->assertCount(2, $oldVersions);
+
+ $this->assertEquals('test file', $this->rootView->file_get_contents($filePath));
+ $info1 = $this->rootView->getFileInfo($filePath);
+
+ \OCA\Files_Versions\Storage::rollback('sub/test.txt', $t2);
+
+ $this->assertEquals('version2', $this->rootView->file_get_contents($filePath));
+ $info2 = $this->rootView->getFileInfo($filePath);
+
+ $this->assertNotEquals(
+ $info2['etag'],
+ $info1['etag'],
+ 'Etag must change after rolling back version'
+ );
+ $this->assertEquals(
+ $info2['fileid'],
+ $info1['fileid'],
+ 'File id must not change after rolling back version'
+ );
+ $this->assertEquals(
+ $info2['mtime'],
+ $t2,
+ 'Restored file has mtime from version'
+ );
+
+ $newVersions = \OCA\Files_Versions\Storage::getVersions(
+ self::TEST_VERSIONS_USER, '/sub/test.txt'
+ );
+
+ $this->assertTrue(
+ $this->rootView->file_exists(self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t0),
+ 'A version file was created for the file before restoration'
+ );
+ $this->assertTrue(
+ $this->rootView->file_exists($v1),
+ 'Untouched version file is still there'
+ );
+ $this->assertFalse(
+ $this->rootView->file_exists($v2),
+ 'Restored version file gone from files_version folder'
+ );
+
+ $this->assertCount(2, $newVersions, 'Additional version created');
+
+ $this->assertTrue(
+ isset($newVersions[$t0 . '#' . 'test.txt']),
+ 'A version was created for the file before restoration'
+ );
+ $this->assertTrue(
+ isset($newVersions[$t1 . '#' . 'test.txt']),
+ 'Untouched version is still there'
+ );
+ $this->assertFalse(
+ isset($newVersions[$t2 . '#' . 'test.txt']),
+ 'Restored version is not in the list any more'
+ );
+ }
+
/**
* @param string $user
* @param bool $create
diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js
index 9c41b38c2e8..dd679fd842c 100644
--- a/apps/user_ldap/l10n/da.js
+++ b/apps/user_ldap/l10n/da.js
@@ -25,7 +25,7 @@ OC.L10N.register(
" entries available within the provided Base DN" : "poster tilgængelige inden for det angivne Base DN.",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Der opstod en fejl. Tjek venligst Base DN, såvel som forbindelsesindstillingerne og brugeroplysningerne.",
"Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?",
- "Confirm Deletion" : "Bekræft Sletning",
+ "Confirm Deletion" : "Bekræft sletning",
"Mappings cleared successfully!" : "Kortlægningerne blev ryddet af vejen!",
"Error while clearing the mappings." : "Fejl under rydning af kortlægninger.",
"Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Lagringen mislykkedes. Sørg venligst for at databasen er i drift. Genindlæs for der fortsættes.",
@@ -50,7 +50,7 @@ OC.L10N.register(
"Users" : "Brugere",
"Login Attributes" : "Login-attributter",
"Groups" : "Grupper",
- "Test Configuration" : "Test Konfiguration",
+ "Test Configuration" : "Test konfigurationen",
"Help" : "Hjælp",
"Groups meeting these criteria are available in %s:" : "Grupper som opfylder disse kriterier er tilgængelige i %s:",
"Only these object classes:" : "Kun disse objektklasser:",
diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json
index fa69492784f..6937eee04f6 100644
--- a/apps/user_ldap/l10n/da.json
+++ b/apps/user_ldap/l10n/da.json
@@ -23,7 +23,7 @@
" entries available within the provided Base DN" : "poster tilgængelige inden for det angivne Base DN.",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Der opstod en fejl. Tjek venligst Base DN, såvel som forbindelsesindstillingerne og brugeroplysningerne.",
"Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?",
- "Confirm Deletion" : "Bekræft Sletning",
+ "Confirm Deletion" : "Bekræft sletning",
"Mappings cleared successfully!" : "Kortlægningerne blev ryddet af vejen!",
"Error while clearing the mappings." : "Fejl under rydning af kortlægninger.",
"Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Lagringen mislykkedes. Sørg venligst for at databasen er i drift. Genindlæs for der fortsættes.",
@@ -48,7 +48,7 @@
"Users" : "Brugere",
"Login Attributes" : "Login-attributter",
"Groups" : "Grupper",
- "Test Configuration" : "Test Konfiguration",
+ "Test Configuration" : "Test konfigurationen",
"Help" : "Hjælp",
"Groups meeting these criteria are available in %s:" : "Grupper som opfylder disse kriterier er tilgængelige i %s:",
"Only these object classes:" : "Kun disse objektklasser:",
diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
index d2da518bf5c..34c37d7aa70 100644
--- a/apps/user_ldap/l10n/de.js
+++ b/apps/user_ldap/l10n/de.js
@@ -22,6 +22,7 @@ OC.L10N.register(
"Could not detect Base DN, please enter it manually." : "Die Base DN konnte nicht erkannt werden, bitte manuell eingeben.",
"{nthServer}. Server" : "{nthServer}. - Server",
"No object found in the given Base DN. Please revise." : "Keine Objekte in der Base DN gefunden, bitte überprüfen.",
+ "More than 1.000 directory entries available." : "Mehr als 1.000 Verzeichniseinträge verfügbar.",
" entries available within the provided Base DN" : "Einträge in der Vorgesehenen Base DN verfügbar",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ein Fehler ist aufgetreten. Bitte prüfe die Base DN und auch die Verbindungs- und Anmeldeeinstellungen.",
"Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json
index fd98cfbec30..26bbc601601 100644
--- a/apps/user_ldap/l10n/de.json
+++ b/apps/user_ldap/l10n/de.json
@@ -20,6 +20,7 @@
"Could not detect Base DN, please enter it manually." : "Die Base DN konnte nicht erkannt werden, bitte manuell eingeben.",
"{nthServer}. Server" : "{nthServer}. - Server",
"No object found in the given Base DN. Please revise." : "Keine Objekte in der Base DN gefunden, bitte überprüfen.",
+ "More than 1.000 directory entries available." : "Mehr als 1.000 Verzeichniseinträge verfügbar.",
" entries available within the provided Base DN" : "Einträge in der Vorgesehenen Base DN verfügbar",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ein Fehler ist aufgetreten. Bitte prüfe die Base DN und auch die Verbindungs- und Anmeldeeinstellungen.",
"Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
index f296e62d242..4b582d0c48e 100644
--- a/apps/user_ldap/l10n/de_DE.js
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -22,6 +22,7 @@ OC.L10N.register(
"Could not detect Base DN, please enter it manually." : "Die Base DN konnte nicht erkannt werden, bitte geben Sie sie manuell ein.",
"{nthServer}. Server" : "{nthServer}. - Server",
"No object found in the given Base DN. Please revise." : "Keine Objekte in der angegebenen Base DN gefunden, bitte überprüfen.",
+ "More than 1.000 directory entries available." : "Mehr als 1.000 Verzeichniseinträge verfügbar.",
" entries available within the provided Base DN" : "Einträge in der angegebenen Base DN verfügbar",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Es ist ein Fehler aufgetreten. Bitte überprüfen Sie die Base DN wie auch die Verbindungseinstellungen und Anmeldeinformationen.",
"Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json
index 0352ac47f7a..83b79938da6 100644
--- a/apps/user_ldap/l10n/de_DE.json
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -20,6 +20,7 @@
"Could not detect Base DN, please enter it manually." : "Die Base DN konnte nicht erkannt werden, bitte geben Sie sie manuell ein.",
"{nthServer}. Server" : "{nthServer}. - Server",
"No object found in the given Base DN. Please revise." : "Keine Objekte in der angegebenen Base DN gefunden, bitte überprüfen.",
+ "More than 1.000 directory entries available." : "Mehr als 1.000 Verzeichniseinträge verfügbar.",
" entries available within the provided Base DN" : "Einträge in der angegebenen Base DN verfügbar",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Es ist ein Fehler aufgetreten. Bitte überprüfen Sie die Base DN wie auch die Verbindungseinstellungen und Anmeldeinformationen.",
"Do you really want to delete the current Server Configuration?" : "Soll die aktuelle Serverkonfiguration wirklich gelöscht werden?",
diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js
index ff440b0c88a..a00a65f3b81 100644
--- a/apps/user_ldap/l10n/el.js
+++ b/apps/user_ldap/l10n/el.js
@@ -22,6 +22,7 @@ OC.L10N.register(
"Could not detect Base DN, please enter it manually." : "Αδυναμία ανίχνευσης Base DN, παρακαλώ να το εισάγετε χειροκίνητα.",
"{nthServer}. Server" : "{nthServer}. Διακομιστής",
"No object found in the given Base DN. Please revise." : "Δεν βρέθηκε αντικείμενο στο δηλωθέν Base DN. Παρακαλώ αναθεωρήστε.",
+ "More than 1.000 directory entries available." : "Περισσότερες από 1.000 εγγραφές καταλόγων διαθέσιμες.",
" entries available within the provided Base DN" : "διαθέσιμες καταχωρήσεις εντός του δηλωθέντος ",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Παρουσιάστηκε σφάλμα. Παρακαλούμε ελέγξτε το Base DN καθώς και τις ρυθμίσεις και τα διαπιστευτήρια σύνδεσης.",
"Do you really want to delete the current Server Configuration?" : "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json
index f12886a6a91..a98c2d0438e 100644
--- a/apps/user_ldap/l10n/el.json
+++ b/apps/user_ldap/l10n/el.json
@@ -20,6 +20,7 @@
"Could not detect Base DN, please enter it manually." : "Αδυναμία ανίχνευσης Base DN, παρακαλώ να το εισάγετε χειροκίνητα.",
"{nthServer}. Server" : "{nthServer}. Διακομιστής",
"No object found in the given Base DN. Please revise." : "Δεν βρέθηκε αντικείμενο στο δηλωθέν Base DN. Παρακαλώ αναθεωρήστε.",
+ "More than 1.000 directory entries available." : "Περισσότερες από 1.000 εγγραφές καταλόγων διαθέσιμες.",
" entries available within the provided Base DN" : "διαθέσιμες καταχωρήσεις εντός του δηλωθέντος ",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Παρουσιάστηκε σφάλμα. Παρακαλούμε ελέγξτε το Base DN καθώς και τις ρυθμίσεις και τα διαπιστευτήρια σύνδεσης.",
"Do you really want to delete the current Server Configuration?" : "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js
index d663c273729..239488f2f82 100644
--- a/apps/user_ldap/l10n/es.js
+++ b/apps/user_ldap/l10n/es.js
@@ -10,14 +10,14 @@ OC.L10N.register(
"No configuration specified" : "No se ha especificado la configuración",
"No data specified" : "No se han especificado los datos",
" Could not set configuration %s" : "No se pudo establecer la configuración %s",
- "Action does not exist" : "Acción no existe.",
+ "Action does not exist" : "La acción no existe.",
"Configuration incorrect" : "Configuración Incorrecta",
"Configuration incomplete" : "Configuración incompleta",
"Configuration OK" : "Configuración correcta",
"Select groups" : "Seleccionar grupos",
"Select object classes" : "Seleccionar la clase de objeto",
"Please check the credentials, they seem to be wrong." : "Por favor verifique las credenciales, parecen no ser correctas.",
- "Please specify the port, it could not be auto-detected." : "Por favor especifique el puerto, no pudo ser auto-detectado.",
+ "Please specify the port, it could not be auto-detected." : "Por favor especifique el puerto, no pudo ser autodetectado.",
"Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN no puede ser detectada automáticamente, por favor revise credenciales, host y puerto.",
"Could not detect Base DN, please enter it manually." : "No se pudo detectar Base DN, por favor ingrésela manualmente.",
"{nthServer}. Server" : "{nthServer}. servidor",
@@ -26,10 +26,10 @@ OC.L10N.register(
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Un error ocurrió. Por favor revise la Base DN, también como la configuración de la conexión y credenciales.",
"Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
"Confirm Deletion" : "Confirmar eliminación",
- "Mappings cleared successfully!" : "Asignaciones borrado exitosamente!",
+ "Mappings cleared successfully!" : "¡Asignaciones borradas exitosamente!",
"Error while clearing the mappings." : "Error mientras se borraban las asignaciones.",
- "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Guardado fallido. Por favor, asegúrese que la base de datos esta en Operación. Actualizar antes de continuar.",
- "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiando el modo habilitará automáticamente las consultas LDAP. Dependiendo del tamaño de su LDAP puede tardar un rato. Desea cambiar el modo?",
+ "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Guardado fallido. Por favor, asegúrese de que la base de datos está en Operación. Actualizar antes de continuar.",
+ "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiando el modo habilitará automáticamente las consultas LDAP. Dependiendo del tamaño de su LDAP puede tardar un rato. ¿Desea cambiar el modo?",
"Mode switch" : "Modo interruptor",
"Select attributes" : "Seleccionar atributos",
"User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Usuario no encontrado. Por favor verifique los atributos de inicio de sesión y nombre de usuario. Filtro eficaz (copie-y-pegue para validar desde la línea de comando):<br/>",
@@ -89,7 +89,7 @@ OC.L10N.register(
"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automáticas al LDAP. Mejor para grandes configuraciones, pero requiere cierto conocimiento de LDAP.",
"Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
"Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
- "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Los objetos de clases más comunes para los usuarios son organizationalPerson, persona, usuario y inetOrgPerson. Si no está seguro que objeto de clase seleccionar, por favor consulte con su administrador de directorio. ",
+ "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Los objetos de clases más comunes para los usuarios son organizationalPerson, persona, usuario y inetOrgPerson. Si no está seguro de qué objeto de clase seleccionar, por favor, consulte con su administrador de directorio. ",
"The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
"Verify settings and count users" : "Verificar configuración y contar usuarios",
"Saving" : "Guardando",
diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json
index 5fdf921e620..adb7a31bfbc 100644
--- a/apps/user_ldap/l10n/es.json
+++ b/apps/user_ldap/l10n/es.json
@@ -8,14 +8,14 @@
"No configuration specified" : "No se ha especificado la configuración",
"No data specified" : "No se han especificado los datos",
" Could not set configuration %s" : "No se pudo establecer la configuración %s",
- "Action does not exist" : "Acción no existe.",
+ "Action does not exist" : "La acción no existe.",
"Configuration incorrect" : "Configuración Incorrecta",
"Configuration incomplete" : "Configuración incompleta",
"Configuration OK" : "Configuración correcta",
"Select groups" : "Seleccionar grupos",
"Select object classes" : "Seleccionar la clase de objeto",
"Please check the credentials, they seem to be wrong." : "Por favor verifique las credenciales, parecen no ser correctas.",
- "Please specify the port, it could not be auto-detected." : "Por favor especifique el puerto, no pudo ser auto-detectado.",
+ "Please specify the port, it could not be auto-detected." : "Por favor especifique el puerto, no pudo ser autodetectado.",
"Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN no puede ser detectada automáticamente, por favor revise credenciales, host y puerto.",
"Could not detect Base DN, please enter it manually." : "No se pudo detectar Base DN, por favor ingrésela manualmente.",
"{nthServer}. Server" : "{nthServer}. servidor",
@@ -24,10 +24,10 @@
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Un error ocurrió. Por favor revise la Base DN, también como la configuración de la conexión y credenciales.",
"Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
"Confirm Deletion" : "Confirmar eliminación",
- "Mappings cleared successfully!" : "Asignaciones borrado exitosamente!",
+ "Mappings cleared successfully!" : "¡Asignaciones borradas exitosamente!",
"Error while clearing the mappings." : "Error mientras se borraban las asignaciones.",
- "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Guardado fallido. Por favor, asegúrese que la base de datos esta en Operación. Actualizar antes de continuar.",
- "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiando el modo habilitará automáticamente las consultas LDAP. Dependiendo del tamaño de su LDAP puede tardar un rato. Desea cambiar el modo?",
+ "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Guardado fallido. Por favor, asegúrese de que la base de datos está en Operación. Actualizar antes de continuar.",
+ "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiando el modo habilitará automáticamente las consultas LDAP. Dependiendo del tamaño de su LDAP puede tardar un rato. ¿Desea cambiar el modo?",
"Mode switch" : "Modo interruptor",
"Select attributes" : "Seleccionar atributos",
"User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Usuario no encontrado. Por favor verifique los atributos de inicio de sesión y nombre de usuario. Filtro eficaz (copie-y-pegue para validar desde la línea de comando):<br/>",
@@ -87,7 +87,7 @@
"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automáticas al LDAP. Mejor para grandes configuraciones, pero requiere cierto conocimiento de LDAP.",
"Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
"Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
- "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Los objetos de clases más comunes para los usuarios son organizationalPerson, persona, usuario y inetOrgPerson. Si no está seguro que objeto de clase seleccionar, por favor consulte con su administrador de directorio. ",
+ "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Los objetos de clases más comunes para los usuarios son organizationalPerson, persona, usuario y inetOrgPerson. Si no está seguro de qué objeto de clase seleccionar, por favor, consulte con su administrador de directorio. ",
"The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
"Verify settings and count users" : "Verificar configuración y contar usuarios",
"Saving" : "Guardando",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index 5a2bb54cac9..c924a9dd16f 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -22,6 +22,7 @@ OC.L10N.register(
"Could not detect Base DN, please enter it manually." : "Impossible de détecter le DN de base, veuillez le spécifier manuellement",
"{nthServer}. Server" : "{nthServer}. Serveur",
"No object found in the given Base DN. Please revise." : "Aucun objet trouvé dans le DN de base spécifié. Veuillez le vérifier.",
+ "More than 1.000 directory entries available." : "Il y a plus de 1000 entrées de répertoire disponibles.",
" entries available within the provided Base DN" : "entrées disponibles dans le DN de base spécifié",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Une erreur est survenue. Veuillez vérifier le DN de base, ainsi que les paramètres de connexion et les informations d'identification",
"Do you really want to delete the current Server Configuration?" : "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 1dfbc319dcf..fbb36e0201a 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -20,6 +20,7 @@
"Could not detect Base DN, please enter it manually." : "Impossible de détecter le DN de base, veuillez le spécifier manuellement",
"{nthServer}. Server" : "{nthServer}. Serveur",
"No object found in the given Base DN. Please revise." : "Aucun objet trouvé dans le DN de base spécifié. Veuillez le vérifier.",
+ "More than 1.000 directory entries available." : "Il y a plus de 1000 entrées de répertoire disponibles.",
" entries available within the provided Base DN" : "entrées disponibles dans le DN de base spécifié",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Une erreur est survenue. Veuillez vérifier le DN de base, ainsi que les paramètres de connexion et les informations d'identification",
"Do you really want to delete the current Server Configuration?" : "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
diff --git a/apps/user_ldap/l10n/gl.js b/apps/user_ldap/l10n/gl.js
index add0dbd2d0f..2dce42d9131 100644
--- a/apps/user_ldap/l10n/gl.js
+++ b/apps/user_ldap/l10n/gl.js
@@ -22,6 +22,7 @@ OC.L10N.register(
"Could not detect Base DN, please enter it manually." : "Non foi posíbel detectar o DN base, introdúzao manualmente.",
"{nthServer}. Server" : "{nthServer}. Servidor",
"No object found in the given Base DN. Please revise." : "Non se atopou o obxecto no DN base solicitado. Revíseo.",
+ "More than 1.000 directory entries available." : "Dispoñíbeis máis de 1.000 entradas de directorio.",
" entries available within the provided Base DN" : "entradas dispoñíbeis no DN base fornecido",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Produciuse un erro. Comprobe o DN base, os axustes de conexión e as credenciais.",
"Do you really want to delete the current Server Configuration?" : "Confirma que quere eliminar a configuración actual do servidor?",
diff --git a/apps/user_ldap/l10n/gl.json b/apps/user_ldap/l10n/gl.json
index fc637ebe9d3..58832e778f2 100644
--- a/apps/user_ldap/l10n/gl.json
+++ b/apps/user_ldap/l10n/gl.json
@@ -20,6 +20,7 @@
"Could not detect Base DN, please enter it manually." : "Non foi posíbel detectar o DN base, introdúzao manualmente.",
"{nthServer}. Server" : "{nthServer}. Servidor",
"No object found in the given Base DN. Please revise." : "Non se atopou o obxecto no DN base solicitado. Revíseo.",
+ "More than 1.000 directory entries available." : "Dispoñíbeis máis de 1.000 entradas de directorio.",
" entries available within the provided Base DN" : "entradas dispoñíbeis no DN base fornecido",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Produciuse un erro. Comprobe o DN base, os axustes de conexión e as credenciais.",
"Do you really want to delete the current Server Configuration?" : "Confirma que quere eliminar a configuración actual do servidor?",
diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js
index 255ee3ee1c8..3433482319d 100644
--- a/apps/user_ldap/l10n/id.js
+++ b/apps/user_ldap/l10n/id.js
@@ -10,15 +10,33 @@ OC.L10N.register(
"No configuration specified" : "Tidak ada konfigurasi yang ditetapkan",
"No data specified" : "Tidak ada data yang ditetapkan",
" Could not set configuration %s" : "Tidak dapat menyetel konfigurasi %s",
+ "Action does not exist" : "Tidak ada tindakan",
"Configuration incorrect" : "Konfigurasi salah",
"Configuration incomplete" : "Konfigurasi tidak lengkap",
"Configuration OK" : "Konfigurasi Oke",
"Select groups" : "Pilih grup",
"Select object classes" : "Pilik kelas obyek",
+ "Please check the credentials, they seem to be wrong." : "Mohon periksa kredensial, nampaknya ada kesalahan.",
+ "Please specify the port, it could not be auto-detected." : "Mohon tentukan port karena tidak terdeteksi secara otomatis.",
+ "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN tidak terdeteksi secara otomatis, mohon periksa kembali kredensial, host dan port.",
+ "Could not detect Base DN, please enter it manually." : "Tidak dapat mendeteksi Base DN, mohon masukkan secara manual.",
"{nthServer}. Server" : "{nthServer}. Server",
+ "No object found in the given Base DN. Please revise." : "Tidak ada obyek ditemukan di Base DN yang diberikan. Mohon diperiksa kembali.",
+ "More than 1.000 directory entries available." : "Lebih dari 1.000 entri direktori yang tersedia.",
+ " entries available within the provided Base DN" : "entri tersedia didalam Base DN yang diberikan",
+ "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Terjadi kesalahan. Silakan periksa Base DN, serta pengaturan sambungan dan kredensial.",
"Do you really want to delete the current Server Configuration?" : "Apakan Anda ingin menghapus Konfigurasi Server saat ini?",
"Confirm Deletion" : "Konfirmasi Penghapusan",
+ "Mappings cleared successfully!" : "Pemetaan berhasil dibersihkan!",
+ "Error while clearing the mappings." : "Kesalahan saat membersihkan pemetaan.",
+ "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Menyimpan gagal. Mohon pastikan basis data di Operasi. Muat Ulang sebelum melanjutkan.",
+ "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Beralih modus akan mengaktifkan kueri LDAP. Hal ini memerlukan beberapa saat tergantung pada ukuran LDAP Anda. Apakah Anda tetap ingin beralih modus?",
+ "Mode switch" : "Beralih modus",
"Select attributes" : "Pilih atribut",
+ "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Pengguna tidak ditemukan. Mohon periksa atribut login dan nama pengguna Anda. Penyaring efektif (salin dan tempel berikut untuk validasi baris perintah):\n<br/>",
+ "User found and settings verified." : "Pengguna ditemukan dan pengaturan terverifikasi.",
+ "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Terjadi kesalahan sambungan ke LDAP / AD, mohon periksa host, port dan kredensial.",
+ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Kotak grup telah diaktifkan, karena server LDAP / AD tidak mendukung keanggotaan.",
"_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
"_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
"Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.",
@@ -26,11 +44,21 @@ OC.L10N.register(
"Invalid Host" : "Host tidak sah",
"Server" : "Server",
"Users" : "Pengguna",
+ "Login Attributes" : "Atribut Login",
"Groups" : "Grup",
"Test Configuration" : "Uji Konfigurasi",
"Help" : "Bantuan",
"Groups meeting these criteria are available in %s:" : "Grup memenuhi kriteria ini tersedia di %s:",
+ "Only these object classes:" : "Hanya kelas obyek berikut:",
+ "Only from these groups:" : "Hanya dari grup berikut:",
+ "Search groups" : "Pencarian grup",
+ "Available groups" : "Grup tersedia",
+ "Selected groups" : "Grup terpilih",
+ "Edit LDAP Query" : "Sunting Kueri LDAP",
+ "LDAP Filter:" : "Penyaring LDAP:",
"Test Filter" : "Uji Penyaring",
+ "LDAP / AD Username:" : "Nama pengguna LDAP / AD:",
+ "LDAP / AD Email Address:" : "Alamat Email LDAP / AD:",
"Other Attributes:" : "Atribut Lain:",
"1. Server" : "1. Server",
"%s. Server:" : "%s. Server:",
diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json
index bbff7d43f0b..0d1818f9a51 100644
--- a/apps/user_ldap/l10n/id.json
+++ b/apps/user_ldap/l10n/id.json
@@ -8,15 +8,33 @@
"No configuration specified" : "Tidak ada konfigurasi yang ditetapkan",
"No data specified" : "Tidak ada data yang ditetapkan",
" Could not set configuration %s" : "Tidak dapat menyetel konfigurasi %s",
+ "Action does not exist" : "Tidak ada tindakan",
"Configuration incorrect" : "Konfigurasi salah",
"Configuration incomplete" : "Konfigurasi tidak lengkap",
"Configuration OK" : "Konfigurasi Oke",
"Select groups" : "Pilih grup",
"Select object classes" : "Pilik kelas obyek",
+ "Please check the credentials, they seem to be wrong." : "Mohon periksa kredensial, nampaknya ada kesalahan.",
+ "Please specify the port, it could not be auto-detected." : "Mohon tentukan port karena tidak terdeteksi secara otomatis.",
+ "Base DN could not be auto-detected, please revise credentials, host and port." : "Base DN tidak terdeteksi secara otomatis, mohon periksa kembali kredensial, host dan port.",
+ "Could not detect Base DN, please enter it manually." : "Tidak dapat mendeteksi Base DN, mohon masukkan secara manual.",
"{nthServer}. Server" : "{nthServer}. Server",
+ "No object found in the given Base DN. Please revise." : "Tidak ada obyek ditemukan di Base DN yang diberikan. Mohon diperiksa kembali.",
+ "More than 1.000 directory entries available." : "Lebih dari 1.000 entri direktori yang tersedia.",
+ " entries available within the provided Base DN" : "entri tersedia didalam Base DN yang diberikan",
+ "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Terjadi kesalahan. Silakan periksa Base DN, serta pengaturan sambungan dan kredensial.",
"Do you really want to delete the current Server Configuration?" : "Apakan Anda ingin menghapus Konfigurasi Server saat ini?",
"Confirm Deletion" : "Konfirmasi Penghapusan",
+ "Mappings cleared successfully!" : "Pemetaan berhasil dibersihkan!",
+ "Error while clearing the mappings." : "Kesalahan saat membersihkan pemetaan.",
+ "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Menyimpan gagal. Mohon pastikan basis data di Operasi. Muat Ulang sebelum melanjutkan.",
+ "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Beralih modus akan mengaktifkan kueri LDAP. Hal ini memerlukan beberapa saat tergantung pada ukuran LDAP Anda. Apakah Anda tetap ingin beralih modus?",
+ "Mode switch" : "Beralih modus",
"Select attributes" : "Pilih atribut",
+ "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Pengguna tidak ditemukan. Mohon periksa atribut login dan nama pengguna Anda. Penyaring efektif (salin dan tempel berikut untuk validasi baris perintah):\n<br/>",
+ "User found and settings verified." : "Pengguna ditemukan dan pengaturan terverifikasi.",
+ "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Terjadi kesalahan sambungan ke LDAP / AD, mohon periksa host, port dan kredensial.",
+ "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Kotak grup telah diaktifkan, karena server LDAP / AD tidak mendukung keanggotaan.",
"_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
"_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
"Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Tidak mendeteksi atribut nama tampilan pengguna. Silakan menentukannya sendiri di pengaturan ldap lanjutan.",
@@ -24,11 +42,21 @@
"Invalid Host" : "Host tidak sah",
"Server" : "Server",
"Users" : "Pengguna",
+ "Login Attributes" : "Atribut Login",
"Groups" : "Grup",
"Test Configuration" : "Uji Konfigurasi",
"Help" : "Bantuan",
"Groups meeting these criteria are available in %s:" : "Grup memenuhi kriteria ini tersedia di %s:",
+ "Only these object classes:" : "Hanya kelas obyek berikut:",
+ "Only from these groups:" : "Hanya dari grup berikut:",
+ "Search groups" : "Pencarian grup",
+ "Available groups" : "Grup tersedia",
+ "Selected groups" : "Grup terpilih",
+ "Edit LDAP Query" : "Sunting Kueri LDAP",
+ "LDAP Filter:" : "Penyaring LDAP:",
"Test Filter" : "Uji Penyaring",
+ "LDAP / AD Username:" : "Nama pengguna LDAP / AD:",
+ "LDAP / AD Email Address:" : "Alamat Email LDAP / AD:",
"Other Attributes:" : "Atribut Lain:",
"1. Server" : "1. Server",
"%s. Server:" : "%s. Server:",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index 6dda509053a..3f2c6e0130e 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -10,6 +10,7 @@ OC.L10N.register(
"No configuration specified" : "構成が指定されていません",
"No data specified" : "データが指定されていません",
" Could not set configuration %s" : "構成 %s を設定できませんでした",
+ "Action does not exist" : "アクションが存在しません",
"Configuration incorrect" : "設定に誤りがあります",
"Configuration incomplete" : "設定が不完全です",
"Configuration OK" : "設定OK",
@@ -33,7 +34,7 @@ OC.L10N.register(
"LDAP Filter:" : "LDAP フィルタ:",
"The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。",
"Test Filter" : "フィルターをテスト",
- "LDAP / AD Username:" : "LDAP / AD ユーザ名:",
+ "LDAP / AD Username:" : "LDAP/ADユーザー名:",
"LDAP / AD Email Address:" : "LDAP / AD メールアドレス:",
"Other Attributes:" : "その他の属性:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例: \"uid=%%uid\"",
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index d616a84e457..12ccf15788c 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -8,6 +8,7 @@
"No configuration specified" : "構成が指定されていません",
"No data specified" : "データが指定されていません",
" Could not set configuration %s" : "構成 %s を設定できませんでした",
+ "Action does not exist" : "アクションが存在しません",
"Configuration incorrect" : "設定に誤りがあります",
"Configuration incomplete" : "設定が不完全です",
"Configuration OK" : "設定OK",
@@ -31,7 +32,7 @@
"LDAP Filter:" : "LDAP フィルタ:",
"The filter specifies which LDAP groups shall have access to the %s instance." : "フィルターは、どの LDAP グループが %s にアクセスするかを指定します。",
"Test Filter" : "フィルターをテスト",
- "LDAP / AD Username:" : "LDAP / AD ユーザ名:",
+ "LDAP / AD Username:" : "LDAP/ADユーザー名:",
"LDAP / AD Email Address:" : "LDAP / AD メールアドレス:",
"Other Attributes:" : "その他の属性:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例: \"uid=%%uid\"",
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index 59b4fcef9a2..34340f65514 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -22,6 +22,7 @@ OC.L10N.register(
"Could not detect Base DN, please enter it manually." : "Kon basis DN niet vaststellen, voer de gegevens handmatig in.",
"{nthServer}. Server" : "{nthServer}. Server",
"No object found in the given Base DN. Please revise." : "Geen object gevonden in de basis DN. Review instellingen.",
+ "More than 1.000 directory entries available." : "Meer dan 1000 directory namen beschikbaar.",
" entries available within the provided Base DN" : "accounts beschikbaar binnen de provider Basis DN",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Er trad een fout op. Controleer de Basis DN en de verbindingsinstellingen en inloggegevens.",
"Do you really want to delete the current Server Configuration?" : "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index e36a672eacf..31a73d6f93b 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -20,6 +20,7 @@
"Could not detect Base DN, please enter it manually." : "Kon basis DN niet vaststellen, voer de gegevens handmatig in.",
"{nthServer}. Server" : "{nthServer}. Server",
"No object found in the given Base DN. Please revise." : "Geen object gevonden in de basis DN. Review instellingen.",
+ "More than 1.000 directory entries available." : "Meer dan 1000 directory namen beschikbaar.",
" entries available within the provided Base DN" : "accounts beschikbaar binnen de provider Basis DN",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Er trad een fout op. Controleer de Basis DN en de verbindingsinstellingen en inloggegevens.",
"Do you really want to delete the current Server Configuration?" : "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js
index 12ae0632005..82d64c27c70 100644
--- a/apps/user_ldap/l10n/sl.js
+++ b/apps/user_ldap/l10n/sl.js
@@ -10,15 +10,19 @@ OC.L10N.register(
"No configuration specified" : "Ni določenih nastavitev",
"No data specified" : "Ni navedenih podatkov",
" Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s",
+ "Action does not exist" : "Operacija ne obstaja",
"Configuration incorrect" : "Nastavitev ni ustrezna",
"Configuration incomplete" : "Nastavitev je nepopolna",
"Configuration OK" : "Nastavitev je ustrezna",
"Select groups" : "Izberi skupine",
"Select object classes" : "Izbor razredov predmeta",
"{nthServer}. Server" : "{nthServer}. strežnik",
+ "More than 1.000 directory entries available." : "Na voljo je več kot 1.000 elementov imenika.",
"Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?",
"Confirm Deletion" : "Potrdi brisanje",
+ "Mode switch" : "Preklop načina",
"Select attributes" : "Izbor atributov",
+ "User found and settings verified." : "Uporabnik najden in nastavitve preverjene.",
"_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"],
"_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"],
"Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.",
@@ -26,14 +30,22 @@ OC.L10N.register(
"Invalid Host" : "Neveljaven gostitelj",
"Server" : "Strežnik",
"Users" : "Uporabniki",
+ "Login Attributes" : "Parametri prijave",
"Groups" : "Skupine",
"Test Configuration" : "Preizkusne nastavitve",
"Help" : "Pomoč",
"Groups meeting these criteria are available in %s:" : "Skupine, ki so skladne s kriterijem, so na voljo v %s:",
+ "Only these object classes:" : "Samo tej razredi objektov:",
+ "Only from these groups:" : "Samo te skupine:",
+ "Search groups" : "Skupine za iskanje",
+ "Available groups" : "Razpoložljive skupine",
+ "Selected groups" : "Izbrane skupine",
+ "LDAP Filter:" : "LDAP Filter:",
"The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
"Test Filter" : "Preizkusi filter",
"Other Attributes:" : "Drugi atributi:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"",
+ "Verify settings" : "Preveri nastavitve",
"1. Server" : "1. strežnik",
"%s. Server:" : "%s. strežnik:",
"Host" : "Gostitelj",
diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json
index 2025e381d90..6ff384a20d7 100644
--- a/apps/user_ldap/l10n/sl.json
+++ b/apps/user_ldap/l10n/sl.json
@@ -8,15 +8,19 @@
"No configuration specified" : "Ni določenih nastavitev",
"No data specified" : "Ni navedenih podatkov",
" Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s",
+ "Action does not exist" : "Operacija ne obstaja",
"Configuration incorrect" : "Nastavitev ni ustrezna",
"Configuration incomplete" : "Nastavitev je nepopolna",
"Configuration OK" : "Nastavitev je ustrezna",
"Select groups" : "Izberi skupine",
"Select object classes" : "Izbor razredov predmeta",
"{nthServer}. Server" : "{nthServer}. strežnik",
+ "More than 1.000 directory entries available." : "Na voljo je več kot 1.000 elementov imenika.",
"Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?",
"Confirm Deletion" : "Potrdi brisanje",
+ "Mode switch" : "Preklop načina",
"Select attributes" : "Izbor atributov",
+ "User found and settings verified." : "Uporabnik najden in nastavitve preverjene.",
"_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"],
"_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"],
"Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.",
@@ -24,14 +28,22 @@
"Invalid Host" : "Neveljaven gostitelj",
"Server" : "Strežnik",
"Users" : "Uporabniki",
+ "Login Attributes" : "Parametri prijave",
"Groups" : "Skupine",
"Test Configuration" : "Preizkusne nastavitve",
"Help" : "Pomoč",
"Groups meeting these criteria are available in %s:" : "Skupine, ki so skladne s kriterijem, so na voljo v %s:",
+ "Only these object classes:" : "Samo tej razredi objektov:",
+ "Only from these groups:" : "Samo te skupine:",
+ "Search groups" : "Skupine za iskanje",
+ "Available groups" : "Razpoložljive skupine",
+ "Selected groups" : "Izbrane skupine",
+ "LDAP Filter:" : "LDAP Filter:",
"The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
"Test Filter" : "Preizkusi filter",
"Other Attributes:" : "Drugi atributi:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"",
+ "Verify settings" : "Preveri nastavitve",
"1. Server" : "1. strežnik",
"%s. Server:" : "%s. strežnik:",
"Host" : "Gostitelj",
diff --git a/apps/user_ldap/l10n/sr.js b/apps/user_ldap/l10n/sr.js
index 1bf136ab66b..fd568599874 100644
--- a/apps/user_ldap/l10n/sr.js
+++ b/apps/user_ldap/l10n/sr.js
@@ -22,6 +22,7 @@ OC.L10N.register(
"Could not detect Base DN, please enter it manually." : "Не могу да откријем базни ДН. Унесите га ручно.",
"{nthServer}. Server" : "{nthServer}. Сервер",
"No object found in the given Base DN. Please revise." : "Нема објекта за дати базни ДН. Проверите.",
+ "More than 1.000 directory entries available." : "Више од 1000 уноса је доступно.",
" entries available within the provided Base DN" : "уноса доступно за дати базни ДН",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Грешка. Проверите базни ДН као и поставке везе и акредитиве.",
"Do you really want to delete the current Server Configuration?" : "Да ли стварно желите да обришете тренутну конфигурацију сервера?",
diff --git a/apps/user_ldap/l10n/sr.json b/apps/user_ldap/l10n/sr.json
index 17beea5aa83..7bb8aaefcba 100644
--- a/apps/user_ldap/l10n/sr.json
+++ b/apps/user_ldap/l10n/sr.json
@@ -20,6 +20,7 @@
"Could not detect Base DN, please enter it manually." : "Не могу да откријем базни ДН. Унесите га ручно.",
"{nthServer}. Server" : "{nthServer}. Сервер",
"No object found in the given Base DN. Please revise." : "Нема објекта за дати базни ДН. Проверите.",
+ "More than 1.000 directory entries available." : "Више од 1000 уноса је доступно.",
" entries available within the provided Base DN" : "уноса доступно за дати базни ДН",
"An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Грешка. Проверите базни ДН као и поставке везе и акредитиве.",
"Do you really want to delete the current Server Configuration?" : "Да ли стварно желите да обришете тренутну конфигурацију сервера?",
diff --git a/core/ajax/share.php b/core/ajax/share.php
index d9bf97d6464..a0db77fd1f9 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -354,7 +354,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$sorter = new \OC\Share\SearchResultSorter((string)$_GET['search'],
'label',
- new \OC\Log());
+ \OC::$server->getLogger());
usort($shareWith, array($sorter, 'sort'));
OC_JSON::success(array('data' => $shareWith));
}
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index b3393c450d4..274cec8253d 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -51,7 +51,7 @@ ul.multiselectoptions > li input[type='checkbox']:checked+label {
div.multiselect, select.multiselect {
display: inline-block;
max-width: 200px;
- min-width: 150px;
+ min-width: 150px !important;
padding-right: 10px;
min-height: 20px;
position: relative;
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 97a3dcfad9c..96144d39ee0 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -191,7 +191,8 @@
});
button.parent().data('preventHide',false);
if(settings.createText){
- var li=$('<li class="creator">+ '+settings.createText+'</li>');
+ var li=$('<li class="creator" title="' + settings.createText +
+ '">+ ' + settings.createText + '</li>');
li.click(function(event){
li.empty();
var input=$('<input type="text" class="new">');
diff --git a/core/l10n/id.js b/core/l10n/id.js
index a2016d4168c..facd8bb6311 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -8,11 +8,18 @@ OC.L10N.register(
"Checked database schema update" : "Pembaruan skema basis data terperiksa",
"Checked database schema update for apps" : "Pembaruan skema basis data terperiksa untuk aplikasi",
"Updated \"%s\" to %s" : "Terbaru \"%s\" sampai %s",
+ "Repair warning: " : "Peringatan perbaikan:",
+ "Repair error: " : "Kesalahan perbaikan:",
+ "Following incompatible apps have been disabled: %s" : "Aplikasi tidak kompatibel berikut telah dinonaktifkan: %s",
+ "Following 3rd party apps have been disabled: %s" : "Aplikasi pihak ke-3 berikut telah dinonaktifkan: %s",
+ "Invalid file provided" : "Berkas yang diberikan tidak sah",
"No image or file provided" : "Tidak ada gambar atau berkas yang disediakan",
"Unknown filetype" : "Tipe berkas tidak dikenal",
"Invalid image" : "Gambar tidak sah",
"No temporary profile picture available, try again" : "Tidak ada gambar profil sementara yang tersedia, coba lagi",
"No crop data provided" : "Tidak ada data krop tersedia",
+ "No valid crop data provided" : "Tidak ada data valid untuk dipangkas",
+ "Crop is not square" : "Pangkas ini tidak persegi",
"Sunday" : "Minggu",
"Monday" : "Senin",
"Tuesday" : "Selasa",
@@ -62,7 +69,14 @@ OC.L10N.register(
"So-so password" : "Sandi lumayan",
"Good password" : "Sandi baik",
"Strong password" : "Sandi kuat",
+ "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Server web Anda belum diatur dengan benar untuk mengizinkan sinkronisasi berkas karena antarmuka WebDAV nampaknya rusak.",
+ "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Server ini tidak tersambung ke internet. Ini berarti beberapa fitur seperti me-mount penyimpanan eksternal, notifikasi pembaruan atau instalasi aplikasi pihak ketiga tidak akan bekerja. Mengakses berkas secara remote dan mengirim notifikasi email juga tidak bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda ingin memiliki fitur ini.",
+ "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Direktori data dan berkas Anda kemungkinan dapat diakses dari Internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan Anda untuk mengkonfigurasi server web agar direktori data tidak lagi dapat diakses atau pindahkan direktori data Anda di luar root dokumen server web.",
+ "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Tembolok memori tidak dikonfigurasi. Untuk meningkatkan kinerja, mohon konfigurasi memcache jika tersedia. Informasi lebih lanjut dapat ditemukan di <a href=\"{docLink}\">dokumentasi</a> kami.",
"Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
+ "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Header HTTP \"{header}\" tidak dikonfigurasi sama dengan \"{expected}\". Hal ini berpotensi pada resiko keamanan dan privasi. Kami sarankan untuk menyesuaikan pengaturan ini.",
+ "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "Header HTTP \"Strict-Transport-Security\" tidak dikonfigurasi setidaknya dalam waktu \"2,678,400\" detik. Hal ini berpotensi pada resiko keamanan dan privasi. Kami sarankan untuk menyesuaikan pengaturan ini.",
+ "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Anda mengakses situs ini via HTTP. Kami sangat menyarankan Anda mengkonfigurasi server Anda untuk menggunakan HTTPS.",
"Shared" : "Dibagikan",
"Shared with {recipients}" : "Dibagikan dengan {recipients}",
"Share" : "Bagikan",
@@ -72,6 +86,9 @@ OC.L10N.register(
"Error while changing permissions" : "Kesalahan saat mengubah izin",
"Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
"Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
+ "Share with users or groups …" : "Bagikan dengan pengguna atau grup ...",
+ "Share with users, groups or remote users …" : "Bagikan dengan pengguna, grup atau pengguna remote ...",
+ "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud",
"Share link" : "Bagikan tautan",
"The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
"Link" : "Tautan",
@@ -84,6 +101,7 @@ OC.L10N.register(
"Set expiration date" : "Atur tanggal kedaluwarsa",
"Expiration" : "Kedaluwarsa",
"Expiration date" : "Tanggal kedaluwarsa",
+ "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali",
"Adding user..." : "Menambahkan pengguna...",
"group" : "grup",
"remote" : "remote",
@@ -157,11 +175,13 @@ OC.L10N.register(
"Technical details" : "Rincian teknis",
"Remote Address: %s" : "Alamat remote: %s",
"Request ID: %s" : "ID Permintaan: %s",
+ "Type: %s" : "Tipe: %s",
"Code: %s" : "Kode: %s",
"Message: %s" : "Pesan: %s",
"File: %s" : "Berkas: %s",
"Line: %s" : "Baris: %s",
"Trace" : "Jejak",
+ "Security warning" : "Peringatan keamanan",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
"Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>",
@@ -175,13 +195,22 @@ OC.L10N.register(
"Database name" : "Nama basis data",
"Database tablespace" : "Tablespace basis data",
"Database host" : "Host basis data",
+ "Performance warning" : "Peringatan kinerja",
+ "SQLite will be used as database." : "SQLite akan digunakan sebagai basis data.",
+ "For larger installations we recommend to choose a different database backend." : "Untuk instalasi yang lebih besar, kami menyarankan untuk memilih backend basis data yang berbeda.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Terutama saat menggunakan klien desktop untuk sinkronisasi berkas, penggunaan SQLite tidak disarankan.",
"Finish setup" : "Selesaikan instalasi",
"Finishing …" : "Menyelesaikan ...",
+ "Need help?" : "Butuh bantuan?",
+ "See the documentation" : "Lihat dokumentasi",
+ "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Aplikasi ini memerlukan JavaScript untuk dapat beroperasi dengan benar. Mohon {linkstart}aktifkan JavaScript{linkend} dan muat ulang halaman ini.",
"%s is available. Get more information on how to update." : "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui.",
"Log out" : "Keluar",
"Search" : "Cari",
"Server side authentication failed!" : "Otentikasi dari sisi server gagal!",
"Please contact your administrator." : "Silahkan hubungi administrator anda.",
+ "An internal error occured." : "Terjadi kesalahan internal.",
+ "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.",
"Forgot your password? Reset it!" : "Lupa sandi Anda? Setel ulang!",
"remember" : "selalu masuk",
"Log in" : "Masuk",
@@ -201,6 +230,7 @@ OC.L10N.register(
"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
"Start update" : "Jalankan pembaruan",
"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Untuk menghindari waktu habis dengan instalasi yang lebih besar, Anda bisa menjalankan perintah berikut dari direktori instalasi Anda:",
+ "This %s instance is currently in maintenance mode, which may take a while." : "Instansi %s ini sedang dalam modus pemeliharaan, mungkin memerlukan beberapa saat.",
"This page will refresh itself when the %s instance is available again." : "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
},
"nplurals=1; plural=0;");
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 9b5cb7c8021..8212cbc2a45 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -6,11 +6,18 @@
"Checked database schema update" : "Pembaruan skema basis data terperiksa",
"Checked database schema update for apps" : "Pembaruan skema basis data terperiksa untuk aplikasi",
"Updated \"%s\" to %s" : "Terbaru \"%s\" sampai %s",
+ "Repair warning: " : "Peringatan perbaikan:",
+ "Repair error: " : "Kesalahan perbaikan:",
+ "Following incompatible apps have been disabled: %s" : "Aplikasi tidak kompatibel berikut telah dinonaktifkan: %s",
+ "Following 3rd party apps have been disabled: %s" : "Aplikasi pihak ke-3 berikut telah dinonaktifkan: %s",
+ "Invalid file provided" : "Berkas yang diberikan tidak sah",
"No image or file provided" : "Tidak ada gambar atau berkas yang disediakan",
"Unknown filetype" : "Tipe berkas tidak dikenal",
"Invalid image" : "Gambar tidak sah",
"No temporary profile picture available, try again" : "Tidak ada gambar profil sementara yang tersedia, coba lagi",
"No crop data provided" : "Tidak ada data krop tersedia",
+ "No valid crop data provided" : "Tidak ada data valid untuk dipangkas",
+ "Crop is not square" : "Pangkas ini tidak persegi",
"Sunday" : "Minggu",
"Monday" : "Senin",
"Tuesday" : "Selasa",
@@ -60,7 +67,14 @@
"So-so password" : "Sandi lumayan",
"Good password" : "Sandi baik",
"Strong password" : "Sandi kuat",
+ "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Server web Anda belum diatur dengan benar untuk mengizinkan sinkronisasi berkas karena antarmuka WebDAV nampaknya rusak.",
+ "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Server ini tidak tersambung ke internet. Ini berarti beberapa fitur seperti me-mount penyimpanan eksternal, notifikasi pembaruan atau instalasi aplikasi pihak ketiga tidak akan bekerja. Mengakses berkas secara remote dan mengirim notifikasi email juga tidak bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda ingin memiliki fitur ini.",
+ "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Direktori data dan berkas Anda kemungkinan dapat diakses dari Internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan Anda untuk mengkonfigurasi server web agar direktori data tidak lagi dapat diakses atau pindahkan direktori data Anda di luar root dokumen server web.",
+ "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Tembolok memori tidak dikonfigurasi. Untuk meningkatkan kinerja, mohon konfigurasi memcache jika tersedia. Informasi lebih lanjut dapat ditemukan di <a href=\"{docLink}\">dokumentasi</a> kami.",
"Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
+ "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Header HTTP \"{header}\" tidak dikonfigurasi sama dengan \"{expected}\". Hal ini berpotensi pada resiko keamanan dan privasi. Kami sarankan untuk menyesuaikan pengaturan ini.",
+ "The \"Strict-Transport-Security\" HTTP header is not configured to least \"2,678,400\" seconds. This is a potential security risk and we recommend adjusting this setting." : "Header HTTP \"Strict-Transport-Security\" tidak dikonfigurasi setidaknya dalam waktu \"2,678,400\" detik. Hal ini berpotensi pada resiko keamanan dan privasi. Kami sarankan untuk menyesuaikan pengaturan ini.",
+ "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Anda mengakses situs ini via HTTP. Kami sangat menyarankan Anda mengkonfigurasi server Anda untuk menggunakan HTTPS.",
"Shared" : "Dibagikan",
"Shared with {recipients}" : "Dibagikan dengan {recipients}",
"Share" : "Bagikan",
@@ -70,6 +84,9 @@
"Error while changing permissions" : "Kesalahan saat mengubah izin",
"Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
"Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
+ "Share with users or groups …" : "Bagikan dengan pengguna atau grup ...",
+ "Share with users, groups or remote users …" : "Bagikan dengan pengguna, grup atau pengguna remote ...",
+ "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud",
"Share link" : "Bagikan tautan",
"The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
"Link" : "Tautan",
@@ -82,6 +99,7 @@
"Set expiration date" : "Atur tanggal kedaluwarsa",
"Expiration" : "Kedaluwarsa",
"Expiration date" : "Tanggal kedaluwarsa",
+ "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali",
"Adding user..." : "Menambahkan pengguna...",
"group" : "grup",
"remote" : "remote",
@@ -155,11 +173,13 @@
"Technical details" : "Rincian teknis",
"Remote Address: %s" : "Alamat remote: %s",
"Request ID: %s" : "ID Permintaan: %s",
+ "Type: %s" : "Tipe: %s",
"Code: %s" : "Kode: %s",
"Message: %s" : "Pesan: %s",
"File: %s" : "Berkas: %s",
"Line: %s" : "Baris: %s",
"Trace" : "Jejak",
+ "Security warning" : "Peringatan keamanan",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
"Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>",
@@ -173,13 +193,22 @@
"Database name" : "Nama basis data",
"Database tablespace" : "Tablespace basis data",
"Database host" : "Host basis data",
+ "Performance warning" : "Peringatan kinerja",
+ "SQLite will be used as database." : "SQLite akan digunakan sebagai basis data.",
+ "For larger installations we recommend to choose a different database backend." : "Untuk instalasi yang lebih besar, kami menyarankan untuk memilih backend basis data yang berbeda.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Terutama saat menggunakan klien desktop untuk sinkronisasi berkas, penggunaan SQLite tidak disarankan.",
"Finish setup" : "Selesaikan instalasi",
"Finishing …" : "Menyelesaikan ...",
+ "Need help?" : "Butuh bantuan?",
+ "See the documentation" : "Lihat dokumentasi",
+ "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Aplikasi ini memerlukan JavaScript untuk dapat beroperasi dengan benar. Mohon {linkstart}aktifkan JavaScript{linkend} dan muat ulang halaman ini.",
"%s is available. Get more information on how to update." : "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui.",
"Log out" : "Keluar",
"Search" : "Cari",
"Server side authentication failed!" : "Otentikasi dari sisi server gagal!",
"Please contact your administrator." : "Silahkan hubungi administrator anda.",
+ "An internal error occured." : "Terjadi kesalahan internal.",
+ "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.",
"Forgot your password? Reset it!" : "Lupa sandi Anda? Setel ulang!",
"remember" : "selalu masuk",
"Log in" : "Masuk",
@@ -199,6 +228,7 @@
"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
"Start update" : "Jalankan pembaruan",
"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Untuk menghindari waktu habis dengan instalasi yang lebih besar, Anda bisa menjalankan perintah berikut dari direktori instalasi Anda:",
+ "This %s instance is currently in maintenance mode, which may take a while." : "Instansi %s ini sedang dalam modus pemeliharaan, mungkin memerlukan beberapa saat.",
"This page will refresh itself when the %s instance is available again." : "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
},"pluralForm" :"nplurals=1; plural=0;"
} \ No newline at end of file
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 73ee7ad6d92..c1328a694aa 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -10,7 +10,7 @@ OC.L10N.register(
"Updated \"%s\" to %s" : "\"%s\" を %s にアップデートしました。",
"Repair warning: " : "修復警告:",
"Repair error: " : "修復エラー:",
- "Following incompatible apps have been disabled: %s" : "次の互換性の無いアプリは無効にされています。: %s",
+ "Following incompatible apps have been disabled: %s" : "次の互換性のないアプリは無効にされています: %s",
"Following 3rd party apps have been disabled: %s" : "次のサードパーティーアプリは無効にされています。: %s",
"Invalid file provided" : "無効なファイルが提供されました",
"No image or file provided" : "画像もしくはファイルが提供されていません",
@@ -69,9 +69,9 @@ OC.L10N.register(
"So-so password" : "まずまずのパスワード",
"Good password" : "良好なパスワード",
"Strong password" : "強いパスワード",
- "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
+ "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースが動作していないようです。Webサーバーは、ファイルの同期を許可するよう適切に設定されていません。",
"This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "このサーバーはインターネットに接続されていません。この場合、外部ストレージのマウント、更新の通知やサードパーティ製のアプリ、といったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信のような機能も利用できない可能性があります。全ての機能を利用するためには、このサーバーからインターネットに接続できるようにすることをお勧めします。",
- "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにウェブサーバーを設定するか、ウェブサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
+ "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにWebサーバーを設定するか、Webサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
"Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
"You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "HTTP経由でアクセスしています。HTTPSを使用するようサーバーを設定することを強くおすすめします。",
"Shared" : "共有中",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index 52476a3ed93..4ba0755d957 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -8,7 +8,7 @@
"Updated \"%s\" to %s" : "\"%s\" を %s にアップデートしました。",
"Repair warning: " : "修復警告:",
"Repair error: " : "修復エラー:",
- "Following incompatible apps have been disabled: %s" : "次の互換性の無いアプリは無効にされています。: %s",
+ "Following incompatible apps have been disabled: %s" : "次の互換性のないアプリは無効にされています: %s",
"Following 3rd party apps have been disabled: %s" : "次のサードパーティーアプリは無効にされています。: %s",
"Invalid file provided" : "無効なファイルが提供されました",
"No image or file provided" : "画像もしくはファイルが提供されていません",
@@ -67,9 +67,9 @@
"So-so password" : "まずまずのパスワード",
"Good password" : "良好なパスワード",
"Strong password" : "強いパスワード",
- "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
+ "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースが動作していないようです。Webサーバーは、ファイルの同期を許可するよう適切に設定されていません。",
"This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "このサーバーはインターネットに接続されていません。この場合、外部ストレージのマウント、更新の通知やサードパーティ製のアプリ、といったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信のような機能も利用できない可能性があります。全ての機能を利用するためには、このサーバーからインターネットに接続できるようにすることをお勧めします。",
- "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにウェブサーバーを設定するか、ウェブサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
+ "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにWebサーバーを設定するか、Webサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
"Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
"You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "HTTP経由でアクセスしています。HTTPSを使用するようサーバーを設定することを強くおすすめします。",
"Shared" : "共有中",
diff --git a/core/search/css/results.css b/core/search/css/results.css
index b62f7df3fe3..36a2ccc13c3 100644
--- a/core/search/css/results.css
+++ b/core/search/css/results.css
@@ -3,12 +3,14 @@
See the COPYING-README file. */
#searchresults {
- background-color:#fff;
- overflow-x:hidden;
- text-overflow:ellipsis;
+ background-color: #fff;
+ overflow-x: hidden;
+ text-overflow: ellipsis;
padding-top: 65px;
box-sizing: border-box;
- z-index:75;
+ z-index: 75;
+ /* account for margin-bottom in files list */
+ margin-top: -250px;
}
#searchresults.hidden {
diff --git a/lib/base.php b/lib/base.php
index 7e6183520e1..d22385c86df 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -503,6 +503,12 @@ class OC {
}
}
+ /**
+ * Try to set some values to the required ownCloud default
+ */
+ public static function setRequiredIniValues() {
+ @ini_set('default_charset', 'UTF-8');
+ }
public static function init() {
// register autoloader
@@ -559,6 +565,7 @@ class OC {
@ini_set('post_max_size', '10G');
@ini_set('file_uploads', '50');
+ self::setRequiredIniValues();
self::handleAuthHeaders();
self::registerAutoloaderCache();
@@ -712,7 +719,7 @@ class OC {
}
private static function registerEncryptionWrapper() {
- \OCP\Util::connectHook('OC_Filesystem', 'setup', 'OC\Encryption\Manager', 'setupStorage');
+ \OCP\Util::connectHook('OC_Filesystem', 'preSetup', 'OC\Encryption\Manager', 'setupStorage');
}
private static function registerEncryptionHooks() {
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index f28db0d7204..8ff63b9b618 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -37,7 +37,7 @@ OC.L10N.register(
"_%n hour ago_::_%n hours ago_" : ["%n 時間前"],
"_%n minute ago_::_%n minutes ago_" : ["%n 分前"],
"seconds ago" : "数秒前",
- "web services under your control" : "あなたの管理下のウェブサービス",
+ "web services under your control" : "あなたが管理するウェブサービス",
"Empty filename is not allowed" : "空のファイル名は許可されていません",
"Dot files are not allowed" : "ドットファイルは許可されていません",
"4-byte characters are not supported in file names" : "ファイル名に4バイト文字を使用するのはサポートされていません",
@@ -103,7 +103,7 @@ OC.L10N.register(
"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "有効期限を設定できません。共有開始から %s 以降に有効期限を設定することはできません。",
"Cannot set expiration date. Expiration date is in the past" : "有効期限を設定できません。有効期限が過去を示しています。",
"Cannot clear expiration date. Shares are required to have an expiration date." : "有効期限を解除できません。共有するには有効期限を設定する必要があります。",
- "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s のバックエンドの共有には、OCP\\Share_Backend インターフェースを実装しなければなりません。",
+ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s のバックエンドの共有には、OCP\\Share_Backend インターフェースを実装しなければなりません。",
"Sharing backend %s not found" : "共有バックエンド %s が見つかりません",
"Sharing backend for %s not found" : "%s のための共有バックエンドが見つかりません",
"Sharing %s failed, because the user %s is the original sharer" : "%s の共有に失敗しました。ユーザー %s が元々の共有者であるからです。",
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index d096d48e3c2..c1b4a5b6963 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -35,7 +35,7 @@
"_%n hour ago_::_%n hours ago_" : ["%n 時間前"],
"_%n minute ago_::_%n minutes ago_" : ["%n 分前"],
"seconds ago" : "数秒前",
- "web services under your control" : "あなたの管理下のウェブサービス",
+ "web services under your control" : "あなたが管理するウェブサービス",
"Empty filename is not allowed" : "空のファイル名は許可されていません",
"Dot files are not allowed" : "ドットファイルは許可されていません",
"4-byte characters are not supported in file names" : "ファイル名に4バイト文字を使用するのはサポートされていません",
@@ -101,7 +101,7 @@
"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "有効期限を設定できません。共有開始から %s 以降に有効期限を設定することはできません。",
"Cannot set expiration date. Expiration date is in the past" : "有効期限を設定できません。有効期限が過去を示しています。",
"Cannot clear expiration date. Shares are required to have an expiration date." : "有効期限を解除できません。共有するには有効期限を設定する必要があります。",
- "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s のバックエンドの共有には、OCP\\Share_Backend インターフェースを実装しなければなりません。",
+ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s のバックエンドの共有には、OCP\\Share_Backend インターフェースを実装しなければなりません。",
"Sharing backend %s not found" : "共有バックエンド %s が見つかりません",
"Sharing backend for %s not found" : "%s のための共有バックエンドが見つかりません",
"Sharing %s failed, because the user %s is the original sharer" : "%s の共有に失敗しました。ユーザー %s が元々の共有者であるからです。",
diff --git a/lib/private/backgroundjob/job.php b/lib/private/backgroundjob/job.php
index 068d1da0ae3..88682cd09bb 100644
--- a/lib/private/backgroundjob/job.php
+++ b/lib/private/backgroundjob/job.php
@@ -24,6 +24,7 @@
namespace OC\BackgroundJob;
use OCP\BackgroundJob\IJob;
+use OCP\ILogger;
abstract class Job implements IJob {
/**
@@ -43,9 +44,9 @@ abstract class Job implements IJob {
/**
* @param JobList $jobList
- * @param \OC\Log $logger
+ * @param ILogger $logger
*/
- public function execute($jobList, $logger = null) {
+ public function execute($jobList, ILogger $logger = null) {
$jobList->setLastRun($this);
try {
$this->run($this->argument);
diff --git a/lib/private/backgroundjob/queuedjob.php b/lib/private/backgroundjob/queuedjob.php
index 21ee03f478d..c4cf8b0e5e0 100644
--- a/lib/private/backgroundjob/queuedjob.php
+++ b/lib/private/backgroundjob/queuedjob.php
@@ -21,6 +21,7 @@
*/
namespace OC\BackgroundJob;
+use OCP\ILogger;
/**
* Class QueuedJob
@@ -34,9 +35,9 @@ abstract class QueuedJob extends Job {
* run the job, then remove it from the joblist
*
* @param JobList $jobList
- * @param \OC\Log $logger
+ * @param ILogger $logger
*/
- public function execute($jobList, $logger = null) {
+ public function execute($jobList, ILogger $logger = null) {
$jobList->remove($this, $this->argument);
parent::execute($jobList, $logger);
}
diff --git a/lib/private/backgroundjob/timedjob.php b/lib/private/backgroundjob/timedjob.php
index 3b896bd4cc7..63db1fed61c 100644
--- a/lib/private/backgroundjob/timedjob.php
+++ b/lib/private/backgroundjob/timedjob.php
@@ -21,6 +21,7 @@
*/
namespace OC\BackgroundJob;
+use OCP\ILogger;
/**
* Class QueuedJob
@@ -45,9 +46,9 @@ abstract class TimedJob extends Job {
* run the job if
*
* @param JobList $jobList
- * @param \OC\Log $logger
+ * @param ILogger $logger
*/
- public function execute($jobList, $logger = null) {
+ public function execute($jobList, ILogger $logger = null) {
if ((time() - $this->lastRun) > $this->interval) {
parent::execute($jobList, $logger);
}
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index af4370e17e5..16f45943f54 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -60,7 +60,7 @@ class OC_Defaults {
$this->defaultiTunesAppId = '543672169';
$this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.owncloud.android';
$this->defaultDocBaseUrl = 'https://doc.owncloud.org';
- $this->defaultDocVersion = $version[0] . '.0'; // used to generate doc links
+ $this->defaultDocVersion = $version[0] . '.' . $version[1]; // used to generate doc links
$this->defaultSlogan = $this->l->t('web services under your control');
$this->defaultLogoClaim = '';
$this->defaultMailHeaderColor = '#1d2d44'; /* header color of mail notifications */
diff --git a/lib/private/l10n/string.php b/lib/private/l10n/string.php
index dd861636f3b..f5d80e695ca 100644
--- a/lib/private/l10n/string.php
+++ b/lib/private/l10n/string.php
@@ -24,8 +24,6 @@
*
*/
-use JsonSerializable;
-
class OC_L10N_String implements JsonSerializable {
/**
* @var OC_L10N
diff --git a/lib/private/lock/memcachelockingprovider.php b/lib/private/lock/memcachelockingprovider.php
new file mode 100644
index 00000000000..9c8c7235462
--- /dev/null
+++ b/lib/private/lock/memcachelockingprovider.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Lock;
+
+use OCP\Lock\ILockingProvider;
+use OCP\Lock\LockedException;
+use OCP\IMemcache;
+
+class MemcacheLockingProvider implements ILockingProvider {
+ /**
+ * @var \OCP\IMemcache
+ */
+ private $memcache;
+
+ /**
+ * @param \OCP\IMemcache $memcache
+ */
+ public function __construct(IMemcache $memcache) {
+ $this->memcache = $memcache;
+ }
+
+ /**
+ * @param string $path
+ * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+ * @return bool
+ */
+ public function isLocked($path, $type) {
+ $lockValue = $this->memcache->get($path);
+ if ($type === self::LOCK_SHARED) {
+ return $lockValue > 0;
+ } else if ($type === self::LOCK_EXCLUSIVE) {
+ return $lockValue === 'exclusive';
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * @param string $path
+ * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+ * @throws \OCP\Lock\LockedException
+ */
+ public function acquireLock($path, $type) {
+ if ($type === self::LOCK_SHARED) {
+ if (!$this->memcache->inc($path)) {
+ throw new LockedException($path);
+ }
+ } else {
+ $this->memcache->add($path, 0);
+ if (!$this->memcache->cas($path, 0, 'exclusive')) {
+ throw new LockedException($path);
+ }
+ }
+ }
+
+ /**
+ * @param string $path
+ * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+ */
+ public function releaseLock($path, $type) {
+ if ($type === self::LOCK_SHARED) {
+ $this->memcache->dec($path);
+ } else if ($type === self::LOCK_EXCLUSIVE) {
+ $this->memcache->cas($path, 'exclusive', 0);
+ }
+ }
+}
diff --git a/lib/private/log/errorhandler.php b/lib/private/log/errorhandler.php
index d3b3b134d11..b1b15f12ed7 100644
--- a/lib/private/log/errorhandler.php
+++ b/lib/private/log/errorhandler.php
@@ -23,10 +23,10 @@
namespace OC\Log;
-use OC\Log as LoggerInterface;
+use OCP\ILogger;
class ErrorHandler {
- /** @var LoggerInterface */
+ /** @var ILogger */
private static $logger;
/**
@@ -50,7 +50,7 @@ class ErrorHandler {
set_exception_handler(array($handler, 'onException'));
}
- public static function setLogger(LoggerInterface $logger) {
+ public static function setLogger(ILogger $logger) {
self::$logger = $logger;
}
diff --git a/lib/private/memcache/apc.php b/lib/private/memcache/apc.php
index b8b2b608124..50b942e7297 100644
--- a/lib/private/memcache/apc.php
+++ b/lib/private/memcache/apc.php
@@ -24,7 +24,13 @@
namespace OC\Memcache;
-class APC extends Cache {
+use OCP\IMemcache;
+
+class APC extends Cache implements IMemcache {
+ use CASTrait {
+ cas as casEmulated;
+ }
+
public function get($key) {
$result = apc_fetch($this->getPrefix() . $key, $success);
if (!$success) {
@@ -52,6 +58,58 @@ class APC extends Cache {
return apc_delete($iter);
}
+ /**
+ * Set a value in the cache if it's not already stored
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+ * @return bool
+ */
+ public function add($key, $value, $ttl = 0) {
+ return apc_add($this->getPrefix() . $key, $value, $ttl);
+ }
+
+ /**
+ * Increase a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ */
+ public function inc($key, $step = 1) {
+ $this->add($key, 0);
+ return apc_inc($this->getPrefix() . $key, $step);
+ }
+
+ /**
+ * Decrease a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ */
+ public function dec($key, $step = 1) {
+ return apc_dec($this->getPrefix() . $key, $step);
+ }
+
+ /**
+ * Compare and set
+ *
+ * @param string $key
+ * @param mixed $old
+ * @param mixed $new
+ * @return bool
+ */
+ public function cas($key, $old, $new) {
+ // apc only does cas for ints
+ if (is_int($old) and is_int($new)) {
+ return apc_cas($this->getPrefix() . $key, $old, $new);
+ } else {
+ return $this->casEmulated($key, $old, $new);
+ }
+ }
+
static public function isAvailable() {
if (!extension_loaded('apc')) {
return false;
diff --git a/lib/private/memcache/arraycache.php b/lib/private/memcache/arraycache.php
index 939472dc518..2b1b87a9eb3 100644
--- a/lib/private/memcache/arraycache.php
+++ b/lib/private/memcache/arraycache.php
@@ -22,7 +22,9 @@
namespace OC\Memcache;
-class ArrayCache extends Cache {
+use OCP\IMemcache;
+
+class ArrayCache extends Cache implements IMemcache {
/** @var array Array with the cached data */
protected $cachedData = array();
@@ -77,6 +79,74 @@ class ArrayCache extends Cache {
}
/**
+ * Set a value in the cache if it's not already stored
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+ * @return bool
+ */
+ public function add($key, $value, $ttl = 0) {
+ // since this cache is not shared race conditions aren't an issue
+ if ($this->hasKey($key)) {
+ return false;
+ } else {
+ return $this->set($key, $value, $ttl);
+ }
+ }
+
+ /**
+ * Increase a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ */
+ public function inc($key, $step = 1) {
+ $oldValue = $this->get($key);
+ if (is_int($oldValue)) {
+ $this->set($key, $oldValue + $step);
+ return $oldValue + $step;
+ } else {
+ $success = $this->add($key, $step);
+ return ($success) ? $step : false;
+ }
+ }
+
+ /**
+ * Decrease a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ */
+ public function dec($key, $step = 1) {
+ $oldValue = $this->get($key);
+ if (is_int($oldValue)) {
+ $this->set($key, $oldValue - $step);
+ return $oldValue - $step;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Compare and set
+ *
+ * @param string $key
+ * @param mixed $old
+ * @param mixed $new
+ * @return bool
+ */
+ public function cas($key, $old, $new) {
+ if ($this->get($key) === $old) {
+ return $this->set($key, $new);
+ } else {
+ return false;
+ }
+ }
+
+ /**
* {@inheritDoc}
*/
static public function isAvailable() {
diff --git a/lib/private/memcache/castrait.php b/lib/private/memcache/castrait.php
new file mode 100644
index 00000000000..c52538023fb
--- /dev/null
+++ b/lib/private/memcache/castrait.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Memcache;
+
+trait CASTrait {
+ abstract public function get($key);
+
+ abstract public function set($key, $value, $ttl = 0);
+
+ abstract public function remove($key);
+
+ abstract public function add($key, $value, $ttl = 0);
+
+ /**
+ * Compare and set
+ *
+ * @param string $key
+ * @param mixed $old
+ * @param mixed $new
+ * @return bool
+ */
+ public function cas($key, $old, $new) {
+ //no native cas, emulate with locking
+ if ($this->add($key . '_lock', true)) {
+ if ($this->get($key) === $old) {
+ $this->set($key, $new);
+ $this->remove($key . '_lock');
+ return true;
+ } else {
+ $this->remove($key . '_lock');
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
+}
diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php
index a2b3440317f..cf1d651b551 100644
--- a/lib/private/memcache/memcached.php
+++ b/lib/private/memcache/memcached.php
@@ -24,7 +24,11 @@
namespace OC\Memcache;
-class Memcached extends Cache {
+use OCP\IMemcache;
+
+class Memcached extends Cache implements IMemcache {
+ use CASTrait;
+
/**
* @var \Memcached $cache
*/
@@ -100,6 +104,41 @@ class Memcached extends Cache {
return true;
}
+ /**
+ * Set a value in the cache if it's not already stored
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+ * @return bool
+ */
+ public function add($key, $value, $ttl = 0) {
+ return self::$cache->add($this->getPrefix() . $key, $value, $ttl);
+ }
+
+ /**
+ * Increase a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ */
+ public function inc($key, $step = 1) {
+ $this->add($key, 0);
+ return self::$cache->increment($this->getPrefix() . $key, $step);
+ }
+
+ /**
+ * Decrease a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ */
+ public function dec($key, $step = 1) {
+ return self::$cache->decrement($this->getPrefix() . $key, $step);
+ }
+
static public function isAvailable() {
return extension_loaded('memcached');
}
diff --git a/lib/private/memcache/redis.php b/lib/private/memcache/redis.php
index e7425726b2b..78d061404ef 100644
--- a/lib/private/memcache/redis.php
+++ b/lib/private/memcache/redis.php
@@ -23,7 +23,10 @@
namespace OC\Memcache;
-class Redis extends Cache {
+use OCP\IMemcache;
+
+class Redis extends Cache implements IMemcache {
+ use CASTrait;
/**
* @var \Redis $cache
@@ -52,10 +55,10 @@ class Redis extends Cache {
$timeout = 0.0; // unlimited
}
- self::$cache->connect( $host, $port, $timeout );
+ self::$cache->connect($host, $port, $timeout);
if (isset($config['dbindex'])) {
- self::$cache->select( $config['dbindex'] );
+ self::$cache->select($config['dbindex']);
}
}
}
@@ -94,19 +97,59 @@ class Redis extends Cache {
} else {
return false;
}
-
}
public function clear($prefix = '') {
- $prefix = $this->getNamespace() . $prefix.'*';
+ $prefix = $this->getNamespace() . $prefix . '*';
$it = null;
self::$cache->setOption(\Redis::OPT_SCAN, \Redis::SCAN_RETRY);
- while($keys = self::$cache->scan($it, $prefix)) {
+ while ($keys = self::$cache->scan($it, $prefix)) {
self::$cache->delete($keys);
}
return true;
}
+ /**
+ * Set a value in the cache if it's not already stored
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+ * @return bool
+ */
+ public function add($key, $value, $ttl = 0) {
+ // dont encode ints for inc/dec
+ if (!is_int($value)) {
+ $value = json_encode($value);
+ }
+ return self::$cache->setnx($this->getPrefix() . $key, $value);
+ }
+
+ /**
+ * Increase a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ */
+ public function inc($key, $step = 1) {
+ return self::$cache->incrBy($this->getNamespace() . $key, $step);
+ }
+
+ /**
+ * Decrease a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ */
+ public function dec($key, $step = 1) {
+ if (!$this->hasKey($key)) {
+ return false;
+ }
+ return self::$cache->decrBy($this->getNamespace() . $key, $step);
+ }
+
static public function isAvailable() {
return extension_loaded('redis');
}
diff --git a/lib/private/memcache/xcache.php b/lib/private/memcache/xcache.php
index 33cea23e62b..0be79d06ed9 100644
--- a/lib/private/memcache/xcache.php
+++ b/lib/private/memcache/xcache.php
@@ -25,11 +25,15 @@
namespace OC\Memcache;
+use OCP\IMemcache;
+
/**
* See http://xcache.lighttpd.net/wiki/XcacheApi for provided constants and
* functions etc.
*/
-class XCache extends Cache {
+class XCache extends Cache implements IMemcache {
+ use CASTrait;
+
/**
* entries in XCache gets namespaced to prevent collisions between ownCloud instances and users
*/
@@ -38,28 +42,28 @@ class XCache extends Cache {
}
public function get($key) {
- return xcache_get($this->getNamespace().$key);
+ return xcache_get($this->getNamespace() . $key);
}
- public function set($key, $value, $ttl=0) {
- if($ttl>0) {
- return xcache_set($this->getNamespace().$key, $value, $ttl);
- }else{
- return xcache_set($this->getNamespace().$key, $value);
+ public function set($key, $value, $ttl = 0) {
+ if ($ttl > 0) {
+ return xcache_set($this->getNamespace() . $key, $value, $ttl);
+ } else {
+ return xcache_set($this->getNamespace() . $key, $value);
}
}
public function hasKey($key) {
- return xcache_isset($this->getNamespace().$key);
+ return xcache_isset($this->getNamespace() . $key);
}
public function remove($key) {
- return xcache_unset($this->getNamespace().$key);
+ return xcache_unset($this->getNamespace() . $key);
}
- public function clear($prefix='') {
+ public function clear($prefix = '') {
if (function_exists('xcache_unset_by_prefix')) {
- return xcache_unset_by_prefix($this->getNamespace().$prefix);
+ return xcache_unset_by_prefix($this->getNamespace() . $prefix);
} else {
// Since we can not clear by prefix, we just clear the whole cache.
xcache_clear_cache(\XC_TYPE_VAR, 0);
@@ -67,11 +71,49 @@ class XCache extends Cache {
return true;
}
- static public function isAvailable(){
+ /**
+ * Set a value in the cache if it's not already stored
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+ * @return bool
+ */
+ public function add($key, $value, $ttl = 0) {
+ if ($this->hasKey($key)) {
+ return false;
+ } else {
+ return $this->set($key, $value, $ttl);
+ }
+ }
+
+ /**
+ * Increase a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ */
+ public function inc($key, $step = 1) {
+ return xcache_inc($this->getPrefix() . $key, $step);
+ }
+
+ /**
+ * Decrease a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ */
+ public function dec($key, $step = 1) {
+ return xcache_dec($this->getPrefix() . $key, $step);
+ }
+
+ static public function isAvailable() {
if (!extension_loaded('xcache')) {
return false;
}
- if (\OC::$CLI) {
+ if (\OC::$CLI && !getenv('XCACHE_TEST')) {
return false;
}
if (!function_exists('xcache_unset_by_prefix') && ini_get('xcache.admin.enable_auth')) {
@@ -80,7 +122,7 @@ class XCache extends Cache {
// AND administration functions are password-protected.
return false;
}
- $var_size = (int) ini_get('xcache.var_size');
+ $var_size = (int)ini_get('xcache.var_size');
if (!$var_size) {
return false;
}
diff --git a/lib/private/share/searchresultsorter.php b/lib/private/share/searchresultsorter.php
index 375e05d0bba..bde2fd05073 100644
--- a/lib/private/share/searchresultsorter.php
+++ b/lib/private/share/searchresultsorter.php
@@ -23,6 +23,8 @@
*/
namespace OC\Share;
+use OCP\ILogger;
+
class SearchResultSorter {
private $search;
private $encoding;
@@ -34,9 +36,9 @@ class SearchResultSorter {
* @param string $key the array key containing the value that should be compared
* against
* @param string $encoding optional, encoding to use, defaults to UTF-8
- * @param \OC\Log $log optional
+ * @param ILogger $log optional
*/
- public function __construct($search, $key, \OC\Log $log = null, $encoding = 'UTF-8') {
+ public function __construct($search, $key, ILogger $log = null, $encoding = 'UTF-8') {
$this->encoding = $encoding;
$this->key = $key;
$this->log = $log;
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 01d4b943bd5..59b1c0a8f66 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -37,6 +37,7 @@ use OC_Installer;
use OC_Util;
use OCP\IConfig;
use OC\Setup;
+use OCP\ILogger;
/**
* Class that handles autoupdating of ownCloud
@@ -49,7 +50,7 @@ use OC\Setup;
*/
class Updater extends BasicEmitter {
- /** @var \OC\Log $log */
+ /** @var ILogger $log */
private $log;
/** @var \OC\HTTPHelper $helper */
@@ -67,9 +68,9 @@ class Updater extends BasicEmitter {
/**
* @param HTTPHelper $httpHelper
* @param IConfig $config
- * @param \OC\Log $log
+ * @param ILogger $log
*/
- public function __construct(HTTPHelper $httpHelper, IConfig $config, $log = null) {
+ public function __construct(HTTPHelper $httpHelper, IConfig $config, ILogger $log = null) {
$this->httpHelper = $httpHelper;
$this->log = $log;
$this->config = $config;
diff --git a/lib/public/backgroundjob/ijob.php b/lib/public/backgroundjob/ijob.php
index 3a1be86ef4e..a24a5434521 100644
--- a/lib/public/backgroundjob/ijob.php
+++ b/lib/public/backgroundjob/ijob.php
@@ -22,6 +22,7 @@
*/
namespace OCP\BackgroundJob;
+use OCP\ILogger;
/**
* Interface IJob
@@ -34,11 +35,11 @@ interface IJob {
* Run the background job with the registered argument
*
* @param \OCP\BackgroundJob\IJobList $jobList The job list that manages the state of this job
- * @param \OC\Log $logger
+ * @param ILogger $logger
* @return void
* @since 7.0.0
*/
- public function execute($jobList, $logger = null);
+ public function execute($jobList, ILogger $logger = null);
/**
* Get the id of the background job
diff --git a/lib/public/imemcache.php b/lib/public/imemcache.php
new file mode 100644
index 00000000000..56a33c9572f
--- /dev/null
+++ b/lib/public/imemcache.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Public interface of ownCloud for apps to use.
+ * Cache interface
+ *
+ */
+
+// use OCP namespace for all classes that are considered public.
+// This means that they should be used by apps instead of the internal ownCloud classes
+namespace OCP;
+
+/**
+ * This interface defines method for accessing the file based user cache.
+ *
+ * @since 8.1.0
+ */
+interface IMemcache extends ICache {
+ /**
+ * Set a value in the cache if it's not already stored
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+ * @return bool
+ * @since 8.0.0
+ */
+ public function add($key, $value, $ttl = 0);
+
+ /**
+ * Increase a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ * @since 8.0.0
+ */
+ public function inc($key, $step = 1);
+
+ /**
+ * Decrease a stored number
+ *
+ * @param string $key
+ * @param int $step
+ * @return int | bool
+ * @since 8.0.0
+ */
+ public function dec($key, $step = 1);
+
+ /**
+ * Compare and set
+ *
+ * @param string $key
+ * @param mixed $old
+ * @param mixed $new
+ * @return bool
+ */
+ public function cas($key, $old, $new);
+}
diff --git a/lib/public/lock/ilockingprovider.php b/lib/public/lock/ilockingprovider.php
new file mode 100644
index 00000000000..a584ec02ef6
--- /dev/null
+++ b/lib/public/lock/ilockingprovider.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP\Lock;
+
+interface ILockingProvider {
+ const LOCK_SHARED = 1;
+ const LOCK_EXCLUSIVE = 2;
+
+ /**
+ * @param string $path
+ * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+ * @return bool
+ */
+ public function isLocked($path, $type);
+
+ /**
+ * @param string $path
+ * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+ * @throws \OCP\Files\Lock\LockedException
+ */
+ public function acquireLock($path, $type);
+
+ /**
+ * @param string $path
+ * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+ */
+ public function releaseLock($path, $type);
+}
diff --git a/lib/public/lock/lockedexception.php b/lib/public/lock/lockedexception.php
new file mode 100644
index 00000000000..87f7164b7e0
--- /dev/null
+++ b/lib/public/lock/lockedexception.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP\Lock;
+
+class LockedException extends \Exception {
+ /**
+ * @var string
+ */
+ private $path;
+
+ /**
+ * LockedException constructor.
+ *
+ * @param string $path
+ */
+ public function __construct($path) {
+ parent::__construct($path . ' is locked');
+ $this->path = $path;
+ }
+
+ /**
+ * @return string
+ */
+ public function getPath() {
+ return $this->path;
+ }
+}
diff --git a/settings/css/settings.css b/settings/css/settings.css
index f610e96eea8..583e8804951 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -368,8 +368,15 @@ table.grid td.date{
display: inline-block;
}
+/* correctly display help icons next to headings */
.icon-info {
padding: 11px 20px;
+ vertical-align: text-bottom;
+}
+#shareAPI h2,
+#encryptionAPI h2,
+#mail_general_settings h2 {
+ display: inline-block;
}
.mail_settings p label:first-child {
diff --git a/settings/l10n/az.js b/settings/l10n/az.js
index a088666f52c..677a7d3ab54 100644
--- a/settings/l10n/az.js
+++ b/settings/l10n/az.js
@@ -152,7 +152,6 @@ OC.L10N.register(
"How to do backups" : "Rezerv nüsxələr neçə edilisin",
"Advanced monitoring" : "İrəliləmiş monitoring",
"Version" : "Versiya",
- "More apps" : "Çoxlu proqramlar",
"Developer documentation" : "Yaradıcı sənədləşməsi",
"by" : "onunla",
"licensed" : "Lisenziyalaşdırılıb",
diff --git a/settings/l10n/az.json b/settings/l10n/az.json
index 0a3eb295f44..1d0b227a3bd 100644
--- a/settings/l10n/az.json
+++ b/settings/l10n/az.json
@@ -150,7 +150,6 @@
"How to do backups" : "Rezerv nüsxələr neçə edilisin",
"Advanced monitoring" : "İrəliləmiş monitoring",
"Version" : "Versiya",
- "More apps" : "Çoxlu proqramlar",
"Developer documentation" : "Yaradıcı sənədləşməsi",
"by" : "onunla",
"licensed" : "Lisenziyalaşdırılıb",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index d1bdea2b333..705728ef365 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -153,7 +153,6 @@ OC.L10N.register(
"Improving the config.php" : "Подобряване на config.php",
"Theming" : "Промяна на облика",
"Version" : "Версия",
- "More apps" : "Още приложения",
"Developer documentation" : "Документация за разработчици",
"by" : "от",
"licensed" : "лицензирано",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index 0fcbc78187b..4e21984c104 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -151,7 +151,6 @@
"Improving the config.php" : "Подобряване на config.php",
"Theming" : "Промяна на облика",
"Version" : "Версия",
- "More apps" : "Още приложения",
"Developer documentation" : "Документация за разработчици",
"by" : "от",
"licensed" : "лицензирано",
diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js
index 293aff2cf3a..dfba4566d82 100644
--- a/settings/l10n/bs.js
+++ b/settings/l10n/bs.js
@@ -131,7 +131,6 @@ OC.L10N.register(
"More" : "Više",
"Less" : "Manje",
"Version" : "Verzija",
- "More apps" : "Više aplikacija",
"by" : "od strane",
"licensed" : "licenciran",
"Documentation:" : "Dokumentacija:",
diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json
index 272158b9e46..5c6f543656f 100644
--- a/settings/l10n/bs.json
+++ b/settings/l10n/bs.json
@@ -129,7 +129,6 @@
"More" : "Više",
"Less" : "Manje",
"Version" : "Verzija",
- "More apps" : "Više aplikacija",
"by" : "od strane",
"licensed" : "licenciran",
"Documentation:" : "Dokumentacija:",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 175b2572c2f..722f9799fb9 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -159,7 +159,6 @@ OC.L10N.register(
"Theming" : "Tematització",
"Hardening and security guidance" : "Guia de protecció i seguretat",
"Version" : "Versió",
- "More apps" : "Més aplicacions",
"Developer documentation" : "Documentació para desenvolupadors",
"by" : "per",
"licensed" : "llicenciat/da",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 32c0b588b1a..e7738f2ad32 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -157,7 +157,6 @@
"Theming" : "Tematització",
"Hardening and security guidance" : "Guia de protecció i seguretat",
"Version" : "Versió",
- "More apps" : "Més aplicacions",
"Developer documentation" : "Documentació para desenvolupadors",
"by" : "per",
"licensed" : "llicenciat/da",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index edc9f676273..88b54e0b637 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Instalace mimo kořenový adresář domény a používání systémového příkazu cron může způsobit problém s generováním správné URL. Pro zabránění těmto chybám nastavte prosím správnou cestu ve svém config.php souboru v hodnotě \"overwrite.cli.url\" (Je doporučena tato: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Nebylo možné spustit službu cron v CLI. Došlo k následujícím technickým chybám:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Ověřte znovu prosím informace z <a target=\"_blank\" href=\"%s\">instalační příručky ↗</a> a zkontrolujte <a href=\"#log-section\">log</a> na výskyt chyb a varování.",
+ "Open documentation" : "Otevřít dokumentaci",
"Allow apps to use the Share API" : "Povolit aplikacím používat API sdílení",
"Allow users to share via link" : "Povolit uživatelům sdílení pomocí odkazů",
"Enforce password protection" : "Vynutit ochranu heslem",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Poslední cron proběhl: %s.",
"Last cron job execution: %s. Something seems wrong." : "Poslední cron proběhl: %s. Vypadá to, že něco není v pořádku.",
"Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
- "Open documentation" : "Otevřít dokumentaci",
"Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Vzhledy",
"Hardening and security guidance" : "Průvodce vylepšením bezpečnosti",
"Version" : "Verze",
- "More apps" : "Více aplikací",
"Developer documentation" : "Vývojářská dokumentace",
"Experimental applications ahead" : "Experimentální aplikace v pořadí",
"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." : "Experimentální aplikace nejsou prověřovány na bezpečnostní chyby, mohou být nestabilní a velmi se měnit. Jejich instalací můžete způsobit ztrátu dat nebo bezpečnostní problémy.",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index f9c923fbcc7..89576802882 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Instalace mimo kořenový adresář domény a používání systémového příkazu cron může způsobit problém s generováním správné URL. Pro zabránění těmto chybám nastavte prosím správnou cestu ve svém config.php souboru v hodnotě \"overwrite.cli.url\" (Je doporučena tato: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Nebylo možné spustit službu cron v CLI. Došlo k následujícím technickým chybám:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Ověřte znovu prosím informace z <a target=\"_blank\" href=\"%s\">instalační příručky ↗</a> a zkontrolujte <a href=\"#log-section\">log</a> na výskyt chyb a varování.",
+ "Open documentation" : "Otevřít dokumentaci",
"Allow apps to use the Share API" : "Povolit aplikacím používat API sdílení",
"Allow users to share via link" : "Povolit uživatelům sdílení pomocí odkazů",
"Enforce password protection" : "Vynutit ochranu heslem",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Poslední cron proběhl: %s.",
"Last cron job execution: %s. Something seems wrong." : "Poslední cron proběhl: %s. Vypadá to, že něco není v pořádku.",
"Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
- "Open documentation" : "Otevřít dokumentaci",
"Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
@@ -172,7 +172,6 @@
"Theming" : "Vzhledy",
"Hardening and security guidance" : "Průvodce vylepšením bezpečnosti",
"Version" : "Verze",
- "More apps" : "Více aplikací",
"Developer documentation" : "Vývojářská dokumentace",
"Experimental applications ahead" : "Experimentální aplikace v pořadí",
"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." : "Experimentální aplikace nejsou prověřovány na bezpečnostní chyby, mohou být nestabilní a velmi se měnit. Jejich instalací můžete způsobit ztrátu dat nebo bezpečnostní problémy.",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 5ddd3f728cb..acfcbc99f30 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -112,6 +112,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis din installation ikke er installeret i roden af domænet, og bruger systemets cron, så kan der være problemer med URL-oprettelsen. For at undgå disse problemer, så angiv tilvalget \"overwrite.cli.url\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke muligt at udføre cronjobbet via kommandolinjefladen CLI. Følgende tekniske fejl fremkom:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Dobbelttjek venligst <a target=\"_blank\" href=\"%s\">, og tjek om der er fejl eller advarsler i <a href=\"#log-section\">loggen</a>.",
+ "Open documentation" : "Åben dokumentation",
"Allow apps to use the Share API" : "Tillad apps til at bruge Share API",
"Allow users to share via link" : "Tillad brugere at dele via link",
"Enforce password protection" : "Tving kodeords beskyttelse",
@@ -129,7 +130,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Seneste udførsel af cronjob: %s.",
"Last cron job execution: %s. Something seems wrong." : "Seneste udførsel af cronjob: %s. Der er vist noget galt.",
"Cron was not executed yet!" : "Cron har ikke kørt endnu!",
- "Open documentation" : "Åben dokumentation",
"Execute one task with each page loaded" : "Udføre en opgave med hver side indlæsning",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
@@ -163,7 +163,6 @@ OC.L10N.register(
"Theming" : "Temaer",
"Hardening and security guidance" : "Modstanddygtighed og sikkerheds vejledning",
"Version" : "Version",
- "More apps" : "Flere programmer",
"Developer documentation" : "Dokumentation for udviklere",
"Experimental applications ahead" : "Kommende eksperimentale programmer",
"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." : "Eksperimentale programmer er ikke undersøgt for sikkerheds problemer. Kendt for at være ustabil og stadig under intensiv udvikling. Installering af disse programmer kan medføre datatab og/eller udgøre en sikkerhedsrisiko.",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 65aed57dea0..ecb240b0603 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -110,6 +110,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis din installation ikke er installeret i roden af domænet, og bruger systemets cron, så kan der være problemer med URL-oprettelsen. For at undgå disse problemer, så angiv tilvalget \"overwrite.cli.url\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke muligt at udføre cronjobbet via kommandolinjefladen CLI. Følgende tekniske fejl fremkom:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Dobbelttjek venligst <a target=\"_blank\" href=\"%s\">, og tjek om der er fejl eller advarsler i <a href=\"#log-section\">loggen</a>.",
+ "Open documentation" : "Åben dokumentation",
"Allow apps to use the Share API" : "Tillad apps til at bruge Share API",
"Allow users to share via link" : "Tillad brugere at dele via link",
"Enforce password protection" : "Tving kodeords beskyttelse",
@@ -127,7 +128,6 @@
"Last cron job execution: %s." : "Seneste udførsel af cronjob: %s.",
"Last cron job execution: %s. Something seems wrong." : "Seneste udførsel af cronjob: %s. Der er vist noget galt.",
"Cron was not executed yet!" : "Cron har ikke kørt endnu!",
- "Open documentation" : "Åben dokumentation",
"Execute one task with each page loaded" : "Udføre en opgave med hver side indlæsning",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
@@ -161,7 +161,6 @@
"Theming" : "Temaer",
"Hardening and security guidance" : "Modstanddygtighed og sikkerheds vejledning",
"Version" : "Version",
- "More apps" : "Flere programmer",
"Developer documentation" : "Dokumentation for udviklere",
"Experimental applications ahead" : "Kommende eksperimentale programmer",
"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." : "Eksperimentale programmer er ikke undersøgt for sikkerheds problemer. Kendt for at være ustabil og stadig under intensiv udvikling. Installering af disse programmer kan medføre datatab og/eller udgøre en sikkerhedsrisiko.",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 8eab3230f22..107fcf2196c 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die „overwrite.cli.url“-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: „%s“).",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfe noch einmal die <a target=\"_blank\" href=\"%s\">Installationsanleitungen ↗</a> und kontrolliere das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
+ "Open documentation" : "Dokumentation öffnen",
"Allow apps to use the Share API" : "Erlaubt Apps die Nutzung der Share-API",
"Allow users to share via link" : "Benutzern erlauben, Inhalte über Links zu teilen",
"Enforce password protection" : "Passwortschutz erzwingen",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
"Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
"Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
- "Open documentation" : "Offene Dokumentation",
"Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Themes verwenden",
"Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen",
"Version" : "Version",
- "More apps" : "Weitere Apps",
"Developer documentation" : "Dokumentation für Entwickler",
"Experimental applications ahead" : "Kommende experimentelle Apps",
"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." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index c05f488bd74..6e40990ec33 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die „overwrite.cli.url“-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: „%s“).",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfe noch einmal die <a target=\"_blank\" href=\"%s\">Installationsanleitungen ↗</a> und kontrolliere das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
+ "Open documentation" : "Dokumentation öffnen",
"Allow apps to use the Share API" : "Erlaubt Apps die Nutzung der Share-API",
"Allow users to share via link" : "Benutzern erlauben, Inhalte über Links zu teilen",
"Enforce password protection" : "Passwortschutz erzwingen",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
"Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
"Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
- "Open documentation" : "Offene Dokumentation",
"Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
@@ -172,7 +172,6 @@
"Theming" : "Themes verwenden",
"Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen",
"Version" : "Version",
- "More apps" : "Weitere Apps",
"Developer documentation" : "Dokumentation für Entwickler",
"Experimental applications ahead" : "Kommende experimentelle Apps",
"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." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
diff --git a/settings/l10n/de_AT.js b/settings/l10n/de_AT.js
index cbec5214387..973ce0df192 100644
--- a/settings/l10n/de_AT.js
+++ b/settings/l10n/de_AT.js
@@ -7,7 +7,6 @@ OC.L10N.register(
"__language_name__" : "Deutsch (Österreich)",
"Server address" : "Adresse des Servers",
"Port" : "Port",
- "More apps" : "Mehr Apps",
"by" : "von",
"Password" : "Passwort",
"Email" : "E-Mail",
diff --git a/settings/l10n/de_AT.json b/settings/l10n/de_AT.json
index c47cd69e340..ed5c5b46f03 100644
--- a/settings/l10n/de_AT.json
+++ b/settings/l10n/de_AT.json
@@ -5,7 +5,6 @@
"__language_name__" : "Deutsch (Österreich)",
"Server address" : "Adresse des Servers",
"Port" : "Port",
- "More apps" : "Mehr Apps",
"by" : "von",
"Password" : "Passwort",
"Email" : "E-Mail",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 967d352d760..a4e3867a51a 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setzen Sie bitte die „overwrite.cli.url“-Option in Ihrer config.php auf das Web-Wurzelverzeichnis Ihrer Installation (Vorschlag: „%s“).",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfen Sie noch einmal die <a target=\"_blank\" href=\"%s\">Installationsanleitungen ↗</a> und kontrollieren Sie das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
+ "Open documentation" : "Dokumentation öffnen",
"Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
"Allow users to share via link" : "Benutzern erlauben, Inhalte über Links zu teilen",
"Enforce password protection" : "Passwortschutz erzwingen",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
"Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
"Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
- "Open documentation" : "Offene Dokumentation",
"Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Themes verwenden",
"Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen",
"Version" : "Version",
- "More apps" : "Weitere Apps",
"Developer documentation" : "Dokumentation für Entwickler",
"Experimental applications ahead" : "Kommende experimentelle Apps",
"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." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 8522a75dd99..9c615638b1f 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setzen Sie bitte die „overwrite.cli.url“-Option in Ihrer config.php auf das Web-Wurzelverzeichnis Ihrer Installation (Vorschlag: „%s“).",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Die Ausführung des Cron-Jobs über die Kommandozeile war nicht möglich. Die folgenden technischen Fehler sind dabei aufgetreten:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfen Sie noch einmal die <a target=\"_blank\" href=\"%s\">Installationsanleitungen ↗</a> und kontrollieren Sie das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
+ "Open documentation" : "Dokumentation öffnen",
"Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
"Allow users to share via link" : "Benutzern erlauben, Inhalte über Links zu teilen",
"Enforce password protection" : "Passwortschutz erzwingen",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Letzte Cron-Job-Ausführung: %s.",
"Last cron job execution: %s. Something seems wrong." : "Letzte Cron-Job-Ausführung: %s. Möglicherweise liegt ein Fehler vor.",
"Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
- "Open documentation" : "Offene Dokumentation",
"Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
@@ -172,7 +172,6 @@
"Theming" : "Themes verwenden",
"Hardening and security guidance" : "Systemhärtung und Sicherheitsempfehlungen",
"Version" : "Version",
- "More apps" : "Weitere Apps",
"Developer documentation" : "Dokumentation für Entwickler",
"Experimental applications ahead" : "Kommende experimentelle Apps",
"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." : "Experimentelle Apps sind nicht auf Sicherheitsprobleme hin überprüft, sind neu oder bekanntermaßen instabil und befinden sich in intensiver Entwicklung. Ihre Installation kann Datenverlust oder Sicherheitslücken hervorrufen.",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index f38184a3cfd..255053ef87c 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν έχει γίνει στο root του τομέα και χρησιμοποιείται το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwrite.cli.url\" στο αρχείο config.php που βρίσκεται στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Δεν ήταν δυνατή η εκτέλεση της cronjob μέσω τερματικού. Εμφανίστηκαν τα παρακάτω τεχνικά σφάλματα:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Παρακαλώ ελέγξτε ξανά <a target=\"_blank\" href=\"%s\">τους οδηγούς εγκατάστασης, καθώς επίσης και για τυχόν σφάλματα ή προειδοποιήσεις στο <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Ανοιχτή τεκμηρίωση.",
"Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
"Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
"Enforce password protection" : "Επιβολή προστασίας με κωδικό",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Τελευταία εκτέλεση cron job: %s.",
"Last cron job execution: %s. Something seems wrong." : "Τελευταία εκτέλεση cron job: %s. Κάτι πήγε στραβά.",
"Cron was not executed yet!" : "Η διεργασία cron δεν έχει εκτελεστεί ακόμα!",
- "Open documentation" : "Ανοιχτή τεκμηρίωση.",
"Execute one task with each page loaded" : "Εκτελεί μια διεργασία κάθε φορά που φορτώνεται μια σελίδα",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Θέματα",
"Hardening and security guidance" : "Οδηγίες ασφάλειας και θωράκισης",
"Version" : "Έκδοση",
- "More apps" : "Περισσότερες εφαρμογές",
"Developer documentation" : "Τεκμηρίωση προγραμματιστή",
"Experimental applications ahead" : "Πειραματικές εφαρμογές",
"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." : "Οι πειραματικές εφαρμογές δεν ελέγχονται για θέματα ασφάλειας, είναι ασταθείς και υπό συνεχή εξέλιξη. Η εγκατάσταση τους μπορεί να προκαλέσει απώλεια δεδομένων ή παραβιάσεις της ασφάλειας.",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index c3df28bc3a1..f7203c957a4 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν έχει γίνει στο root του τομέα και χρησιμοποιείται το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwrite.cli.url\" στο αρχείο config.php που βρίσκεται στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Δεν ήταν δυνατή η εκτέλεση της cronjob μέσω τερματικού. Εμφανίστηκαν τα παρακάτω τεχνικά σφάλματα:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Παρακαλώ ελέγξτε ξανά <a target=\"_blank\" href=\"%s\">τους οδηγούς εγκατάστασης, καθώς επίσης και για τυχόν σφάλματα ή προειδοποιήσεις στο <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Ανοιχτή τεκμηρίωση.",
"Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
"Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
"Enforce password protection" : "Επιβολή προστασίας με κωδικό",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Τελευταία εκτέλεση cron job: %s.",
"Last cron job execution: %s. Something seems wrong." : "Τελευταία εκτέλεση cron job: %s. Κάτι πήγε στραβά.",
"Cron was not executed yet!" : "Η διεργασία cron δεν έχει εκτελεστεί ακόμα!",
- "Open documentation" : "Ανοιχτή τεκμηρίωση.",
"Execute one task with each page loaded" : "Εκτελεί μια διεργασία κάθε φορά που φορτώνεται μια σελίδα",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
@@ -172,7 +172,6 @@
"Theming" : "Θέματα",
"Hardening and security guidance" : "Οδηγίες ασφάλειας και θωράκισης",
"Version" : "Έκδοση",
- "More apps" : "Περισσότερες εφαρμογές",
"Developer documentation" : "Τεκμηρίωση προγραμματιστή",
"Experimental applications ahead" : "Πειραματικές εφαρμογές",
"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." : "Οι πειραματικές εφαρμογές δεν ελέγχονται για θέματα ασφάλειας, είναι ασταθείς και υπό συνεχή εξέλιξη. Η εγκατάσταση τους μπορεί να προκαλέσει απώλεια δεδομένων ή παραβιάσεις της ασφάλειας.",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 7329098ec4c..dc024c2de5f 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -119,6 +119,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Open documentation",
"Allow apps to use the Share API" : "Allow apps to use the Share API",
"Allow users to share via link" : "Allow users to share via link",
"Enforce password protection" : "Enforce password protection",
@@ -136,7 +137,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Last cron job execution: %s.",
"Last cron job execution: %s. Something seems wrong." : "Last cron job execution: %s. Something seems wrong.",
"Cron was not executed yet!" : "Cron was not executed yet!",
- "Open documentation" : "Open documentation",
"Execute one task with each page loaded" : "Execute one task with each page loaded",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
@@ -172,7 +172,6 @@ OC.L10N.register(
"Theming" : "Theming",
"Hardening and security guidance" : "Hardening and security guidance",
"Version" : "Version",
- "More apps" : "More apps",
"Developer documentation" : "Developer documentation",
"Experimental applications ahead" : "Experimental applications ahead",
"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." : "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.",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index de4fdc0699c..3b259791f1e 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -117,6 +117,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Open documentation",
"Allow apps to use the Share API" : "Allow apps to use the Share API",
"Allow users to share via link" : "Allow users to share via link",
"Enforce password protection" : "Enforce password protection",
@@ -134,7 +135,6 @@
"Last cron job execution: %s." : "Last cron job execution: %s.",
"Last cron job execution: %s. Something seems wrong." : "Last cron job execution: %s. Something seems wrong.",
"Cron was not executed yet!" : "Cron was not executed yet!",
- "Open documentation" : "Open documentation",
"Execute one task with each page loaded" : "Execute one task with each page loaded",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
@@ -170,7 +170,6 @@
"Theming" : "Theming",
"Hardening and security guidance" : "Hardening and security guidance",
"Version" : "Version",
- "More apps" : "More apps",
"Developer documentation" : "Developer documentation",
"Experimental applications ahead" : "Experimental applications ahead",
"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." : "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.",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 5565afb7163..dbd2c36f473 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -50,7 +50,7 @@ OC.L10N.register(
"Email saved" : "Correo electrónico guardado",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
"Add trusted domain" : "Agregar dominio de confianza",
- "Migration in progress. Please wait until the migration is finished" : "Migración en curso. Por favor espere hasta que la migración esté finalizada.",
+ "Migration in progress. Please wait until the migration is finished" : "Migración en curso. Por favor, espere hasta que la migración esté finalizada.",
"Migration started …" : "Migración iniciada...",
"Sending..." : "Enviando...",
"All" : "Todos",
@@ -76,7 +76,7 @@ OC.L10N.register(
"Strong password" : "Contraseña muy buena",
"Valid until {date}" : "Válido hasta {date}",
"Delete" : "Eliminar",
- "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Un error ha ocurrido. Por favor cargue un certificado PEM codificado en ASCII.",
+ "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.",
"Groups" : "Grupos",
"Unable to delete {objName}" : "No es posible eliminar {objName}",
"Error creating group" : "Error al crear un grupo",
@@ -107,8 +107,8 @@ OC.L10N.register(
"NT LAN Manager" : "Gestor de NT LAN",
"SSL" : "SSL",
"TLS" : "TLS",
- "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no esta configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") solo retorna una respuesta vacía.",
- "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor verifique la documentación de instalación para las notas de configuración de php y la configuración de php en tu servidor, específicamente donde se está usando php-fpm.",
+ "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.",
+ "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique la documentación de instalación para las notas de configuración de php y la configuración de php en tu servidor, específicamente donde se está usando php-fpm.",
"The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwrite.cli.url\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor revise las <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, y compruebe los errores o avisos en el <a ref=\"#log-section\">registro</a>.",
+ "Open documentation" : "Documentación abierta",
"Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
"Allow users to share via link" : "Permite a los usuarios compartir por medio de enlaces",
"Enforce password protection" : "Forzar la protección por contraseña.",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Cron se ejecutó por última vez: %s",
"Last cron job execution: %s. Something seems wrong." : "Cron se ejecutó por última vez: %s. Algo va mal.",
"Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
- "Open documentation" : "Documentación abierta",
"Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Personalizar el tema",
"Hardening and security guidance" : "Guía de protección y seguridad",
"Version" : "Versión",
- "More apps" : "Más aplicaciones",
"Developer documentation" : "Documentación de desarrollador",
"Experimental applications ahead" : "Aplicaciones experimentales más adelante",
"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." : "Las aplicaciones experimentales no están verificadas por problemas de seguridad, recientes o conocidas por ser inestables y/o bajo un fuerte desarrollo. Instalándolas pueden causar pérdida de datos o violación de seguridades.",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 42c926ed0bb..a17d9acbdb8 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -48,7 +48,7 @@
"Email saved" : "Correo electrónico guardado",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
"Add trusted domain" : "Agregar dominio de confianza",
- "Migration in progress. Please wait until the migration is finished" : "Migración en curso. Por favor espere hasta que la migración esté finalizada.",
+ "Migration in progress. Please wait until the migration is finished" : "Migración en curso. Por favor, espere hasta que la migración esté finalizada.",
"Migration started …" : "Migración iniciada...",
"Sending..." : "Enviando...",
"All" : "Todos",
@@ -74,7 +74,7 @@
"Strong password" : "Contraseña muy buena",
"Valid until {date}" : "Válido hasta {date}",
"Delete" : "Eliminar",
- "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Un error ha ocurrido. Por favor cargue un certificado PEM codificado en ASCII.",
+ "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.",
"Groups" : "Grupos",
"Unable to delete {objName}" : "No es posible eliminar {objName}",
"Error creating group" : "Error al crear un grupo",
@@ -105,8 +105,8 @@
"NT LAN Manager" : "Gestor de NT LAN",
"SSL" : "SSL",
"TLS" : "TLS",
- "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no esta configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") solo retorna una respuesta vacía.",
- "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor verifique la documentación de instalación para las notas de configuración de php y la configuración de php en tu servidor, específicamente donde se está usando php-fpm.",
+ "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.",
+ "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique la documentación de instalación para las notas de configuración de php y la configuración de php en tu servidor, específicamente donde se está usando php-fpm.",
"The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwrite.cli.url\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor revise las <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, y compruebe los errores o avisos en el <a ref=\"#log-section\">registro</a>.",
+ "Open documentation" : "Documentación abierta",
"Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
"Allow users to share via link" : "Permite a los usuarios compartir por medio de enlaces",
"Enforce password protection" : "Forzar la protección por contraseña.",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Cron se ejecutó por última vez: %s",
"Last cron job execution: %s. Something seems wrong." : "Cron se ejecutó por última vez: %s. Algo va mal.",
"Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
- "Open documentation" : "Documentación abierta",
"Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
@@ -172,7 +172,6 @@
"Theming" : "Personalizar el tema",
"Hardening and security guidance" : "Guía de protección y seguridad",
"Version" : "Versión",
- "More apps" : "Más aplicaciones",
"Developer documentation" : "Documentación de desarrollador",
"Experimental applications ahead" : "Aplicaciones experimentales más adelante",
"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." : "Las aplicaciones experimentales no están verificadas por problemas de seguridad, recientes o conocidas por ser inestables y/o bajo un fuerte desarrollo. Instalándolas pueden causar pérdida de datos o violación de seguridades.",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index 6e0677337dc..027c1c930bf 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -118,7 +118,6 @@ OC.L10N.register(
"More" : "Rohkem",
"Less" : "Vähem",
"Version" : "Versioon",
- "More apps" : "Rohkem rakendusi",
"by" : "lisas",
"licensed" : "litsenseeritud",
"Documentation:" : "Dokumentatsioon:",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 0edc3d3b916..f1cb49e5fc6 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -116,7 +116,6 @@
"More" : "Rohkem",
"Less" : "Vähem",
"Version" : "Versioon",
- "More apps" : "Rohkem rakendusi",
"by" : "lisas",
"licensed" : "litsenseeritud",
"Documentation:" : "Dokumentatsioon:",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index 7f30c91fa52..d0da711e006 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -137,7 +137,6 @@ OC.L10N.register(
"More" : "Gehiago",
"Less" : "Gutxiago",
"Version" : "Bertsioa",
- "More apps" : "App gehiago",
"by" : " Egilea:",
"licensed" : "lizentziatua",
"Documentation:" : "Dokumentazioa:",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index 5c9ce4bdf34..6cbfc0a9d25 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -135,7 +135,6 @@
"More" : "Gehiago",
"Less" : "Gutxiago",
"Version" : "Bertsioa",
- "More apps" : "App gehiago",
"by" : " Egilea:",
"licensed" : "lizentziatua",
"Documentation:" : "Dokumentazioa:",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index 8e3f3983c34..8b943e25466 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -114,6 +114,7 @@ OC.L10N.register(
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Suosittelemme asentamaan vaaditut paketit järjestelmään, jotta järjestelmässä on tuki yhdelle seuraavista maa-asetuksista: %s.",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Cron-työn suorittaminen komentorivin kautta ei onnistunut. Ilmeni seuraavia teknisiä virheitä:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lue tarkasti <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a>, tarkista myös mahdolliset virheet ja varoitukset <a href=\"#log-section\">lokitiedostosta</a>.",
+ "Open documentation" : "Avaa dokumentaatio",
"Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
"Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
"Enforce password protection" : "Pakota salasanasuojaus",
@@ -131,7 +132,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Viimeisin cron-työn suoritus: %s.",
"Last cron job execution: %s. Something seems wrong." : "Viimeisin cron-työn suoritus: %s. Jokin vaikuttaa menneen pieleen.",
"Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
- "Open documentation" : "Avaa dokumentaatio",
"Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta 15 minuutin välein http:tä käyttäen.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
@@ -166,7 +166,6 @@ OC.L10N.register(
"Theming" : "Teemojen käyttö",
"Hardening and security guidance" : "Turvaamis- ja tietoturvaopas",
"Version" : "Versio",
- "More apps" : "Lisää sovelluksia",
"Developer documentation" : "Kehittäjädokumentaatio",
"Experimental applications ahead" : "Kokeellisia sovelluksia edessä",
"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." : "Kokeellisia sovelluksia ei ole tarkistettu tietoturvauhkien varalta. Sovellukset ovat uusia, ne saattavat olla epävakaita ja ovat nopean kehityksen alaisia. Kokeellisten sovellusten asentaminen saattaa aiheuttaa tietojen katoamista tai tietoturvauhkia.",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 54da02c3291..ad8328fd41d 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -112,6 +112,7 @@
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Suosittelemme asentamaan vaaditut paketit järjestelmään, jotta järjestelmässä on tuki yhdelle seuraavista maa-asetuksista: %s.",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Cron-työn suorittaminen komentorivin kautta ei onnistunut. Ilmeni seuraavia teknisiä virheitä:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lue tarkasti <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a>, tarkista myös mahdolliset virheet ja varoitukset <a href=\"#log-section\">lokitiedostosta</a>.",
+ "Open documentation" : "Avaa dokumentaatio",
"Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
"Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
"Enforce password protection" : "Pakota salasanasuojaus",
@@ -129,7 +130,6 @@
"Last cron job execution: %s." : "Viimeisin cron-työn suoritus: %s.",
"Last cron job execution: %s. Something seems wrong." : "Viimeisin cron-työn suoritus: %s. Jokin vaikuttaa menneen pieleen.",
"Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
- "Open documentation" : "Avaa dokumentaatio",
"Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta 15 minuutin välein http:tä käyttäen.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
@@ -164,7 +164,6 @@
"Theming" : "Teemojen käyttö",
"Hardening and security guidance" : "Turvaamis- ja tietoturvaopas",
"Version" : "Versio",
- "More apps" : "Lisää sovelluksia",
"Developer documentation" : "Kehittäjädokumentaatio",
"Experimental applications ahead" : "Kokeellisia sovelluksia edessä",
"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." : "Kokeellisia sovelluksia ei ole tarkistettu tietoturvauhkien varalta. Sovellukset ovat uusia, ne saattavat olla epävakaita ja ovat nopean kehityksen alaisia. Kokeellisten sovellusten asentaminen saattaa aiheuttaa tietojen katoamista tai tietoturvauhkia.",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index be037890bfd..33176fcb579 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>, et cherchez des erreurs ou avertissements dans <a href=\"#log-section\">les logs</a>.",
+ "Open documentation" : "Voir la documentation",
"Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
"Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
"Enforce password protection" : "Obliger la protection par mot de passe",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
"Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
"Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
- "Open documentation" : "Voir la documentation",
"Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré auprès d'un service webcron qui l'exécutera toutes les 15 minutes via http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Thème",
"Hardening and security guidance" : "Guide pour le renforcement et la sécurité",
"Version" : "Version",
- "More apps" : "Plus d'applications",
"Developer documentation" : "Documentation pour les développeurs",
"Experimental applications ahead" : "Attention! Applications expérimentales",
"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." : "Les applications expérimentales n'ont pas été testées pour les problèmes de sécurité, sont nouvelles ou connues comme étant instables et sont encore en développement. Les installer peut causer des pertes de données ou des failles de sécurités. ",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index c0c2a1ba6b3..f6c2a64b3dc 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>, et cherchez des erreurs ou avertissements dans <a href=\"#log-section\">les logs</a>.",
+ "Open documentation" : "Voir la documentation",
"Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
"Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
"Enforce password protection" : "Obliger la protection par mot de passe",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
"Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
"Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
- "Open documentation" : "Voir la documentation",
"Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré auprès d'un service webcron qui l'exécutera toutes les 15 minutes via http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
@@ -172,7 +172,6 @@
"Theming" : "Thème",
"Hardening and security guidance" : "Guide pour le renforcement et la sécurité",
"Version" : "Version",
- "More apps" : "Plus d'applications",
"Developer documentation" : "Documentation pour les développeurs",
"Experimental applications ahead" : "Attention! Applications expérimentales",
"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." : "Les applications expérimentales n'ont pas été testées pour les problèmes de sécurité, sont nouvelles ou connues comme étant instables et sont encore en développement. Les installer peut causer des pertes de données ou des failles de sécurités. ",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index be7d809e120..33ade900711 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación no está feita na raíz do dominio e usa o sistema cron, pode haber incidencias coa xeración de URL. Para evitar estes problemas, axuste a opción «overwrite.cli.url» no seu ficheiro config.php á ruta webroot da instalación (suxestión: «%s»)",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non foi posíbel executar a tarefa de cron programada desde a liña de ordes. Atopáronse os seguintes erros técnicos:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Volva comprobar as <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, e comprobe que non existen erros ou avisos no <a href=\"#log-section\">rexistro</a>.>.",
+ "Open documentation" : "Abrir a documentación",
"Allow apps to use the Share API" : "Permitir que as aplicacións empreguen o API para compartir",
"Allow users to share via link" : "Permitir que os usuarios compartan a través de ligazóns",
"Enforce password protection" : "Forzar a protección por contrasinal",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Última execución da tarefa de cron: %s.",
"Last cron job execution: %s. Something seems wrong." : "Última execución da tarefa de cron: %s. Semella que algo vai mal",
"Cron was not executed yet!" : "«Cron» aínda non foi executado!",
- "Open documentation" : "Abrir a documentación",
"Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Tematización",
"Hardening and security guidance" : "Orientacións sobre fortificación e seguridade",
"Version" : "Versión",
- "More apps" : "Máis aplicativos",
"Developer documentation" : "Documentación do desenvolvedor",
"Experimental applications ahead" : "Ante as aplicacións experimentais",
"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." : "As aplicacións experimentais, novas ou coñecidas por ser inestábeis e en forte desenvolvemento, non se lles fan comprobacións de seguridade. A súa instalación pode provocar a perda de datos o violacións de seguridade.",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index bea734309f9..dfab2fa295d 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación no está feita na raíz do dominio e usa o sistema cron, pode haber incidencias coa xeración de URL. Para evitar estes problemas, axuste a opción «overwrite.cli.url» no seu ficheiro config.php á ruta webroot da instalación (suxestión: «%s»)",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non foi posíbel executar a tarefa de cron programada desde a liña de ordes. Atopáronse os seguintes erros técnicos:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Volva comprobar as <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, e comprobe que non existen erros ou avisos no <a href=\"#log-section\">rexistro</a>.>.",
+ "Open documentation" : "Abrir a documentación",
"Allow apps to use the Share API" : "Permitir que as aplicacións empreguen o API para compartir",
"Allow users to share via link" : "Permitir que os usuarios compartan a través de ligazóns",
"Enforce password protection" : "Forzar a protección por contrasinal",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Última execución da tarefa de cron: %s.",
"Last cron job execution: %s. Something seems wrong." : "Última execución da tarefa de cron: %s. Semella que algo vai mal",
"Cron was not executed yet!" : "«Cron» aínda non foi executado!",
- "Open documentation" : "Abrir a documentación",
"Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
@@ -172,7 +172,6 @@
"Theming" : "Tematización",
"Hardening and security guidance" : "Orientacións sobre fortificación e seguridade",
"Version" : "Versión",
- "More apps" : "Máis aplicativos",
"Developer documentation" : "Documentación do desenvolvedor",
"Experimental applications ahead" : "Ante as aplicacións experimentais",
"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." : "As aplicacións experimentais, novas ou coñecidas por ser inestábeis e en forte desenvolvemento, non se lles fan comprobacións de seguridade. A súa instalación pode provocar a perda de datos o violacións de seguridade.",
diff --git a/settings/l10n/he.js b/settings/l10n/he.js
index 0873768285e..546a303c2f3 100644
--- a/settings/l10n/he.js
+++ b/settings/l10n/he.js
@@ -45,7 +45,6 @@ OC.L10N.register(
"More" : "יותר",
"Less" : "פחות",
"Version" : "גרסא",
- "More apps" : "יישומים נוספים",
"by" : "על ידי",
"User Documentation" : "תיעוד משתמש",
"Forum" : "פורום",
diff --git a/settings/l10n/he.json b/settings/l10n/he.json
index 47e9f8d95e9..3c35ed9de47 100644
--- a/settings/l10n/he.json
+++ b/settings/l10n/he.json
@@ -43,7 +43,6 @@
"More" : "יותר",
"Less" : "פחות",
"Version" : "גרסא",
- "More apps" : "יישומים נוספים",
"by" : "על ידי",
"User Documentation" : "תיעוד משתמש",
"Forum" : "פורום",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 5719ca22195..c7e5e0d790e 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -1,10 +1,14 @@
OC.L10N.register(
"settings",
{
+ "Security & setup warnings" : "Peringatan Keamanan & Pengaturan",
"Sharing" : "Berbagi",
"External Storage" : "Penyimpanan Eksternal",
+ "Server-side encryption" : "Enkripsi sisi-server",
"Cron" : "Cron",
+ "Email server" : "Server email",
"Log" : "Log",
+ "Tips & tricks" : "Tips & trik",
"Updates" : "Pembaruan",
"Authentication error" : "Terjadi kesalahan saat otentikasi",
"Your full name has been changed." : "Nama lengkap Anda telah diubah",
@@ -20,18 +24,23 @@ OC.L10N.register(
"No user supplied" : "Tidak ada pengguna yang diberikan",
"Please provide an admin recovery password, otherwise all user data will be lost" : "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
"Wrong admin recovery password. Please check the password and try again." : "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
+ "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Backend tidak mendukung pengubahan sandi, tapi kunci enkripsi pengguna berhasil diperbarui.",
"Unable to change password" : "Tidak dapat mengubah sandi",
"Enabled" : "Diaktifkan",
"Not enabled" : "Tidak diaktifkan",
+ "A problem occurred, please check your log files (Error: %s)" : "Terjadi masalah, mohon periksa berkas log Anda (Kesalahan: %s)",
+ "Migration Completed" : "Migrasi Selesai",
"Group already exists." : "Grup sudah ada.",
"Unable to add group." : "Tidak dapat menambah grup.",
"Unable to delete group." : "Tidak dapat menghapus grup.",
"log-level out of allowed range" : "level-log melebihi batas yang diizinkan",
"Saved" : "Disimpan",
"test email settings" : "pengaturan email percobaan",
+ "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Terjadi masalah saat mengirim email. Mohon periksa kembali pengaturan Anda. (Kesalahan: %s)",
"Email sent" : "Email terkirim",
"You need to set your user email before being able to send test emails." : "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
"Invalid mail address" : "Alamat email salah",
+ "A user with that name already exists." : "Pengguna dengan nama tersebut sudah ada.",
"Unable to create user." : "Tidak dapat membuat pengguna.",
"Your %s account was created" : "Akun %s Anda telah dibuat",
"Unable to delete user." : "Tidak dapat menghapus pengguna.",
@@ -41,8 +50,13 @@ OC.L10N.register(
"Email saved" : "Email disimpan",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
"Add trusted domain" : "Tambah domain terpercaya",
+ "Migration in progress. Please wait until the migration is finished" : "Migrasi sedang dalam proses. Mohon tunggu sampai migrasi selesai.",
+ "Migration started …" : "Migrasi dimulai ...",
"Sending..." : "Mengirim",
"All" : "Semua",
+ "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh komunitas ownCloud. Mereka menawarkan fitur pusat bagi ownCloud dan siap digunakan untuk penggunaan produksi.",
+ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplikasi tersetujui dikembangkan oleh pengembang terpercaya dan telah lulus pemeriksaan keamanan. Mereka secara aktif dipelihara direpositori kode terbuka dan pemelihara sudah memastikan mereka stabil untuk penggunaan normal.",
+ "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Aplikasi ini belum diperiksa masalah keamanan dan baru atau dikenal tidak stabil. Instal dengan resiko.",
"Please wait...." : "Mohon tunggu....",
"Error while disabling app" : "Terjadi kesalahan saat menonaktifkan aplikasi",
"Disable" : "Nonaktifkan",
@@ -62,6 +76,7 @@ OC.L10N.register(
"Strong password" : "Sandi kuat",
"Valid until {date}" : "Berlaku sampai {date}",
"Delete" : "Hapus",
+ "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.",
"Groups" : "Grup",
"Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
"Error creating group" : "Terjadi kesalahan saat membuat grup",
@@ -78,6 +93,8 @@ OC.L10N.register(
"A valid password must be provided" : "Harus memberikan sandi yang benar",
"A valid email must be provided" : "Email yang benar harus diberikan",
"__language_name__" : "__language_name__",
+ "Sync clients" : "Klien sync",
+ "Personal info" : "Info pribadi",
"SSL root certificates" : "Sertifikat root SSL",
"Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
"Info, warnings, errors and fatal issues" : "Info, peringatan, galat dan masalah fatal",
@@ -90,15 +107,21 @@ OC.L10N.register(
"NT LAN Manager" : "Manajer NT LAN",
"SSL" : "SSL",
"TLS" : "TLS",
+ "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "kelihatannya php tidak diatur dengan benar untuk variabel lingkungan sistem kueri. Pemeriksaan dengan getenv(\"PATH\") hanya mengembalikan respon kosong.",
+ "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Mohon periksa dokumentasi instalasi untuk catatan konfigurasi php dan konfigurasi php server Anda, terutama saat menggunakan ph-fpm.",
"The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.",
+ "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu dibawah versi 4.0.6 terinstal, untuk alasan stabilitas dan kinerja, kami menyarankan untuk memperbarui ke versi APCu yang lebih baru.",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
"System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
"This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Kamu sangat menyarankan untuk menginstal paket-paket yang dibutuhkan pada sistem agar mendukung lokal berikut: %s.",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak di root domain dan menggunakan sistem cron, hal tersebut dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah tersebut, mohon atur opsi \"overwrite.cli.url\" pada berkas config.php Anda ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
+ "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Tidak mungkin untuk mengeksekusi cronjob via CLI. Kesalahan teknis berikut muncul:",
+ "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon periksa dua kali <a target=\"_blank\" href=\"%s\">panduan instalasi ↗</a>, dan periksa segala kesalahan atau peringatan pada <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Buka dokumentasi",
"Allow apps to use the Share API" : "Izinkan aplikasi untuk menggunakan API Pembagian",
"Allow users to share via link" : "Izinkan pengguna untuk membagikan via tautan",
"Enforce password protection" : "Berlakukan perlindungan sandi",
@@ -113,10 +136,14 @@ OC.L10N.register(
"Allow users to send mail notification for shared files to other users" : "Izinkan pengguna mengirim pemberitahuan email saat berbagi berkas kepada pengguna lainnya",
"Exclude groups from sharing" : "Tidak termasuk grup untuk berbagi",
"These groups will still be able to receive shares, but not to initiate them." : "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
+ "Last cron job execution: %s." : "Eksekusi penjadwalan cron terakhir: %s.",
+ "Last cron job execution: %s. Something seems wrong." : "Eksekusi penjadwalan cron terakhir: %s. Kelihatannya ada yang salah.",
"Cron was not executed yet!" : "Cron masih belum dieksekusi!",
"Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
+ "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
+ "Start migration" : "Mulai migrasi",
"This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
"Send mode" : "Modus kirim",
"Encryption" : "Enkripsi",
@@ -136,25 +163,46 @@ OC.L10N.register(
"Download logfile" : "Unduh berkas log",
"More" : "Lainnya",
"Less" : "Ciutkan",
+ "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Pengunduhan ini memerlukan beberapa saat!",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami menyarankan untuk beralih ke backend basis data yang berbeda.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Terutama saat menggunakan klien desktop untuk sinkronisasi berkas, penggunaan SQLite tidak disarankan.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Untuk migrasi ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type', atau lihat <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a>.",
+ "How to do backups" : "Bagaimana cara mencadangkan",
+ "Advanced monitoring" : "Pemantauan tingkat lanjut",
+ "Performance tuning" : "Pemeliharaan performa",
+ "Improving the config.php" : "Memperbaiki config.php",
+ "Theming" : "Tema",
"Version" : "Versi",
- "More apps" : "Lebih banyak aplikasi",
+ "Developer documentation" : "Dokumentasi pengembang",
+ "Experimental applications ahead" : "Aplikasi percobaan terdepan",
+ "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." : "Aplikasi percobaan belum diperiksa untuk masalah keamanan, baru atau dikenal tidak stabil dan dalam proses pengembangan. Menginstalnya dapat menyebabkan kehilangan data atau penerobosan keamanan.",
"by" : "oleh",
"licensed" : "dilisensikan",
"Documentation:" : "Dokumentasi:",
"User Documentation" : "Dokumentasi Pengguna",
"Admin Documentation" : "Dokumentasi Admin",
+ "Show description …" : "Tampilkan deskripsi ...",
+ "Hide description …" : "Sembunyikan deskripsi ...",
"This app cannot be installed because the following dependencies are not fulfilled:" : "Apl ini tidak dapat diinstal karena ketergantungan berikut belum terpenuhi:",
"Update to %s" : "Perbarui ke %s",
"Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu",
"Uninstall App" : "Copot aplikasi",
+ "Enable experimental apps" : "Aktifkan aplikasi percobaan",
+ "No apps found for your version" : "Aplikasi tidak ditemukan untuk versi ini.",
"Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hai,<br><br>sekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.<br><br>Nama Pengguna Anda: %s<br>Akses di: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Horee!",
"Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hai,\n\nsekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.\n\nNama Pengguna Anda: %s\nAkses di: %s\n",
+ "User documentation" : "Dokumentasi pengguna.",
+ "Administrator documentation" : "Dokumentasi administrator",
+ "Online documentation" : "Dokumentasi online",
"Forum" : "Forum",
+ "Issue tracker" : "Pelacak masalah",
+ "Commercial support" : "Dukungan komersial",
"Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
"Desktop client" : "Klien desktop",
"Android app" : "Aplikasi Android",
"iOS app" : "Aplikasi iOS",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">bergabunglah dalam pengembangan</a>\n\t\tatau\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">promosikan</a>!",
"Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
"Password" : "Sandi",
@@ -162,11 +210,13 @@ OC.L10N.register(
"Current password" : "Sandi saat ini",
"New password" : "Sandi baru",
"Change password" : "Ubah sandi",
+ "Full name" : "Nama lengkap",
"No display name set" : "Nama tampilan tidak diatur",
"Email" : "Email",
"Your email address" : "Alamat email Anda",
"Fill in an email address to enable password recovery and receive notifications" : "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
"No email address set" : "Alamat email tidak diatur",
+ "You are member of the following groups:" : "Anda adalah anggota dari grup berikut:",
"Profile picture" : "Foto profil",
"Upload new" : "Unggah baru",
"Select new from Files" : "Pilih baru dari Berkas",
@@ -181,6 +231,8 @@ OC.L10N.register(
"Valid until" : "Berlaku sampai",
"Issued By" : "Diterbitkan oleh",
"Valid until %s" : "Berlaku sampai %s",
+ "Import root certificate" : "Impor sertifikat root",
+ "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Dikembangkan oleh {communityopen}komunitas ownCloud{linkclose}, {githubopen}kode sumber{linkclose} dilisensikan dibawah {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
"Show storage location" : "Tampilkan kolasi penyimpanan",
"Show last log in" : "Tampilkan masuk terakhir",
"Show user backend" : "Tampilkan pengguna backend",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index c4b0c17df75..67d33788f1d 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -1,8 +1,12 @@
{ "translations": {
+ "Security & setup warnings" : "Peringatan Keamanan & Pengaturan",
"Sharing" : "Berbagi",
"External Storage" : "Penyimpanan Eksternal",
+ "Server-side encryption" : "Enkripsi sisi-server",
"Cron" : "Cron",
+ "Email server" : "Server email",
"Log" : "Log",
+ "Tips & tricks" : "Tips & trik",
"Updates" : "Pembaruan",
"Authentication error" : "Terjadi kesalahan saat otentikasi",
"Your full name has been changed." : "Nama lengkap Anda telah diubah",
@@ -18,18 +22,23 @@
"No user supplied" : "Tidak ada pengguna yang diberikan",
"Please provide an admin recovery password, otherwise all user data will be lost" : "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
"Wrong admin recovery password. Please check the password and try again." : "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
+ "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Backend tidak mendukung pengubahan sandi, tapi kunci enkripsi pengguna berhasil diperbarui.",
"Unable to change password" : "Tidak dapat mengubah sandi",
"Enabled" : "Diaktifkan",
"Not enabled" : "Tidak diaktifkan",
+ "A problem occurred, please check your log files (Error: %s)" : "Terjadi masalah, mohon periksa berkas log Anda (Kesalahan: %s)",
+ "Migration Completed" : "Migrasi Selesai",
"Group already exists." : "Grup sudah ada.",
"Unable to add group." : "Tidak dapat menambah grup.",
"Unable to delete group." : "Tidak dapat menghapus grup.",
"log-level out of allowed range" : "level-log melebihi batas yang diizinkan",
"Saved" : "Disimpan",
"test email settings" : "pengaturan email percobaan",
+ "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Terjadi masalah saat mengirim email. Mohon periksa kembali pengaturan Anda. (Kesalahan: %s)",
"Email sent" : "Email terkirim",
"You need to set your user email before being able to send test emails." : "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
"Invalid mail address" : "Alamat email salah",
+ "A user with that name already exists." : "Pengguna dengan nama tersebut sudah ada.",
"Unable to create user." : "Tidak dapat membuat pengguna.",
"Your %s account was created" : "Akun %s Anda telah dibuat",
"Unable to delete user." : "Tidak dapat menghapus pengguna.",
@@ -39,8 +48,13 @@
"Email saved" : "Email disimpan",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
"Add trusted domain" : "Tambah domain terpercaya",
+ "Migration in progress. Please wait until the migration is finished" : "Migrasi sedang dalam proses. Mohon tunggu sampai migrasi selesai.",
+ "Migration started …" : "Migrasi dimulai ...",
"Sending..." : "Mengirim",
"All" : "Semua",
+ "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh komunitas ownCloud. Mereka menawarkan fitur pusat bagi ownCloud dan siap digunakan untuk penggunaan produksi.",
+ "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Aplikasi tersetujui dikembangkan oleh pengembang terpercaya dan telah lulus pemeriksaan keamanan. Mereka secara aktif dipelihara direpositori kode terbuka dan pemelihara sudah memastikan mereka stabil untuk penggunaan normal.",
+ "This app is not checked for security issues and is new or known to be unstable. Install on your own risk." : "Aplikasi ini belum diperiksa masalah keamanan dan baru atau dikenal tidak stabil. Instal dengan resiko.",
"Please wait...." : "Mohon tunggu....",
"Error while disabling app" : "Terjadi kesalahan saat menonaktifkan aplikasi",
"Disable" : "Nonaktifkan",
@@ -60,6 +74,7 @@
"Strong password" : "Sandi kuat",
"Valid until {date}" : "Berlaku sampai {date}",
"Delete" : "Hapus",
+ "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.",
"Groups" : "Grup",
"Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
"Error creating group" : "Terjadi kesalahan saat membuat grup",
@@ -76,6 +91,8 @@
"A valid password must be provided" : "Harus memberikan sandi yang benar",
"A valid email must be provided" : "Email yang benar harus diberikan",
"__language_name__" : "__language_name__",
+ "Sync clients" : "Klien sync",
+ "Personal info" : "Info pribadi",
"SSL root certificates" : "Sertifikat root SSL",
"Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
"Info, warnings, errors and fatal issues" : "Info, peringatan, galat dan masalah fatal",
@@ -88,15 +105,21 @@
"NT LAN Manager" : "Manajer NT LAN",
"SSL" : "SSL",
"TLS" : "TLS",
+ "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "kelihatannya php tidak diatur dengan benar untuk variabel lingkungan sistem kueri. Pemeriksaan dengan getenv(\"PATH\") hanya mengembalikan respon kosong.",
+ "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Mohon periksa dokumentasi instalasi untuk catatan konfigurasi php dan konfigurasi php server Anda, terutama saat menggunakan ph-fpm.",
"The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
"Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.",
+ "APCu below version 4.0.6 is installed, for stability and performance reasons we recommend to update to a newer APCu version." : "APCu dibawah versi 4.0.6 terinstal, untuk alasan stabilitas dan kinerja, kami menyarankan untuk memperbarui ke versi APCu yang lebih baru.",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
"System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
"This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Kamu sangat menyarankan untuk menginstal paket-paket yang dibutuhkan pada sistem agar mendukung lokal berikut: %s.",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak di root domain dan menggunakan sistem cron, hal tersebut dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah tersebut, mohon atur opsi \"overwrite.cli.url\" pada berkas config.php Anda ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
+ "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Tidak mungkin untuk mengeksekusi cronjob via CLI. Kesalahan teknis berikut muncul:",
+ "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon periksa dua kali <a target=\"_blank\" href=\"%s\">panduan instalasi ↗</a>, dan periksa segala kesalahan atau peringatan pada <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Buka dokumentasi",
"Allow apps to use the Share API" : "Izinkan aplikasi untuk menggunakan API Pembagian",
"Allow users to share via link" : "Izinkan pengguna untuk membagikan via tautan",
"Enforce password protection" : "Berlakukan perlindungan sandi",
@@ -111,10 +134,14 @@
"Allow users to send mail notification for shared files to other users" : "Izinkan pengguna mengirim pemberitahuan email saat berbagi berkas kepada pengguna lainnya",
"Exclude groups from sharing" : "Tidak termasuk grup untuk berbagi",
"These groups will still be able to receive shares, but not to initiate them." : "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
+ "Last cron job execution: %s." : "Eksekusi penjadwalan cron terakhir: %s.",
+ "Last cron job execution: %s. Something seems wrong." : "Eksekusi penjadwalan cron terakhir: %s. Kelihatannya ada yang salah.",
"Cron was not executed yet!" : "Cron masih belum dieksekusi!",
"Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
+ "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
+ "Start migration" : "Mulai migrasi",
"This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
"Send mode" : "Modus kirim",
"Encryption" : "Enkripsi",
@@ -134,25 +161,46 @@
"Download logfile" : "Unduh berkas log",
"More" : "Lainnya",
"Less" : "Ciutkan",
+ "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Pengunduhan ini memerlukan beberapa saat!",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami menyarankan untuk beralih ke backend basis data yang berbeda.",
+ "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Terutama saat menggunakan klien desktop untuk sinkronisasi berkas, penggunaan SQLite tidak disarankan.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Untuk migrasi ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type', atau lihat <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a>.",
+ "How to do backups" : "Bagaimana cara mencadangkan",
+ "Advanced monitoring" : "Pemantauan tingkat lanjut",
+ "Performance tuning" : "Pemeliharaan performa",
+ "Improving the config.php" : "Memperbaiki config.php",
+ "Theming" : "Tema",
"Version" : "Versi",
- "More apps" : "Lebih banyak aplikasi",
+ "Developer documentation" : "Dokumentasi pengembang",
+ "Experimental applications ahead" : "Aplikasi percobaan terdepan",
+ "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." : "Aplikasi percobaan belum diperiksa untuk masalah keamanan, baru atau dikenal tidak stabil dan dalam proses pengembangan. Menginstalnya dapat menyebabkan kehilangan data atau penerobosan keamanan.",
"by" : "oleh",
"licensed" : "dilisensikan",
"Documentation:" : "Dokumentasi:",
"User Documentation" : "Dokumentasi Pengguna",
"Admin Documentation" : "Dokumentasi Admin",
+ "Show description …" : "Tampilkan deskripsi ...",
+ "Hide description …" : "Sembunyikan deskripsi ...",
"This app cannot be installed because the following dependencies are not fulfilled:" : "Apl ini tidak dapat diinstal karena ketergantungan berikut belum terpenuhi:",
"Update to %s" : "Perbarui ke %s",
"Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu",
"Uninstall App" : "Copot aplikasi",
+ "Enable experimental apps" : "Aktifkan aplikasi percobaan",
+ "No apps found for your version" : "Aplikasi tidak ditemukan untuk versi ini.",
"Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hai,<br><br>sekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.<br><br>Nama Pengguna Anda: %s<br>Akses di: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Horee!",
"Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hai,\n\nsekedar memberi tahu bahwa Andaa sekarang memiliki akun %s.\n\nNama Pengguna Anda: %s\nAkses di: %s\n",
+ "User documentation" : "Dokumentasi pengguna.",
+ "Administrator documentation" : "Dokumentasi administrator",
+ "Online documentation" : "Dokumentasi online",
"Forum" : "Forum",
+ "Issue tracker" : "Pelacak masalah",
+ "Commercial support" : "Dukungan komersial",
"Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
"Desktop client" : "Klien desktop",
"Android app" : "Aplikasi Android",
"iOS app" : "Aplikasi iOS",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">bergabunglah dalam pengembangan</a>\n\t\tatau\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">promosikan</a>!",
"Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
"Password" : "Sandi",
@@ -160,11 +208,13 @@
"Current password" : "Sandi saat ini",
"New password" : "Sandi baru",
"Change password" : "Ubah sandi",
+ "Full name" : "Nama lengkap",
"No display name set" : "Nama tampilan tidak diatur",
"Email" : "Email",
"Your email address" : "Alamat email Anda",
"Fill in an email address to enable password recovery and receive notifications" : "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
"No email address set" : "Alamat email tidak diatur",
+ "You are member of the following groups:" : "Anda adalah anggota dari grup berikut:",
"Profile picture" : "Foto profil",
"Upload new" : "Unggah baru",
"Select new from Files" : "Pilih baru dari Berkas",
@@ -179,6 +229,8 @@
"Valid until" : "Berlaku sampai",
"Issued By" : "Diterbitkan oleh",
"Valid until %s" : "Berlaku sampai %s",
+ "Import root certificate" : "Impor sertifikat root",
+ "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Dikembangkan oleh {communityopen}komunitas ownCloud{linkclose}, {githubopen}kode sumber{linkclose} dilisensikan dibawah {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
"Show storage location" : "Tampilkan kolasi penyimpanan",
"Show last log in" : "Tampilkan masuk terakhir",
"Show user backend" : "Tampilkan pengguna backend",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 26d8341ad3e..2991681a1dc 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwrite.cli.url\" nel file config.php al percorso della radice del sito della tua installazione (Consigliato: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non è stato possibile eseguire il job di cron tramite CLI. Sono apparsi i seguenti errori tecnici:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Leggi attentamente le <a target=\"_blank\" href=\"%s\">guide d'installazione ↗</a>, e controlla gli errori o gli avvisi nel <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Apri la documentazione",
"Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
"Allow users to share via link" : "Consenti agli utenti di condivere tramite collegamento",
"Enforce password protection" : "Imponi la protezione con password",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Ultima esecuzione di cron: %s.",
"Last cron job execution: %s. Something seems wrong." : "Ultima esecuzione di cron: %s. Potrebbe esserci un problema.",
"Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
- "Open documentation" : "Apri la documentazione",
"Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Temi",
"Hardening and security guidance" : "Guida alla messa in sicurezza",
"Version" : "Versione",
- "More apps" : "Altre applicazioni",
"Developer documentation" : "Documentazione dello sviluppatore",
"Experimental applications ahead" : "Prima le applicazioni sperimentali",
"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." : "Le applicazioni sperimentali non sono sottoposte a controlli di sicurezza, sono nuove o notoriamente instabili e sotto sviluppo intensivo. La loro installazione può causare perdite di dati o problemi di sicurezza.",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 2fd23c272a3..275ec25b750 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwrite.cli.url\" nel file config.php al percorso della radice del sito della tua installazione (Consigliato: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non è stato possibile eseguire il job di cron tramite CLI. Sono apparsi i seguenti errori tecnici:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Leggi attentamente le <a target=\"_blank\" href=\"%s\">guide d'installazione ↗</a>, e controlla gli errori o gli avvisi nel <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Apri la documentazione",
"Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
"Allow users to share via link" : "Consenti agli utenti di condivere tramite collegamento",
"Enforce password protection" : "Imponi la protezione con password",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Ultima esecuzione di cron: %s.",
"Last cron job execution: %s. Something seems wrong." : "Ultima esecuzione di cron: %s. Potrebbe esserci un problema.",
"Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
- "Open documentation" : "Apri la documentazione",
"Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
@@ -172,7 +172,6 @@
"Theming" : "Temi",
"Hardening and security guidance" : "Guida alla messa in sicurezza",
"Version" : "Versione",
- "More apps" : "Altre applicazioni",
"Developer documentation" : "Documentazione dello sviluppatore",
"Experimental applications ahead" : "Prima le applicazioni sperimentali",
"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." : "Le applicazioni sperimentali non sono sottoposte a controlli di sicurezza, sono nuove o notoriamente instabili e sotto sviluppo intensivo. La loro installazione può causare perdite di dati o problemi di sicurezza.",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 98e86129cbc..af2258907a0 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -106,8 +106,9 @@ OC.L10N.register(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
"System locale can not be set to a one which supports UTF-8." : "システムロケールを UTF-8 をサポートするロケールに設定できません。",
"This means that there might be problems with certain characters in file names." : "これは、ファイル名の特定の文字に問題があることを意味しています。",
- "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするには、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwrite.cli.url\" オプションをインストールしたwebrootのパスに設定してください。(推奨: \"%s\")",
+ "Open documentation" : "ドキュメントを開く",
"Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
"Allow users to share via link" : "URLリンクで共有を許可する",
"Enforce password protection" : "常にパスワード保護を有効にする",
@@ -125,10 +126,9 @@ OC.L10N.register(
"Last cron job execution: %s." : "最終cronジョブ実行: %s。",
"Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s。何らかの問題があります。",
"Cron was not executed yet!" : "cronはまだ実行されていません!",
- "Open documentation" : "ドキュメントを開く",
"Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています。",
- "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行する。",
+ "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行します。",
"This is used for sending out notifications." : "通知を送信する際に使用します。",
"Send mode" : "送信モード",
"Encryption" : "暗号化",
@@ -145,10 +145,10 @@ OC.L10N.register(
"Test email settings" : "メール設定のテスト",
"Send email" : "メールを送信",
"Log level" : "ログレベル",
- "Download logfile" : "logファイルのダウンロード",
+ "Download logfile" : "ログファイルのダウンロード",
"More" : "もっと見る",
"Less" : "閉じる",
- "The logfile is bigger than 100 MB. Downloading it may take some time!" : "100MBより大きいlogファイルです。ダウンロードに時間がかかります!",
+ "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ログファイルが100MB以上あります。ダウンロードに時間がかかります!",
"SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLiteがデータベースとして使用されています。大規模な運用では別のデータベースに切り替えることをお勧めします。",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合,SQLiteは非推奨です.",
"How to do backups" : "バックアップ方法",
@@ -156,7 +156,6 @@ OC.L10N.register(
"Performance tuning" : "パフォーマンスチューニング",
"Improving the config.php" : "config.phpの改善",
"Version" : "バージョン",
- "More apps" : "他のアプリ",
"Developer documentation" : "デベロッパードキュメント",
"by" : "by",
"licensed" : "ライセンス",
@@ -165,7 +164,7 @@ OC.L10N.register(
"Admin Documentation" : "管理者ドキュメント",
"Show description …" : "説明を表示 ...",
"Hide description …" : "説明を隠す ...",
- "This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係は無いためこのアプリをインストールできません",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係が満たされないためこのアプリをインストールできません:",
"Update to %s" : "%sにアップデート",
"Enable only for specific groups" : "特定のグループのみ有効に",
"Uninstall App" : "アプリをアンインストール",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 1ee6d8f1b08..172fdd971b0 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -104,8 +104,9 @@
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
"System locale can not be set to a one which supports UTF-8." : "システムロケールを UTF-8 をサポートするロケールに設定できません。",
"This means that there might be problems with certain characters in file names." : "これは、ファイル名の特定の文字に問題があることを意味しています。",
- "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
+ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするには、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwrite.cli.url\" オプションをインストールしたwebrootのパスに設定してください。(推奨: \"%s\")",
+ "Open documentation" : "ドキュメントを開く",
"Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
"Allow users to share via link" : "URLリンクで共有を許可する",
"Enforce password protection" : "常にパスワード保護を有効にする",
@@ -123,10 +124,9 @@
"Last cron job execution: %s." : "最終cronジョブ実行: %s。",
"Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s。何らかの問題があります。",
"Cron was not executed yet!" : "cronはまだ実行されていません!",
- "Open documentation" : "ドキュメントを開く",
"Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています。",
- "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行する。",
+ "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行します。",
"This is used for sending out notifications." : "通知を送信する際に使用します。",
"Send mode" : "送信モード",
"Encryption" : "暗号化",
@@ -143,10 +143,10 @@
"Test email settings" : "メール設定のテスト",
"Send email" : "メールを送信",
"Log level" : "ログレベル",
- "Download logfile" : "logファイルのダウンロード",
+ "Download logfile" : "ログファイルのダウンロード",
"More" : "もっと見る",
"Less" : "閉じる",
- "The logfile is bigger than 100 MB. Downloading it may take some time!" : "100MBより大きいlogファイルです。ダウンロードに時間がかかります!",
+ "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ログファイルが100MB以上あります。ダウンロードに時間がかかります!",
"SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLiteがデータベースとして使用されています。大規模な運用では別のデータベースに切り替えることをお勧めします。",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合,SQLiteは非推奨です.",
"How to do backups" : "バックアップ方法",
@@ -154,7 +154,6 @@
"Performance tuning" : "パフォーマンスチューニング",
"Improving the config.php" : "config.phpの改善",
"Version" : "バージョン",
- "More apps" : "他のアプリ",
"Developer documentation" : "デベロッパードキュメント",
"by" : "by",
"licensed" : "ライセンス",
@@ -163,7 +162,7 @@
"Admin Documentation" : "管理者ドキュメント",
"Show description …" : "説明を表示 ...",
"Hide description …" : "説明を隠す ...",
- "This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係は無いためこのアプリをインストールできません",
+ "This app cannot be installed because the following dependencies are not fulfilled:" : "次の依存関係が満たされないためこのアプリをインストールできません:",
"Update to %s" : "%sにアップデート",
"Enable only for specific groups" : "特定のグループのみ有効に",
"Uninstall App" : "アプリをアンインストール",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index 853fa76e4b6..3453fe87c6e 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -99,6 +99,7 @@ OC.L10N.register(
"This means that there might be problems with certain characters in file names." : "파일 이름의 일부 문자에 문제가 생길 수도 있습니다.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "다음 중 하나 이상의 로캘을 지원하기 위하여 필요한 패키지를 시스템에 설치하는 것을 추천합니다: %s.",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "도메인의 루트 디렉터리 아래에 설치되어 있지 않고 시스템 cron을 사용한다면 URL 생성에 문제가 발생할 수도 있습니다. 이 문제를 해결하려면 설치본의 웹 루트 경로에 있는 config.php 파일의 \"overwrite.cli.url\" 옵션을 변경하십시오(제안: \"%s\")",
+ "Open documentation" : "문서 열기",
"Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
"Allow users to share via link" : "사용자별 링크 공유 허용",
"Enforce password protection" : "암호 보호 강제",
@@ -114,7 +115,6 @@ OC.L10N.register(
"Exclude groups from sharing" : "공유에서 그룹 제외",
"These groups will still be able to receive shares, but not to initiate them." : "이 그룹의 사용자들은 다른 사용자가 공유한 파일을 받을 수는 있지만, 자기 파일을 공유할 수는 없습니다.",
"Cron was not executed yet!" : "Cron이 실행되지 않았습니다!",
- "Open documentation" : "문서 열기",
"Execute one task with each page loaded" : "개별 페이지를 불러올 때마다 실행",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
"Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
@@ -140,7 +140,6 @@ OC.L10N.register(
"SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정이면, SQLite를 사용하지 않는 것이 좋습니다.",
"Version" : "버전",
- "More apps" : "더 많은 앱",
"by" : "작성:",
"licensed" : "라이선스:",
"Documentation:" : "문서:",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 536184f0faf..6c1de20e3cd 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -97,6 +97,7 @@
"This means that there might be problems with certain characters in file names." : "파일 이름의 일부 문자에 문제가 생길 수도 있습니다.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "다음 중 하나 이상의 로캘을 지원하기 위하여 필요한 패키지를 시스템에 설치하는 것을 추천합니다: %s.",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "도메인의 루트 디렉터리 아래에 설치되어 있지 않고 시스템 cron을 사용한다면 URL 생성에 문제가 발생할 수도 있습니다. 이 문제를 해결하려면 설치본의 웹 루트 경로에 있는 config.php 파일의 \"overwrite.cli.url\" 옵션을 변경하십시오(제안: \"%s\")",
+ "Open documentation" : "문서 열기",
"Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
"Allow users to share via link" : "사용자별 링크 공유 허용",
"Enforce password protection" : "암호 보호 강제",
@@ -112,7 +113,6 @@
"Exclude groups from sharing" : "공유에서 그룹 제외",
"These groups will still be able to receive shares, but not to initiate them." : "이 그룹의 사용자들은 다른 사용자가 공유한 파일을 받을 수는 있지만, 자기 파일을 공유할 수는 없습니다.",
"Cron was not executed yet!" : "Cron이 실행되지 않았습니다!",
- "Open documentation" : "문서 열기",
"Execute one task with each page loaded" : "개별 페이지를 불러올 때마다 실행",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
"Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
@@ -138,7 +138,6 @@
"SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정이면, SQLite를 사용하지 않는 것이 좋습니다.",
"Version" : "버전",
- "More apps" : "더 많은 앱",
"by" : "작성:",
"licensed" : "라이선스:",
"Documentation:" : "문서:",
diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js
index dcc63ecfe67..dc945058bb4 100644
--- a/settings/l10n/lt_LT.js
+++ b/settings/l10n/lt_LT.js
@@ -57,7 +57,6 @@ OC.L10N.register(
"More" : "Daugiau",
"Less" : "Mažiau",
"Version" : "Versija",
- "More apps" : "Daugiau programų",
"by" : " ",
"User Documentation" : "Naudotojo dokumentacija",
"Cheers!" : "Sveikinimai!",
diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json
index 42ed77a5636..722625bc3c7 100644
--- a/settings/l10n/lt_LT.json
+++ b/settings/l10n/lt_LT.json
@@ -55,7 +55,6 @@
"More" : "Daugiau",
"Less" : "Mažiau",
"Version" : "Versija",
- "More apps" : "Daugiau programų",
"by" : " ",
"User Documentation" : "Naudotojo dokumentacija",
"Cheers!" : "Sveikinimai!",
diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js
index dca43da8cda..dd025ff843a 100644
--- a/settings/l10n/lv.js
+++ b/settings/l10n/lv.js
@@ -103,7 +103,6 @@ OC.L10N.register(
"More" : "Vairāk",
"Less" : "Mazāk",
"Version" : "Versija",
- "More apps" : "Vairāk programmu",
"by" : "līdz",
"User Documentation" : "Lietotāja dokumentācija",
"Forum" : "Forums",
diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json
index 1b8afb4d657..ccb6c126ab8 100644
--- a/settings/l10n/lv.json
+++ b/settings/l10n/lv.json
@@ -101,7 +101,6 @@
"More" : "Vairāk",
"Less" : "Mazāk",
"Version" : "Versija",
- "More apps" : "Vairāk programmu",
"by" : "līdz",
"User Documentation" : "Lietotāja dokumentācija",
"Forum" : "Forums",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 51e7b24564b..aac2edc5dde 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -159,7 +159,6 @@ OC.L10N.register(
"Theming" : "Temaer",
"Hardening and security guidance" : "Herding og sikkerhetsveiledning",
"Version" : "Versjon",
- "More apps" : "Flere apper",
"Developer documentation" : "Utviklerdokumentasjon",
"by" : "av",
"licensed" : "lisensiert",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index db720d1a9e8..94ec9d09438 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -157,7 +157,6 @@
"Theming" : "Temaer",
"Hardening and security guidance" : "Herding og sikkerhetsveiledning",
"Version" : "Versjon",
- "More apps" : "Flere apper",
"Developer documentation" : "Utviklerdokumentasjon",
"by" : "av",
"licensed" : "lisensiert",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 369601bfbd1..af519698068 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de <a href='%s'>installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.",
+ "Open documentation" : "Open documentatie",
"Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken",
"Allow users to share via link" : "Sta gebruikers toe om te delen via een link",
"Enforce password protection" : "Dwing wachtwoordbeveiliging af",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Laatst uitgevoerde cronjob: %s.",
"Last cron job execution: %s. Something seems wrong." : "Laatst uitgevoerde cronjob: %s. Er lijkt iets fout gegaan.",
"Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
- "Open documentation" : "Open documentatie",
"Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Thema's",
"Hardening and security guidance" : "Hardening en security advies",
"Version" : "Versie",
- "More apps" : "Meer applicaties",
"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.",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 5532072a790..6fdfc8f41a1 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de <a href='%s'>installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.",
+ "Open documentation" : "Open documentatie",
"Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken",
"Allow users to share via link" : "Sta gebruikers toe om te delen via een link",
"Enforce password protection" : "Dwing wachtwoordbeveiliging af",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Laatst uitgevoerde cronjob: %s.",
"Last cron job execution: %s. Something seems wrong." : "Laatst uitgevoerde cronjob: %s. Er lijkt iets fout gegaan.",
"Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
- "Open documentation" : "Open documentatie",
"Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
@@ -172,7 +172,6 @@
"Theming" : "Thema's",
"Hardening and security guidance" : "Hardening en security advies",
"Version" : "Versie",
- "More apps" : "Meer applicaties",
"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.",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index 924856fe64f..97421042b76 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -98,6 +98,7 @@ OC.L10N.register(
"System locale can not be set to a one which supports UTF-8." : "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
"This means that there might be problems with certain characters in file names." : "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Zalecamy instalację na Twoim systemie komponentów wymaganych do obsługi języków: %s",
+ "Open documentation" : "Otwórz dokumentację",
"Allow apps to use the Share API" : "Zezwalaj aplikacjom na korzystanie z API udostępniania",
"Allow users to share via link" : "Pozwól użytkownikom współdzielić przez link",
"Enforce password protection" : "Wymuś zabezpieczenie hasłem",
@@ -112,7 +113,6 @@ OC.L10N.register(
"Exclude groups from sharing" : "Wyklucz grupy z udostępniania",
"These groups will still be able to receive shares, but not to initiate them." : "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
"Cron was not executed yet!" : "Cron nie został jeszcze uruchomiony!",
- "Open documentation" : "Otwórz dokumentację",
"Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
@@ -137,7 +137,6 @@ OC.L10N.register(
"Less" : "Mniej",
"The logfile is bigger than 100 MB. Downloading it may take some time!" : "Plik log jest większy niż 100MB. Ściąganie może trochę potrwać!",
"Version" : "Wersja",
- "More apps" : "Więcej aplikacji",
"Developer documentation" : "Dokumentacja dewelopera",
"by" : "przez",
"licensed" : "Licencja",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index 1e4a1054f31..63bc9f4e514 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -96,6 +96,7 @@
"System locale can not be set to a one which supports UTF-8." : "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
"This means that there might be problems with certain characters in file names." : "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Zalecamy instalację na Twoim systemie komponentów wymaganych do obsługi języków: %s",
+ "Open documentation" : "Otwórz dokumentację",
"Allow apps to use the Share API" : "Zezwalaj aplikacjom na korzystanie z API udostępniania",
"Allow users to share via link" : "Pozwól użytkownikom współdzielić przez link",
"Enforce password protection" : "Wymuś zabezpieczenie hasłem",
@@ -110,7 +111,6 @@
"Exclude groups from sharing" : "Wyklucz grupy z udostępniania",
"These groups will still be able to receive shares, but not to initiate them." : "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
"Cron was not executed yet!" : "Cron nie został jeszcze uruchomiony!",
- "Open documentation" : "Otwórz dokumentację",
"Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
@@ -135,7 +135,6 @@
"Less" : "Mniej",
"The logfile is bigger than 100 MB. Downloading it may take some time!" : "Plik log jest większy niż 100MB. Ściąganie może trochę potrwać!",
"Version" : "Wersja",
- "More apps" : "Więcej aplikacji",
"Developer documentation" : "Dokumentacja dewelopera",
"by" : "przez",
"licensed" : "Licencja",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 9e89869e9b6..b745d3d2186 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwrite.cli.url\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cron via CLI. Os seguintes erros técnicos têm aparecido:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique os <a target=\"_blank\" href=\"%s\">guias de instalação ↗</a>, e verificar se há erros ou avisos no <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Abrir documentação",
"Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
"Allow users to share via link" : "Permitir que os usuários compartilhem por link",
"Enforce password protection" : "Reforce a proteção por senha",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Última execução do trabalho cron: %s.",
"Last cron job execution: %s. Something seems wrong." : "Última execução do trabalho cron: %s. Algo parece errado.",
"Cron was not executed yet!" : "Cron não foi executado ainda!",
- "Open documentation" : "Abrir documentação",
"Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Elaborar um tema",
"Hardening and security guidance" : "Orientações de proteção e segurança",
"Version" : "Versão",
- "More apps" : "Mais aplicativos",
"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.",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 507f2276104..e21236cb0d6 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwrite.cli.url\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cron via CLI. Os seguintes erros técnicos têm aparecido:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique os <a target=\"_blank\" href=\"%s\">guias de instalação ↗</a>, e verificar se há erros ou avisos no <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Abrir documentação",
"Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
"Allow users to share via link" : "Permitir que os usuários compartilhem por link",
"Enforce password protection" : "Reforce a proteção por senha",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Última execução do trabalho cron: %s.",
"Last cron job execution: %s. Something seems wrong." : "Última execução do trabalho cron: %s. Algo parece errado.",
"Cron was not executed yet!" : "Cron não foi executado ainda!",
- "Open documentation" : "Abrir documentação",
"Execute one task with each page loaded" : "Execute uma tarefa com cada página carregada",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
@@ -172,7 +172,6 @@
"Theming" : "Elaborar um tema",
"Hardening and security guidance" : "Orientações de proteção e segurança",
"Version" : "Versão",
- "More apps" : "Mais aplicativos",
"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.",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 44706a6f4df..1c9e5a1a860 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -114,6 +114,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwrite.cli.url\" no ficheiro config.php para o caminho webroot da sua instalação (Sugestão: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cronjob via CLI. Os seguintes erros técnicos apareceram:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique os <a target=\"_blank\" href=\"%s\">guias de instalação ↗</a>, e verifique se existe algum erro ou aviso no <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Abrir documentação",
"Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
"Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
"Enforce password protection" : "Forçar proteção por palavra-passe",
@@ -131,7 +132,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Última execução de cron job: %s.",
"Last cron job execution: %s. Something seems wrong." : "Última execução de cron job: %s. Algo está errado.",
"Cron was not executed yet!" : "Cron ainda não foi executado!",
- "Open documentation" : "Abrir documentação",
"Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
@@ -166,7 +166,6 @@ OC.L10N.register(
"Theming" : "Temas",
"Hardening and security guidance" : "Orientações de proteção e segurança",
"Version" : "Versão",
- "More apps" : "Mais aplicações",
"Developer documentation" : "Documentação de Programador",
"Experimental applications ahead" : "Aplicações experimentais de futuro",
"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." : "As apps experimentais não estão selecionadas para problemas de segurança, nova ou conhecida como instável e em forte desenvolvimento. Ao instalá-las pode causar a perda de dados ou quebra de segurança.",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 3b116ebfd38..16f515dae3d 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -112,6 +112,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwrite.cli.url\" no ficheiro config.php para o caminho webroot da sua instalação (Sugestão: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cronjob via CLI. Os seguintes erros técnicos apareceram:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique os <a target=\"_blank\" href=\"%s\">guias de instalação ↗</a>, e verifique se existe algum erro ou aviso no <a href=\"#log-section\">log</a>.",
+ "Open documentation" : "Abrir documentação",
"Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
"Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
"Enforce password protection" : "Forçar proteção por palavra-passe",
@@ -129,7 +130,6 @@
"Last cron job execution: %s." : "Última execução de cron job: %s.",
"Last cron job execution: %s. Something seems wrong." : "Última execução de cron job: %s. Algo está errado.",
"Cron was not executed yet!" : "Cron ainda não foi executado!",
- "Open documentation" : "Abrir documentação",
"Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
@@ -164,7 +164,6 @@
"Theming" : "Temas",
"Hardening and security guidance" : "Orientações de proteção e segurança",
"Version" : "Versão",
- "More apps" : "Mais aplicações",
"Developer documentation" : "Documentação de Programador",
"Experimental applications ahead" : "Aplicações experimentais de futuro",
"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." : "As apps experimentais não estão selecionadas para problemas de segurança, nova ou conhecida como instável e em forte desenvolvimento. Ao instalá-las pode causar a perda de dados ou quebra de segurança.",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 5304780e7eb..3c0687d5331 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -120,6 +120,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует системный планировщик cron, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию \"overwrite.cli.url\" в файле config.php равной пути папки установки. (Предположительно: \"%s\".)",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не удается запустить задачу планировщика через CLI. Произошли следующие технические ошибки:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Пожалуйста, перепроверьте <a href=\"%s\">инструкцию по установке</a> и проверьте ошибки или предупреждения в <a href=\"#log-section\">журнале</a>",
+ "Open documentation" : "Открыть документацию",
"Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
"Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
"Enforce password protection" : "Защита паролем обязательна",
@@ -137,7 +138,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Последнее выполненное Cron задание: %s.",
"Last cron job execution: %s. Something seems wrong." : "Последнее выполненное Cron задание: %s. Что-то кажется неправильным.",
"Cron was not executed yet!" : "Задачи cron ещё не запускались!",
- "Open documentation" : "Открыть документацию",
"Execute one task with each page loaded" : "Выполнять одно задание с каждой загруженной страницей",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
@@ -173,7 +173,6 @@ OC.L10N.register(
"Theming" : "Темы оформления",
"Hardening and security guidance" : "Руководство по безопасности и защите",
"Version" : "Версия",
- "More apps" : "Ещё приложения",
"Developer documentation" : "Документация для разработчиков",
"Experimental applications ahead" : "Экспериментальные приложения",
"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." : "Экспериментальные приложения не проверялись на наличие уязвимостей безопасности, так-же могут быть не стабильны, т.к. находятся в активной разработке. Их установка может повлечь потерю информации или нарушение безопасности.",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 874ad602bb2..155e3e909b5 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -118,6 +118,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует системный планировщик cron, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию \"overwrite.cli.url\" в файле config.php равной пути папки установки. (Предположительно: \"%s\".)",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не удается запустить задачу планировщика через CLI. Произошли следующие технические ошибки:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Пожалуйста, перепроверьте <a href=\"%s\">инструкцию по установке</a> и проверьте ошибки или предупреждения в <a href=\"#log-section\">журнале</a>",
+ "Open documentation" : "Открыть документацию",
"Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
"Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
"Enforce password protection" : "Защита паролем обязательна",
@@ -135,7 +136,6 @@
"Last cron job execution: %s." : "Последнее выполненное Cron задание: %s.",
"Last cron job execution: %s. Something seems wrong." : "Последнее выполненное Cron задание: %s. Что-то кажется неправильным.",
"Cron was not executed yet!" : "Задачи cron ещё не запускались!",
- "Open documentation" : "Открыть документацию",
"Execute one task with each page loaded" : "Выполнять одно задание с каждой загруженной страницей",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
@@ -171,7 +171,6 @@
"Theming" : "Темы оформления",
"Hardening and security guidance" : "Руководство по безопасности и защите",
"Version" : "Версия",
- "More apps" : "Ещё приложения",
"Developer documentation" : "Документация для разработчиков",
"Experimental applications ahead" : "Экспериментальные приложения",
"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." : "Экспериментальные приложения не проверялись на наличие уязвимостей безопасности, так-же могут быть не стабильны, т.к. находятся в активной разработке. Их установка может повлечь потерю информации или нарушение безопасности.",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index e0db3ab18ee..0694712c0e9 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -144,7 +144,6 @@ OC.L10N.register(
"SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Ako databáza je použitá SQLite. Pre veľké inštalácie odporúčame prejsť na inú databázu.",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Najmä pri používaní aplikácie na synchronizáciu s desktopom nie je databáza SQLite doporučená.",
"Version" : "Verzia",
- "More apps" : "Viac aplikácií",
"Developer documentation" : "Dokumentácia vývojára",
"by" : "od",
"licensed" : "licencované",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index 30e34ac1d6c..002a3c49816 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -142,7 +142,6 @@
"SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Ako databáza je použitá SQLite. Pre veľké inštalácie odporúčame prejsť na inú databázu.",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Najmä pri používaní aplikácie na synchronizáciu s desktopom nie je databáza SQLite doporučená.",
"Version" : "Verzia",
- "More apps" : "Viac aplikácií",
"Developer documentation" : "Dokumentácia vývojára",
"by" : "od",
"licensed" : "licencované",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index 78af6f4d0aa..bcc464963d8 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -1,10 +1,14 @@
OC.L10N.register(
"settings",
{
+ "Security & setup warnings" : "Varnost in namestitvena opozorila",
"Sharing" : "Souporaba",
"External Storage" : "Zunanja podatkovna shramba",
+ "Server-side encryption" : "Šifriranje na strežniku",
"Cron" : "Periodično opravilo",
+ "Email server" : "Poštni strežnik",
"Log" : "Dnevnik",
+ "Tips & tricks" : "Nasveti in triki",
"Updates" : "Posodobitve",
"Authentication error" : "Napaka med overjanjem",
"Your full name has been changed." : "Vaše polno ime je spremenjeno.",
@@ -23,14 +27,19 @@ OC.L10N.register(
"Unable to change password" : "Ni mogoče spremeniti gesla",
"Enabled" : "Omogočeno",
"Not enabled" : "Ni omogočeno",
+ "A problem occurred, please check your log files (Error: %s)" : "Pojavila se je težava. Prosimo, preverite dnevniške zapise (Napaka: %s)",
+ "Migration Completed" : "Selitev zaključena",
"Group already exists." : "Skupina že obstaja.",
"Unable to add group." : "Ni mogoče dodati skupine",
"Unable to delete group." : "Ni mogoče izbrisati skupine.",
+ "log-level out of allowed range" : "stopnja zapisovanja izven območja",
"Saved" : "Shranjeno",
"test email settings" : "preizkusi nastavitve elektronske pošte",
+ "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Med pošiljanjem sporočila se je pojavila težava. Preglejte nastavitve. (Napaka: %s)",
"Email sent" : "Elektronska pošta je poslana",
"You need to set your user email before being able to send test emails." : "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
"Invalid mail address" : "Neveljaven elektronski naslov",
+ "A user with that name already exists." : "Uporabnik s takim imenom že obstaja.",
"Unable to create user." : "Ni mogoče ustvariti uporabnika.",
"Your %s account was created" : "Račun %s je uspešno ustvarjen.",
"Unable to delete user." : "Ni mogoče izbrisati uporabnika",
@@ -40,6 +49,8 @@ OC.L10N.register(
"Email saved" : "Elektronski naslov je shranjen",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Ali ste prepričani, da želite dodati \"{domain}\" kot varno domeno?",
"Add trusted domain" : "Dodaj varno domeno",
+ "Migration in progress. Please wait until the migration is finished" : "Selitev v teku. Prosimo, počakajte, da se selitev zaključi.",
+ "Migration started …" : "Selitev pognana...",
"Sending..." : "Poteka pošiljanje ...",
"All" : "Vsi",
"Please wait...." : "Počakajte ...",
@@ -71,6 +82,7 @@ OC.L10N.register(
"never" : "nikoli",
"deleted {userName}" : "izbrisano {userName}",
"add group" : "dodaj skupino",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Sprememba gesla bo povzročila izgubo podatkov, ker obnova podatkov za tega uporabnika ni na voljo.",
"A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
"Error creating user" : "Napaka ustvarjanja uporabnika",
"A valid password must be provided" : "Navedeno mora biti veljavno geslo",
@@ -90,9 +102,11 @@ OC.L10N.register(
"NT LAN Manager" : "Upravljalnik NT LAN",
"SSL" : "SSL",
"TLS" : "TLS",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Vaš strežnik je nameščen na Microsoft Windows. Toplo priporočamo Linux okolje za optimalno uporabniško izkušnjo.",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
"System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
"This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
+ "Open documentation" : "Odprta dokumentacija",
"Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
"Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami",
"Enforce password protection" : "Vsili zaščito z geslom",
@@ -104,16 +118,20 @@ OC.L10N.register(
"Enforce expiration date" : "Vsili datum preteka",
"Allow resharing" : "Dovoli nadaljnjo souporabo",
"Restrict users to only share with users in their groups" : "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
+ "Allow users to send mail notification for shared files to other users" : "Omogočite uporabnikom, da pošiljajo poštna obvestila za deljene datoteke drugim uporabnikom.",
"Exclude groups from sharing" : "Izloči skupine iz souporabe",
"These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
"Cron was not executed yet!" : "Periodično opravilo cron še ni zagnano!",
"Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
+ "Enable server-side encryption" : "Omogoči šifriranje na strežniku",
+ "Start migration" : "Zaženite selitev",
"This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
"Send mode" : "Način pošiljanja",
"Encryption" : "Šifriranje",
"From address" : "Naslov pošiljatelja",
+ "mail" : "pošta",
"Authentication method" : "Način overitve",
"Authentication required" : "Zahtevana je overitev",
"Server address" : "Naslov strežnika",
@@ -128,22 +146,44 @@ OC.L10N.register(
"Download logfile" : "Prejmi dnevniško datoteko",
"More" : "Več",
"Less" : "Manj",
+ "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Datoteeka dnevniškega zapisa je večja od 100MB. Prenos lahko traja dlje!",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Uporabljena baza je SQLite. Za večje namestitve priporočamo prehod na drugačno bazo.",
+ "How to do backups" : "Kako napraviti varnostne kopije",
+ "Advanced monitoring" : "Napredno sledenje",
+ "Performance tuning" : "Optimizacija izvajanja",
+ "Improving the config.php" : "Izboljšanje config.php",
+ "Theming" : "Teme",
+ "Hardening and security guidance" : "Varovanje in varnostni napotki",
"Version" : "Različica",
- "More apps" : "Več programov",
+ "Developer documentation" : "Razvojniška dokumentacija",
+ "Experimental applications ahead" : "Testne aplikacija",
"by" : "od",
+ "licensed" : "licencirano",
"Documentation:" : "Dokumentacija:",
"User Documentation" : "Uporabniška dokumentacija",
"Admin Documentation" : "Skrbniška dokumentacija",
+ "Show description …" : "Prikaži opis...",
+ "Hide description …" : "Skrij opis...",
"This app cannot be installed because the following dependencies are not fulfilled:" : "Programa ni mogoče namestiti zaradi nerešenih odvisnosti:",
"Update to %s" : "Posodobi na %s",
"Enable only for specific groups" : "Omogoči le za posamezne skupine",
"Uninstall App" : "Odstrani program",
+ "Enable experimental apps" : "Omogoči testne aplikacije",
+ "No apps found for your version" : "Ni aplikacij za vašo verzijo",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Pozdravljeni,<br><br>samo sporočamo, da imate %s račun.<br><br>Vaše uporabniško ime: %s<br>Dostop: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Na zdravje!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Pozdravljeni,\n\nsamo sporočamo, da imate %s račun.\n\nVaše uporabniško ime: %s\nDostop: %s\n",
+ "User documentation" : "Uporabniška navodila",
+ "Administrator documentation" : "Skrbniška navodila",
+ "Online documentation" : "Dokumentacija na spletu",
"Forum" : "Forum",
+ "Issue tracker" : "Spremljanje težav",
+ "Commercial support" : "Komercialna podpora",
"Get the apps to sync your files" : "Pridobi programe za usklajevanje datotek",
"Desktop client" : "Namizni odjemalec",
"Android app" : "Program za Android",
"iOS app" : "Program za iOS",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Če bi radi podprli projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">pristopite razvoju</a>\n\t\tali\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">razširite glas</a>!",
"Show First Run Wizard again" : "Zaženi čarovnika prvega zagona",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
"Password" : "Geslo",
@@ -151,8 +191,13 @@ OC.L10N.register(
"Current password" : "Trenutno geslo",
"New password" : "Novo geslo",
"Change password" : "Spremeni geslo",
+ "Full name" : "Polno ime",
+ "No display name set" : "Ime za prikaz ni bilo nastavljeno",
"Email" : "Elektronski naslov",
"Your email address" : "Osebni elektronski naslov",
+ "Fill in an email address to enable password recovery and receive notifications" : "Podajte elektronski naslov, da vam omogočimo reševanje izgubljenega gesla in sprejem obvestil",
+ "No email address set" : "Poštni naslov ni bil vpisan",
+ "You are member of the following groups:" : "Vi ste član sledečih skupin:",
"Profile picture" : "Slika profila",
"Upload new" : "Pošlji novo",
"Select new from Files" : "Izberi novo iz menija datotek",
@@ -167,8 +212,10 @@ OC.L10N.register(
"Valid until" : "Veljavno do",
"Issued By" : "Izdajatelj",
"Valid until %s" : "Veljavno do %s",
+ "Import root certificate" : "Uvozite korenski certifikat",
"Show storage location" : "Pokaži mesto shrambe",
"Show last log in" : "Pokaži podatke zadnje prijave",
+ "Send email to new user" : "Pošlji sporočilo novemu uporabniku",
"Show email address" : "Pokaži naslov elektronske pošte",
"Username" : "Uporabniško ime",
"E-Mail" : "Elektronska pošta",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 5fc355467bd..7d4b4f74e0f 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -1,8 +1,12 @@
{ "translations": {
+ "Security & setup warnings" : "Varnost in namestitvena opozorila",
"Sharing" : "Souporaba",
"External Storage" : "Zunanja podatkovna shramba",
+ "Server-side encryption" : "Šifriranje na strežniku",
"Cron" : "Periodično opravilo",
+ "Email server" : "Poštni strežnik",
"Log" : "Dnevnik",
+ "Tips & tricks" : "Nasveti in triki",
"Updates" : "Posodobitve",
"Authentication error" : "Napaka med overjanjem",
"Your full name has been changed." : "Vaše polno ime je spremenjeno.",
@@ -21,14 +25,19 @@
"Unable to change password" : "Ni mogoče spremeniti gesla",
"Enabled" : "Omogočeno",
"Not enabled" : "Ni omogočeno",
+ "A problem occurred, please check your log files (Error: %s)" : "Pojavila se je težava. Prosimo, preverite dnevniške zapise (Napaka: %s)",
+ "Migration Completed" : "Selitev zaključena",
"Group already exists." : "Skupina že obstaja.",
"Unable to add group." : "Ni mogoče dodati skupine",
"Unable to delete group." : "Ni mogoče izbrisati skupine.",
+ "log-level out of allowed range" : "stopnja zapisovanja izven območja",
"Saved" : "Shranjeno",
"test email settings" : "preizkusi nastavitve elektronske pošte",
+ "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Med pošiljanjem sporočila se je pojavila težava. Preglejte nastavitve. (Napaka: %s)",
"Email sent" : "Elektronska pošta je poslana",
"You need to set your user email before being able to send test emails." : "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
"Invalid mail address" : "Neveljaven elektronski naslov",
+ "A user with that name already exists." : "Uporabnik s takim imenom že obstaja.",
"Unable to create user." : "Ni mogoče ustvariti uporabnika.",
"Your %s account was created" : "Račun %s je uspešno ustvarjen.",
"Unable to delete user." : "Ni mogoče izbrisati uporabnika",
@@ -38,6 +47,8 @@
"Email saved" : "Elektronski naslov je shranjen",
"Are you really sure you want add \"{domain}\" as trusted domain?" : "Ali ste prepričani, da želite dodati \"{domain}\" kot varno domeno?",
"Add trusted domain" : "Dodaj varno domeno",
+ "Migration in progress. Please wait until the migration is finished" : "Selitev v teku. Prosimo, počakajte, da se selitev zaključi.",
+ "Migration started …" : "Selitev pognana...",
"Sending..." : "Poteka pošiljanje ...",
"All" : "Vsi",
"Please wait...." : "Počakajte ...",
@@ -69,6 +80,7 @@
"never" : "nikoli",
"deleted {userName}" : "izbrisano {userName}",
"add group" : "dodaj skupino",
+ "Changing the password will result in data loss, because data recovery is not available for this user" : "Sprememba gesla bo povzročila izgubo podatkov, ker obnova podatkov za tega uporabnika ni na voljo.",
"A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
"Error creating user" : "Napaka ustvarjanja uporabnika",
"A valid password must be provided" : "Navedeno mora biti veljavno geslo",
@@ -88,9 +100,11 @@
"NT LAN Manager" : "Upravljalnik NT LAN",
"SSL" : "SSL",
"TLS" : "TLS",
+ "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Vaš strežnik je nameščen na Microsoft Windows. Toplo priporočamo Linux okolje za optimalno uporabniško izkušnjo.",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
"System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
"This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
+ "Open documentation" : "Odprta dokumentacija",
"Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
"Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami",
"Enforce password protection" : "Vsili zaščito z geslom",
@@ -102,16 +116,20 @@
"Enforce expiration date" : "Vsili datum preteka",
"Allow resharing" : "Dovoli nadaljnjo souporabo",
"Restrict users to only share with users in their groups" : "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
+ "Allow users to send mail notification for shared files to other users" : "Omogočite uporabnikom, da pošiljajo poštna obvestila za deljene datoteke drugim uporabnikom.",
"Exclude groups from sharing" : "Izloči skupine iz souporabe",
"These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
"Cron was not executed yet!" : "Periodično opravilo cron še ni zagnano!",
"Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
+ "Enable server-side encryption" : "Omogoči šifriranje na strežniku",
+ "Start migration" : "Zaženite selitev",
"This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
"Send mode" : "Način pošiljanja",
"Encryption" : "Šifriranje",
"From address" : "Naslov pošiljatelja",
+ "mail" : "pošta",
"Authentication method" : "Način overitve",
"Authentication required" : "Zahtevana je overitev",
"Server address" : "Naslov strežnika",
@@ -126,22 +144,44 @@
"Download logfile" : "Prejmi dnevniško datoteko",
"More" : "Več",
"Less" : "Manj",
+ "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Datoteeka dnevniškega zapisa je večja od 100MB. Prenos lahko traja dlje!",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Uporabljena baza je SQLite. Za večje namestitve priporočamo prehod na drugačno bazo.",
+ "How to do backups" : "Kako napraviti varnostne kopije",
+ "Advanced monitoring" : "Napredno sledenje",
+ "Performance tuning" : "Optimizacija izvajanja",
+ "Improving the config.php" : "Izboljšanje config.php",
+ "Theming" : "Teme",
+ "Hardening and security guidance" : "Varovanje in varnostni napotki",
"Version" : "Različica",
- "More apps" : "Več programov",
+ "Developer documentation" : "Razvojniška dokumentacija",
+ "Experimental applications ahead" : "Testne aplikacija",
"by" : "od",
+ "licensed" : "licencirano",
"Documentation:" : "Dokumentacija:",
"User Documentation" : "Uporabniška dokumentacija",
"Admin Documentation" : "Skrbniška dokumentacija",
+ "Show description …" : "Prikaži opis...",
+ "Hide description …" : "Skrij opis...",
"This app cannot be installed because the following dependencies are not fulfilled:" : "Programa ni mogoče namestiti zaradi nerešenih odvisnosti:",
"Update to %s" : "Posodobi na %s",
"Enable only for specific groups" : "Omogoči le za posamezne skupine",
"Uninstall App" : "Odstrani program",
+ "Enable experimental apps" : "Omogoči testne aplikacije",
+ "No apps found for your version" : "Ni aplikacij za vašo verzijo",
+ "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Pozdravljeni,<br><br>samo sporočamo, da imate %s račun.<br><br>Vaše uporabniško ime: %s<br>Dostop: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Na zdravje!",
+ "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Pozdravljeni,\n\nsamo sporočamo, da imate %s račun.\n\nVaše uporabniško ime: %s\nDostop: %s\n",
+ "User documentation" : "Uporabniška navodila",
+ "Administrator documentation" : "Skrbniška navodila",
+ "Online documentation" : "Dokumentacija na spletu",
"Forum" : "Forum",
+ "Issue tracker" : "Spremljanje težav",
+ "Commercial support" : "Komercialna podpora",
"Get the apps to sync your files" : "Pridobi programe za usklajevanje datotek",
"Desktop client" : "Namizni odjemalec",
"Android app" : "Program za Android",
"iOS app" : "Program za iOS",
+ "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Če bi radi podprli projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">pristopite razvoju</a>\n\t\tali\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">razširite glas</a>!",
"Show First Run Wizard again" : "Zaženi čarovnika prvega zagona",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
"Password" : "Geslo",
@@ -149,8 +189,13 @@
"Current password" : "Trenutno geslo",
"New password" : "Novo geslo",
"Change password" : "Spremeni geslo",
+ "Full name" : "Polno ime",
+ "No display name set" : "Ime za prikaz ni bilo nastavljeno",
"Email" : "Elektronski naslov",
"Your email address" : "Osebni elektronski naslov",
+ "Fill in an email address to enable password recovery and receive notifications" : "Podajte elektronski naslov, da vam omogočimo reševanje izgubljenega gesla in sprejem obvestil",
+ "No email address set" : "Poštni naslov ni bil vpisan",
+ "You are member of the following groups:" : "Vi ste član sledečih skupin:",
"Profile picture" : "Slika profila",
"Upload new" : "Pošlji novo",
"Select new from Files" : "Izberi novo iz menija datotek",
@@ -165,8 +210,10 @@
"Valid until" : "Veljavno do",
"Issued By" : "Izdajatelj",
"Valid until %s" : "Veljavno do %s",
+ "Import root certificate" : "Uvozite korenski certifikat",
"Show storage location" : "Pokaži mesto shrambe",
"Show last log in" : "Pokaži podatke zadnje prijave",
+ "Send email to new user" : "Pošlji sporočilo novemu uporabniku",
"Show email address" : "Pokaži naslov elektronske pošte",
"Username" : "Uporabniško ime",
"E-Mail" : "Elektronska pošta",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index 20ec171070c..7bcb9874bdd 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталација није инсталирана у основи домена и користи системски крон, може бити проблема са генерисањем веб адреса. Да бисте избегли ове проблеме, молимо вас да подесите \"overwrite.cli.url\" опцију у вашем config.php фајлу у путању веб-основе ваше инсталације (Предложено: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Није било могуће да се изврши крон задатак путем интерфејса командне линије. Појавила су се следеће техничке грешке:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Молимо вас да добро проверите <a target=\"_blank\" href=\"%s\">упутства за инсталацију ↗</a>, и да проверите ли постоје било какве грешке или упозорења у <a href=\"#log-section\">дневнику записа</a>.",
+ "Open documentation" : "Отвори документацију",
"Allow apps to use the Share API" : "Дозвољава апликацијама да користе АПИ дељења",
"Allow users to share via link" : "Дозволи корисницима да деле путем везе",
"Enforce password protection" : "Захтевај заштиту лозинком",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Последњи извршени крон задатак: %s.",
"Last cron job execution: %s. Something seems wrong." : "Последњи извршени крон задатак: %s. Нешто изгледа није у реду.",
"Cron was not executed yet!" : "Крон задатак још увек није извршен!",
- "Open documentation" : "Отвори документацију",
"Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php је регистрован код вебкрон сервиса за позивање cron.php сваких 15 минута преко протокола http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Користите системски крон сервис за позивање cron.php фајла сваких 15 минута.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Теме",
"Hardening and security guidance" : "Ојачавање система и безбедносне препоруке",
"Version" : "Верзија",
- "More apps" : "Још апликација",
"Developer documentation" : "Програмерска документација",
"Experimental applications ahead" : "Експериментална апликација",
"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." : "Експерименталне апликације се непроверене што се тиче безбедности и могу бити нестабилне и недовршене. Инсталирање може довести до губитка података или нарушавања безбедности.",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index 423c8f0a10a..5f84a0f6ee7 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталација није инсталирана у основи домена и користи системски крон, може бити проблема са генерисањем веб адреса. Да бисте избегли ове проблеме, молимо вас да подесите \"overwrite.cli.url\" опцију у вашем config.php фајлу у путању веб-основе ваше инсталације (Предложено: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Није било могуће да се изврши крон задатак путем интерфејса командне линије. Појавила су се следеће техничке грешке:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Молимо вас да добро проверите <a target=\"_blank\" href=\"%s\">упутства за инсталацију ↗</a>, и да проверите ли постоје било какве грешке или упозорења у <a href=\"#log-section\">дневнику записа</a>.",
+ "Open documentation" : "Отвори документацију",
"Allow apps to use the Share API" : "Дозвољава апликацијама да користе АПИ дељења",
"Allow users to share via link" : "Дозволи корисницима да деле путем везе",
"Enforce password protection" : "Захтевај заштиту лозинком",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Последњи извршени крон задатак: %s.",
"Last cron job execution: %s. Something seems wrong." : "Последњи извршени крон задатак: %s. Нешто изгледа није у реду.",
"Cron was not executed yet!" : "Крон задатак још увек није извршен!",
- "Open documentation" : "Отвори документацију",
"Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php је регистрован код вебкрон сервиса за позивање cron.php сваких 15 минута преко протокола http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Користите системски крон сервис за позивање cron.php фајла сваких 15 минута.",
@@ -172,7 +172,6 @@
"Theming" : "Теме",
"Hardening and security guidance" : "Ојачавање система и безбедносне препоруке",
"Version" : "Верзија",
- "More apps" : "Још апликација",
"Developer documentation" : "Програмерска документација",
"Experimental applications ahead" : "Експериментална апликација",
"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." : "Експерименталне апликације се непроверене што се тиче безбедности и могу бити нестабилне и недовршене. Инсталирање може довести до губитка података или нарушавања безбедности.",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index 05b7dcba6c0..a898e8796a2 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -136,7 +136,6 @@ OC.L10N.register(
"More" : "Mer",
"Less" : "Mindre",
"Version" : "Version",
- "More apps" : "Fler appar",
"by" : "av",
"licensed" : "licensierad",
"Documentation:" : "Dokumentation:",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index 42bd8e5b6f4..654f005f3a2 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -134,7 +134,6 @@
"More" : "Mer",
"Less" : "Mindre",
"Version" : "Version",
- "More apps" : "Fler appar",
"by" : "av",
"licensed" : "licensierad",
"Documentation:" : "Dokumentation:",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index c51cb37c468..78bc9ac243a 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -121,6 +121,7 @@ OC.L10N.register(
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum rehberlerini ↗</a> iki kez denetleyip <a href=\"#log-section\">günlük</a> içerisindeki hata ve uyarılara bakın.",
+ "Open documentation" : "Dokümantasyonu aç",
"Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
"Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
"Enforce password protection" : "Parola korumasını zorla",
@@ -138,7 +139,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Son cron çalıştırılma: %s.",
"Last cron job execution: %s. Something seems wrong." : "Son cron çalıştırılma: %s. Bir şeyler yanlış gibi görünüyor.",
"Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
- "Open documentation" : "Dokümantasyonu aç",
"Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
@@ -174,7 +174,6 @@ OC.L10N.register(
"Theming" : "Tema",
"Hardening and security guidance" : "Sağlamlaştırma ve güvenlik rehberliği",
"Version" : "Sürüm",
- "More apps" : "Daha fazla uygulama",
"Developer documentation" : "Geliştirici belgelendirmesi",
"Experimental applications ahead" : "Deneyimsel uygulamalar önde",
"by" : "Yazan:",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index cc2bb485c02..11f9c828f3e 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -119,6 +119,7 @@
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
"Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum rehberlerini ↗</a> iki kez denetleyip <a href=\"#log-section\">günlük</a> içerisindeki hata ve uyarılara bakın.",
+ "Open documentation" : "Dokümantasyonu aç",
"Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
"Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
"Enforce password protection" : "Parola korumasını zorla",
@@ -136,7 +137,6 @@
"Last cron job execution: %s." : "Son cron çalıştırılma: %s.",
"Last cron job execution: %s. Something seems wrong." : "Son cron çalıştırılma: %s. Bir şeyler yanlış gibi görünüyor.",
"Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
- "Open documentation" : "Dokümantasyonu aç",
"Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
@@ -172,7 +172,6 @@
"Theming" : "Tema",
"Hardening and security guidance" : "Sağlamlaştırma ve güvenlik rehberliği",
"Version" : "Sürüm",
- "More apps" : "Daha fazla uygulama",
"Developer documentation" : "Geliştirici belgelendirmesi",
"Experimental applications ahead" : "Deneyimsel uygulamalar önde",
"by" : "Yazan:",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index cd0a51fc157..6ea35e1eb67 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -117,6 +117,7 @@ OC.L10N.register(
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Пропонуємо встановити необхідні пакети для вашої системи для підтримки однієї з наступних мов %s.",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію \"overwrite.cli.url\" файлу config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не вдалося запустити завдання планувальника через CLI. Відбулися наступні технічні помилки:",
+ "Open documentation" : "Відкрити документацію",
"Allow apps to use the Share API" : "Дозволити програмам використовувати API спільного доступу",
"Allow users to share via link" : "Дозволити користувачам ділитися через посилання",
"Enforce password protection" : "Захист паролем обов'язковий",
@@ -134,7 +135,6 @@ OC.L10N.register(
"Last cron job execution: %s." : "Останне виконане Cron завдання: %s.",
"Last cron job execution: %s. Something seems wrong." : "Останне виконане Cron завдання: %s. Щось здається неправильним.",
"Cron was not executed yet!" : "Cron-задачі ще не запускалися!",
- "Open documentation" : "Відкрити документацію",
"Execute one task with each page loaded" : "Виконати одне завдання для кожної завантаженої сторінки ",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зареєстрований в службі webcron та буде викликатися кожні 15 хвилин через HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Використовувати системний cron для виклику cron.php кожні 15 хвилин.",
@@ -169,7 +169,6 @@ OC.L10N.register(
"Theming" : "Оформлення",
"Hardening and security guidance" : "Інструктування з безпеки та захисту",
"Version" : "Версія",
- "More apps" : "Більше додатків",
"Developer documentation" : "Документація для розробників",
"Experimental applications ahead" : "Спершу експериментальні застосунки",
"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." : "Експериментальні застосунки не перевірені на наявність проблем безпеки, нові або нестабільні і в процесі активної розробки. Встановлення їх може спричинити втрату даних або дірки в безпеці.",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index 1dceebe4b75..4201c9d339f 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -115,6 +115,7 @@
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Пропонуємо встановити необхідні пакети для вашої системи для підтримки однієї з наступних мов %s.",
"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію \"overwrite.cli.url\" файлу config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не вдалося запустити завдання планувальника через CLI. Відбулися наступні технічні помилки:",
+ "Open documentation" : "Відкрити документацію",
"Allow apps to use the Share API" : "Дозволити програмам використовувати API спільного доступу",
"Allow users to share via link" : "Дозволити користувачам ділитися через посилання",
"Enforce password protection" : "Захист паролем обов'язковий",
@@ -132,7 +133,6 @@
"Last cron job execution: %s." : "Останне виконане Cron завдання: %s.",
"Last cron job execution: %s. Something seems wrong." : "Останне виконане Cron завдання: %s. Щось здається неправильним.",
"Cron was not executed yet!" : "Cron-задачі ще не запускалися!",
- "Open documentation" : "Відкрити документацію",
"Execute one task with each page loaded" : "Виконати одне завдання для кожної завантаженої сторінки ",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зареєстрований в службі webcron та буде викликатися кожні 15 хвилин через HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Використовувати системний cron для виклику cron.php кожні 15 хвилин.",
@@ -167,7 +167,6 @@
"Theming" : "Оформлення",
"Hardening and security guidance" : "Інструктування з безпеки та захисту",
"Version" : "Версія",
- "More apps" : "Більше додатків",
"Developer documentation" : "Документація для розробників",
"Experimental applications ahead" : "Спершу експериментальні застосунки",
"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." : "Експериментальні застосунки не перевірені на наявність проблем безпеки, нові або нестабільні і в процесі активної розробки. Встановлення їх може спричинити втрату даних або дірки в безпеці.",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 242c78eee7a..313a118900b 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -116,7 +116,6 @@ OC.L10N.register(
"Less" : "更少",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时,不鼓励使用 SQLite 。",
"Version" : "版本",
- "More apps" : "更多应用",
"by" : "被",
"Documentation:" : "文档:",
"User Documentation" : "用户文档",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index f911248ed41..d9ea601b66a 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -114,7 +114,6 @@
"Less" : "更少",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时,不鼓励使用 SQLite 。",
"Version" : "版本",
- "More apps" : "更多应用",
"by" : "被",
"Documentation:" : "文档:",
"User Documentation" : "用户文档",
diff --git a/settings/l10n/zh_HK.js b/settings/l10n/zh_HK.js
index 6b613fdf4f7..c2d56692bcf 100644
--- a/settings/l10n/zh_HK.js
+++ b/settings/l10n/zh_HK.js
@@ -35,7 +35,6 @@ OC.L10N.register(
"Log level" : "日誌等級",
"More" : "更多",
"Version" : "版本",
- "More apps" : "更多應用程式",
"Forum" : "討論區",
"Android app" : "Android 應用程式",
"iOS app" : "iOS 應用程式",
diff --git a/settings/l10n/zh_HK.json b/settings/l10n/zh_HK.json
index 1f562400c05..4a5e3ed713a 100644
--- a/settings/l10n/zh_HK.json
+++ b/settings/l10n/zh_HK.json
@@ -33,7 +33,6 @@
"Log level" : "日誌等級",
"More" : "更多",
"Version" : "版本",
- "More apps" : "更多應用程式",
"Forum" : "討論區",
"Android app" : "Android 應用程式",
"iOS app" : "iOS 應用程式",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index e946e3b5de2..0c562a1f5a6 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -94,7 +94,6 @@ OC.L10N.register(
"More" : "更多",
"Less" : "更少",
"Version" : "版本",
- "More apps" : "更多 Apps",
"by" : "由",
"Documentation:" : "文件:",
"User Documentation" : "用戶說明文件",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index cb4858f9009..898f2f391e8 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -92,7 +92,6 @@
"More" : "更多",
"Less" : "更少",
"Version" : "版本",
- "More apps" : "更多 Apps",
"by" : "由",
"Documentation:" : "文件:",
"User Documentation" : "用戶說明文件",
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 587a3b6c66b..5edf4e2a9c7 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -180,6 +180,9 @@ if ($_['cronErrors']) {
<div class="section" id="shareAPI">
<h2><?php p($l->t('Sharing'));?></h2>
+ <a target="_blank" class="icon-info svg"
+ title="<?php p($l->t('Open documentation'));?>"
+ href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
<p id="enable">
<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
@@ -310,7 +313,10 @@ if ($_['cronErrors']) {
</div>
<div class="section" id='encryptionAPI'>
- <h2><?php p($l->t('Server-side encryption')); ?> </h2>
+ <h2><?php p($l->t('Server-side encryption')); ?></h2>
+ <a target="_blank" class="icon-info svg"
+ title="<?php p($l->t('Open documentation'));?>"
+ href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
<p id="enable">
<input type="checkbox" name="encryption_enabled"
@@ -359,6 +365,9 @@ if ($_['cronErrors']) {
<div class="section" id="mail_general_settings">
<form id="mail_general_settings_form" class="mail_settings">
<h2><?php p($l->t('Email server'));?></h2>
+ <a target="_blank" class="icon-info svg"
+ title="<?php p($l->t('Open documentation'));?>"
+ href="<?php p(link_to_docs('admin-email')); ?>"></a>
<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 31de7fa2318..fb25917ee59 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -31,9 +31,6 @@ script(
<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
<li>
- <a class="app-external" target="_blank" href="https://apps.owncloud.com/?xsortmode=high"><?php p($l->t('More apps'));?> …</a>
- </li>
- <li>
<a class="app-external" target="_blank" href="https://owncloud.org/dev"><?php p($l->t('Developer documentation'));?> …</a>
</li>
<?php endif; ?>
diff --git a/tests/lib/lock/lockingprovider.php b/tests/lib/lock/lockingprovider.php
new file mode 100644
index 00000000000..08d879da8bb
--- /dev/null
+++ b/tests/lib/lock/lockingprovider.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Test\Lock;
+
+use OCP\Lock\ILockingProvider;
+use OCP\Lock\LockedException;
+use Test\TestCase;
+
+abstract class LockingProvider extends TestCase {
+ /**
+ * @var \OCP\Lock\ILockingProvider
+ */
+ protected $instance;
+
+ /**
+ * @return \OCP\Lock\ILockingProvider
+ */
+ abstract protected function getInstance();
+
+ protected function setUp() {
+ parent::setUp();
+ $this->instance = $this->getInstance();
+ }
+
+ public function testExclusiveLock() {
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
+ $this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+ }
+
+ public function testSharedLock() {
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+ $this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+ }
+
+ public function testDoubleSharedLock() {
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+ $this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+ }
+
+ public function testReleaseSharedLock() {
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+ $this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+ $this->instance->releaseLock('foo', ILockingProvider::LOCK_SHARED);
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+ $this->instance->releaseLock('foo', ILockingProvider::LOCK_SHARED);
+ $this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+ }
+
+ /**
+ * @expectedException \OCP\Lock\LockedException
+ */
+ public function testDoubleExclusiveLock() {
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
+ }
+
+ public function testReleaseExclusiveLock() {
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
+ $this->instance->releaseLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
+ $this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
+ }
+
+ /**
+ * @expectedException \OCP\Lock\LockedException
+ */
+ public function testExclusiveLockAfterShared() {
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
+ }
+
+ public function testExclusiveLockAfterSharedReleased() {
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+ $this->instance->releaseLock('foo', ILockingProvider::LOCK_SHARED);
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
+ }
+
+
+ /**
+ * @expectedException \OCP\Lock\LockedException
+ */
+ public function testSharedLockAfterExclusive() {
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
+ $this->assertTrue($this->instance->isLocked('foo', ILockingProvider::LOCK_EXCLUSIVE));
+ $this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+ }
+
+ public function testLockedExceptionHasPathForShared() {
+ try {
+ $this->testSharedLockAfterExclusive();
+ $this->fail('Expected locked exception');
+ } catch (LockedException $e) {
+ $this->assertEquals('foo', $e->getPath());
+ }
+ }
+
+ public function testLockedExceptionHasPathForExclusive() {
+ try {
+ $this->testExclusiveLockAfterShared();
+ $this->fail('Expected locked exception');
+ } catch (LockedException $e) {
+ $this->assertEquals('foo', $e->getPath());
+ }
+ }
+}
diff --git a/tests/lib/lock/memcachelockingprovider.php b/tests/lib/lock/memcachelockingprovider.php
new file mode 100644
index 00000000000..40478b22939
--- /dev/null
+++ b/tests/lib/lock/memcachelockingprovider.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Test\Lock;
+
+use OC\Memcache\ArrayCache;
+
+class MemcacheLockingProvider extends LockingProvider {
+
+ /**
+ * @var \OCP\IMemcache
+ */
+ private $memcache;
+
+ /**
+ * @return \OCP\Lock\ILockingProvider
+ */
+ protected function getInstance() {
+ $this->memcache = new ArrayCache();
+ return new \OC\Lock\MemcacheLockingProvider($this->memcache);
+ }
+
+ public function tearDown() {
+ $this->memcache->clear();
+ parent::tearDown();
+ }
+}
diff --git a/tests/lib/memcache/cache.php b/tests/lib/memcache/cache.php
index e5ceae52fb0..9d977cf0247 100644
--- a/tests/lib/memcache/cache.php
+++ b/tests/lib/memcache/cache.php
@@ -10,6 +10,11 @@
namespace Test\Memcache;
abstract class Cache extends \Test_Cache {
+ /**
+ * @var \OCP\IMemcache cache;
+ */
+ protected $instance;
+
public function testExistsAfterSet() {
$this->assertFalse($this->instance->hasKey('foo'));
$this->instance->set('foo', 'bar');
@@ -56,6 +61,49 @@ abstract class Cache extends \Test_Cache {
$this->assertFalse($this->instance->hasKey('foo'));
}
+ public function testAdd() {
+ $this->assertTrue($this->instance->add('foo', 'bar'));
+ $this->assertEquals('bar', $this->instance->get('foo'));
+ $this->assertFalse($this->instance->add('foo', 'asd'));
+ $this->assertEquals('bar', $this->instance->get('foo'));
+ }
+
+ public function testInc() {
+ $this->assertEquals(1, $this->instance->inc('foo'));
+ $this->assertEquals(1, $this->instance->get('foo'));
+ $this->assertEquals(2, $this->instance->inc('foo'));
+ $this->assertEquals(12, $this->instance->inc('foo', 10));
+
+ $this->instance->set('foo', 'bar');
+ $this->assertFalse($this->instance->inc('foo'));
+ $this->assertEquals('bar', $this->instance->get('foo'));
+ }
+
+ public function testDec() {
+ $this->assertEquals(false, $this->instance->dec('foo'));
+ $this->instance->set('foo', 20);
+ $this->assertEquals(19, $this->instance->dec('foo'));
+ $this->assertEquals(19, $this->instance->get('foo'));
+ $this->assertEquals(9, $this->instance->dec('foo', 10));
+
+ $this->instance->set('foo', 'bar');
+ $this->assertFalse($this->instance->dec('foo'));
+ $this->assertEquals('bar', $this->instance->get('foo'));
+ }
+
+ public function testCasNotChanged() {
+ $this->instance->set('foo', 'bar');
+ $this->assertTrue($this->instance->cas('foo', 'bar', 'asd'));
+ $this->assertEquals('asd', $this->instance->get('foo'));
+ }
+
+ public function testCasChanged() {
+ $this->instance->set('foo', 'bar1');
+ $this->assertFalse($this->instance->cas('foo', 'bar', 'asd'));
+ $this->assertEquals('bar1', $this->instance->get('foo'));
+ }
+
+
protected function tearDown() {
if ($this->instance) {
$this->instance->clear();
diff --git a/tests/lib/memcache/castrait.php b/tests/lib/memcache/castrait.php
new file mode 100644
index 00000000000..17f412bb638
--- /dev/null
+++ b/tests/lib/memcache/castrait.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Test\Memcache;
+
+use Test\TestCase;
+
+class CasTrait extends TestCase {
+ /**
+ * @return \OC\Memcache\CasTrait
+ */
+ private function getCache() {
+ $sourceCache = new \OC\Memcache\ArrayCache();
+ $mock = $this->getMockForTrait('\OC\Memcache\CasTrait');
+
+ $mock->expects($this->any())
+ ->method('set')
+ ->will($this->returnCallback(function ($key, $value, $ttl) use ($sourceCache) {
+ return $sourceCache->set($key, $value, $ttl);
+ }));
+
+ $mock->expects($this->any())
+ ->method('get')
+ ->will($this->returnCallback(function ($key) use ($sourceCache) {
+ return $sourceCache->get($key);
+ }));
+
+ $mock->expects($this->any())
+ ->method('add')
+ ->will($this->returnCallback(function ($key, $value, $ttl) use ($sourceCache) {
+ return $sourceCache->add($key, $value, $ttl);
+ }));
+
+ $mock->expects($this->any())
+ ->method('remove')
+ ->will($this->returnCallback(function ($key) use ($sourceCache) {
+ return $sourceCache->remove($key);
+ }));
+ return $mock;
+ }
+
+ public function testCasNotChanged() {
+ $cache = $this->getCache();
+ $cache->set('foo', 'bar');
+ $this->assertTrue($cache->cas('foo', 'bar', 'asd'));
+ $this->assertEquals('asd', $cache->get('foo'));
+ }
+
+ public function testCasChanged() {
+ $cache = $this->getCache();
+ $cache->set('foo', 'bar1');
+ $this->assertFalse($cache->cas('foo', 'bar', 'asd'));
+ $this->assertEquals('bar1', $cache->get('foo'));
+ }
+}
diff --git a/version.php b/version.php
index 9b61256f751..1b7105b1273 100644
--- a/version.php
+++ b/version.php
@@ -23,10 +23,10 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
-$OC_Version=array(8, 1, 0, 3);
+$OC_Version=array(8, 1, 0, 4);
// The human readable string
-$OC_VersionString='8.1 alpha 2';
+$OC_VersionString='8.1 alpha 3';
// The ownCloud channel
$OC_Channel='git';