Merge branch 'master' into oc_avatars

7 files changed, 147 insertions, 6 deletions

diff --git a/settings/js/apps.js b/settings/js/apps.js
index d9817aff6b6..1ae45932172 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -27,7 +27,15 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		}
 		page.find('small.externalapp').attr('style', 'visibility:visible');
 		page.find('span.author').text(app.author);
-		page.find('span.licence').text(app.license);
+
+		// FIXME licenses of downloaded apps go into app.licence, licenses of not-downloaded apps into app.license
+		var appLicense = '';
+		if (typeof(app.licence) !== 'undefined') {
+			appLicense = app.licence;
+		} else if (typeof(app.license) !== 'undefined') {
+			appLicense = app.license;
+		}
+		page.find('span.licence').text(appLicense);
 
 		if (app.update !== false) {
 			page.find('input.update').show();
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index a6288e471fd..09caacbb5ae 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -20,12 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Zakázat",
 "Enable" => "Povolit",
 "Please wait...." => "Čekejte prosím...",
+"Error while disabling app" => "Chyba při zakazování aplikace",
+"Error while enabling app" => "Chyba při povolování aplikace",
 "Updating...." => "Aktualizuji...",
 "Error while updating app" => "Chyba při aktualizaci aplikace",
 "Error" => "Chyba",
 "Update" => "Aktualizovat",
 "Updated" => "Aktualizováno",
-"Decrypting files... Please wait, this can take some time." => "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut.",
+"Decrypting files... Please wait, this can take some time." => "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
 "Saving..." => "Ukládám...",
 "deleted" => "smazáno",
 "undo" => "vrátit zpět",
@@ -103,8 +105,8 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
 "Encryption" => "Šifrování",
-"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory",
-"Log-in password" => "Heslo",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není zapnuta, odšifrujte všechny své soubory",
+"Log-in password" => "Přihlašovací heslo",
 "Decrypt all Files" => "Odšifrovat všechny soubory",
 "Login Name" => "Přihlašovací jméno",
 "Create" => "Vytvořit",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 2c30e51017c..87e935a93c6 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten...",
+"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
 "Updating...." => "Aktualisierung...",
 "Error while updating app" => "Fehler beim Aktualisieren der App",
 "Error" => "Fehler",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index c14e5a3606a..6998b51042b 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -20,8 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten....",
-"Error while disabling app" => "Beim deaktivieren der Applikation ist ein Fehler aufgetreten.",
-"Error while enabling app" => "Beim aktivieren der Applikation ist ein Fehler aufgetreten.",
+"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
 "Updating...." => "Update...",
 "Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
 "Error" => "Fehler",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
new file mode 100644
index 00000000000..e1a00643908
--- /dev/null
+++ b/settings/l10n/en_GB.php
@@ -0,0 +1,124 @@
+<?php
+$TRANSLATIONS = array(
+"Unable to load list from App Store" => "Unable to load list from App Store",
+"Authentication error" => "Authentication error",
+"Your display name has been changed." => "Your display name has been changed.",
+"Unable to change display name" => "Unable to change display name",
+"Group already exists" => "Group already exists",
+"Unable to add group" => "Unable to add group",
+"Email saved" => "Email saved",
+"Invalid email" => "Invalid email",
+"Unable to delete group" => "Unable to delete group",
+"Unable to delete user" => "Unable to delete user",
+"Language changed" => "Language changed",
+"Invalid request" => "Invalid request",
+"Admins can't remove themself from the admin group" => "Admins can't remove themselves from the admin group",
+"Unable to add user to group %s" => "Unable to add user to group %s",
+"Unable to remove user from group %s" => "Unable to remove user from group %s",
+"Couldn't update app." => "Couldn't update app.",
+"Update to {appversion}" => "Update to {appversion}",
+"Disable" => "Disable",
+"Enable" => "Enable",
+"Please wait...." => "Please wait....",
+"Error while disabling app" => "Error whilst disabling app",
+"Error while enabling app" => "Error whilst enabling app",
+"Updating...." => "Updating....",
+"Error while updating app" => "Error whilst updating app",
+"Error" => "Error",
+"Update" => "Update",
+"Updated" => "Updated",
+"Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
+"Saving..." => "Saving...",
+"deleted" => "deleted",
+"undo" => "undo",
+"Unable to remove user" => "Unable to remove user",
+"Groups" => "Groups",
+"Group Admin" => "Group Admin",
+"Delete" => "Delete",
+"add group" => "add group",
+"A valid username must be provided" => "A valid username must be provided",
+"Error creating user" => "Error creating user",
+"A valid password must be provided" => "A valid password must be provided",
+"__language_name__" => "__language_name__",
+"Security Warning" => "Security Warning",
+"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 webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "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 webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.",
+"Setup Warning" => "Setup Warning",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Please double check the <a href=\"%s\">installation guides</a>.",
+"Module 'fileinfo' missing" => "Module 'fileinfo' missing",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection.",
+"Locale not working" => "Locale not working",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.",
+"Internet connection not working" => "Internet connection not working",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don't work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.",
+"Cron" => "Cron",
+"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 once a minute over http." => "cron.php is registered at a webcron service to call cron.php once a minute over http.",
+"Use systems cron service to call the cron.php file once a minute." => "Use systems cron service to call the cron.php file once a minute.",
+"Sharing" => "Sharing",
+"Enable Share API" => "Enable Share API",
+"Allow apps to use the Share API" => "Allow apps to use the Share API",
+"Allow links" => "Allow links",
+"Allow users to share items to the public with links" => "Allow users to share items to the public with links",
+"Allow public uploads" => "Allow public uploads",
+"Allow users to enable others to upload into their publicly shared folders" => "Allow users to enable others to upload into their publicly shared folders",
+"Allow resharing" => "Allow resharing",
+"Allow users to share items shared with them again" => "Allow users to share items shared with them again",
+"Allow users to share with anyone" => "Allow users to share with anyone",
+"Allow users to only share with users in their groups" => "Allow users to only share with users in their groups",
+"Security" => "Security",
+"Enforce HTTPS" => "Enforce HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
+"Log" => "Log",
+"Log level" => "Log level",
+"More" => "More",
+"Less" => "Less",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Add your App",
+"More Apps" => "More Apps",
+"Select an App" => "Select an App",
+"See application page at apps.owncloud.com" => "See application page at apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"User Documentation" => "User Documentation",
+"Administrator Documentation" => "Administrator Documentation",
+"Online Documentation" => "Online Documentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Commercial Support",
+"Get the apps to sync your files" => "Get the apps to sync your files",
+"Show First Run Wizard again" => "Show First Run Wizard again",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "You have used <strong>%s</strong> of the available <strong>%s</strong>",
+"Password" => "Password",
+"Your password was changed" => "Your password was changed",
+"Unable to change your password" => "Unable to change your password",
+"Current password" => "Current password",
+"New password" => "New password",
+"Change password" => "Change password",
+"Display Name" => "Display Name",
+"Email" => "Email",
+"Your email address" => "Your email address",
+"Fill in an email address to enable password recovery" => "Fill in an email address to enable password recovery",
+"Language" => "Language",
+"Help translate" => "Help translate",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>",
+"Encryption" => "Encryption",
+"The encryption app is no longer enabled, decrypt all your file" => "The encryption app is no longer enabled, decrypt all your files",
+"Log-in password" => "Log-in password",
+"Decrypt all Files" => "Decrypt all Files",
+"Login Name" => "Login Name",
+"Create" => "Create",
+"Admin Recovery Password" => "Admin Recovery Password",
+"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the user's files during password change",
+"Default Storage" => "Default Storage",
+"Unlimited" => "Unlimited",
+"Other" => "Other",
+"Username" => "Username",
+"Storage" => "Storage",
+"change display name" => "change display name",
+"set new password" => "set new password",
+"Default" => "Default"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index fb51d793c69..b3e3dfec91b 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Agarde...",
+"Error while disabling app" => "Produciuse un erro ao desactivar o aplicativo",
+"Error while enabling app" => "Produciuse un erro ao activar o aplicativo",
 "Updating...." => "Actualizando...",
 "Error while updating app" => "Produciuse un erro mentres actualizaba o aplicativo",
 "Error" => "Erro",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 0d22ad10741..b83407fc3bc 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Zakázať",
 "Enable" => "Zapnúť",
 "Please wait...." => "Čakajte prosím...",
+"Error while disabling app" => "Chyba pri zablokovaní aplikácie",
+"Error while enabling app" => "Chyba pri povoľovaní aplikácie",
 "Updating...." => "Aktualizujem...",
 "Error while updating app" => "chyba pri aktualizácii aplikácie",
 "Error" => "Chyba",
@@ -103,6 +105,7 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>",
 "Encryption" => "Šifrovanie",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifrovacia aplikácia nie je povolená, dešifrujte všetky vaše súbory",
 "Log-in password" => "Prihlasovacie heslo",
 "Decrypt all Files" => "Dešifrovať všetky súbory",
 "Login Name" => "Prihlasovacie meno",