diff --git a/core/js/js.js b/core/js/js.js
index 164fab80ed4..3b4cabe710b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1,3 +1,19 @@
+/**
+ * Disable console output unless DEBUG mode is enabled.
+ * Add
+ * define('DEBUG', true);
+ * To the end of config/config.php to enable debug mode.
+ */
+if (oc_debug !== true) {
+ if (!window.console) {
+ window.console = {};
+ }
+ var methods = ['log', 'debug', 'warn', 'info', 'error', 'assert'];
+ for (var i = 0; i < methods.length; i++) {
+ console[methods[i]] = function () { };
+ }
+}
+
/**
* translate a string
* @param app the id of the app for which to translate the string
diff --git a/core/js/router.js b/core/js/router.js
index 8b66f5a05c5..3562785b342 100644
--- a/core/js/router.js
+++ b/core/js/router.js
@@ -1,9 +1,14 @@
OC.router_base_url = OC.webroot + '/index.php/',
OC.Router = {
+ // register your ajax requests to load after the loading of the routes
+ // has finished. otherwise you face problems with race conditions
+ registerLoadedCallback: function(callback){
+ this.routes_request.done(callback);
+ },
routes_request: $.ajax(OC.router_base_url + 'core/routes.json', {
dataType: 'json',
success: function(jsondata) {
- if (jsondata.status == 'success') {
+ if (jsondata.status === 'success') {
OC.Router.routes = jsondata.data;
}
}
@@ -11,7 +16,7 @@ OC.Router = {
generate:function(name, opt_params) {
if (!('routes' in this)) {
if(this.routes_request.state() != 'resolved') {
- alert('wait');// wait
+ console.warn('To avoid race conditions, please register a callback');// wait
}
}
if (!(name in this.routes)) {
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index c7cbacbf644..80a22a248e6 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -2,6 +2,7 @@
"Settings" => "تعديلات",
"Cancel" => "الغاء",
"Password" => "كلمة السر",
+"Unshare" => "إلغاء مشاركة",
"Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
"You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
"Username" => "إسم المستخدم",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index a49a6645278..f0977f060d6 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,15 +1,23 @@
"Nezadán typ kategorie.",
"No category to add?" => "Žádná kategorie k přidání?",
"This category already exists: " => "Tato kategorie již existuje: ",
+"Object type not provided." => "Nezadán typ objektu.",
+"%s ID not provided." => "Nezadáno ID %s.",
+"Error adding %s to favorites." => "Chyba při přidávání %s k oblíbeným.",
"No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazání.",
+"Error removing %s from favorites." => "Chyba při odebírání %s z oblíbených.",
"Settings" => "Nastavení",
"seconds ago" => "před pár vteřinami",
"1 minute ago" => "před minutou",
"{minutes} minutes ago" => "před {minutes} minutami",
+"1 hour ago" => "před hodinou",
+"{hours} hours ago" => "před {hours} hodinami",
"today" => "dnes",
"yesterday" => "včera",
"{days} days ago" => "před {days} dny",
"last month" => "minulý mesíc",
+"{months} months ago" => "před {months} měsíci",
"months ago" => "před měsíci",
"last year" => "minulý rok",
"years ago" => "před lety",
@@ -18,7 +26,10 @@
"No" => "Ne",
"Yes" => "Ano",
"Ok" => "Ok",
+"The object type is not specified." => "Není určen typ objektu.",
"Error" => "Chyba",
+"The app name is not specified." => "Není určen název aplikace.",
+"The required file {file} is not installed!" => "Požadovaný soubor {file} není nainstalován.",
"Error while sharing" => "Chyba při sdílení",
"Error while unsharing" => "Chyba při rušení sdílení",
"Error while changing permissions" => "Chyba při změně oprávnění",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index a9e16f913ee..252b0369e55 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -6,10 +6,13 @@
"seconds ago" => "sekuntia sitten",
"1 minute ago" => "1 minuutti sitten",
"{minutes} minutes ago" => "{minutes} minuuttia sitten",
+"1 hour ago" => "1 tunti sitten",
+"{hours} hours ago" => "{hours} tuntia sitten",
"today" => "tänään",
"yesterday" => "eilen",
"{days} days ago" => "{days} päivää sitten",
"last month" => "viime kuussa",
+"{months} months ago" => "{months} kuukautta sitten",
"months ago" => "kuukautta sitten",
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
@@ -19,6 +22,8 @@
"Yes" => "Kyllä",
"Ok" => "Ok",
"Error" => "Virhe",
+"The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.",
+"The required file {file} is not installed!" => "Vaadittua tiedostoa {file} ei ole asennettu!",
"Error while sharing" => "Virhe jaettaessa",
"Error while unsharing" => "Virhe jakoa peruttaessa",
"Error while changing permissions" => "Virhe oikeuksia muuttaessa",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 3cb0aaeacee..c04b125f4f9 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,15 +1,23 @@
"カテゴリタイプは提供されていません。",
"No category to add?" => "追加するカテゴリはありませんか？",
"This category already exists: " => "このカテゴリはすでに存在します: ",
+"Object type not provided." => "オブジェクトタイプは提供されていません。",
+"%s ID not provided." => "%s ID は提供されていません。",
+"Error adding %s to favorites." => "お気に入りに %s を追加エラー",
"No categories selected for deletion." => "削除するカテゴリが選択されていません。",
+"Error removing %s from favorites." => "お気に入りから %s の削除エラー",
"Settings" => "設定",
"seconds ago" => "秒前",
"1 minute ago" => "1 分前",
"{minutes} minutes ago" => "{minutes} 分前",
+"1 hour ago" => "1 時間前",
+"{hours} hours ago" => "{hours} 時間前",
"today" => "今日",
"yesterday" => "昨日",
"{days} days ago" => "{days} 日前",
"last month" => "一月前",
+"{months} months ago" => "{months} 月前",
"months ago" => "月前",
"last year" => "一年前",
"years ago" => "年前",
@@ -18,7 +26,10 @@
"No" => "いいえ",
"Yes" => "はい",
"Ok" => "OK",
+"The object type is not specified." => "オブジェクタイプが指定されていません。",
"Error" => "エラー",
+"The app name is not specified." => "アプリ名がしていされていません。",
+"The required file {file} is not installed!" => "必要なファイル {file} がインストールされていません！",
"Error while sharing" => "共有でエラー発生",
"Error while unsharing" => "共有解除でエラー発生",
"Error while changing permissions" => "権限変更でエラー発生",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index ec8df2055be..fe6a569ddb9 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -6,10 +6,13 @@
"seconds ago" => "seconden geleden",
"1 minute ago" => "1 minuut geleden",
"{minutes} minutes ago" => "{minutes} minuten geleden",
+"1 hour ago" => "1 uur geleden",
+"{hours} hours ago" => "{hours} uren geleden",
"today" => "vandaag",
"yesterday" => "gisteren",
"{days} days ago" => "{days} dagen geleden",
"last month" => "vorige maand",
+"{months} months ago" => "{months} maanden geleden",
"months ago" => "maanden geleden",
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index d5f9416f9a5..7dea4062809 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,15 +1,23 @@
"Тип категории не предоставлен.",
"No category to add?" => "Нет категории для добавления?",
"This category already exists: " => "Эта категория уже существует:",
+"Object type not provided." => "Тип объекта не предоставлен.",
+"%s ID not provided." => "%s ID не предоставлен.",
+"Error adding %s to favorites." => "Ошибка добавления %s в избранное.",
"No categories selected for deletion." => "Нет категорий, выбранных для удаления.",
+"Error removing %s from favorites." => "Ошибка удаления %s из избранного.",
"Settings" => "Настройки",
"seconds ago" => "секунд назад",
"1 minute ago" => " 1 минуту назад",
"{minutes} minutes ago" => "{минуты} минут назад",
+"1 hour ago" => "1 час назад",
+"{hours} hours ago" => "{часы} часов назад",
"today" => "сегодня",
"yesterday" => "вчера",
"{days} days ago" => "{дни} дней назад",
"last month" => "в прошлом месяце",
+"{months} months ago" => "{месяцы} месяцев назад",
"months ago" => "месяц назад",
"last year" => "в прошлом году",
"years ago" => "лет назад",
@@ -18,7 +26,10 @@
"No" => "Нет",
"Yes" => "Да",
"Ok" => "Да",
+"The object type is not specified." => "Тип объекта не указан.",
"Error" => "Ошибка",
+"The app name is not specified." => "Имя приложения не указано.",
+"The required file {file} is not installed!" => "Требуемый файл {файл} не установлен!",
"Error while sharing" => "Ошибка создания общего доступа",
"Error while unsharing" => "Ошибка отключения общего доступа",
"Error while changing permissions" => "Ошибка при изменении прав доступа",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index dd2c2fce02f..b06ccb199c6 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,15 +1,23 @@
"Kategorityp inte angiven.",
"No category to add?" => "Ingen kategori att lägga till?",
"This category already exists: " => "Denna kategori finns redan:",
+"Object type not provided." => "Objekttyp inte angiven.",
+"%s ID not provided." => "%s ID inte angiven.",
+"Error adding %s to favorites." => "Fel vid tillägg av %s till favoriter.",
"No categories selected for deletion." => "Inga kategorier valda för radering.",
+"Error removing %s from favorites." => "Fel vid borttagning av %s från favoriter.",
"Settings" => "Inställningar",
"seconds ago" => "sekunder sedan",
"1 minute ago" => "1 minut sedan",
"{minutes} minutes ago" => "{minutes} minuter sedan",
+"1 hour ago" => "1 timme sedan",
+"{hours} hours ago" => "{hours} timmar sedan",
"today" => "i dag",
"yesterday" => "i går",
"{days} days ago" => "{days} dagar sedan",
"last month" => "förra månaden",
+"{months} months ago" => "{months} månader sedan",
"months ago" => "månader sedan",
"last year" => "förra året",
"years ago" => "år sedan",
@@ -18,7 +26,10 @@
"No" => "Nej",
"Yes" => "Ja",
"Ok" => "Ok",
+"The object type is not specified." => "Objekttypen är inte specificerad.",
"Error" => "Fel",
+"The app name is not specified." => " Namnet på appen är inte specificerad.",
+"The required file {file} is not installed!" => "Den nödvändiga filen {file} är inte installerad!",
"Error while sharing" => "Fel vid delning",
"Error while unsharing" => "Fel när delning skulle avslutas",
"Error while changing permissions" => "Fel vid ändring av rättigheter",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 0caa647465b..9a432d11c9b 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -1,15 +1,23 @@
"பிரிவு வகைகள் வழங்கப்படவில்லை",
"No category to add?" => "சேர்ப்பதற்கான வகைகள் இல்லையா?",
"This category already exists: " => "இந்த வகை ஏற்கனவே உள்ளது:",
+"Object type not provided." => "பொருள் வகை வழங்கப்படவில்லை",
+"%s ID not provided." => "%s ID வழங்கப்படவில்லை",
+"Error adding %s to favorites." => "விருப்பங்களுக்கு %s ஐ சேர்ப்பதில் வழு",
"No categories selected for deletion." => "நீக்குவதற்கு எந்தப் பிரிவும் தெரிவுசெய்யப்படவில்லை.",
+"Error removing %s from favorites." => "விருப்பத்திலிருந்து %s ஐ அகற்றுவதில் வழு.உஇஇ",
"Settings" => "அமைப்புகள்",
"seconds ago" => "செக்கன்களுக்கு முன்",
"1 minute ago" => "1 நிமிடத்திற்கு முன் ",
"{minutes} minutes ago" => "{நிமிடங்கள்} நிமிடங்களுக்கு முன் ",
+"1 hour ago" => "1 மணித்தியாலத்திற்கு முன்",
+"{hours} hours ago" => "{மணித்தியாலங்கள்} மணித்தியாலங்களிற்கு முன்",
"today" => "இன்று",
"yesterday" => "நேற்று",
"{days} days ago" => "{நாட்கள்} நாட்களுக்கு முன்",
"last month" => "கடந்த மாதம்",
+"{months} months ago" => "{மாதங்கள்} மாதங்களிற்கு முன்",
"months ago" => "மாதங்களுக்கு முன்",
"last year" => "கடந்த வருடம்",
"years ago" => "வருடங்களுக்கு முன்",
@@ -18,7 +26,10 @@
"No" => "இல்லை",
"Yes" => "ஆம்",
"Ok" => "சரி",
+"The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
"Error" => "வழு",
+"The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.",
+"The required file {file} is not installed!" => "தேவைப்பட்ட கோப்பு {கோப்பு} நிறுவப்படவில்லை!",
"Error while sharing" => "பகிரும் போதான வழு",
"Error while unsharing" => "பகிராமல் உள்ளப்போதான வழு",
"Error while changing permissions" => "அனுமதிகள் மாறும்போதான வழு",
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index d8f83058775..47f4b423b3e 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -8,6 +8,7 @@