Merge branch 'master' into ocs_api

34 files changed, 115 insertions, 59 deletions

diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 71cb046fc8d..b47a67c13bb 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -11,7 +11,7 @@ require_once '../../../lib/base.php';
 
 OC_JSON::checkAdminUser();
 
-$l = OC_L10N::get('core');
+$l = OC_L10N::get('settings');
 
 if(OC_Config::getValue('appstoreenabled', true)==false) {
 	OCP\JSON::success(array('type' => 'external', 'data' => array()));
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 1075a9a433c..c3b3491db93 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -10,5 +10,6 @@ $appid = OC_App::enable($_POST['appid']);
 if($appid !== false) {
 	OC_JSON::success(array('data' => array('appid' => $appid)));
 } else {
+	$l = OC_L10N::get('settings');	
 	OC_JSON::error(array("data" => array( "message" => $l->t("Could not enable app. ") )));
 }
diff --git a/settings/css/settings.css b/settings/css/settings.css
index f41edc96fb8..2015e93b43c 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -65,4 +65,4 @@ span.version { margin-left:3em; margin-right:3em; color:#555; }
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
 input[type=radio] { width:1em; }
-table.shareAPI td { padding-right: 2em; }
\ No newline at end of file
+table.shareAPI td { padding-bottom: 0.8em; }
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 67b1d77dc7a..c549ef2262e 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -3,6 +3,7 @@
 "Authentication error" => "Error d'autenticació",
 "Group already exists" => "El grup ja existeix",
 "Unable to add group" => "No es pot afegir el grup",
+"Could not enable app. " => "No s'ha pogut activar l'apliació",
 "Email saved" => "S'ha desat el correu electrònic",
 "Invalid email" => "El correu electrònic no és vàlid",
 "OpenID Changed" => "OpenID ha canviat",
@@ -20,8 +21,7 @@
 "Security Warning" => "Avís de seguretat",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La fitxer .htaccess que ownCloud proporciona no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "executa una tasca en carregar cada pàgina",
-"Share API" => "API de compartir",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php està registrat en un servei webcron. Feu una crida a la pàgina cron.php a l'arrel de ownCloud cada minut a través de http.",
 "Enable Share API" => "Activa l'API de compartir",
 "Allow apps to use the Share API" => "Permet que les aplicacions usin l'API de compartir",
 "Allow links" => "Permet enllaços",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 6fbac99b37d..382c2e75b3c 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -3,6 +3,7 @@
 "Authentication error" => "Chyba ověření",
 "Group already exists" => "Skupina již existuje",
 "Unable to add group" => "Nelze přidat skupinu",
+"Could not enable app. " => "Nelze povolit aplikaci.",
 "Email saved" => "E-mail uložen",
 "Invalid email" => "Neplatný e-mail",
 "OpenID Changed" => "OpenID změněno",
@@ -20,8 +21,7 @@
 "Security Warning" => "Bezpečnostní varování",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Váš adresář dat a soubory jsou pravděpodobně přístupné z internetu. Soubor .htacces, který ownCloud poskytuje nefunguje. Doporučujeme Vám abyste nastavili Váš webový server tak, aby nebylo možno přistupovat do adresáře s daty, nebo přesunuli adresář dat mimo kořenovou složku dokumentů webového serveru.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "spustit jednu úlohu s každou načtenou stránkou",
-"Share API" => "API sdílení",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php je registrován u služby webcron. Zavolá stránku cron.php v kořenovém adresáři owncloud každou minutu skrze http.",
 "Enable Share API" => "Povolit API sdílení",
 "Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
 "Allow links" => "Povolit odkazy",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 16b4e11eb99..53e51111a21 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -13,8 +13,6 @@
 "__language_name__" => "Dansk",
 "Security Warning" => "Sikkerhedsadvarsel",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "udfør en opgave for hver indlæst side",
-"Share API" => "Del API",
 "Enable Share API" => "Aktiver dele API",
 "Allow apps to use the Share API" => "Tillad apps a bruge dele APIen",
 "Allow links" => "Tillad links",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index ce1ef9c7ea1..83a57cc196a 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -3,6 +3,7 @@
 "Authentication error" => "Anmeldungsfehler",
 "Group already exists" => "Gruppe existiert bereits",
 "Unable to add group" => "Gruppe konnte nicht angelegt werden",
+"Could not enable app. " => "App konnte nicht aktiviert werden.",
 "Email saved" => "E-Mail gespeichert",
 "Invalid email" => "Ungültige E-Mail",
 "OpenID Changed" => "OpenID geändert",
@@ -20,8 +21,7 @@
 "Security Warning" => "Sicherheitshinweis",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von OwnCloud funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "Führe eine Aufgabe pro geladener Seite aus.",
-"Share API" => "Teilungs-API",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Dienst registriert. Rufen Sie die Seite cron.php im owncloud Root minütlich per HTTP auf.",
 "Enable Share API" => "Teilungs-API aktivieren",
 "Allow apps to use the Share API" => "Erlaubt Nutzern, die Teilungs-API zu nutzen",
 "Allow links" => "Links erlauben",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 536e72bad69..075734fb5f9 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -13,7 +13,6 @@
 "__language_name__" => "__όνομα_γλώσσας__",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται",
 "Log" => "Αρχείο καταγραφής",
 "More" => "Περισσότερο",
 "Add your App" => "Πρόσθεσε τη δικιά σου εφαρμογή ",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 61ac0fac272..c3bfa63f154 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -13,7 +13,6 @@
 "__language_name__" => "Esperanto",
 "Security Warning" => "Sekureca averto",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "lanĉi unu taskon po ĉiu paĝo ŝargita",
 "Log" => "Protokolo",
 "More" => "Pli",
 "Add your App" => "Aldonu vian aplikaĵon",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 36561d9aee5..c9393994940 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -3,6 +3,7 @@
 "Authentication error" => "Error de autenticación",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No se pudo añadir el grupo",
+"Could not enable app. " => "No puedo habilitar la app.",
 "Email saved" => "Correo guardado",
 "Invalid email" => "Correo no válido",
 "OpenID Changed" => "OpenID cambiado",
@@ -20,8 +21,7 @@
 "Security Warning" => "Advertencia de seguridad",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "El directorio de datos -data- y sus archivos probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configure su servidor web de forma que el directorio de datos ya no sea accesible o mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "ejecutar una tarea con cada página cargada",
-"Share API" => "API de compartición",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registrado como un servicio del webcron. Llama a la página de cron.php en la raíz de owncloud cada minuto sobre http.",
 "Enable Share API" => "Activar API de compartición",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la API de compartición",
 "Allow links" => "Permitir enlaces",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 13924f75484..9a8dd9fe134 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -19,8 +19,6 @@
 "__language_name__" => "Eesti",
 "Security Warning" => "Turvahoiatus",
 "Cron" => "Ajastatud töö",
-"execute one task with each page loaded" => "käivita iga laetud lehe juures üks ülesanne",
-"Share API" => "Jagamise API",
 "Enable Share API" => "Luba jagamise API",
 "Allow apps to use the Share API" => "Luba rakendustel kasutada jagamise API-t",
 "Allow links" => "Luba linke",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 51e62bc9ddc..529b13df39e 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -3,6 +3,7 @@
 "Authentication error" => "Autentifikazio errorea",
 "Group already exists" => "Taldea dagoeneko existitzenda",
 "Unable to add group" => "Ezin izan da taldea gehitu",
+"Could not enable app. " => "Ezin izan da aplikazioa gaitu.",
 "Email saved" => "Eposta gorde da",
 "Invalid email" => "Baliogabeko eposta",
 "OpenID Changed" => "OpenID aldatuta",
@@ -20,8 +21,7 @@
 "Security Warning" => "Segurtasun abisua",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "exekutatu zeregina orri karga bakoitzean",
-"Share API" => "Partekatze APIa",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez.",
 "Enable Share API" => "Gaitu Partekatze APIa",
 "Allow apps to use the Share API" => "Baimendu aplikazioak Partekatze APIa erabiltzeko",
 "Allow links" => "Baimendu loturak",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index edd5465b7da..b5571ac9a58 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -3,6 +3,7 @@
 "Authentication error" => "Todennusvirhe",
 "Group already exists" => "Ryhmä on jo olemassa",
 "Unable to add group" => "Ryhmän lisäys epäonnistui",
+"Could not enable app. " => "Sovelluksen käyttöönotto epäonnistui.",
 "Email saved" => "Sähköposti tallennettu",
 "Invalid email" => "Virheellinen sähköposti",
 "OpenID Changed" => "OpenID on vaihdettu",
@@ -20,8 +21,6 @@
 "Security Warning" => "Turvallisuusvaroitus",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "suorita yksi tehtävä jokaisella ladatulla sivulla",
-"Share API" => "Jaon ohelmointirajapinta (Share API)",
 "Enable Share API" => "Ota käyttöön jaon ohjelmoitirajapinta (Share API)",
 "Allow apps to use the Share API" => "Salli sovellusten käyttää jaon ohjelmointirajapintaa (Share API)",
 "Allow links" => "Salli linkit",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index a1c38d1e79e..2ef64e25312 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -20,8 +20,6 @@
 "Security Warning" => "Alertes de sécurité",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Votre répertoire de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni avec ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce répertoire ne soit plus accessible, ou bien de déplacer le répertoire de données à l'extérieur de la racine du serveur web.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "exécuter une tâche pour chaque page chargée",
-"Share API" => "API de partage",
 "Enable Share API" => "Activer l'API de partage",
 "Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
 "Allow links" => "Autoriser les liens",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 245ef329e8c..0cb1fbd6460 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -13,7 +13,6 @@
 "__language_name__" => "Galego",
 "Security Warning" => "Aviso de seguridade",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "executar unha tarefa con cada páxina cargada",
 "Log" => "Conectar",
 "More" => "Máis",
 "Add your App" => "Engade o teu aplicativo",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index e8728f6a1c7..6359655b55e 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -3,6 +3,7 @@
 "Authentication error" => "Errore di autenticazione",
 "Group already exists" => "Il gruppo esiste già",
 "Unable to add group" => "Impossibile aggiungere il gruppo",
+"Could not enable app. " => "Impossibile abilitare l'applicazione.",
 "Email saved" => "Email salvata",
 "Invalid email" => "Email non valida",
 "OpenID Changed" => "OpenID modificato",
@@ -20,8 +21,7 @@
 "Security Warning" => "Avviso di sicurezza",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess fornito da ownCloud non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile e spostare la cartella fuori dalla radice del server web.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "esegui un'attività con ogni pagina caricata",
-"Share API" => "API di condivisione",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php è registrato su un servizio webcron. Chiama la pagina cron.php nella radice di owncloud ogni minuto su http.",
 "Enable Share API" => "Abilita API di condivisione",
 "Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
 "Allow links" => "Consenti collegamenti",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 88c8b4c81c1..d675cc6836c 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -3,6 +3,7 @@
 "Authentication error" => "認証エラー",
 "Group already exists" => "グループは既に存在しています",
 "Unable to add group" => "グループを追加できません",
+"Could not enable app. " => "アプリを有効にできませんでした。",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
 "OpenID Changed" => "OpenIDが変更されました",
@@ -20,8 +21,7 @@
 "Security Warning" => "セキュリティ警告",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。",
 "Cron" => "cron(自動定期実行)",
-"execute one task with each page loaded" => "ページを開く毎にタスクを1つ実行",
-"Share API" => "Share API",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php は webcron サービスとして登録されています。HTTP経由で1分間に1回の頻度で owncloud のルートページ内の cron.php ページを呼び出します。",
 "Enable Share API" => "Share APIを有効",
 "Allow apps to use the Share API" => "Share APIの使用をアプリケーションに許可",
 "Allow links" => "リンクを許可",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 0ff261c9295..3ea2674a18c 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -13,7 +13,6 @@
 "__language_name__" => "한국어",
 "Security Warning" => "보안 경고",
 "Cron" => "크론",
-"execute one task with each page loaded" => "각 페이지가 로드 된 하나의 작업을 실행",
 "Log" => "로그",
 "More" => "더",
 "Add your App" => "앱 추가",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 5728299d0df..d840a1d710d 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -13,7 +13,6 @@
 "__language_name__" => "__language_name__",
 "Security Warning" => "Sécherheets Warnung",
 "Cron" => "Cron",
-"Share API" => "Share API",
 "Enable Share API" => "Share API aschalten",
 "Allow apps to use the Share API" => "Erlab Apps d'Share API ze benotzen",
 "Allow links" => "Links erlaben",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 183406d0b0a..8a1f42b7bfb 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -13,7 +13,6 @@
 "__language_name__" => "__language_name__",
 "Security Warning" => "Sikkerhetsadvarsel",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "utfør en oppgave med hver side som blir lastet",
 "Log" => "Logg",
 "More" => "Mer",
 "Add your App" => "Legg til din App",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index a942d519123..098f29a06e7 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -3,6 +3,7 @@
 "Authentication error" => "Authenticatie fout",
 "Group already exists" => "Groep bestaat al",
 "Unable to add group" => "Niet in staat om groep toe te voegen",
+"Could not enable app. " => "Kan de app. niet activeren",
 "Email saved" => "E-mail bewaard",
 "Invalid email" => "Ongeldige e-mail",
 "OpenID Changed" => "OpenID is aangepast",
@@ -20,8 +21,7 @@
 "Security Warning" => "Veiligheidswaarschuwing",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Uw data folder en uw bestanden zijn hoogst waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess bestand dat ownCloud meelevert werkt niet.  Het is ten zeerste aangeraden om uw webserver zodanig te configureren, dat de data folder niet bereikbaar is vanaf het internet of verplaatst uw data folder naar een locatie buiten de webserver document root.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "Voer 1 taak uit bij elke geladen pagina",
-"Share API" => "Deel API",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php is bij een webcron dienst geregistreerd.  Roep de cron.php pagina in de owncloud root via http één maal per minuut op.",
 "Enable Share API" => "Zet de Deel API aan",
 "Allow apps to use the Share API" => "Sta apps toe om de Deel API te gebruiken",
 "Allow links" => "Sta links toe",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index ba6a36f28f4..7a3dfdfdde0 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -20,8 +20,6 @@
 "Security Warning" => "Ostrzeżenia bezpieczeństwa",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "wykonanie jednego zadania z każdej  załadowanej strony",
-"Share API" => "Udostępnij API",
 "Enable Share API" => "Włącz udostępniane API",
 "Allow apps to use the Share API" => "Zezwalaj aplikacjom na używanie API",
 "Allow links" => "Zezwalaj na łącza",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 9bd4923e3c0..b5579d4f9e8 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -11,7 +11,6 @@
 "Saving..." => "Gravando...",
 "__language_name__" => "Português",
 "Security Warning" => "Aviso de Segurança",
-"execute one task with each page loaded" => "executar uma tarefa com cada página em aberto",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione seu Aplicativo",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 98eb41b15e4..bf5a742e1b0 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -13,7 +13,6 @@
 "__language_name__" => "__language_name__",
 "Security Warning" => "Aviso de Segurança",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "Executar uma tarefa com cada página carregada",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione a sua aplicação",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index a41e7bc06c1..e072daa9913 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -13,7 +13,6 @@
 "__language_name__" => "_language_name_",
 "Security Warning" => "Avertisment de securitate",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "executâ o sarcină cu fiecare pagină încărcată",
 "Log" => "Jurnal de activitate",
 "More" => "Mai mult",
 "Add your App" => "Adaugă aplicația ta",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index f8e70b391cd..7ae8d53174a 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -20,8 +20,6 @@
 "Security Warning" => "Предупреждение безопасности",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера.",
 "Cron" => "Задание",
-"execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы",
-"Share API" => "API публикации",
 "Enable Share API" => "Включить API публикации",
 "Allow apps to use the Share API" => "Разрешить API публикации для приложений",
 "Allow links" => "Разрешить ссылки",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
new file mode 100644
index 00000000000..2b7400968a0
--- /dev/null
+++ b/settings/l10n/ru_RU.php
@@ -0,0 +1,59 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Невозможно загрузить список из App Store",
+"Authentication error" => "Ошибка авторизации",
+"Group already exists" => "Группа уже существует",
+"Unable to add group" => "Невозможно добавить группу",
+"Email saved" => "Email сохранен",
+"Invalid email" => "Неверный email",
+"OpenID Changed" => "OpenID изменен",
+"Invalid request" => "Неверный запрос",
+"Unable to delete group" => "Невозможно удалить группу",
+"Unable to delete user" => "Невозможно удалить пользователя",
+"Language changed" => "Язык изменен",
+"Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
+"Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
+"Error" => "Ошибка",
+"Disable" => "Отключить",
+"Enable" => "Включить",
+"Saving..." => "Сохранение",
+"__language_name__" => "__язык_имя__",
+"Security Warning" => "Предупреждение системы безопасности",
+"Cron" => "Cron",
+"Enable Share API" => "Включить разделяемые API",
+"Allow links" => "Предоставить ссылки",
+"Log" => "Вход",
+"More" => "Подробнее",
+"Add your App" => "Добавить Ваше приложение",
+"Select an App" => "Выбрать приложение",
+"See application page at apps.owncloud.com" => "Обратитесь к странице приложений на apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"Documentation" => "Документация",
+"Managing Big Files" => "Управление большими файлами",
+"Ask a question" => "Задать вопрос",
+"Go there manually." => "Сделать вручную.",
+"Answer" => "Ответ",
+"You use" => "Вы используете",
+"of the available" => "из доступных",
+"Desktop and Mobile Syncing Clients" => "Клиенты синхронизации настольной и мобильной систем",
+"Download" => "Загрузка",
+"Your password got changed" => "Ваш пароль был изменен",
+"Unable to change your password" => "Невозможно изменить Ваш пароль",
+"Current password" => "Текущий пароль",
+"New password" => "Новый пароль",
+"show" => "показать",
+"Change password" => "Изменить пароль",
+"Email" => "Электронная почта",
+"Your email address" => "Адрес Вашей электронной почты",
+"Fill in an email address to enable password recovery" => "Введите адрес электронной почты для возможности восстановления пароля",
+"Language" => "Язык",
+"Help translate" => "Помогите перевести",
+"use this address to connect to your ownCloud in your file manager" => "Используйте этот адрес для соединения с Вашим ownCloud в файловом менеджере",
+"Name" => "Имя",
+"Password" => "Пароль",
+"Groups" => "Группы",
+"Create" => "Создать",
+"Default Quota" => "Квота по умолчанию",
+"Other" => "Другой",
+"Quota" => "квота",
+"Delete" => "Удалить"
+);
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index cc8690878df..b15a70aef1d 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -3,6 +3,7 @@
 "Authentication error" => "Napaka overitve",
 "Group already exists" => "Skupina že obstaja",
 "Unable to add group" => "Ni mogoče dodati skupine",
+"Could not enable app. " => "Aplikacije ni bilo mogoče omogočiti.",
 "Email saved" => "E-poštni naslov je bil shranjen",
 "Invalid email" => "Neveljaven e-poštni naslov",
 "OpenID Changed" => "OpenID je bil spremenjen",
@@ -20,10 +21,9 @@
 "Security Warning" => "Varnostno opozorilo",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Vaša mapa data in vaše datoteke so verjetno vsem dostopne preko interneta. Datoteka .htaccess vključena v ownCloud ni omogočena. Močno vam priporočamo, da nastavite vaš spletni strežnik tako, da mapa data ne bo več na voljo vsem, ali pa jo preselite izven korenske mape spletnega strežnika.",
 "Cron" => "Periodično opravilo",
-"execute one task with each page loaded" => "izvedi eno nalogo z vsako naloženo stranjo",
-"Share API" => "API souporabe",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Datoteka cron.php je prijavljena pri enem od spletnih servisov za periodična opravila. Preko protokola http pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto.",
 "Enable Share API" => "Omogoči API souporabe",
-"Allow apps to use the Share API" => "Dovoli aplikacijam uporabo API-ja souporabe",
+"Allow apps to use the Share API" => "Aplikacijam dovoli uporabo API-ja souporabe",
 "Allow links" => "Dovoli povezave",
 "Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo z javnimi povezavami",
 "Allow resharing" => "Dovoli nadaljnjo souporabo",
@@ -32,7 +32,7 @@
 "Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo le znotraj njihove skupine",
 "Log" => "Dnevnik",
 "More" => "Več",
-"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>." => "Razvit s strani <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnosti ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <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>." => "Razvija ga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud skupnost</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <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" => "Dodajte vašo aplikacijo",
 "Select an App" => "Izberite aplikacijo",
 "See application page at apps.owncloud.com" => "Obiščite spletno stran aplikacije na apps.owncloud.com",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index dab31f80015..88865020444 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -3,6 +3,7 @@
 "Authentication error" => "Autentiseringsfel",
 "Group already exists" => "Gruppen finns redan",
 "Unable to add group" => "Kan inte lägga till grupp",
+"Could not enable app. " => "Kunde inte aktivera appen.",
 "Email saved" => "E-post sparad",
 "Invalid email" => "Ogiltig e-post",
 "OpenID Changed" => "OpenID ändrat",
@@ -20,8 +21,7 @@
 "Security Warning" => "Säkerhetsvarning",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Din datamapp och dina filer kan möjligen vara nåbara från internet. Filen .htaccess som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du ställer in din webbserver på ett sätt så att datamappen inte är nåbar. Alternativt att ni flyttar datamappen utanför webbservern.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "utför en uppgift vid varje sidladdning",
-"Share API" => "Delat API",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gång i minuten över HTTP.",
 "Enable Share API" => "Aktivera delat API",
 "Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
 "Allow links" => "Tillåt länkar",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 61b2eb940dd..074c8128b41 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -3,6 +3,7 @@
 "Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
 "Unable to add group" => "ไม่สามารถเพิ่มกลุ่มได้",
+"Could not enable app. " => "ไม่สามารถเปิดใช้งานแอปได้",
 "Email saved" => "อีเมลถูกบันทึกแล้ว",
 "Invalid email" => "อีเมลไม่ถูกต้อง",
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
@@ -20,8 +21,7 @@
 "Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง",
-"Share API" => "API สำหรับคุณสมบัติแชร์ข้อมูล",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ได้รับการลงทะเบียนแล้วกับเว็บผู้ให้บริการ webcron เรียกหน้าเว็บ cron.php ที่ตำแหน่ง root ของ owncloud หลังจากนี้สักครู่ผ่านทาง http",
 "Enable Share API" => "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล",
 "Allow apps to use the Share API" => "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
 "Allow links" => "อนุญาตให้ใช้งานลิงก์ได้",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index d1d7e0c433f..ade8a02131e 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -20,8 +20,6 @@
 "Security Warning" => "Cảnh bảo bảo mật",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không  còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "Thực thi một nhiệm vụ với mỗi trang được nạp",
-"Share API" => "Chia sẻ API",
 "Enable Share API" => "Bật chia sẻ API",
 "Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
 "Allow links" => "Cho phép liên kết",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 07f361d3b62..89115f6c7c1 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -3,6 +3,7 @@
 "Authentication error" => "认证错误",
 "Group already exists" => "已存在组",
 "Unable to add group" => "不能添加组",
+"Could not enable app. " => "无法开启App",
 "Email saved" => "电子邮件已保存",
 "Invalid email" => "无效的电子邮件",
 "OpenID Changed" => "OpenID 已修改",
@@ -20,8 +21,7 @@
 "Security Warning" => "安全警告",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
 "Cron" => "计划任务",
-"execute one task with each page loaded" => "为每个装入的页面执行任务",
-"Share API" => "共享API",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。",
 "Enable Share API" => "开启共享API",
 "Allow apps to use the Share API" => "允许 应用 使用共享API",
 "Allow links" => "允许连接",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 0abeb6e285c..1a162152302 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -19,7 +19,6 @@
 "__language_name__" => "__語言_名稱__",
 "Security Warning" => "安全性警告",
 "Cron" => "定期執行",
-"execute one task with each page loaded" => "當頁面載入時，執行",
 "Allow links" => "允許連結",
 "Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案",
 "Allow resharing" => "允許轉貼分享",
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 4edbe64e967..35f34489fec 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -29,16 +29,31 @@ if(!$_['htaccessworking']) {
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_ajax" title="<?php echo $l->t("execute one task with each page loaded"); ?>">AJAX</label><br />
-	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_webcron" title="<?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?>">Webcron</label><br />
-	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?>">Cron</label><br />
+	<table class="nostyle">
+		<tr>
+			<td>
+				<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
+				<label for="backgroundjobs_ajax">AJAX</label><br />
+				<em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
+			</td>
+		</tr><tr>
+			<td>
+				<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
+				<label for="backgroundjobs_webcron">Webcron</label><br />
+				<em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
+			</td>
+		</tr><tr>
+			<td>
+				<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
+				<label for="backgroundjobs_cron">Cron</label><br />
+				<em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
+			</td>
+		</tr>
+	</table>
 </fieldset>
 
 <fieldset class="personalblock" id="shareAPI">
-	<legend><strong><?php echo $l->t('Share API');?></strong></legend>
+	<legend><strong><?php echo $l->t('Sharing');?></strong></legend>
 	<table class="shareAPI nostyle">
 		<tr>
 			<td id="enable">
@@ -46,15 +61,19 @@ if(!$_['htaccessworking']) {
 				<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br />
 				<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
 			</td>
+		</tr><tr>
 			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
 				<input type="checkbox" name="shareapi_allow_links" id="allowLinks" value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
 				<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br />
 				<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
 			</td>
+		</tr><tr>
 			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
 				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
 				<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br />
 				<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+			</td>
+		</tr><tr>
 			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
 				<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br />