Merge branch 'master' into oc_error

20 files changed, 215 insertions, 26 deletions

diff --git a/core/css/styles.css b/core/css/styles.css
index 69c12dbe6d7..e3c595113ad 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -134,7 +134,7 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
 li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; color: #FF3B3B; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow: hidden; text-overflow: ellipsis; }
-.hint { background-image: url('/core/img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;}
+.hint { background-image: url('../img/actions/info.png'); background-repeat:no-repeat; color: #777777; padding-left: 25px; background-position: 0 0.3em;}
 .separator { display: inline; border-left: 1px solid #d3d3d3; border-right: 1px solid #fff; height: 10px; width:0px; margin: 4px; }
 
 a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padding-top: 0px;padding-bottom: 2px; text-decoration: none; margin-top: 5px }
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 97ebb27baca..f7b5b48f6fb 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Applikationens navn ikke medsendt",
+"No category to add?" => "Ingen kategori at tilføje?",
+"This category already exists: " => "Denne kategori eksisterer allerede: ",
 "Owncloud password reset" => "Nulstil adgangskode til Owncloud",
+"ownCloud password reset" => "Nulstil ownCloud kodeord",
 "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
 "Requested" => "Forespugt",
@@ -15,7 +19,10 @@
 "Apps" => "Apps",
 "Admin" => "Admin",
 "Help" => "Hjælp",
+"Access forbidden" => "Adgang forbudt",
 "Cloud not found" => "Sky ikke fundet",
+"Edit categories" => "Rediger kategorier",
+"Add" => "Tilføj",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
 "Password" => "Kodeord",
 "Advanced" => "Avanceret",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index f29382f8ef1..9fcd5c84966 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Application name not provided." => "Applikationsname nicht angegeben",
-"No category to add?" => "Keine Kategorie hinzufügen?",
+"No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: " => "Kategorie existiert bereits:",
-"Owncloud password reset" => "OwnCloud Passwort zurücksetzen",
+"Owncloud password reset" => "ownCloud Passwort zurücksetzen",
 "ownCloud password reset" => "ownCloud Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutze folgenden Link, um dein Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 5d2e3310c35..6dc65ed4955 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,6 +1,46 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Sovelluksen nimeä ei määritelty.",
+"No category to add?" => "Ei lisättävää luokkaa?",
+"This category already exists: " => "Tämä luokka on jo olemassa: ",
+"Owncloud password reset" => "Owncloud-salasanan nollaus",
+"ownCloud password reset" => "ownCloud-salasanan nollaus",
+"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
+"Requested" => "Tilattu",
+"Login failed!" => "Kirjautuminen epäonnistui!",
 "Username" => "Käyttäjätunnus",
+"Request reset" => "Tilaus lähetetty",
+"Your password was reset" => "Salasanasi nollattiin",
+"To login page" => "Kirjautumissivulle",
+"New password" => "Uusi salasana",
+"Reset password" => "Palauta salasana",
+"Personal" => "Henkilökohtaiset",
+"Users" => "Käyttäjät",
+"Apps" => "Sovellukset",
+"Admin" => "Hallinta",
+"Help" => "Ohje",
+"Access forbidden" => "Pääsy estetty",
+"Cloud not found" => "Pilveä ei löydy",
+"Edit categories" => "Muokkaa luokkia",
+"Add" => "Lisää",
+"Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
 "Password" => "Salasana",
+"Advanced" => "Lisäasetukset",
+"Data folder" => "Datakansio",
+"Configure the database" => "Muokkaa tietokantaa",
+"will be used" => "käytetään",
+"Database user" => "Tietokannan käyttäjä",
+"Database password" => "Tietokannan salasana",
+"Database name" => "Tietokannan nimi",
+"Database host" => "Tietokantapalvelin",
+"Finish setup" => "Viimeistele asennus",
+"web services under your control" => "verkkopalvelut hallinnassasi",
 "Log out" => "Kirjaudu ulos",
-"You are logged out." => "Olet kirjautunut ulos."
+"Settings" => "Asetukset",
+"Lost your password?" => "Unohditko salasanasi?",
+"remember" => "muista",
+"Log in" => "Kirjaudu sisään",
+"You are logged out." => "Olet kirjautunut ulos.",
+"prev" => "edellinen",
+"next" => "seuraava"
 );
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index ae080dc4bca..8d839a6ac6c 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Non se indicou o nome do aplicativo.",
+"No category to add?" => "Sen categoría que engadir?",
+"This category already exists: " => "Esta categoría xa existe: ",
 "Owncloud password reset" => "Restablecemento do contrasinal de Owncloud",
+"ownCloud password reset" => "Restablecer contrasinal de ownCloud",
 "Use the following link to reset your password: {link}" => "Use a seguinte ligazón para restablecer o contrasinal: {link}",
 "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo electrónico para restablecer o contrasinal",
 "Requested" => "Solicitado",
@@ -15,7 +19,10 @@
 "Apps" => "Aplicativos",
 "Admin" => "Admin",
 "Help" => "Axuda",
+"Access forbidden" => "Acceso denegado",
 "Cloud not found" => "Nube non atopada",
+"Edit categories" => "Editar categorias",
+"Add" => "Engadir",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
 "Password" => "Contrasinal",
 "Advanced" => "Avanzado",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index f91d283118e..1929681e066 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,10 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "שם היישום לא סופק.",
+"No category to add?" => "אין קטגוריה להוספה?",
+"This category already exists: " => "קטגוריה זאת כבר קיימת: ",
+"Owncloud password reset" => "איפוס הססמה של ownCloud",
+"ownCloud password reset" => "איפוס הססמה של ownCloud",
+"Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
 "You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
 "Requested" => "נדרש",
 "Login failed!" => "הכניסה נכשלה!",
 "Username" => "שם משתמש",
 "Request reset" => "בקשת איפוס",
 "Your password was reset" => "הססמה שלך אופסה",
+"To login page" => "לדף הכניסה",
 "New password" => "ססמה חדשה",
 "Reset password" => "איפוס ססמה",
 "Personal" => "אישי",
@@ -12,7 +19,10 @@
 "Apps" => "יישומים",
 "Admin" => "מנהל",
 "Help" => "עזרה",
+"Access forbidden" => "הגישה נחסמה",
 "Cloud not found" => "ענן לא נמצא",
+"Edit categories" => "עריכת הקטגוריות",
+"Add" => "הוספה",
 "Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
 "Password" => "ססמה",
 "Advanced" => "מתקדם",
@@ -24,11 +34,13 @@
 "Database name" => "שם מסד הנתונים",
 "Database host" => "שרת בסיס נתונים",
 "Finish setup" => "סיום התקנה",
+"web services under your control" => "שירותי רשת בשליטתך",
 "Log out" => "התנתקות",
 "Settings" => "הגדרות",
 "Lost your password?" => "שכחת את ססמתך?",
 "remember" => "שמירת הססמה",
-"You are logged out." => "אינך מחובר.",
-"prev" => "קודם",
+"Log in" => "כניסה",
+"You are logged out." => "לא התחברת.",
+"prev" => "הקודם",
 "next" => "הבא"
 );
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index f129ca70608..92be8048045 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -1,34 +1,46 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Ime aplikacije nije pribavljeno.",
+"No category to add?" => "Nemate kategorija koje možete dodati?",
+"This category already exists: " => "Ova kategorija već postoji: ",
+"Owncloud password reset" => "ownCloud resetiranje lozinke",
+"ownCloud password reset" => "ownCloud resetiranje lozinke",
+"Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poništili lozinku: {link}",
 "You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.",
 "Requested" => "Zahtijevano",
 "Login failed!" => "Prijava nije uspjela!",
 "Username" => "Korisničko ime",
 "Request reset" => "Zahtjev za resetiranjem",
 "Your password was reset" => "Vaša lozinka je resetirana",
-"New password" => "nova lozinka",
-"Reset password" => "poništavanje lozinke",
+"To login page" => "Idi na stranicu za prijavu",
+"New password" => "Nova lozinka",
+"Reset password" => "Poništavanje lozinke",
 "Personal" => "Osobno",
-"Users" => "korisnici",
-"Apps" => "aplikacije",
-"Admin" => "administrator",
-"Help" => "pomoć",
+"Users" => "Korisnici",
+"Apps" => "Aplikacije",
+"Admin" => "Administrator",
+"Help" => "Pomoć",
+"Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Cloud nije pronađen",
-"Create an <strong>admin account</strong>" => "stvoriti <strong>Administratorski račun</strong>",
+"Edit categories" => "Uredi kategorije",
+"Add" => "Dodaj",
+"Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
 "Password" => "Lozinka",
 "Advanced" => "Dodatno",
 "Data folder" => "Mapa baze podataka",
-"Configure the database" => "konfigurirati baze podataka",
+"Configure the database" => "Konfiguriraj bazu podataka",
 "will be used" => "će se koristiti",
-"Database user" => "korisnik baze podataka",
-"Database password" => "lozinka baze podataka",
-"Database name" => "ime baze podataka",
+"Database user" => "Korisnik baze podataka",
+"Database password" => "Lozinka baze podataka",
+"Database name" => "Ime baze podataka",
 "Database host" => "Poslužitelj baze podataka",
-"Finish setup" => "završiti postavljanje",
-"Log out" => "odjaviti",
-"Settings" => "postavke",
+"Finish setup" => "Završi postavljanje",
+"web services under your control" => "web usluge pod vašom kontrolom",
+"Log out" => "Odjava",
+"Settings" => "Postavke",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "zapamtiti",
-"You are logged out." => "Vi ste odjavljeni.",
+"Log in" => "Prijava",
+"You are logged out." => "Odjavljeni ste.",
 "prev" => "prethodan",
 "next" => "sljedeći"
 );
