diff options
Diffstat (limited to 'core')
62 files changed, 194 insertions, 66 deletions
diff --git a/core/css/apps.css b/core/css/apps.css index 445a3b9b59f..5de146feb1f 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -129,6 +129,7 @@ /* counter and actions */ #app-navigation .utils { position: absolute; + padding: 7px 7px 0 0; right: 0; top: 0; bottom: 0; diff --git a/core/css/fixes.css b/core/css/fixes.css index 3df60ad5b5c..a33bd94bb10 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -44,3 +44,7 @@ height: auto !important; } +/* oc-dialog only uses box shadow which is not supported by ie8 */ +.ie8 .oc-dialog { + border: 1px solid #888888; +} diff --git a/core/css/styles.css b/core/css/styles.css index 85f65a2f427..bf78af15af5 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -150,14 +150,20 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b /* CONTENT ------------------------------------------------------------------ */ #controls { - position:fixed; - height:2.8em; width:100%; - padding:0 70px 0 0.5em; margin:0; - -moz-box-sizing:border-box; box-sizing:border-box; - -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; - background:#eee; border-bottom:1px solid #e7e7e7; z-index:50; + position: fixed; + height: 36px; + width: 100%; + padding: 0 75px 0 6px; + margin: 0; + background: #eee; + border-bottom: 1px solid #e7e7e7; + z-index: 50; + -moz-box-sizing: border-box; box-sizing: border-box; + -moz-box-shadow: 0 -3px 7px #000; -webkit-box-shadow: 0 -3px 7px #000; box-shadow: 0 -3px 7px #000; +} +#controls .button { + display: inline-block; } -#controls .button { display:inline-block; } #content { position:relative; height:100%; width:100%; } #content .hascontrols { position: relative; top: 2.9em; } @@ -177,7 +183,14 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b #leftcontent a { height:100%; display:block; margin:0; padding:0 1em 0 0; float:left; } #rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto } - +#emptycontent { + font-size:1.5em; font-weight:bold; + color:#888; text-shadow:#fff 0 1px 0; + position: absolute; + text-align: center; + top: 50%; + width: 100%; +} /* LOG IN & INSTALLATION ------------------------------------------------------------ */ @@ -677,8 +690,21 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin background-color:white; width:100%; } -#oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; } -#oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; } +#oc-dialog-filepicker-content .filelist li { + position: relative; +} +#oc-dialog-filepicker-content .filelist .filename { + position: absolute; + top: 8px; +} +#oc-dialog-filepicker-content .filelist img { + margin: 2px 1em 0 4px; +} +#oc-dialog-filepicker-content .filelist .date { + float: right; + margin-right: 1em; + margin-top: 8px; +} #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;} .ui-dialog {position:fixed !important;} span.ui-icon {float: left; margin: 3px 7px 30px 0;} diff --git a/core/js/js.js b/core/js/js.js index af4a6d6b336..1999ff73d23 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -431,9 +431,16 @@ OC.Notification={ OC.Breadcrumb={ container:null, - crumbs:[], show:function(dir, leafname, leaflink){ - OC.Breadcrumb.clear(); + if(!this.container){//default + this.container=$('#controls'); + } + this._show(this.container, dir, leafname, leaflink); + }, + _show:function(container, dir, leafname, leaflink){ + var self = this; + + this._clear(container); // show home + path in subdirectories if (dir && dir !== '/') { @@ -450,8 +457,7 @@ OC.Breadcrumb={ crumbImg.attr('src',OC.imagePath('core','places/home')); crumbLink.append(crumbImg); crumb.append(crumbLink); - OC.Breadcrumb.container.prepend(crumb); - OC.Breadcrumb.crumbs.push(crumb); + container.prepend(crumb); //add path parts var segments = dir.split('/'); @@ -460,20 +466,23 @@ OC.Breadcrumb={ if (name !== '') { pathurl = pathurl+'/'+name; var link = OC.linkTo('files','index.php')+'?dir='+encodeURIComponent(pathurl); - OC.Breadcrumb.push(name, link); + self._push(container, name, link); } }); } //add leafname if (leafname && leaflink) { - OC.Breadcrumb.push(leafname, leaflink); + this._push(container, leafname, leaflink); } }, push:function(name, link){ - if(!OC.Breadcrumb.container){//default - OC.Breadcrumb.container=$('#controls'); + if(!this.container){//default + this.container=$('#controls'); } + return this._push(OC.Breadcrumb.container, name, link); + }, + _push:function(container, name, link){ var crumb=$('<div/>'); crumb.addClass('crumb').addClass('last'); @@ -482,30 +491,30 @@ OC.Breadcrumb={ crumbLink.text(name); crumb.append(crumbLink); - var existing=OC.Breadcrumb.container.find('div.crumb'); + var existing=container.find('div.crumb'); if(existing.length){ existing.removeClass('last'); existing.last().after(crumb); }else{ - OC.Breadcrumb.container.prepend(crumb); + container.prepend(crumb); } - OC.Breadcrumb.crumbs.push(crumb); return crumb; }, pop:function(){ - if(!OC.Breadcrumb.container){//default - OC.Breadcrumb.container=$('#controls'); + if(!this.container){//default + this.container=$('#controls'); } - OC.Breadcrumb.container.find('div.crumb').last().remove(); - OC.Breadcrumb.container.find('div.crumb').last().addClass('last'); - OC.Breadcrumb.crumbs.pop(); + this.container.find('div.crumb').last().remove(); + this.container.find('div.crumb').last().addClass('last'); }, clear:function(){ - if(!OC.Breadcrumb.container){//default - OC.Breadcrumb.container=$('#controls'); + if(!this.container){//default + this.container=$('#controls'); } - OC.Breadcrumb.container.find('div.crumb').remove(); - OC.Breadcrumb.crumbs=[]; + this._clear(this.container); + }, + _clear:function(container) { + container.find('div.crumb').remove(); } }; diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 4092b8d0746..f184a1022bc 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -77,7 +77,7 @@ var OCdialogs = { self.$filePicker = $tmpl.octemplate({ dialog_name: dialog_name, title: title - }).data('path', ''); + }).data('path', '').data('multiselect', multiselect).data('mimetype', mimetype_filter); if (modal === undefined) { modal = false; @@ -100,7 +100,7 @@ var OCdialogs = { self._handlePickerClick(event, $(this)); }); self._fillFilePicker(''); - }).data('multiselect', multiselect).data('mimetype',mimetype_filter); + }); // build buttons var functionToCall = function() { @@ -285,7 +285,11 @@ var OCdialogs = { filename: entry.name, date: OC.mtime2date(entry.mtime) }); - $li.find('img').attr('src', entry.mimetype_icon); + if (entry.mimetype === "httpd/unix-directory") { + $li.find('img').attr('src', OC.imagePath('core', 'filetypes/folder.png')); + } else { + $li.find('img').attr('src', OC.Router.generate('core_ajax_preview', {x:32, y:32, file:escapeHTML(dir+'/'+entry.name)}) ); + } self.$filelist.append($li); }); diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js index 6cc6b5a855b..0d7f40c592a 100644 --- a/core/js/oc-requesttoken.js +++ b/core/js/oc-requesttoken.js @@ -1,3 +1,4 @@ -$(document).bind('ajaxSend', function(elm, xhr, s) { +$(document).on('ajaxSend',function(elm, xhr, s) { xhr.setRequestHeader('requesttoken', oc_requesttoken); }); + diff --git a/core/js/placeholder.js b/core/js/placeholder.js index 16543541cb4..d63730547d7 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -34,23 +34,20 @@ * * Which will result in: * - * <div id="albumart" style="background-color: rgb(123, 123, 123); ... ">T</div> + * <div id="albumart" style="background-color: hsl(123, 90%, 65%); ... ">T</div> * */ (function ($) { $.fn.placeholder = function(seed) { var hash = md5(seed), - maxRange = parseInt('ffffffffff', 16), - red = parseInt(hash.substr(0,10), 16) / maxRange * 256, - green = parseInt(hash.substr(10,10), 16) / maxRange * 256, - blue = parseInt(hash.substr(20,10), 16) / maxRange * 256, - rgb = [Math.floor(red), Math.floor(green), Math.floor(blue)], + maxRange = parseInt('ffffffffffffffffffffffffffffffff', 16), + hue = parseInt(hash, 16) / maxRange * 256, height = this.height(); - this.css('background-color', 'rgb(' + rgb.join(',') + ')'); + this.css('background-color', 'hsl(' + hue + ', 90%, 65%)'); // CSS rules - this.css('color', 'rgb(255, 255, 255)'); + this.css('color', '#fff'); this.css('font-weight', 'bold'); this.css('text-align', 'center'); diff --git a/core/l10n/ar.php b/core/l10n/ar.php index 84f076f3018..17c3ab293c6 100644 --- a/core/l10n/ar.php +++ b/core/l10n/ar.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "مجموعة", "Category type not provided." => "نوع التصنيف لم يدخل", "No category to add?" => "ألا توجد فئة للإضافة؟", "This category already exists: %s" => "هذا التصنيف موجود مسبقا : %s", diff --git a/core/l10n/ca.php b/core/l10n/ca.php index c389ad01883..a77924b1218 100644 --- a/core/l10n/ca.php +++ b/core/l10n/ca.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s ha compartit »%s« amb tu", +"group" => "grup", "Category type not provided." => "No s'ha especificat el tipus de categoria.", "No category to add?" => "No voleu afegir cap categoria?", "This category already exists: %s" => "Aquesta categoria ja existeix: %s", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index d104a9fbe80..1301dae32f3 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s s vámi sdílí »%s«", +"group" => "skupina", "Turned on maintenance mode" => "Zapnut režim údržby", "Turned off maintenance mode" => "Vypnut režim údržby", "Updated database" => "Zaktualizována databáze", diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php index 442970fbb0b..1f6c50524b3 100644 --- a/core/l10n/cy_GB.php +++ b/core/l10n/cy_GB.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "grŵp", "Category type not provided." => "Math o gategori heb ei ddarparu.", "No category to add?" => "Dim categori i'w ychwanegu?", "This category already exists: %s" => "Mae'r categori hwn eisoes yn bodoli: %s", diff --git a/core/l10n/da.php b/core/l10n/da.php index 5a1fe65f441..abaea4ba6a5 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s delte »%s« med sig", +"group" => "gruppe", "Turned on maintenance mode" => "Startede vedligeholdelsestilstand", "Turned off maintenance mode" => "standsede vedligeholdelsestilstand", "Updated database" => "Opdaterede database", diff --git a/core/l10n/de.php b/core/l10n/de.php index 655305488f3..1f205a9db5b 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s teilte »%s« mit Ihnen", +"group" => "Gruppe", "Turned on maintenance mode" => "Wartungsmodus eingeschaltet", "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", "Updated database" => "Datenbank aktualisiert", diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php index 2dde9eb5367..6e01b3e2083 100644 --- a/core/l10n/de_CH.php +++ b/core/l10n/de_CH.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s teilt »%s« mit Ihnen", +"group" => "Gruppe", "Category type not provided." => "Kategorie nicht angegeben.", "No category to add?" => "Keine Kategorie hinzuzufügen?", "This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 1311a76d693..a29fc4547c6 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s geteilt »%s« mit Ihnen", +"group" => "Gruppe", "Turned on maintenance mode" => "Wartungsmodus eingeschaltet ", "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet", "Updated database" => "Datenbank aktualisiert", diff --git a/core/l10n/el.php b/core/l10n/el.php index 51a3a68d788..54c13c89bfa 100644 --- a/core/l10n/el.php +++ b/core/l10n/el.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "Ο %s διαμοιράστηκε μαζί σας το »%s«", +"group" => "ομάδα", "Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.", "No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;", "This category already exists: %s" => "Αυτή η κατηγορία υπάρχει ήδη: %s", diff --git a/core/l10n/eo.php b/core/l10n/eo.php index fc688b103a6..669f677d46d 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s kunhavigis “%s” kun vi", +"group" => "grupo", "Category type not provided." => "Ne proviziĝis tipon de kategorio.", "No category to add?" => "Ĉu neniu kategorio estas aldonota?", "This category already exists: %s" => "Tiu kategorio jam ekzistas: %s", diff --git a/core/l10n/es.php b/core/l10n/es.php index 9e7f5656683..077f677e972 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s compatido »%s« contigo", +"group" => "grupo", "Category type not provided." => "Tipo de categoría no proporcionado.", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: %s" => "Esta categoría ya existe: %s", diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index cd51ba2f441..389251de8aa 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s compartió \"%s\" con vos", +"group" => "grupo", "Category type not provided." => "Tipo de categoría no provisto. ", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: %s" => "Esta categoría ya existe: %s", diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index d9d007819d3..5391a144349 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s jagas sinuga »%s«", +"group" => "grupp", "Turned on maintenance mode" => "Haldusreziimis", "Turned off maintenance mode" => "Haldusreziim lõpetatud", "Updated database" => "Uuendatud andmebaas", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index ae241e93873..1e0eb36e1e3 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du", +"group" => "taldea", "Category type not provided." => "Kategoria mota ez da zehaztu.", "No category to add?" => "Ez dago gehitzeko kategoriarik?", "This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s", diff --git a/core/l10n/fa.php b/core/l10n/fa.php index a9e17a194ae..82356c0ab12 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما", +"group" => "گروه", "Category type not provided." => "نوع دسته بندی ارائه نشده است.", "No category to add?" => "آیا گروه دیگری برای افزودن ندارید", "This category already exists: %s" => "این دسته هم اکنون وجود دارد: %s", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index 7efeaa1fac2..25f5f466ef9 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi", +"group" => "ryhmä", "Turned on maintenance mode" => "Siirrytty ylläpitotilaan", "Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä", "Updated database" => "Tietokanta ajan tasalla", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 3f85cb1503f..0f338a09340 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s partagé »%s« avec vous", +"group" => "groupe", +"Turned on maintenance mode" => "Basculé en mode maintenance", +"Turned off maintenance mode" => "Basculé en mode production (non maintenance)", +"Updated database" => "Base de données mise à jour", +"Updating filecache, this may take really long..." => "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue...", +"Updated filecache" => "Cache de fichier mis à jour", +"... %d%% done ..." => "... %d%% effectué ...", "Category type not provided." => "Type de catégorie non spécifié.", "No category to add?" => "Pas de catégorie à ajouter ?", "This category already exists: %s" => "Cette catégorie existe déjà : %s", @@ -30,13 +37,13 @@ $TRANSLATIONS = array( "December" => "décembre", "Settings" => "Paramètres", "seconds ago" => "il y a quelques secondes", -"_%n minute ago_::_%n minutes ago_" => array("",""), -"_%n hour ago_::_%n hours ago_" => array("",""), +"_%n minute ago_::_%n minutes ago_" => array("il y a %n minute","il y a %n minutes"), +"_%n hour ago_::_%n hours ago_" => array("Il y a %n heure","Il y a %n heures"), "today" => "aujourd'hui", "yesterday" => "hier", -"_%n day ago_::_%n days ago_" => array("",""), +"_%n day ago_::_%n days ago_" => array("il y a %n jour","il y a %n jours"), "last month" => "le mois dernier", -"_%n month ago_::_%n months ago_" => array("",""), +"_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"), "months ago" => "il y a plusieurs mois", "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", @@ -83,6 +90,7 @@ $TRANSLATIONS = array( "Email sent" => "Email envoyé", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.", +"%s password reset" => "Réinitialisation de votre mot de passe %s", "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}", "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local.", "Request failed!<br>Did you make sure your email/username was right?" => "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?", @@ -107,9 +115,11 @@ $TRANSLATIONS = array( "Add" => "Ajouter", "Security Warning" => "Avertissement de sécurité", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)", +"Please update your PHP installation to use %s securely." => "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner", +"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.", "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>", "Advanced" => "Avancé", "Data folder" => "Répertoire des données", diff --git a/core/l10n/gl.php b/core/l10n/gl.php index 56027e4cf1a..663d769ee98 100644 --- a/core/l10n/gl.php +++ b/core/l10n/gl.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s compartiu «%s» con vostede", +"group" => "grupo", "Turned on maintenance mode" => "Modo de mantemento activado", "Turned off maintenance mode" => "Modo de mantemento desactivado", "Updated database" => "Base de datos actualizada", diff --git a/core/l10n/he.php b/core/l10n/he.php index b197a67b116..d5d83fea330 100644 --- a/core/l10n/he.php +++ b/core/l10n/he.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s שיתף/שיתפה איתך את »%s«", +"group" => "קבוצה", "Category type not provided." => "סוג הקטגוריה לא סופק.", "No category to add?" => "אין קטגוריה להוספה?", "This category already exists: %s" => "הקטגוריה הבאה כבר קיימת: %s", diff --git a/core/l10n/hi.php b/core/l10n/hi.php index 00cb5926d70..29e67f68abf 100644 --- a/core/l10n/hi.php +++ b/core/l10n/hi.php @@ -1,5 +1,15 @@ <?php $TRANSLATIONS = array( +"Category type not provided." => "कैटेगरी प्रकार उपलब्ध नहीं है", +"This category already exists: %s" => "यह कैटेगरी पहले से ही मौजूद है: %s", +"Object type not provided." => "ऑब्जेक्ट प्रकार नहीं दिया हुआ", +"Sunday" => "रविवार", +"Monday" => "सोमवार", +"Tuesday" => "मंगलवार", +"Wednesday" => "बुधवार", +"Thursday" => "बृहस्पतिवार", +"Friday" => "शुक्रवार", +"Saturday" => "शनिवार", "January" => "जनवरी", "February" => "फरवरी", "March" => "मार्च", @@ -21,6 +31,9 @@ $TRANSLATIONS = array( "Share" => "साझा करें", "Share with" => "के साथ साझा", "Password" => "पासवर्ड", +"Send" => "भेजें", +"Sending ..." => "भेजा जा रहा है", +"Email sent" => "ईमेल भेज दिया गया है ", "Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}", "You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|", "Username" => "प्रयोक्ता का नाम", @@ -31,6 +44,7 @@ $TRANSLATIONS = array( "Apps" => "Apps", "Help" => "सहयोग", "Cloud not found" => "क्लौड नहीं मिला ", +"Add" => "डाले", "Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ", "Advanced" => "उन्नत", "Data folder" => "डाटा फोल्डर", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index c231d7f9a44..93f96e17847 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s megosztotta Önnel ezt: »%s«", +"group" => "csoport", "Category type not provided." => "Nincs megadva a kategória típusa.", "No category to add?" => "Nincs hozzáadandó kategória?", "This category already exists: %s" => "Ez a kategória már létezik: %s", diff --git a/core/l10n/id.php b/core/l10n/id.php index fc6cb788fb0..0f222918c95 100644 --- a/core/l10n/id.php +++ b/core/l10n/id.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "grup", "Category type not provided." => "Tipe kategori tidak diberikan.", "No category to add?" => "Tidak ada kategori yang akan ditambahkan?", "This category already exists: %s" => "Kategori ini sudah ada: %s", diff --git a/core/l10n/it.php b/core/l10n/it.php index 63a7545d891..71f6ffdf50e 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s ha condiviso «%s» con te", +"group" => "gruppo", "Turned on maintenance mode" => "Modalità di manutenzione attivata", "Turned off maintenance mode" => "Modalità di manutenzione disattivata", "Updated database" => "Database aggiornato", diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php index 2ab85f13d30..82e4153367d 100644 --- a/core/l10n/ja_JP.php +++ b/core/l10n/ja_JP.php @@ -1,6 +1,13 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%sが あなたと »%s«を共有しました", +"group" => "グループ", +"Turned on maintenance mode" => "メンテナンスモードがオンになりました", +"Turned off maintenance mode" => "メンテナンスモードがオフになりました", +"Updated database" => "データベース更新完了", +"Updating filecache, this may take really long..." => "ファイルキャッシュを更新しています、しばらく掛かる恐れがあります...", +"Updated filecache" => "ファイルキャッシュ更新完了", +"... %d%% done ..." => "... %d%% 完了 ...", "Category type not provided." => "カテゴリタイプは提供されていません。", "No category to add?" => "追加するカテゴリはありませんか？", "This category already exists: %s" => "このカテゴリはすでに存在します: %s", diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php index 0f4b23906d6..15cacc8b218 100644 --- a/core/l10n/ka_GE.php +++ b/core/l10n/ka_GE.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "ჯგუფი", "Category type not provided." => "კატეგორიის ტიპი არ არის განხილული.", "No category to add?" => "არ არის კატეგორია დასამატებლად?", "This category already exists: %s" => "კატეგორია უკვე არსებობს: %s", diff --git a/core/l10n/ko.php b/core/l10n/ko.php index c4b6b9f091b..0265f38dc07 100644 --- a/core/l10n/ko.php +++ b/core/l10n/ko.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "그룹", "Category type not provided." => "분류 형식이 제공되지 않았습니다.", "No category to add?" => "추가할 분류가 없습니까?", "This category already exists: %s" => "분류가 이미 존재합니다: %s", diff --git a/core/l10n/lb.php b/core/l10n/lb.php index 8a5a28957c4..5f4c415bed7 100644 --- a/core/l10n/lb.php +++ b/core/l10n/lb.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "Den/D' %s huet »%s« mat dir gedeelt", +"group" => "Grupp", "Category type not provided." => "Typ vun der Kategorie net uginn.", "No category to add?" => "Keng Kategorie fir bäizesetzen?", "This category already exists: %s" => "Dës Kategorie existéiert schon: %s", diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php index 5db8f6c21a9..7b0c3ed4f80 100644 --- a/core/l10n/lt_LT.php +++ b/core/l10n/lt_LT.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s pasidalino »%s« su tavimi", +"group" => "grupė", "Category type not provided." => "Kategorija nenurodyta.", "No category to add?" => "Nepridėsite jokios kategorijos?", "This category already exists: %s" => "Ši kategorija jau egzistuoja: %s", diff --git a/core/l10n/lv.php b/core/l10n/lv.php index ddfc6008983..57b9186f3cf 100644 --- a/core/l10n/lv.php +++ b/core/l10n/lv.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s kopīgots »%s« ar jums", +"group" => "grupa", "Category type not provided." => "Kategorijas tips nav norādīts.", "No category to add?" => "Nav kategoriju, ko pievienot?", "This category already exists: %s" => "Šāda kategorija jau eksistē — %s", diff --git a/core/l10n/mk.php b/core/l10n/mk.php index e2416dc052c..6a8ec50061c 100644 --- a/core/l10n/mk.php +++ b/core/l10n/mk.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "група", "Category type not provided." => "Не беше доставен тип на категорија.", "No category to add?" => "Нема категорија да се додаде?", "Object type not provided." => "Не беше доставен тип на објект.", diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php index 393dc0d7d11..132b65daab2 100644 --- a/core/l10n/nb_NO.php +++ b/core/l10n/nb_NO.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s delte »%s« med deg", +"group" => "gruppe", "No category to add?" => "Ingen kategorier å legge til?", "This category already exists: %s" => "Denne kategorien finnes allerede: %s", "No categories selected for deletion." => "Ingen kategorier merket for sletting.", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 6a2d1a03a10..6d5d5dc9917 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s deelde »%s« met jou", +"group" => "groep", "Category type not provided." => "Categorie type niet opgegeven.", "No category to add?" => "Geen categorie om toe te voegen?", "This category already exists: %s" => "Deze categorie bestaat al: %s", diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php index f73cb96076e..942824ecb74 100644 --- a/core/l10n/nn_NO.php +++ b/core/l10n/nn_NO.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "gruppe", "Category type not provided." => "Ingen kategoritype.", "No category to add?" => "Ingen kategori å leggja til?", "This category already exists: %s" => "Denne kategorien finst alt: %s", diff --git a/core/l10n/oc.php b/core/l10n/oc.php index 68bf2f89a2a..0ca3cc427a0 100644 --- a/core/l10n/oc.php +++ b/core/l10n/oc.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "grop", "No category to add?" => "Pas de categoria d'ajustar ?", "No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.", "Sunday" => "Dimenge", diff --git a/core/l10n/pl.php b/core/l10n/pl.php index 1188e555316..48f6dff6184 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s Współdzielone »%s« z tobą", +"group" => "grupa", "Category type not provided." => "Nie podano typu kategorii.", "No category to add?" => "Brak kategorii do dodania?", "This category already exists: %s" => "Ta kategoria już istnieje: %s", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index 8db5262e94b..84762cde5e4 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s compartilhou »%s« com você", +"group" => "grupo", "Category type not provided." => "Tipo de categoria não fornecido.", "No category to add?" => "Nenhuma categoria a adicionar?", "This category already exists: %s" => "Esta categoria já existe: %s", diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php index 25ddaa322d5..2afb9ef9b39 100644 --- a/core/l10n/pt_PT.php +++ b/core/l10n/pt_PT.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s partilhado »%s« contigo", +"group" => "grupo", "Category type not provided." => "Tipo de categoria não fornecido", "No category to add?" => "Nenhuma categoria para adicionar?", "This category already exists: %s" => "A categoria já existe: %s", diff --git a/core/l10n/ro.php b/core/l10n/ro.php index 7e33003bcce..ca0e409f71f 100644 --- a/core/l10n/ro.php +++ b/core/l10n/ro.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s Partajat »%s« cu tine de", +"group" => "grup", "Category type not provided." => "Tipul de categorie nu a fost specificat.", "No category to add?" => "Nici o categorie de adăugat?", "This category already exists: %s" => "Această categorie deja există: %s", diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 503ca579ce7..d79326aff32 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s поделился »%s« с вами", +"group" => "группа", "Category type not provided." => "Тип категории не предоставлен", "No category to add?" => "Нет категорий для добавления?", "This category already exists: %s" => "Эта категория уже существует: %s", diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php index 475cdf5613a..184566b5f1c 100644 --- a/core/l10n/si_LK.php +++ b/core/l10n/si_LK.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "කණ්ඩායම", "No categories selected for deletion." => "මකා දැමීම සඳහා ප්රවර්ගයන් තෝරා නොමැත.", "Sunday" => "ඉරිදා", "Monday" => "සඳුදා", diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php index 82745d617e9..ed061068b4b 100644 --- a/core/l10n/sk_SK.php +++ b/core/l10n/sk_SK.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s s Vami zdieľa »%s«", +"group" => "skupina", "Turned on maintenance mode" => "Mód údržby zapnutý", "Turned off maintenance mode" => "Mód údržby vypnutý", "Updated database" => "Databáza aktualizovaná", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 0b72f1dc4e4..460ca99eeab 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s je delil »%s« z vami", +"group" => "skupina", "Category type not provided." => "Vrsta kategorije ni podana.", "No category to add?" => "Ali ni kategorije za dodajanje?", "This category already exists: %s" => "Kategorija že obstaja: %s", diff --git a/core/l10n/sr.php b/core/l10n/sr.php index 3de06c70883..89c13c49254 100644 --- a/core/l10n/sr.php +++ b/core/l10n/sr.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "група", "Category type not provided." => "Врста категорије није унет.", "No category to add?" => "Додати још неку категорију?", "Object type not provided." => "Врста објекта није унета.", diff --git a/core/l10n/sv.php b/core/l10n/sv.php index 74d285a35a6..9bfd91d2691 100644 --- a/core/l10n/sv.php +++ b/core/l10n/sv.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s delade »%s« med dig", +"group" => "Grupp", "Turned on maintenance mode" => "Aktiverade underhållsläge", "Turned off maintenance mode" => "Deaktiverade underhållsläge", "Updated database" => "Uppdaterade databasen", diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index 3fc461d4284..a1a286275eb 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "குழு", "Category type not provided." => "பிரிவு வகைகள் வழங்கப்படவில்லை", "No category to add?" => "சேர்ப்பதற்கான வகைகள் இல்லையா?", "Object type not provided." => "பொருள் வகை வழங்கப்படவில்லை", diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php index bb5181fd9e6..90fec245c95 100644 --- a/core/l10n/th_TH.php +++ b/core/l10n/th_TH.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "กลุ่มผู้ใช้งาน", "Category type not provided." => "ยังไม่ได้ระบุชนิดของหมวดหมู่", "No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?", "Object type not provided." => "ชนิดของวัตถุยังไม่ได้ถูกระบุ", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index 6dd54057950..8b6c261d64c 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu", +"group" => "grup", "Category type not provided." => "Kategori türü girilmedi.", "No category to add?" => "Eklenecek kategori yok?", "This category already exists: %s" => "Bu kategori zaten mevcut: %s", diff --git a/core/l10n/ug.php b/core/l10n/ug.php index eb16e841c67..e77718233de 100644 --- a/core/l10n/ug.php +++ b/core/l10n/ug.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "گۇرۇپپا", "Sunday" => "يەكشەنبە", "Monday" => "دۈشەنبە", "Tuesday" => "سەيشەنبە", diff --git a/core/l10n/uk.php b/core/l10n/uk.php index 6fcb23d0a32..8e74855dd08 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "група", "Category type not provided." => "Не вказано тип категорії.", "No category to add?" => "Відсутні категорії для додавання?", "This category already exists: %s" => "Ця категорія вже існує: %s", diff --git a/core/l10n/vi.php b/core/l10n/vi.php index 305839b4760..1ccf03c0aaa 100644 --- a/core/l10n/vi.php +++ b/core/l10n/vi.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"group" => "nhóm", "Category type not provided." => "Kiểu hạng mục không được cung cấp.", "No category to add?" => "Không có danh mục được thêm?", "This category already exists: %s" => "Danh mục này đã tồn tại: %s", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index 08d70dfee66..ddcc902c8d7 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s 向您分享了 »%s«", +"group" => "组", "Turned on maintenance mode" => "启用维护模式", "Turned off maintenance mode" => "关闭维护模式", "Updated database" => "数据库已更新", diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index fabec7537d1..c25a58dc8ea 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -1,10 +1,17 @@ <?php $TRANSLATIONS = array( "%s shared »%s« with you" => "%s 與您分享了 %s", +"group" => "群組", +"Turned on maintenance mode" => "已啓用維護模式", +"Turned off maintenance mode" => "已停用維護模式", +"Updated database" => "已更新資料庫", +"Updating filecache, this may take really long..." => "更新檔案快取，這可能要很久…", +"Updated filecache" => "已更新檔案快取", +"... %d%% done ..." => "已完成 %d%%", "Category type not provided." => "未提供分類類型。", "No category to add?" => "沒有可增加的分類？", -"This category already exists: %s" => "分類已經存在： %s", -"Object type not provided." => "不支援的物件類型", +"This category already exists: %s" => "分類已經存在：%s", +"Object type not provided." => "未指定物件類型", "%s ID not provided." => "未提供 %s ID 。", "Error adding %s to favorites." => "加入 %s 到最愛時發生錯誤。", "No categories selected for deletion." => "沒有選擇要刪除的分類。", @@ -56,20 +63,20 @@ $TRANSLATIONS = array( "Error while changing permissions" => "修改權限時發生錯誤", "Shared with you and the group {group} by {owner}" => "由 {owner} 分享給您和 {group}", "Shared with you by {owner}" => "{owner} 已經和您分享", -"Share with" => "與...分享", +"Share with" => "分享給別人", "Share with link" => "使用連結分享", "Password protect" => "密碼保護", "Password" => "密碼", "Allow Public Upload" => "允許任何人上傳", "Email link to person" => "將連結 email 給別人", "Send" => "寄出", -"Set expiration date" => "設置到期日", +"Set expiration date" => "指定到期日", "Expiration date" => "到期日", "Share via email:" => "透過電子郵件分享：", "No people found" => "沒有找到任何人", "Resharing is not allowed" => "不允許重新分享", "Shared in {item} with {user}" => "已和 {user} 分享 {item}", -"Unshare" => "取消共享", +"Unshare" => "取消分享", "can edit" => "可編輯", "access control" => "存取控制", "create" => "建立", @@ -77,15 +84,15 @@ $TRANSLATIONS = array( "delete" => "刪除", "share" => "分享", "Password protected" => "受密碼保護", -"Error unsetting expiration date" => "解除過期日設定失敗", -"Error setting expiration date" => "錯誤的到期日設定", -"Sending ..." => "正在傳送...", +"Error unsetting expiration date" => "取消到期日設定失敗", +"Error setting expiration date" => "設定到期日發生錯誤", +"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 。", "%s password reset" => "%s 密碼重設", "Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼： {link}", -"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。", +"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被歸為垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。", "Request failed!<br>Did you make sure your email/username was right?" => "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？", "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到您的電子郵件信箱。", "Username" => "使用者名稱", @@ -102,8 +109,8 @@ $TRANSLATIONS = array( "Admin" => "管理", "Help" => "說明", "Access forbidden" => "存取被拒", -"Cloud not found" => "未發現雲端", -"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "嗨，\n\n通知您，%s 與您分享了 %s 。\n看一下：%s", +"Cloud not found" => "找不到網頁", +"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "嗨，\n\n通知您一聲，%s 與您分享了 %s 。\n您可以到 %s 看看", "Edit categories" => "編輯分類", "Add" => "增加", "Security Warning" => "安全性警告", @@ -115,7 +122,7 @@ $TRANSLATIONS = array( "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。", "Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>", "Advanced" => "進階", -"Data folder" => "資料夾", +"Data folder" => "資料儲存位置", "Configure the database" => "設定資料庫", "will be used" => "將會使用", "Database user" => "資料庫使用者", @@ -132,8 +139,8 @@ $TRANSLATIONS = array( "Lost your password?" => "忘記密碼？", "remember" => "記住", "Log in" => "登入", -"Alternative Logins" => "替代登入方法", -"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "嗨，<br><br>通知您，%s 與您分享了 %s ，<br><a href=\"%s\">看一下吧</a>", -"Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ，這可能需要一點時間。" +"Alternative Logins" => "其他登入方法", +"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "嗨，<br><br>通知您一聲，%s 與您分享了 %s ，<br><a href=\"%s\">看一下吧</a>", +"Updating ownCloud to version %s, this may take a while." => "正在將 ownCloud 升級至版本 %s ，這可能需要一點時間。" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index 74a5be2b96f..f761e45d25f 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -42,7 +42,7 @@ class OC_Core_LostPassword_Controller { } if (OC_User::userExists($_POST['user']) && $continue) { - $token = hash('sha256', OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', '')); + $token = hash('sha256', OC_Util::generateRandomBytes(30).OC_Config::getValue('passwordsalt', '')); OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', hash('sha256', $token)); // Hash the token again to prevent timing attacks $email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', ''); diff --git a/core/minimizer.php b/core/minimizer.php index 4da9037c413..eeeddf86a81 100644 --- a/core/minimizer.php +++ b/core/minimizer.php @@ -5,11 +5,11 @@ OC_App::loadApps(); if ($service == 'core.css') { $minimizer = new OC_Minimizer_CSS(); - $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles); + $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$coreStyles); $minimizer->output($files, $service); } else if ($service == 'core.js') { $minimizer = new OC_Minimizer_JS(); - $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts); + $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$coreScripts); $minimizer->output($files, $service); } diff --git a/core/setup.php b/core/setup.php index 40e30db533a..4758c23b045 100644 --- a/core/setup.php +++ b/core/setup.php @@ -33,8 +33,8 @@ $opts = array( 'hasOracle' => $hasOracle, 'hasMSSQL' => $hasMSSQL, 'directory' => $datadir, - 'secureRNG' => OC_Util::secureRNG_available(), - 'htaccessWorking' => OC_Util::ishtaccessworking(), + 'secureRNG' => OC_Util::secureRNGAvailable(), + 'htaccessWorking' => OC_Util::isHtAccessWorking(), 'vulnerableToNullByte' => $vulnerableToNullByte, 'errors' => array(), ); |