diff options
Diffstat (limited to 'settings')
36 files changed, 107 insertions, 39 deletions
diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php index 46782a0cace..e9ffc36904e 100644 --- a/settings/controller/userscontroller.php +++ b/settings/controller/userscontroller.php @@ -504,7 +504,12 @@ class UsersController extends Controller { ); } - $this->config->setUserValue($id, 'settings', 'email', $mailAddress); + // delete user value if email address is empty + if($mailAddress === '') { + $this->config->deleteUserValue($id, 'settings', 'email'); + } else { + $this->config->setUserValue($id, 'settings', 'email', $mailAddress); + } return new DataResponse( array( diff --git a/settings/css/settings.css b/settings/css/settings.css index 583e8804951..4e398c64c4e 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -494,3 +494,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { #encryptionModules { padding: 10px; } + +#warning { + color: red; +} diff --git a/settings/js/admin.js b/settings/js/admin.js index 9cdb7f5b0f1..8f705b9048d 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -54,20 +54,15 @@ $(document).ready(function(){ $('#shareAPI p:not(#enable)').toggleClass('hidden', !this.checked); }); - $('#encryptionEnabled').change(function() { - $('#encryptionAPI div#EncryptionSettingsArea').toggleClass('hidden'); + $('#enableEncryption').change(function() { + $('#encryptionAPI div#EncryptionWarning').toggleClass('hidden'); }); - $('#encryptionAPI input').change(function() { - var value = $(this).val(); - if ($(this).attr('type') === 'checkbox') { - if (this.checked) { - value = 'yes'; - } else { - value = 'no'; - } - } - OC.AppConfig.setValue('core', $(this).attr('name'), value); + $('#reallyEnableEncryption').click(function() { + $('#encryptionAPI div#EncryptionWarning').toggleClass('hidden'); + $('#encryptionAPI div#EncryptionSettingsArea').toggleClass('hidden'); + OC.AppConfig.setValue('core', 'encryption_enabled', 'yes'); + $('#enableEncryption').attr('disabled', 'disabled'); }); $('#startmigration').click(function(event){ diff --git a/settings/js/personal.js b/settings/js/personal.js index f3fcf614bfa..3745b1372ea 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -12,8 +12,9 @@ * user or 1 second after the last data entry * * @param callback + * @param allowEmptyValue if this is set to true the callback is also called when the value is empty */ -jQuery.fn.keyUpDelayedOrEnter = function (callback) { +jQuery.fn.keyUpDelayedOrEnter = function (callback, allowEmptyValue) { var cb = callback; var that = this; this.keyup(_.debounce(function (event) { @@ -21,13 +22,13 @@ jQuery.fn.keyUpDelayedOrEnter = function (callback) { if (event.keyCode === 13) { return; } - if (that.val() !== '') { + if (allowEmptyValue || that.val() !== '') { cb(); } }, 1000)); this.keypress(function (event) { - if (event.keyCode === 13 && that.val() !== '') { + if (event.keyCode === 13 && (allowEmptyValue || that.val() !== '')) { event.preventDefault(); cb(); } @@ -213,7 +214,7 @@ $(document).ready(function () { }); $('#displayName').keyUpDelayedOrEnter(changeDisplayName); - $('#email').keyUpDelayedOrEnter(changeEmailAddress); + $('#email').keyUpDelayedOrEnter(changeEmailAddress, true); $("#languageinput").change(function () { // Serialize the data @@ -301,6 +302,10 @@ $(document).ready(function () { type: 'DELETE' }); row.remove(); + + if ($('#sslCertificate > tbody > tr').length === 0) { + $('#sslCertificate').hide(); + } return true; }); @@ -329,6 +334,7 @@ $(document).ready(function () { )); $('#sslCertificate tbody').append(row); + $('#sslCertificate').show(); }, fail: function () { OC.Notification.showTemporary( @@ -339,6 +345,10 @@ $(document).ready(function () { $('#rootcert_import_button').click(function () { $('#rootcert_import').click(); }); + + if ($('#sslCertificate > tbody > tr').length === 0) { + $('#sslCertificate').hide(); + } }); if (!OC.Encryption) { diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 88b54e0b637..6f44ab3ec3d 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -143,6 +143,7 @@ OC.L10N.register( "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.", "Enable server-side encryption" : "Povolit šifrování na straně serveru", + "Enable encryption" : "Povolit šifrování", "Start migration" : "Spustit migraci", "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.", "Send mode" : "Mód odesílání", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index 89576802882..e173b704c5c 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -141,6 +141,7 @@ "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.", "Enable server-side encryption" : "Povolit šifrování na straně serveru", + "Enable encryption" : "Povolit šifrování", "Start migration" : "Spustit migraci", "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.", "Send mode" : "Mód odesílání", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 107fcf2196c..21f0f86f3f8 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -143,6 +143,7 @@ OC.L10N.register( "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.", "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren", + "Enable encryption" : "Verschlüsselung aktivieren", "Start migration" : "Migration beginnen", "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.", "Send mode" : "Sendemodus", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 6e40990ec33..d9d6422e341 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -141,6 +141,7 @@ "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.", "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren", + "Enable encryption" : "Verschlüsselung aktivieren", "Start migration" : "Migration beginnen", "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.", "Send mode" : "Sendemodus", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index a4e3867a51a..150a87d30b4 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -143,6 +143,7 @@ OC.L10N.register( "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.", "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren", + "Enable encryption" : "Verschlüsselung aktivieren", "Start migration" : "Migration beginnen", "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.", "Send mode" : "Sendemodus", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 9c615638b1f..b643f508a9e 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -141,6 +141,7 @@ "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.", "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren", + "Enable encryption" : "Verschlüsselung aktivieren", "Start migration" : "Migration beginnen", "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.", "Send mode" : "Sendemodus", diff --git a/settings/l10n/el.js b/settings/l10n/el.js index 255053ef87c..22e6b49be6b 100644 --- a/settings/l10n/el.js +++ b/settings/l10n/el.js @@ -143,6 +143,7 @@ OC.L10N.register( "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 λεπτά.", "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή", + "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης", "Start migration" : "Έναρξη μετάβασης", "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.", "Send mode" : "Κατάσταση αποστολής", diff --git a/settings/l10n/el.json b/settings/l10n/el.json index f7203c957a4..47e75e8275f 100644 --- a/settings/l10n/el.json +++ b/settings/l10n/el.json @@ -141,6 +141,7 @@ "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 λεπτά.", "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή", + "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης", "Start migration" : "Έναρξη μετάβασης", "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.", "Send mode" : "Κατάσταση αποστολής", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index dbd2c36f473..37d4d98d352 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -143,6 +143,7 @@ OC.L10N.register( "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.", "Enable server-side encryption" : "Habilitar cifrado en el servidor", + "Enable encryption" : "Habilitar cifrado", "Start migration" : "Iniciar migración", "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.", "Send mode" : "Modo de envío", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index a17d9acbdb8..9763360bd1a 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -141,6 +141,7 @@ "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.", "Enable server-side encryption" : "Habilitar cifrado en el servidor", + "Enable encryption" : "Habilitar cifrado", "Start migration" : "Iniciar migración", "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.", "Send mode" : "Modo de envío", diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index 8b943e25466..1154a5abf8a 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -136,6 +136,7 @@ OC.L10N.register( "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.", "Enable server-side encryption" : "Käytä palvelinpään salausta", + "Enable encryption" : "Käytä salausta", "Start migration" : "Käynnistä migraatio", "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.", "Send mode" : "Lähetystila", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index ad8328fd41d..f190c7e939a 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -134,6 +134,7 @@ "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.", "Enable server-side encryption" : "Käytä palvelinpään salausta", + "Enable encryption" : "Käytä salausta", "Start migration" : "Käynnistä migraatio", "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.", "Send mode" : "Lähetystila", diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js index 33ade900711..c15b6fdc789 100644 --- a/settings/l10n/gl.js +++ b/settings/l10n/gl.js @@ -143,6 +143,7 @@ OC.L10N.register( "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.", "Enable server-side encryption" : "Activar o cifrado na parte do servidor", + "Enable encryption" : "Activar o cifrado", "Start migration" : "Iniciar a migración", "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.", "Send mode" : "Modo de envío", diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json index dfab2fa295d..8cf46a36e8c 100644 --- a/settings/l10n/gl.json +++ b/settings/l10n/gl.json @@ -141,6 +141,7 @@ "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.", "Enable server-side encryption" : "Activar o cifrado na parte do servidor", + "Enable encryption" : "Activar o cifrado", "Start migration" : "Iniciar a migración", "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.", "Send mode" : "Modo de envío", diff --git a/settings/l10n/is.js b/settings/l10n/is.js index 0d51ee2eb39..73c70d9fd8f 100644 --- a/settings/l10n/is.js +++ b/settings/l10n/is.js @@ -47,4 +47,4 @@ OC.L10N.register( "Other" : "Annað", "Default" : "Sjálfgefið" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"); diff --git a/settings/l10n/is.json b/settings/l10n/is.json index ece8f077333..341531648a6 100644 --- a/settings/l10n/is.json +++ b/settings/l10n/is.json @@ -44,5 +44,5 @@ "Unlimited" : "Ótakmarkað", "Other" : "Annað", "Default" : "Sjálfgefið" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);" }
\ No newline at end of file diff --git a/settings/l10n/it.js b/settings/l10n/it.js index 2991681a1dc..4d9ae5c0a78 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -143,6 +143,7 @@ OC.L10N.register( "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.", "Enable server-side encryption" : "Abilita cifratura lato server", + "Enable encryption" : "Abilita cifratura", "Start migration" : "Avvia migrazione", "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.", "Send mode" : "Modalità di invio", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index 275ec25b750..44accb98865 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -141,6 +141,7 @@ "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.", "Enable server-side encryption" : "Abilita cifratura lato server", + "Enable encryption" : "Abilita cifratura", "Start migration" : "Avvia migrazione", "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.", "Send mode" : "Modalità di invio", diff --git a/settings/l10n/lb.js b/settings/l10n/lb.js index 0c061ae7d6e..7fae2ae2f3c 100644 --- a/settings/l10n/lb.js +++ b/settings/l10n/lb.js @@ -9,6 +9,8 @@ OC.L10N.register( "Admins can't remove themself from the admin group" : "Admins kennen sech selwer net aus enger Admin Group läschen.", "Unable to add user to group %s" : "Onmeiglech User an Grupp ze sätzen %s", "Wrong password" : "Falscht Passwuert", + "Enabled" : "Aktivéiert", + "Saved" : "Gespäichert", "Email sent" : "Email geschéckt", "Email saved" : "E-mail gespäichert", "All" : "All", @@ -20,6 +22,7 @@ OC.L10N.register( "never" : "ni", "__language_name__" : "__language_name__", "Login" : "Login", + "Open documentation" : "Dokumentatioun opmaachen", "Allow apps to use the Share API" : "Erlab Apps d'Share API ze benotzen", "Allow resharing" : "Resharing erlaben", "Authentication required" : "Authentifizéierung néideg", @@ -28,6 +31,9 @@ OC.L10N.register( "Less" : "Manner", "by" : "vun", "Cheers!" : "Prost!", + "Desktop client" : "Desktop-Programm", + "Android app" : "Android-App", + "iOS app" : "iOS-App", "Password" : "Passwuert", "Unable to change your password" : "Konnt däin Passwuert net änneren", "Current password" : "Momentan 't Passwuert", diff --git a/settings/l10n/lb.json b/settings/l10n/lb.json index 10b63b5668d..99510c77501 100644 --- a/settings/l10n/lb.json +++ b/settings/l10n/lb.json @@ -7,6 +7,8 @@ "Admins can't remove themself from the admin group" : "Admins kennen sech selwer net aus enger Admin Group läschen.", "Unable to add user to group %s" : "Onmeiglech User an Grupp ze sätzen %s", "Wrong password" : "Falscht Passwuert", + "Enabled" : "Aktivéiert", + "Saved" : "Gespäichert", "Email sent" : "Email geschéckt", "Email saved" : "E-mail gespäichert", "All" : "All", @@ -18,6 +20,7 @@ "never" : "ni", "__language_name__" : "__language_name__", "Login" : "Login", + "Open documentation" : "Dokumentatioun opmaachen", "Allow apps to use the Share API" : "Erlab Apps d'Share API ze benotzen", "Allow resharing" : "Resharing erlaben", "Authentication required" : "Authentifizéierung néideg", @@ -26,6 +29,9 @@ "Less" : "Manner", "by" : "vun", "Cheers!" : "Prost!", + "Desktop client" : "Desktop-Programm", + "Android app" : "Android-App", + "iOS app" : "iOS-App", "Password" : "Passwuert", "Unable to change your password" : "Konnt däin Passwuert net änneren", "Current password" : "Momentan 't Passwuert", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index af519698068..b97de8823d3 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -143,6 +143,7 @@ OC.L10N.register( "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.", "Enable server-side encryption" : "Server-side versleuteling inschakelen", + "Enable encryption" : "Versleuteling inschakelen", "Start migration" : "Start migratie", "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.", "Send mode" : "Verstuurmodus", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index 6fdfc8f41a1..d4859ec7f93 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -141,6 +141,7 @@ "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.", "Enable server-side encryption" : "Server-side versleuteling inschakelen", + "Enable encryption" : "Versleuteling inschakelen", "Start migration" : "Start migratie", "This is used for sending out notifications." : "Dit wordt gebruikt voor het verzenden van meldingen.", "Send mode" : "Verstuurmodus", diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js index 3c0687d5331..1a95c76b0d2 100644 --- a/settings/l10n/ru.js +++ b/settings/l10n/ru.js @@ -263,4 +263,4 @@ OC.L10N.register( "change email address" : "изменить адрес email", "Default" : "По умолчанию" }, -"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); +"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json index 155e3e909b5..c6ab2412e5a 100644 --- a/settings/l10n/ru.json +++ b/settings/l10n/ru.json @@ -260,5 +260,5 @@ "set new password" : "установить новый пароль", "change email address" : "изменить адрес email", "Default" : "По умолчанию" -},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" +},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js index 7bcb9874bdd..372aa9e6978 100644 --- a/settings/l10n/sr.js +++ b/settings/l10n/sr.js @@ -143,6 +143,7 @@ OC.L10N.register( "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 минута.", "Enable server-side encryption" : "Укључи шифровање на страни сервера", + "Enable encryption" : "Укључи шифровање", "Start migration" : "Покрени пресељење", "This is used for sending out notifications." : "Ово се користи за слање обавештења.", "Send mode" : "Режим слања", diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json index 5f84a0f6ee7..6af0f5951c9 100644 --- a/settings/l10n/sr.json +++ b/settings/l10n/sr.json @@ -141,6 +141,7 @@ "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 минута.", "Enable server-side encryption" : "Укључи шифровање на страни сервера", + "Enable encryption" : "Укључи шифровање", "Start migration" : "Покрени пресељење", "This is used for sending out notifications." : "Ово се користи за слање обавештења.", "Send mode" : "Режим слања", diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js index d17362b1b3c..05110cb7046 100644 --- a/settings/l10n/th_TH.js +++ b/settings/l10n/th_TH.js @@ -12,6 +12,7 @@ OC.L10N.register( "Unable to add user to group %s" : "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้", "Unable to remove user from group %s" : "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้", "Couldn't update app." : "ไม่สามารถอัพเดทแอปฯ", + "Saved" : "บันทึกแล้ว", "Email sent" : "ส่งอีเมล์แล้ว", "Email saved" : "อีเมลถูกบันทึกแล้ว", "All" : "ทั้งหมด", diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json index 7519442d4fe..5b3ba2b98ed 100644 --- a/settings/l10n/th_TH.json +++ b/settings/l10n/th_TH.json @@ -10,6 +10,7 @@ "Unable to add user to group %s" : "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้", "Unable to remove user from group %s" : "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้", "Couldn't update app." : "ไม่สามารถอัพเดทแอปฯ", + "Saved" : "บันทึกแล้ว", "Email sent" : "ส่งอีเมล์แล้ว", "Email saved" : "อีเมลถูกบันทึกแล้ว", "All" : "ทั้งหมด", diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index 78bc9ac243a..bdb5f511d41 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -143,6 +143,7 @@ OC.L10N.register( "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.", "Enable server-side encryption" : "Sunucu-taraflı şifrelemeyi aç", + "Enable encryption" : "Kriptolamayı aç", "Start migration" : "Taşınmayı başlat", "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.", "Send mode" : "Gönderme kipi", @@ -187,11 +188,17 @@ OC.L10N.register( "Update to %s" : "%s sürümüne güncelle", "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir", "Uninstall App" : "Uygulamayı Kaldır", + "Enable experimental apps" : "Deneme uygulamalarını aç", "No apps found for your version" : "Sürümünüz için uygulama bulunamadı", "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>" : "Merhaba,<br><br>Sadece artık bir %s hesabınızın olduğunu söylemek istedim.<br><br>Kullanıcı adınız: %s<br>Şuradan erişin: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Hoşçakalın!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Merhaba,\n\nSadece, artık bir %s hesabınızın olduğunu söylemek istedim.\n\nKullanıcı adınız: %s\nErişim: %s\n\n", + "User documentation" : "Kullanıcı kılavuzu", + "Administrator documentation" : "Yönetici kılavuzu", + "Online documentation" : "Online kılavuz", "Forum" : "Forum", + "Issue tracker" : "Sorun Takip", + "Commercial support" : "Ticari destek", "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin", "Desktop client" : "Masaüstü istemcisi", "Android app" : "Android uygulaması", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index 11f9c828f3e..f21b1dc5a3f 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -141,6 +141,7 @@ "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.", "Enable server-side encryption" : "Sunucu-taraflı şifrelemeyi aç", + "Enable encryption" : "Kriptolamayı aç", "Start migration" : "Taşınmayı başlat", "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.", "Send mode" : "Gönderme kipi", @@ -185,11 +186,17 @@ "Update to %s" : "%s sürümüne güncelle", "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir", "Uninstall App" : "Uygulamayı Kaldır", + "Enable experimental apps" : "Deneme uygulamalarını aç", "No apps found for your version" : "Sürümünüz için uygulama bulunamadı", "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>" : "Merhaba,<br><br>Sadece artık bir %s hesabınızın olduğunu söylemek istedim.<br><br>Kullanıcı adınız: %s<br>Şuradan erişin: <a href=\"%s\">%s</a><br><br>", "Cheers!" : "Hoşçakalın!", "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Merhaba,\n\nSadece, artık bir %s hesabınızın olduğunu söylemek istedim.\n\nKullanıcı adınız: %s\nErişim: %s\n\n", + "User documentation" : "Kullanıcı kılavuzu", + "Administrator documentation" : "Yönetici kılavuzu", + "Online documentation" : "Online kılavuz", "Forum" : "Forum", + "Issue tracker" : "Sorun Takip", + "Commercial support" : "Ticari destek", "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin", "Desktop client" : "Masaüstü istemcisi", "Android app" : "Android uygulaması", diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 6d2796d963f..1fc8c9faf7e 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -319,20 +319,27 @@ if ($_['cronErrors']) { href="<?php p(link_to_docs('admin-encryption')); ?>"></a> <p id="enable"> - <input type="checkbox" name="encryption_enabled" - id="encryptionEnabled" - value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked"'); ?> /> + <input type="checkbox" + id="enableEncryption" + value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> /> <label - for="encryptionEnabled"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/> + for="enableEncryption"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/> </p> + <div id="EncryptionWarning" class="warning hidden"> + <?php p($l->t('Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?')) ?> + <input type="button" + id="reallyEnableEncryption" + value="<?php p($l->t("Enable encryption")); ?>" /> + </div> + <div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>"> <div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>"> <?php if (empty($_['encryptionModules'])) { - p('No encryption module loaded, please load a encryption module in the app menu'); + p($l->t('No encryption module loaded, please load a encryption module in the app menu')); } else { ?> - <h3>Select default encryption module:</h3> + <h3><?php p($l->t('Select default encryption module:')) ?></h3> <fieldset id='encryptionModules'> <?php foreach ($_['encryptionModules'] as $id => $module): ?> <input type="radio" id="<?php p($id) ?>" @@ -353,10 +360,9 @@ if ($_['cronErrors']) { <div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>"> <?php if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) { - p('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. ' - . 'Please enable the "ownCloud Default Encryption Module" and run \'occ encryption:migrate\''); + p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "ownCloud Default Encryption Module" and run \'occ encryption:migrate\'')); } elseif ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === false) { - p('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.'); ?> + p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.')); ?> <input type="submit" name="startmigration" id="startmigration" value="<?php p($l->t('Start migration')); ?>"/> <?php } ?> diff --git a/settings/templates/apps.php b/settings/templates/apps.php index fb25917ee59..6bbde71df97 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -41,10 +41,7 @@ script( <div class="section apps-experimental"> <h2><?php p($l->t('Experimental applications ahead')) ?></h2> <p> - <?php p($l->t('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.')) ?> + <?php p($l->t('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.')) ?> </p> </div> {{/if}} @@ -54,7 +51,13 @@ script( <div class="app-image{{#if previewAsIcon}} app-image-icon{{/if}} hidden"> </div> {{/if}} - <h2 class="app-name"><a href="{{detailpage}}" target="_blank">{{name}}</a></h2> + <h2 class="app-name"> + {{#if detailpage}} + <a href="{{detailpage}}" target="_blank">{{name}}</a> + {{else}} + {{name}} + {{/if}} + </h2> <div class="app-version"> {{version}}</div> {{#if profilepage}}<a href="{{profilepage}}" target="_blank" rel="noreferrer">{{/if}} <div class="app-author"><?php p($l->t('by')); ?> {{author}} @@ -140,10 +143,7 @@ script( <label for="enable-experimental-apps"><?php p($l->t('Enable experimental apps')) ?></label> <p> <small> - <?php p($l->t('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.')) ?> + <?php p($l->t('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.')) ?> </small> </p> </div> |