diff --git a/core/l10n/id.php b/core/l10n/id.php
index eb20a4209c5..f9fa7d2bb9b 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,11 +1,28 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Nama aplikasi tidak diberikan.",
+"No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
+"This category already exists: " => "Kategori ini sudah ada:",
+"Owncloud password reset" => "Reset password Owncloud",
+"ownCloud password reset" => "reset password ownCloud",
+"Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
+"You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
+"Requested" => "Telah diminta",
+"Login failed!" => "Login gagal!",
 "Username" => "Username",
+"Request reset" => "Meminta reset",
+"Your password was reset" => "Password anda telah direset",
+"To login page" => "Ke halaman login",
+"New password" => "Password baru",
+"Reset password" => "Reset password",
 "Personal" => "Pribadi",
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
 "Help" => "Bantuan",
+"Access forbidden" => "Akses Ditiadakan",
 "Cloud not found" => "Cloud tidak ditemukan",
+"Edit categories" => "Edit kategori",
+"Add" => "Tambahkan",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
 "Password" => "Password",
 "Advanced" => "Tingkat Lanjut",
@@ -17,10 +34,12 @@
 "Database name" => "Nama database",
 "Database host" => "Host database",
 "Finish setup" => "Selesaikan instalasi",
+"web services under your control" => "web service dibawah kontrol anda",
 "Log out" => "Keluar",
 "Settings" => "Setelan",
 "Lost your password?" => "Lupa password anda?",
 "remember" => "selalu login",
