summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/css/styles.css11
-rw-r--r--core/js/octemplate.js101
-rw-r--r--core/l10n/ar.php6
-rw-r--r--core/l10n/bn_BD.php6
-rw-r--r--core/l10n/ca.php6
-rw-r--r--core/l10n/cs_CZ.php6
-rw-r--r--core/l10n/cy_GB.php117
-rw-r--r--core/l10n/da.php6
-rw-r--r--core/l10n/de.php6
-rw-r--r--core/l10n/de_DE.php6
-rw-r--r--core/l10n/eo.php6
-rw-r--r--core/l10n/es.php6
-rw-r--r--core/l10n/es_AR.php6
-rw-r--r--core/l10n/eu.php6
-rw-r--r--core/l10n/fa.php6
-rw-r--r--core/l10n/fi_FI.php6
-rw-r--r--core/l10n/fr.php6
-rw-r--r--core/l10n/gl.php6
-rw-r--r--core/l10n/he.php6
-rw-r--r--core/l10n/hr.php6
-rw-r--r--core/l10n/hu_HU.php6
-rw-r--r--core/l10n/is.php6
-rw-r--r--core/l10n/it.php6
-rw-r--r--core/l10n/ja_JP.php8
-rw-r--r--core/l10n/ko.php6
-rw-r--r--core/l10n/lb.php6
-rw-r--r--core/l10n/lt_LT.php6
-rw-r--r--core/l10n/lv.php6
-rw-r--r--core/l10n/mk.php6
-rw-r--r--core/l10n/ms_MY.php4
-rw-r--r--core/l10n/my_MM.php6
-rw-r--r--core/l10n/nb_NO.php6
-rw-r--r--core/l10n/nl.php6
-rw-r--r--core/l10n/oc.php6
-rw-r--r--core/l10n/pl.php6
-rw-r--r--core/l10n/pt_BR.php6
-rw-r--r--core/l10n/pt_PT.php6
-rw-r--r--core/l10n/ro.php6
-rw-r--r--core/l10n/ru.php6
-rw-r--r--core/l10n/ru_RU.php6
-rw-r--r--core/l10n/si_LK.php6
-rw-r--r--core/l10n/sk_SK.php6
-rw-r--r--core/l10n/sl.php6
-rw-r--r--core/l10n/sq.php6
-rw-r--r--core/l10n/sr.php6
-rw-r--r--core/l10n/sv.php6
-rw-r--r--core/l10n/ta_LK.php6
-rw-r--r--core/l10n/te.php4
-rw-r--r--core/l10n/th_TH.php6
-rw-r--r--core/l10n/tr.php6
-rw-r--r--core/l10n/uk.php8
-rw-r--r--core/l10n/ur_PK.php6
-rw-r--r--core/l10n/vi.php6
-rw-r--r--core/l10n/zh_CN.GB2312.php6
-rw-r--r--core/l10n/zh_CN.php6
-rw-r--r--core/l10n/zh_HK.php4
-rw-r--r--core/l10n/zh_TW.php24
-rw-r--r--core/templates/installation.php1
58 files changed, 396 insertions, 174 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index 7b0fc7644ac..d3aec156852 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -359,17 +359,17 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; }
li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; }
.error { color:#FF3B3B; }
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; }
-.hint { background-image:url('../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:#777; 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 }
-.exception{color:#000000;}
+.exception{color:#000;}
.exception textarea{width:95%;height:200px;background:#ffe;border:0;}
.ui-icon-circle-triangle-e{ background-image:url('../img/actions/play-next.svg'); }
.ui-icon-circle-triangle-w{ background-image:url('../img/actions/play-previous.svg'); }
-.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#ffffff; }
+.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }
/* ---- DIALOGS ---- */
#dirup {width:4%;}
@@ -390,7 +390,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
#category_addinput { width:10em; }
/* ---- APP SETTINGS ---- */
-.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888888; color:#333333; padding:10px; position:fixed !important; z-index:200; }
+.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:200; }
.popup.topright { top:7em; right:1em; }
.popup.bottomleft { bottom:1em; left:33em; }
.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/delete.svg') no-repeat center; }
@@ -437,7 +437,8 @@ div.crumb a{ padding: 0.9em 0 0.7em 0; }
-moz-box-sizing: border-box; box-sizing: border-box;
text-shadow: 0 1px 0 rgba(255,255,255,.9);
}
-#app-navigation .active { /* active navigation entry or folder */
+#app-navigation .active,
+#app-navigation .active a { /* active navigation entry or folder */
background-color: #ddd;
text-shadow: 0 1px 0 rgba(255,255,255,.7);
}
diff --git a/core/js/octemplate.js b/core/js/octemplate.js
new file mode 100644
index 00000000000..a5d56852a57
--- /dev/null
+++ b/core/js/octemplate.js
@@ -0,0 +1,101 @@
+/**
+ * jQuery plugin for micro templates
+ *
+ * Strings are automatically escaped, but that can be disabled by setting escapeFunction to null.
+ *
+ * Usage examples:
+ *
+ * var htmlStr = '<p>Bake, uncovered, until the {greasystuff} is melted and the {pasta} is heated through, about {min} minutes.</p>'
+ * $(htmlStr).octemplate({greasystuff: 'cheese', pasta: 'macaroni', min: 10});
+ *
+ * var htmlStr = '<p>Welcome back {user}</p>';
+ * $(htmlStr).octemplate({user: 'John Q. Public'}, {escapeFunction: null});
+ *
+ * Be aware that the target string must be wrapped in an HTML element for the plugin to work. The following won't work:
+ *
+ * var textStr = 'Welcome back {user}';
+ * $(textStr).octemplate({user: 'John Q. Public'});
+ *
+ * For anything larger than one-liners, you can use a simple $.get() ajax request to get the template,
+ * or you can embed them it the page using the text/template type:
+ *
+ * <script id="contactListItemTemplate" type="text/template">
+ * <tr class="contact" data-id="{id}">
+ * <td class="name">
+ * <input type="checkbox" name="id" value="{id}" /><span class="nametext">{name}</span>
+ * </td>
+ * <td class="email">
+ * <a href="mailto:{email}">{email}</a>
+ * </td>
+ * <td class="phone">{phone}</td>
+ * </tr>
+ * </script>
+ *
+ * var $tmpl = $('#contactListItemTemplate');
+ * var contacts = // fetched in some ajax call
+ *
+ * $.each(contacts, function(idx, contact) {
+ * $contactList.append(
+ * $tmpl.octemplate({
+ * id: contact.getId(),
+ * name: contact.getDisplayName(),
+ * email: contact.getPreferredEmail(),
+ * phone: contact.getPreferredPhone(),
+ * });
+ * );
+ * });
+ */
+(function( $ ) {
+ /**
+ * Object Template
+ * Inspired by micro templating done by e.g. underscore.js
+ */
+ var Template = {
+ init: function(vars, options, elem) {
+ // Mix in the passed in options with the default options
+ this.vars = vars;
+ this.options = $.extend({},this.options,options);
+
+ this.elem = elem;
+ var self = this;
+
+ if(typeof this.options.escapeFunction === 'function') {
+ $.each(this.vars, function(key, val) {
+ if(typeof val === 'string') {
+ self.vars[key] = self.options.escapeFunction(val);
+ }
+ });
+ }
+
+ var _html = this._build(this.vars);
+ return $(_html);
+ },
+ // From stackoverflow.com/questions/1408289/best-way-to-do-variable-interpolation-in-javascript
+ _build: function(o){
+ var data = this.elem.attr('type') === 'text/template' ? this.elem.html() : this.elem.get(0).outerHTML;
+ try {
+ return data.replace(/{([^{}]*)}/g,
+ function (a, b) {
+ var r = o[b];
+ return typeof r === 'string' || typeof r === 'number' ? r : a;
+ }
+ );
+ } catch(e) {
+ console.error(e, 'data:', data)
+ }
+ },
+ options: {
+ escapeFunction: function(str) {return $('<i></i>').text(str).html();}
+ }
+ };
+
+ $.fn.octemplate = function(vars, options) {
+ var vars = vars ? vars : {};
+ if(this.length) {
+ var _template = Object.create(Template);
+ return _template.init(vars, options, this);
+ }
+ };
+
+})( jQuery );
+
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index f75d8071709..4d413715de3 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -44,11 +44,11 @@
"months ago" => "شهر مضى",
"last year" => "السنةالماضية",
"years ago" => "سنة مضت",
-"Choose" => "اختيار",
+"Ok" => "موافق",
"Cancel" => "الغاء",
-"No" => "لا",
+"Choose" => "اختيار",
"Yes" => "نعم",
-"Ok" => "موافق",
+"No" => "لا",
"The object type is not specified." => "نوع العنصر غير محدد.",
"Error" => "خطأ",
"The app name is not specified." => "اسم التطبيق غير محدد.",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 686ebdf9af1..1b18b6ae3e4 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -43,11 +43,11 @@
"months ago" => "মাস পূর্বে",
"last year" => "গত বছর",
"years ago" => "বছর পূর্বে",
-"Choose" => "বেছে নিন",
+"Ok" => "তথাস্তু",
"Cancel" => "বাতির",
-"No" => "না",
+"Choose" => "বেছে নিন",
"Yes" => "হ্যাঁ",
-"Ok" => "তথাস্তু",
+"No" => "না",
"The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
"Error" => "সমস্যা",
"The app name is not specified." => "অ্যাপের নামটি সুনির্দিষ্ট নয়।",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index acf617034fe..91b51d1b31d 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -44,11 +44,11 @@
"months ago" => "mesos enrere",
"last year" => "l'any passat",
"years ago" => "anys enrere",
-"Choose" => "Escull",
+"Ok" => "D'acord",
"Cancel" => "Cancel·la",
-"No" => "No",
+"Choose" => "Escull",
"Yes" => "Sí",
-"Ok" => "D'acord",
+"No" => "No",
"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
"Error" => "Error",
"The app name is not specified." => "No s'ha especificat el nom de l'aplicació.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index eb70ac3e096..15c89106e5d 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -44,11 +44,11 @@
"months ago" => "před měsíci",
"last year" => "minulý rok",
"years ago" => "před lety",
-"Choose" => "Vybrat",
+"Ok" => "Ok",
"Cancel" => "Zrušit",
-"No" => "Ne",
+"Choose" => "Vybrat",
"Yes" => "Ano",
-"Ok" => "Ok",
+"No" => "Ne",
"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.",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
new file mode 100644
index 00000000000..6698ce77a3e
--- /dev/null
+++ b/core/l10n/cy_GB.php
@@ -0,0 +1,117 @@
+<?php $TRANSLATIONS = array(
+"Category type not provided." => "Math o gategori heb ei ddarparu.",
+"No category to add?" => "Dim categori i'w ychwanegu?",
+"Object type not provided." => "Math o wrthrych heb ei ddarparu.",
+"%s ID not provided." => "%s ID heb ei ddarparu.",
+"Error adding %s to favorites." => "Gwall wrth ychwanegu %s at ffefrynnau.",
+"No categories selected for deletion." => "Ni ddewiswyd categorïau i'w dileu.",
+"Error removing %s from favorites." => "Gwall wrth dynnu %s o ffefrynnau.",
+"Sunday" => "Sul",
+"Monday" => "Llun",
+"Tuesday" => "Mawrth",
+"Wednesday" => "Mercher",
+"Thursday" => "Iau",
+"Friday" => "Gwener",
+"Saturday" => "Sadwrn",
+"January" => "Ionawr",
+"February" => "Chwefror",
+"March" => "Mawrth",
+"April" => "Ebrill",
+"May" => "Mai",
+"June" => "Mehefin",
+"July" => "Gorffennaf",
+"August" => "Awst",
+"September" => "Medi",
+"October" => "Hydref",
+"November" => "Tachwedd",
+"December" => "Rhagfyr",
+"Settings" => "Gosodiadau",
+"seconds ago" => "eiliad yn ôl",
+"1 minute ago" => "1 munud yn ôl",
+"{minutes} minutes ago" => "{minutes} munud yn ôl",
+"1 hour ago" => "1 awr yn ôl",
+"{hours} hours ago" => "{hours} awr yn ôl",
+"today" => "heddiw",
+"yesterday" => "ddoe",
+"{days} days ago" => "{days} diwrnod yn ôl",
+"last month" => "mis diwethaf",
+"{months} months ago" => "{months} mis yn ôl",
+"months ago" => "misoedd yn ôl",
+"last year" => "y llynedd",
+"years ago" => "blwyddyn yn ôl",
+"Ok" => "Iawn",
+"Cancel" => "Diddymu",
+"Choose" => "Dewisiwch",
+"Yes" => "Ie",
+"No" => "Na",
+"Error" => "Gwall",
+"Error while sharing" => "Gwall wrth rannu",
+"Error while unsharing" => "Gwall wrth ddad-rannu",
+"Error while changing permissions" => "Gwall wrth newid caniatâd",
+"Shared with you and the group {group} by {owner}" => "Rhannwyd â chi a'r grŵp {group} gan {owner}",
+"Shared with you by {owner}" => "Rhannwyd â chi gan {owner}",
+"Share with" => "Rhannu gyda",
+"Share with link" => "Dolen ar gyfer rhannu",
+"Password protect" => "Diogelu cyfrinair",
+"Password" => "Cyfrinair",
+"Set expiration date" => "Gosod dyddiad dod i ben",
+"Expiration date" => "Dyddiad dod i ben",
+"Share via email:" => "Rhannu drwy e-bost:",
+"No people found" => "Heb ganfod pobl",
+"Resharing is not allowed" => "Does dim hawl ail-rannu",
+"Shared in {item} with {user}" => "Rhannwyd yn {item} â {user}",
+"Unshare" => "Dad-rannu",
+"can edit" => "yn gallu golygu",
+"access control" => "rheolaeth mynediad",
+"create" => "creu",
+"update" => "diweddaru",
+"delete" => "dileu",
+"share" => "rhannu",
+"Password protected" => "Diogelwyd â chyfrinair",
+"Error unsetting expiration date" => "Gwall wrth ddad-osod dyddiad dod i ben",
+"Error setting expiration date" => "Gwall wrth osod dyddiad dod i ben",
+"ownCloud password reset" => "ailosod cyfrinair ownCloud",
+"Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
+"You will receive a link to reset your password via Email." => "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
+"Reset email send." => "Ailosod anfon e-bost.",
+"Request failed!" => "Methodd y cais!",
+"Username" => "Enw defnyddiwr",
+"Request reset" => "Gwneud cais i ailosod",
+"Your password was reset" => "Ailosodwyd eich cyfrinair",
+"To login page" => "I'r dudalen mewngofnodi",
+"New password" => "Cyfrinair newydd",
+"Reset password" => "Ailosod cyfrinair",
+"Personal" => "Personol",
+"Users" => "Defnyddwyr",
+"Apps" => "Pecynnau",
+"Admin" => "Gweinyddu",
+"Help" => "Cymorth",
+"Access forbidden" => "Mynediad wedi'i wahardd",
+"Cloud not found" => "Methwyd canfod cwmwl",
+"Edit categories" => "Golygu categorïau",
+"Add" => "Ychwanegu",
+"Security Warning" => "Rhybudd Diogelwch",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Does dim cynhyrchydd rhifau hap diogel ar gael, galluogwch estyniad PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif.",
+"Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>",
+"Advanced" => "Uwch",
+"Data folder" => "Plygell data",
+"Configure the database" => "Cyflunio'r gronfa ddata",
+"will be used" => "ddefnyddir",
+"Database user" => "Defnyddiwr cronfa ddata",
+"Database password" => "Cyfrinair cronfa ddata",
+"Database name" => "Enw cronfa ddata",
+"Database tablespace" => "Tablespace cronfa ddata",
+"Database host" => "Gwesteiwr cronfa ddata",
+"Finish setup" => "Gorffen sefydlu",
+"web services under your control" => "gwasanaethau gwe a reolir gennych",
+"Log out" => "Allgofnodi",
+"Automatic logon rejected!" => "Gwrthodwyd mewngofnodi awtomatig!",
+"If you did not change your password recently, your account may be compromised!" => "Os na wnaethoch chi newid eich cyfrinair yn ddiweddar, gall eich cyfrif fod yn anniogel!",
+"Please change your password to secure your account again." => "Newidiwch eich cyfrinair i ddiogleu eich cyfrif eto.",
+"Lost your password?" => "Wedi colli'ch cyfrinair?",
+"remember" => "cofio",
+"Log in" => "Mewngofnodi",
+"prev" => "blaenorol",
+"next" => "nesaf"
+);
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 6650a7e1d8c..286f524b678 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -44,11 +44,11 @@
"months ago" => "måneder siden",
"last year" => "sidste år",
"years ago" => "år siden",
-"Choose" => "Vælg",
+"Ok" => "OK",
"Cancel" => "Fortryd",
-"No" => "Nej",
+"Choose" => "Vælg",
"Yes" => "Ja",
-"Ok" => "OK",
+"No" => "Nej",
"The object type is not specified." => "Objekttypen er ikke angivet.",
"Error" => "Fejl",
"The app name is not specified." => "Den app navn er ikke angivet.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 3b9ac15f4e5..3af653b9ac9 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -44,11 +44,11 @@
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
+"Ok" => "OK",
"Cancel" => "Abbrechen",
-"No" => "Nein",
+"Choose" => "Auswählen",
"Yes" => "Ja",
-"Ok" => "OK",
+"No" => "Nein",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index d6a8b1405e5..4065f2484f5 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -44,11 +44,11 @@
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
+"Ok" => "OK",
"Cancel" => "Abbrechen",
-"No" => "Nein",
+"Choose" => "Auswählen",
"Yes" => "Ja",
-"Ok" => "OK",
+"No" => "Nein",
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Error" => "Fehler",
"The app name is not specified." => "Der App-Name ist nicht angegeben.",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index f2297bd3d97..5c8fe340317 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -43,11 +43,11 @@
"months ago" => "monatoj antaŭe",
"last year" => "lastajare",
"years ago" => "jaroj antaŭe",
-"Choose" => "Elekti",
+"Ok" => "Akcepti",
"Cancel" => "Nuligi",
-"No" => "Ne",
+"Choose" => "Elekti",
"Yes" => "Jes",
-"Ok" => "Akcepti",
+"No" => "Ne",
"The object type is not specified." => "Ne indikiĝis tipo de la objekto.",
"Error" => "Eraro",
"The app name is not specified." => "Ne indikiĝis nomo de la aplikaĵo.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index e64858c4b11..543563bed11 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -44,11 +44,11 @@
"months ago" => "hace meses",
"last year" => "año pasado",
"years ago" => "hace años",
-"Choose" => "Seleccionar",
+"Ok" => "Aceptar",
"Cancel" => "Cancelar",
-"No" => "No",
+"Choose" => "Seleccionar",
"Yes" => "Sí",
-"Ok" => "Aceptar",
+"No" => "No",
"The object type is not specified." => "El tipo de objeto no se ha especificado.",
"Error" => "Fallo",
"The app name is not specified." => "El nombre de la app no se ha especificado.",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index f17a6d9baf1..748de3ddd13 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "el año pasado",
"years ago" => "años atrás",
-"Choose" => "Elegir",
+"Ok" => "Aceptar",
"Cancel" => "Cancelar",
-"No" => "No",
+"Choose" => "Elegir",
"Yes" => "Sí",
-"Ok" => "Aceptar",
+"No" => "No",
"The object type is not specified." => "El tipo de objeto no esta especificado. ",
"Error" => "Error",
"The app name is not specified." => "El nombre de la aplicación no esta especificado.",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index dde2d59cbdf..76e38a92d1f 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -44,11 +44,11 @@
"months ago" => "hilabete",
"last year" => "joan den urtean",
"years ago" => "urte",
-"Choose" => "Aukeratu",
+"Ok" => "Ados",
"Cancel" => "Ezeztatu",
-"No" => "Ez",
+"Choose" => "Aukeratu",
"Yes" => "Bai",
-"Ok" => "Ados",
+"No" => "Ez",
"The object type is not specified." => "Objetu mota ez dago zehaztuta.",
"Error" => "Errorea",
"The app name is not specified." => "App izena ez dago zehaztuta.",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 58f201a3fef..e6f5aaac0cb 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -44,11 +44,11 @@
"months ago" => "ماه‌های قبل",
"last year" => "سال قبل",
"years ago" => "سال‌های قبل",
-"Choose" => "انتخاب کردن",
+"Ok" => "قبول",
"Cancel" => "منصرف شدن",
-"No" => "نه",
+"Choose" => "انتخاب کردن",
"Yes" => "بله",
-"Ok" => "قبول",
+"No" => "نه",
"The object type is not specified." => "نوع شی تعیین نشده است.",
"Error" => "خطا",
"The app name is not specified." => "نام برنامه تعیین نشده است.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index e9386cad431..ec79d031227 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -42,11 +42,11 @@
"months ago" => "kuukautta sitten",
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
-"Choose" => "Valitse",
+"Ok" => "Ok",
"Cancel" => "Peru",
-"No" => "Ei",
+"Choose" => "Valitse",
"Yes" => "Kyllä",
-"Ok" => "Ok",
+"No" => "Ei",
"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!",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 84c4c0abdf4..3b89d69b3b9 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -44,11 +44,11 @@
"months ago" => "il y a plusieurs mois",
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
-"Choose" => "Choisir",
+"Ok" => "Ok",
"Cancel" => "Annuler",
-"No" => "Non",
+"Choose" => "Choisir",
"Yes" => "Oui",
-"Ok" => "Ok",
+"No" => "Non",
"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
"Error" => "Erreur",
"The app name is not specified." => "Le nom de l'application n'est pas spécifié.",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 4e8eb6e4fbd..fd237a39c86 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
-"Choose" => "Escoller",
+"Ok" => "Aceptar",
"Cancel" => "Cancelar",
-"No" => "Non",
+"Choose" => "Escoller",
"Yes" => "Si",
-"Ok" => "Aceptar",
+"No" => "Non",
"The object type is not specified." => "Non se especificou o tipo de obxecto.",
"Error" => "Erro",
"The app name is not specified." => "Non se especificou o nome do aplicativo.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 1db5820bdf7..56f273e95de 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -44,11 +44,11 @@
"months ago" => "חודשים",
"last year" => "שנה שעברה",
"years ago" => "שנים",
-"Choose" => "בחירה",
+"Ok" => "בסדר",
"Cancel" => "ביטול",
-"No" => "לא",
+"Choose" => "בחירה",
"Yes" => "כן",
-"Ok" => "בסדר",
+"No" => "לא",
"The object type is not specified." => "סוג הפריט לא צוין.",
"Error" => "שגיאה",
"The app name is not specified." => "שם היישום לא צוין.",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 86136329d8f..d32d8d4b227 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -28,11 +28,11 @@
"months ago" => "mjeseci",
"last year" => "prošlu godinu",
"years ago" => "godina",
-"Choose" => "Izaberi",
+"Ok" => "U redu",
"Cancel" => "Odustani",
-"No" => "Ne",
+"Choose" => "Izaberi",
"Yes" => "Da",
-"Ok" => "U redu",
+"No" => "Ne",
"Error" => "Pogreška",
"Share" => "Podijeli",
"Error while sharing" => "Greška prilikom djeljenja",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 0f110bfc4c7..eb0a3d1a91d 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -44,11 +44,11 @@
"months ago" => "több hónapja",
"last year" => "tavaly",
"years ago" => "több éve",
-"Choose" => "Válasszon",
+"Ok" => "Ok",
"Cancel" => "Mégse",
-"No" => "Nem",
+"Choose" => "Válasszon",
"Yes" => "Igen",
-"Ok" => "Ok",
+"No" => "Nem",
"The object type is not specified." => "Az objektum típusa nincs megadva.",
"Error" => "Hiba",
"The app name is not specified." => "Az alkalmazás neve nincs megadva.",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 997a582d228..c6b7a6df325 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -43,11 +43,11 @@
"months ago" => "mánuðir síðan",
"last year" => "síðasta ári",
"years ago" => "árum síðan",
-"Choose" => "Veldu",
+"Ok" => "Í lagi",
"Cancel" => "Hætta við",
-"No" => "Nei",
+"Choose" => "Veldu",
"Yes" => "Já",
-"Ok" => "Í lagi",
+"No" => "Nei",
"The object type is not specified." => "Tegund ekki tilgreind",
"Error" => "Villa",
"The app name is not specified." => "Nafn forrits ekki tilgreint",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 2d9b46ddfc1..d24c3330bfd 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -44,11 +44,11 @@
"months ago" => "mesi fa",
"last year" => "anno scorso",
"years ago" => "anni fa",
-"Choose" => "Scegli",
+"Ok" => "Ok",
"Cancel" => "Annulla",
-"No" => "No",
+"Choose" => "Scegli",
"Yes" => "Sì",
-"Ok" => "Ok",
+"No" => "No",
"The object type is not specified." => "Il tipo di oggetto non è specificato.",
"Error" => "Errore",
"The app name is not specified." => "Il nome dell'applicazione non è specificato.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 617a8bf4f49..200e494d8c1 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -31,7 +31,7 @@
"November" => "11月",
"December" => "12月",
"Settings" => "設定",
-"seconds ago" => "秒前",
+"seconds ago" => "数秒前",
"1 minute ago" => "1 分前",
"{minutes} minutes ago" => "{minutes} 分前",
"1 hour ago" => "1 時間前",
@@ -44,11 +44,11 @@
"months ago" => "月前",
"last year" => "一年前",
"years ago" => "年前",
-"Choose" => "選択",
+"Ok" => "OK",
"Cancel" => "キャンセル",
-"No" => "いいえ",
+"Choose" => "選択",
"Yes" => "はい",
-"Ok" => "OK",
+"No" => "いいえ",
"The object type is not specified." => "オブジェクタイプが指定されていません。",
"Error" => "エラー",
"The app name is not specified." => "アプリ名がしていされていません。",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 408afa372b7..2a75ce9c4f4 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -43,11 +43,11 @@
"months ago" => "개월 전",
"last year" => "작년",
"years ago" => "년 전",
-"Choose" => "선택",
+"Ok" => "승락",
"Cancel" => "취소",
-"No" => "아니요",
+"Choose" => "선택",
"Yes" => "예",
-"Ok" => "승락",
+"No" => "아니요",
"The object type is not specified." => "객체 유형이 지정되지 않았습니다.",
"Error" => "오류",
"The app name is not specified." => "앱 이름이 지정되지 않았습니다.",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 11137f27aa2..79258b8e974 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -28,11 +28,11 @@
"months ago" => "Méint hier",
"last year" => "Läscht Joer",
"years ago" => "Joren hier",
-"Choose" => "Auswielen",
+"Ok" => "OK",
"Cancel" => "Ofbriechen",
-"No" => "Nee",
+"Choose" => "Auswielen",
"Yes" => "Jo",
-"Ok" => "OK",
+"No" => "Nee",
"Error" => "Fehler",
"Share" => "Deelen",
"Password" => "Passwuert",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 563fd8884b0..0f55c341e56 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -31,11 +31,11 @@
"months ago" => "prieš mėnesį",
"last year" => "praeitais metais",
"years ago" => "prieš metus",
-"Choose" => "Pasirinkite",
+"Ok" => "Gerai",
"Cancel" => "Atšaukti",
-"No" => "Ne",
+"Choose" => "Pasirinkite",
"Yes" => "Taip",
-"Ok" => "Gerai",
+"No" => "Ne",
"Error" => "Klaida",
"Share" => "Dalintis",
"Error while sharing" => "Klaida, dalijimosi metu",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 2ddea9421be..76188662fbb 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -44,11 +44,11 @@
"months ago" => "mēnešus atpakaļ",
"last year" => "gājušajā gadā",
"years ago" => "gadus atpakaļ",
-"Choose" => "Izvēlieties",
+"Ok" => "Labi",
"Cancel" => "Atcelt",
-"No" => "Nē",
+"Choose" => "Izvēlieties",
"Yes" => "Jā",
-"Ok" => "Labi",
+"No" => "Nē",
"The object type is not specified." => "Nav norādīts objekta tips.",
"Error" => "Kļūda",
"The app name is not specified." => "Nav norādīts lietotnes nosaukums.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index d9da7669004..9743d8b299e 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -43,11 +43,11 @@
"months ago" => "пред месеци",
"last year" => "минатата година",
"years ago" => "пред години",
-"Choose" => "Избери",
+"Ok" => "Во ред",
"Cancel" => "Откажи",
-"No" => "Не",
+"Choose" => "Избери",
"Yes" => "Да",
-"Ok" => "Во ред",
+"No" => "Не",
"The object type is not specified." => "Не е специфициран типот на објект.",
"Error" => "Грешка",
"The app name is not specified." => "Името на апликацијата не е специфицирано.",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index af51079b570..d8a2cf88367 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -21,10 +21,10 @@
"November" => "November",
"December" => "Disember",
"Settings" => "Tetapan",
+"Ok" => "Ok",
"Cancel" => "Batal",
-"No" => "Tidak",
"Yes" => "Ya",
-"Ok" => "Ok",
+"No" => "Tidak",
"Error" => "Ralat",
"Share" => "Kongsi",
"Password" => "Kata laluan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 97631d4df58..ef8be954ede 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -21,11 +21,11 @@
"last month" => "ပြီးခဲ့သောလ",
"last year" => "မနှစ်က",
"years ago" => "နှစ် အရင်က",
-"Choose" => "ရွေးချယ်",
+"Ok" => "အိုကေ",
"Cancel" => "ပယ်ဖျက်မည်",
-"No" => "မဟုတ်ဘူး",
+"Choose" => "ရွေးချယ်",
"Yes" => "ဟုတ်",
-"Ok" => "အိုကေ",
+"No" => "မဟုတ်ဘူး",
"Password" => "စကားဝှက်",
"Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
"Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 340625449ee..4e1ee45eec9 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -34,11 +34,11 @@
"months ago" => "måneder siden",
"last year" => "forrige år",
"years ago" => "år siden",
-"Choose" => "Velg",
+"Ok" => "Ok",
"Cancel" => "Avbryt",
-"No" => "Nei",
+"Choose" => "Velg",
"Yes" => "Ja",
-"Ok" => "Ok",
+"No" => "Nei",
"Error" => "Feil",
"Share" => "Del",
"Error while sharing" => "Feil under deling",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index d7379849f14..5e050c33bec 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -44,11 +44,11 @@
"months ago" => "maanden geleden",
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
-"Choose" => "Kies",
+"Ok" => "Ok",
"Cancel" => "Annuleren",
-"No" => "Nee",
+"Choose" => "Kies",
"Yes" => "Ja",
-"Ok" => "Ok",
+"No" => "Nee",
"The object type is not specified." => "Het object type is niet gespecificeerd.",
"Error" => "Fout",
"The app name is not specified." => "De app naam is niet gespecificeerd.",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index abd5f5736af..ec432d495a4 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -29,11 +29,11 @@
"months ago" => "meses a",
"last year" => "an passat",
"years ago" => "ans a",
-"Choose" => "Causís",
+"Ok" => "D'accòrdi",
"Cancel" => "Anulla",
-"No" => "Non",
+"Choose" => "Causís",
"Yes" => "Òc",
-"Ok" => "D'accòrdi",
+"No" => "Non",
"Error" => "Error",
"Share" => "Parteja",
"Error while sharing" => "Error al partejar",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 79b7301a039..2821bf77eed 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -44,11 +44,11 @@
"months ago" => "miesięcy temu",
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
-"Choose" => "Wybierz",
+"Ok" => "OK",
"Cancel" => "Anuluj",
-"No" => "Nie",
+"Choose" => "Wybierz",
"Yes" => "Tak",
-"Ok" => "OK",
+"No" => "Nie",
"The object type is not specified." => "Nie określono typu obiektu.",
"Error" => "Błąd",
"The app name is not specified." => "Nie określono nazwy aplikacji.",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 378b0789ed5..e5acd4da8f6 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
-"Choose" => "Escolha",
+"Ok" => "Ok",
"Cancel" => "Cancelar",
-"No" => "Não",
+"Choose" => "Escolha",
"Yes" => "Sim",
-"Ok" => "Ok",
+"No" => "Não",
"The object type is not specified." => "O tipo de objeto não foi especificado.",
"Error" => "Erro",
"The app name is not specified." => "O nome do app não foi especificado.",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 41506bd9ec4..67d43e372a1 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -44,11 +44,11 @@
"months ago" => "meses atrás",
"last year" => "ano passado",
"years ago" => "anos atrás",
-"Choose" => "Escolha",
+"Ok" => "Ok",
"Cancel" => "Cancelar",
-"No" => "Não",
+"Choose" => "Escolha",
"Yes" => "Sim",
-"Ok" => "Ok",
+"No" => "Não",
"The object type is not specified." => "O tipo de objecto não foi especificado",
"Error" => "Erro",
"The app name is not specified." => "O nome da aplicação não foi especificado",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index da9f1a7da94..51c1523d7e0 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -43,11 +43,11 @@
"months ago" => "luni în urmă",
"last year" => "ultimul an",
"years ago" => "ani în urmă",
-"Choose" => "Alege",
+"Ok" => "Ok",
"Cancel" => "Anulare",
-"No" => "Nu",
+"Choose" => "Alege",
"Yes" => "Da",
-"Ok" => "Ok",
+"No" => "Nu",
"The object type is not specified." => "Tipul obiectului nu a fost specificat",
"Error" => "Eroare",
"The app name is not specified." => "Numele aplicației nu a fost specificat",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 2f90c5c5df3..0625a5d11d4 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -44,11 +44,11 @@
"months ago" => "несколько месяцев назад",
"last year" => "в прошлом году",
"years ago" => "несколько лет назад",
-"Choose" => "Выбрать",
+"Ok" => "Ок",
"Cancel" => "Отмена",
-"No" => "Нет",
+"Choose" => "Выбрать",
"Yes" => "Да",
-"Ok" => "Ок",
+"No" => "Нет",
"The object type is not specified." => "Тип объекта не указан",
"Error" => "Ошибка",
"The app name is not specified." => "Имя приложения не указано",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 0399d56dfcf..1afb9e20c9b 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -44,11 +44,11 @@
"months ago" => "месяц назад",
"last year" => "в прошлом году",
"years ago" => "лет назад",
-"Choose" => "Выбрать",
+"Ok" => "Да",
"Cancel" => "Отмена",
-"No" => "Нет",
+"Choose" => "Выбрать",
"Yes" => "Да",
-"Ok" => "Да",
+"No" => "Нет",
"The object type is not specified." => "Тип объекта не указан.",
"Error" => "Ошибка",
"The app name is not specified." => "Имя приложения не указано.",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index eaafca2f3f6..dc9801139a4 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -28,11 +28,11 @@
"months ago" => "මාස කීපයකට පෙර",
"last year" => "පෙර අවුරුද්දේ",
"years ago" => "අවුරුදු කීපයකට පෙර",
-"Choose" => "තෝරන්න",
+"Ok" => "හරි",
"Cancel" => "එපා",
-"No" => "නැහැ",
+"Choose" => "තෝරන්න",
"Yes" => "ඔව්",
-"Ok" => "හරි",
+"No" => "නැහැ",
"Error" => "දෝෂයක්",
"Share" => "බෙදා හදා ගන්න",
"Share with" => "බෙදාගන්න",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 9b0bd45fce3..b52c8b03c41 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -44,11 +44,11 @@
"months ago" => "pred mesiacmi",
"last year" => "minulý rok",
"years ago" => "pred rokmi",
-"Choose" => "Výber",
+"Ok" => "Ok",
"Cancel" => "Zrušiť",
-"No" => "Nie",
+"Choose" => "Výber",
"Yes" => "Áno",
-"Ok" => "Ok",
+"No" => "Nie",
"The object type is not specified." => "Nešpecifikovaný typ objektu.",
"Error" => "Chyba",
"The app name is not specified." => "Nešpecifikované meno aplikácie.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index df86a608bbd..b3cd5c353cf 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -44,11 +44,11 @@
"months ago" => "mesecev nazaj",
"last year" => "lansko leto",
"years ago" => "let nazaj",
-"Choose" => "Izbor",
+"Ok" => "V redu",
"Cancel" => "Prekliči",
-"No" => "Ne",
+"Choose" => "Izbor",
"Yes" => "Da",
-"Ok" => "V redu",
+"No" => "Ne",
"The object type is not specified." => "Vrsta predmeta ni podana.",
"Error" => "Napaka",
"The app name is not specified." => "Ime programa ni podano.",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index f869d1bc280..6881d0105c7 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -44,11 +44,11 @@
"months ago" => "muaj më parë",
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
-"Choose" => "Zgjidh",
+"Ok" => "Në rregull",
"Cancel" => "Anulo",
-"No" => "Jo",
+"Choose" => "Zgjidh",
"Yes" => "Po",
-"Ok" => "Në rregull",
+"No" => "Jo",
"The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
"Error" => "Veprim i gabuar",
"The app name is not specified." => "Nuk është specifikuar emri i app-it.",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 557cb6a8aba..b71d8cdd945 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -41,11 +41,11 @@
"months ago" => "месеци раније",
"last year" => "прошле године",
"years ago" => "година раније",
-"Choose" => "Одабери",
+"Ok" => "У реду",
"Cancel" => "Откажи",
-"No" => "Не",
+"Choose" => "Одабери",
"Yes" => "Да",
-"Ok" => "У реду",
+"No" => "Не",
"The object type is not specified." => "Врста објекта није подешена.",
"Error" => "Грешка",
"The app name is not specified." => "Име програма није унето.",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index ff2e8d8d680..553afea5f71 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -44,11 +44,11 @@
"months ago" => "månader sedan",
"last year" => "förra året",
"years ago" => "år sedan",
-"Choose" => "Välj",
+"Ok" => "Ok",
"Cancel" => "Avbryt",
-"No" => "Nej",
+"Choose" => "Välj",
"Yes" => "Ja",
-"Ok" => "Ok",
+"No" => "Nej",
"The object type is not specified." => "Objekttypen är inte specificerad.",
"Error" => "Fel",
"The app name is not specified." => " Namnet på appen är inte specificerad.",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 9863ca8154e..b45f38627a3 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -39,11 +39,11 @@
"months ago" => "மாதங்களுக்கு முன்",
"last year" => "கடந்த வருடம்",
"years ago" => "வருடங்களுக்கு முன்",
-"Choose" => "தெரிவுசெய்க ",
+"Ok" => "சரி",
"Cancel" => "இரத்து செய்க",
-"No" => "இல்லை",
+"Choose" => "தெரிவுசெய்க ",
"Yes" => "ஆம்",
-"Ok" => "சரி",
+"No" => "இல்லை",
"The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
"Error" => "வழு",
"The app name is not specified." => "செயலி பெயர் குறிப்பிடப்படவில்லை.",
diff --git a/core/l10n/te.php b/core/l10n/te.php
index a18af79ab17..040ab9b550e 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -33,10 +33,10 @@
"months ago" => "నెలల క్రితం",
"last year" => "పోయిన సంవత్సరం",
"years ago" => "సంవత్సరాల క్రితం",
+"Ok" => "సరే",
"Cancel" => "రద్దుచేయి",
-"No" => "కాదు",
"Yes" => "అవును",
-"Ok" => "సరే",
+"No" => "కాదు",
"Error" => "పొరపాటు",
"Password" => "సంకేతపదం",
"Send" => "పంపించు",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 560c150066c..47d4b87b17c 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -43,11 +43,11 @@
"months ago" => "เดือน ที่ผ่านมา",
"last year" => "ปีที่แล้ว",
"years ago" => "ปี ที่ผ่านมา",
-"Choose" => "เลือก",
+"Ok" => "ตกลง",
"Cancel" => "ยกเลิก",
-"No" => "ไม่ตกลง",
+"Choose" => "เลือก",
"Yes" => "ตกลง",
-"Ok" => "ตกลง",
+"No" => "ไม่ตกลง",
"The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ",
"Error" => "พบข้อผิดพลาด",
"The app name is not specified." => "ชื่อของแอปยังไม่ได้รับการระบุชื่อ",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 342a010da0a..891cfb6b849 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -44,11 +44,11 @@
"months ago" => "ay önce",
"last year" => "geçen yıl",
"years ago" => "yıl önce",
-"Choose" => "seç",
+"Ok" => "Tamam",
"Cancel" => "İptal",
-"No" => "Hayır",
+"Choose" => "seç",
"Yes" => "Evet",
-"Ok" => "Tamam",
+"No" => "Hayır",
"The object type is not specified." => "Nesne türü belirtilmemiş.",
"Error" => "Hata",
"The app name is not specified." => "uygulama adı belirtilmedi.",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 685a31d52ed..1e86ed7d36c 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -44,11 +44,11 @@
"months ago" => "місяці тому",
"last year" => "минулого року",
"years ago" => "роки тому",
-"Choose" => "Обрати",
+"Ok" => "Ok",
"Cancel" => "Відмінити",
-"No" => "Ні",
+"Choose" => "Обрати",
"Yes" => "Так",
-"Ok" => "Ok",
+"No" => "Ні",
"The object type is not specified." => "Не визначено тип об'єкту.",
"Error" => "Помилка",
"The app name is not specified." => "Не визначено ім'я програми.",
@@ -107,6 +107,8 @@
"Edit categories" => "Редагувати категорії",
"Add" => "Додати",
"Security Warning" => "Попередження про небезпеку",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Будь ласка, оновіть інсталяцію PHP для безпечного використання ownCloud.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не доступний безпечний генератор випадкових чисел, будь ласка, активуйте PHP OpenSSL додаток.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без безпечного генератора випадкових чисел зловмисник може визначити токени скидання пароля і заволодіти Вашим обліковим записом.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що .htaccess файл не працює.",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index e2448c4d651..544d041e48f 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -14,11 +14,11 @@
"November" => "نومبر",
"December" => "دسمبر",
"Settings" => "سیٹینگز",
-"Choose" => "منتخب کریں",
+"Ok" => "اوکے",
"Cancel" => "منسوخ کریں",
-"No" => "نہیں",
+"Choose" => "منتخب کریں",
"Yes" => "ہاں",
-"Ok" => "اوکے",
+"No" => "نہیں",
"Error" => "ایرر",
"Error while sharing" => "شئیرنگ کے دوران ایرر",
"Error while unsharing" => "شئیرنگ ختم کرنے کے دوران ایرر",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index f03c58f3491..709a8743086 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -44,11 +44,11 @@
"months ago" => "tháng trước",
"last year" => "năm trước",
"years ago" => "năm trước",
-"Choose" => "Chọn",
+"Ok" => "Đồng ý",
"Cancel" => "Hủy",
-"No" => "Không",
+"Choose" => "Chọn",
"Yes" => "Có",
-"Ok" => "Đồng ý",
+"No" => "Không",
"The object type is not specified." => "Loại đối tượng không được chỉ định.",
"Error" => "Lỗi",
"The app name is not specified." => "Tên ứng dụng không được chỉ định.",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index e7c99413cdc..9fbfac2eec1 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -41,11 +41,11 @@
"months ago" => "月前",
"last year" => "去年",
"years ago" => "年前",
-"Choose" => "选择",
+"Ok" => "好的",
"Cancel" => "取消",
-"No" => "否",
+"Choose" => "选择",
"Yes" => "是",
-"Ok" => "好的",
+"No" => "否",
"The object type is not specified." => "未指定对象类型。",
"Error" => "错误",
"The app name is not specified." => "未指定应用名称。",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 68f8280f799..926d4691ed1 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -44,11 +44,11 @@
"months ago" => "月前",
"last year" => "去年",
"years ago" => "年前",
-"Choose" => "选择(&C)...",
+"Ok" => "好",
"Cancel" => "取消",
-"No" => "否",
+"Choose" => "选择(&C)...",
"Yes" => "是",
-"Ok" => "好",
+"No" => "否",
"The object type is not specified." => "未指定对象类型。",
"Error" => "错误",
"The app name is not specified." => "未指定App名称。",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index d02b7be6601..178ab88e5e0 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -23,10 +23,10 @@
"yesterday" => "昨日",
"last month" => "前一月",
"months ago" => "個月之前",
+"Ok" => "OK",
"Cancel" => "取消",
-"No" => "No",
"Yes" => "Yes",
-"Ok" => "OK",
+"No" => "No",
"Error" => "錯誤",
"Shared" => "已分享",
"Share" => "分享",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index a6c4251d1fa..5b14033ffeb 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -44,11 +44,11 @@
"months ago" => "幾個月前",
"last year" => "去年",
"years ago" => "幾年前",
-"Choose" => "選擇",
+"Ok" => "好",
"Cancel" => "取消",
-"No" => "No",
-"Yes" => "Yes",
-"Ok" => "Ok",
+"Choose" => "選擇",
+"Yes" => "是",
+"No" => "否",
"The object type is not specified." => "未指定物件類型。",
"Error" => "錯誤",
"The app name is not specified." => "沒有指定 app 名稱。",
@@ -68,7 +68,7 @@
"Send" => "寄出",
"Set expiration date" => "設置到期日",
"Expiration date" => "到期日",
-"Share via email:" => "透過 email 分享:",
+"Share via email:" => "透過電子郵件分享:",
"No people found" => "沒有找到任何人",
"Resharing is not allowed" => "不允許重新分享",
"Shared in {item} with {user}" => "已和 {user} 分享 {item}",
@@ -82,18 +82,18 @@
"Password protected" => "受密碼保護",
"Error unsetting expiration date" => "解除過期日設定失敗",
"Error setting expiration date" => "錯誤的到期日設定",
-"Sending ..." => "正在寄出...",
+"Sending ..." => "正在傳送...",
"Email sent" => "Email 已寄出",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "升級失敗,請將此問題回報 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。",
"The update was successful. Redirecting you to ownCloud now." => "升級成功,正將您重新導向至 ownCloud 。",
"ownCloud password reset" => "ownCloud 密碼重設",
-"Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: {link}",
+"Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼: {link}",
"You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱。",
"Reset email send." => "重設郵件已送出。",
"Request failed!" => "請求失敗!",
"Username" => "使用者名稱",
"Request reset" => "請求重設",
-"Your password was reset" => "你的密碼已重設",
+"Your password was reset" => "您的密碼已重設",
"To login page" => "至登入頁面",
"New password" => "新密碼",
"Reset password" => "重設密碼",
@@ -107,8 +107,8 @@
"Edit categories" => "編輯分類",
"Add" => "增加",
"Security Warning" => "安全性警告",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的PHP版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "請更新您的PHP安裝以更安全地使用ownCloud。",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "請更新您的 PHP 安裝以更安全地使用 ownCloud 。",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "沒有可用的亂數產生器,請啟用 PHP 中的 OpenSSL 擴充功能。",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "若沒有安全的亂數產生器,攻擊者可能可以預測密碼重設信物,然後控制您的帳戶。",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的資料目錄看起來可以被 Internet 公開存取,因為 .htaccess 設定並未生效。",
@@ -124,11 +124,11 @@
"Database tablespace" => "資料庫 tablespace",
"Database host" => "資料庫主機",
"Finish setup" => "完成設定",
-"web services under your control" => "網路服務在您控制之下",
+"web services under your control" => "由您控制的網路服務",
"Log out" => "登出",
"Automatic logon rejected!" => "自動登入被拒!",
"If you did not change your password recently, your account may be compromised!" => "如果您最近並未更改密碼,您的帳號可能已經遭到入侵!",
-"Please change your password to secure your account again." => "請更改您的密碼以再次取得您的帳戶的控制權。",
+"Please change your password to secure your account again." => "請更改您的密碼以再次取得您帳戶的控制權。",
"Lost your password?" => "忘記密碼?",
"remember" => "記住",
"Log in" => "登入",
diff --git a/core/templates/installation.php b/core/templates/installation.php
index c034fe5b52f..de7ff8c168c 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -63,6 +63,7 @@
<div id="datadirContent">
<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
<input type="text" name="directory" id="directory"
+ placeholder="<?php p(OC::$SERVERROOT."/data"); ?>"
value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
</div>
</fieldset>