+"Log in" => "Masuk",
 "You are logged out." => "Anda telah keluar.",
 "prev" => "sebelum",
 "next" => "selanjutnya"
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 3584bf6732b..50b8e9e616e 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,11 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "アプリケーション名は提供されていません。",
+"No category to add?" => "追加するカテゴリはありませんか？",
+"This category already exists: " => "このカテゴリはすでに存在します: ",
 "Owncloud password reset" => "Owncloud のパスワードをリセット",
+"ownCloud password reset" => "ownCloudのパスワードをリセットします",
 "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
-"You will receive a link to reset your password via Email." => "パスワードをリセットするリンクがメールで届きます。",
+"You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
 "Requested" => "送信されました",
-"Login failed!" => "ログインに失敗しました。",
+"Login failed!" => "ログインに失敗しました！",
 "Username" => "ユーザ名",
-"Request reset" => "リセットを要求する。",
+"Request reset" => "リセットを要求します。",
 "Your password was reset" => "あなたのパスワードはリセットされました。",
 "To login page" => "ログインページへ戻る",
 "New password" => "新しいパスワードを入力",
@@ -15,7 +19,10 @@
 "Apps" => "アプリ",
 "Admin" => "管理者",
 "Help" => "ヘルプ",
-"Cloud not found" => "見つけられません",
+"Access forbidden" => "アクセスが禁止されています",
+"Cloud not found" => "見つかりません",
+"Edit categories" => "カテゴリを編集",
+"Add" => "追加",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
 "Password" => "パスワード",
 "Advanced" => "詳細設定",
@@ -30,7 +37,7 @@
 "web services under your control" => "管理下にあるウェブサービス",
 "Log out" => "ログアウト",
 "Settings" => "設定",
-"Lost your password?" => "パスワードがわからなくなりましたか？",
+"Lost your password?" => "パスワードを忘れましたか？",
 "remember" => "パスワードを記憶する",
 "Log in" => "ログイン",
 "You are logged out." => "ログアウトしました。",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index d663b6dc424..dd942011384 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,10 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Numm vun der Applikatioun ass net uginn.",
+"No category to add?" => "Keng Kategorie fir bäizesetzen?",
+"This category already exists: " => "Des Kategorie existéiert schonn:",
+"Owncloud password reset" => "Owncloud Passwuert reset",
+"ownCloud password reset" => "ownCloud Passwuert reset",
+"Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert ze reseten: {link}",
 "You will receive a link to reset your password via Email." => "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt.",
 "Requested" => "Gefrot",
 "Login failed!" => "Falschen Login!",
 "Username" => "Benotzernumm",
 "Request reset" => "Reset ufroen",
 "Your password was reset" => "Dän Passwuert ass zeréck gesat gin",
+"To login page" => "Op d'Login Säit",
 "New password" => "Neit Passwuert",
 "Reset password" => "Passwuert zeréck setzen",
 "Personal" => "Perséinlech",
@@ -12,7 +19,10 @@
 "Apps" => "Applicatiounen",
 "Admin" => "Admin",
 "Help" => "Hëllef",
+"Access forbidden" => "Access net erlaabt",
 "Cloud not found" => "Cloud net fonnt",
+"Edit categories" => "Kategorien editéieren",
+"Add" => "Bäisetzen",
 "Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
 "Password" => "Passwuert",
 "Advanced" => "Erweidert",
@@ -24,10 +34,12 @@
 "Database name" => "Datebank Numm",
 "Database host" => "Datebank Server",
 "Finish setup" => "Installatioun ofschléissen",
+"web services under your control" => "Web Servicer ënnert denger Kontroll",
 "Log out" => "Ausloggen",
 "Settings" => "Astellungen",
 "Lost your password?" => "Passwuert vergiess?",
 "remember" => "verhalen",
+"Log in" => "Log dech an",
 "You are logged out." => "Du bass ausgeloggt.",
 "prev" => "zeréck",
 "next" => "weider"
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 6828a078865..5dedfffabd1 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
+"This category already exists: " => "Tokia kategorija jau yra:",
 "Owncloud password reset" => "Owncloud slaptažodžio atkūrimas",
+"ownCloud password reset" => "ownCloud slaptažodžio atkūrimas",
 "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
 "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
 "Requested" => "Užklausta",
@@ -15,7 +17,10 @@
 "Apps" => "Programos",
 "Admin" => "Administravimas",
 "Help" => "Pagalba",
+"Access forbidden" => "Priėjimas draudžiamas",
 "Cloud not found" => "Negalima rasti",
+"Edit categories" => "Redaguoti kategorijas",
+"Add" => "Pridėti",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
 "Password" => "Slaptažodis",
 "Advanced" => "Išplėstiniai",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 9222a4f7033..80b9da0e1e9 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Applikasjonsnavn ikke angitt.",
+"No category to add?" => "Ingen kategorier å legge til?",
+"This category already exists: " => "Denne kategorien finnes allerede:",
 "Owncloud password reset" => "OwnCloud passordtilbakestilling",
+"ownCloud password reset" => "Tilbakestill ownCloud passord",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
 "Requested" => "Anmodning",
@@ -15,7 +19,10 @@
 "Apps" => "Apper",
 "Admin" => "Admin",
 "Help" => "Hjelp",
+"Access forbidden" => "Tilgang nektet",
 "Cloud not found" => "Sky ikke funnet",
+"Edit categories" => "Rediger kategorier",
+"Add" => "Legg til",
 "Create an <strong>admin account</strong>" => "opprett en <strong>administrator-konto</strong>",
 "Password" => "Passord",
 "Advanced" => "Avansert",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 47ad9d0a408..3c6f28c856e 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Brak nazwy dla aplikacji",
+"No category to add?" => "Brak kategorii",
+"This category already exists: " => "Ta kategoria już istnieje",
 "Owncloud password reset" => "Resetowanie hasła",
+"ownCloud password reset" => "restart hasła",
 "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
 "Requested" => "Żądane",
@@ -15,7 +19,10 @@
 "Apps" => "Programy",
 "Admin" => "Administrator",
 "Help" => "Pomoc",
+"Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
+"Edit categories" => "Edytuj kategorię",
+"Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Tworzenie <strong>konta administratora</strong>",
 "Password" => "Hasło",
 "Advanced" => "Zaawansowane",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 93cd551976c..55c4c96e5c5 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Nome da aplicação não definida.",
+"No category to add?" => "Nenhuma categoria para adicionar?",
+"This category already exists: " => "Esta categoria já existe:",
 "Owncloud password reset" => "Redefinir palavra-chave ownCloud",
+"ownCloud password reset" => "Reposição da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
 "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
 "Requested" => "Pedido",
@@ -15,7 +19,10 @@
 "Apps" => "Aplicações",
 "Admin" => "Admin",
 "Help" => "Ajuda",
+"Access forbidden" => "Acesso interdito",
 "Cloud not found" => "Cloud nao encontrada",
+"Edit categories" => "Editar categorias",
+"Add" => "Adicionar",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
 "Password" => "Palavra chave",
 "Advanced" => "Avançado",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 6f8256cea4b..b6170d8e96f 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Numele aplicație nu este furnizat.",
+"No category to add?" => "Nici o categorie de adăugat?",
+"This category already exists: " => "Această categorie deja există:",
 "Owncloud password reset" => "Resetarea parolei ownCloud",
+"ownCloud password reset" => "Resetarea parolei ownCloud ",
 "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
 "Requested" => "Solicitat",
@@ -15,7 +19,10 @@
 "Apps" => "Aplicații",
 "Admin" => "Administrator",
 "Help" => "Ajutor",
+"Access forbidden" => "Acces interzis",
 "Cloud not found" => "Nu s-a găsit",
+"Edit categories" => "Editează categoriile",
+"Add" => "Adaugă",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
 "Password" => "Parola",
 "Advanced" => "Avansat",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 0fe8c079f27..ff86f29b267 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Имя приложения не установлено.",
+"No category to add?" => "Нет категорий для добавления?",
+"This category already exists: " => "Эта категория уже существует: ",
 "Owncloud password reset" => "Сброс пароля OwnCloud",
+"ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
 "Requested" => "Запрошено",
@@ -15,7 +19,10 @@
 "Apps" => "Приложения",
 "Admin" => "Администратор",
 "Help" => "Помощь",
+"Access forbidden" => "Доступ запрещён",
 "Cloud not found" => "Облако не найдено",
+"Edit categories" => "Редактировать категории",
+"Add" => "Добавить",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
 "Password" => "Пароль",
 "Advanced" => "Дополнительно",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 99fca3619fe..fd53952184b 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Programnamn har inte angetts",
+"No category to add?" => "Ingen kategori att lägga till?",
+"This category already exists: " => "Denna kategori finns redan:",
 "Owncloud password reset" => "Owncloud lösenordsåterställning",
+"ownCloud password reset" => "ownCloud lösenordsåterställning",
 "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
 "You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
 "Requested" => "Begärd",
@@ -15,7 +19,10 @@
 "Apps" => "Program",
 "Admin" => "Admin",
 "Help" => "Hjälp",
+"Access forbidden" => "Åtkomst förbjuden",
 "Cloud not found" => "Hittade inget moln",
+"Edit categories" => "Redigera kategorier",
+"Add" => "Lägg till",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
 "Password" => "Lösenord",
 "Advanced" => "Avancerat",
diff --git a/core/minimizer.php b/core/minimizer.php
new file mode 100644
index 00000000000..6828acc87d8
--- /dev/null
+++ b/core/minimizer.php
@@ -0,0 +1,14 @@
+<?php
+
+OC_App::loadApps();
+
+if ($service == 'core.css'){
+	$minimizer = new OC_Minimizer_CSS();
+	$files = $minimizer->findFiles(OC_Util::$core_styles);
+	$minimizer->output($files);
+}
+else if ($service == 'core.js'){
+	$minimizer = new OC_Minimizer_JS();
+	$files = $minimizer->findFiles(OC_Util::$core_scripts);
+	$minimizer->output($files);
+}
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 7ba7abdbf12..7f5a4d50fc6 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,6 +4,9 @@
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
+		<?php endif ?>
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -11,6 +14,9 @@
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
 		</script>
+		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+		<?php endif ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index e9d105ed043..8f6c029007f 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -4,6 +4,9 @@
 		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
+		<?php endif ?>
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -12,6 +15,9 @@
 			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 		</script>
+		<?php if (!defined('DEBUG') || !DEBUG): ?>
+		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+		<?php endif ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>