summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/css/multiselect.css27
-rw-r--r--core/css/styles.css4
-rw-r--r--core/js/config.js2
-rw-r--r--core/js/js.js13
-rw-r--r--core/js/multiselect.js231
-rw-r--r--core/l10n/ar.php6
-rw-r--r--core/l10n/bg_BG.php63
-rw-r--r--core/l10n/bn_BD.php82
-rw-r--r--core/l10n/ca.php5
-rw-r--r--core/l10n/cs_CZ.php5
-rw-r--r--core/l10n/da.php6
-rw-r--r--core/l10n/de.php5
-rw-r--r--core/l10n/de_DE.php5
-rw-r--r--core/l10n/el.php6
-rw-r--r--core/l10n/eo.php6
-rw-r--r--core/l10n/es.php5
-rw-r--r--core/l10n/es_AR.php5
-rw-r--r--core/l10n/et_EE.php5
-rw-r--r--core/l10n/eu.php6
-rw-r--r--core/l10n/fa.php1
-rw-r--r--core/l10n/fi_FI.php10
-rw-r--r--core/l10n/fr.php5
-rw-r--r--core/l10n/gl.php5
-rw-r--r--core/l10n/he.php5
-rw-r--r--core/l10n/hi.php1
-rw-r--r--core/l10n/hr.php1
-rw-r--r--core/l10n/hu_HU.php6
-rw-r--r--core/l10n/ia.php1
-rw-r--r--core/l10n/id.php6
-rw-r--r--core/l10n/is.php21
-rw-r--r--core/l10n/it.php5
-rw-r--r--core/l10n/ja_JP.php5
-rw-r--r--core/l10n/ka_GE.php5
-rw-r--r--core/l10n/ko.php13
-rw-r--r--core/l10n/lb.php1
-rw-r--r--core/l10n/lt_LT.php6
-rw-r--r--core/l10n/lv.php1
-rw-r--r--core/l10n/mk.php6
-rw-r--r--core/l10n/ms_MY.php1
-rw-r--r--core/l10n/nb_NO.php5
-rw-r--r--core/l10n/nl.php5
-rw-r--r--core/l10n/nn_NO.php1
-rw-r--r--core/l10n/oc.php1
-rw-r--r--core/l10n/pl.php5
-rw-r--r--core/l10n/pt_BR.php6
-rw-r--r--core/l10n/pt_PT.php5
-rw-r--r--core/l10n/ro.php6
-rw-r--r--core/l10n/ru.php5
-rw-r--r--core/l10n/ru_RU.php6
-rw-r--r--core/l10n/si_LK.php1
-rw-r--r--core/l10n/sk_SK.php6
-rw-r--r--core/l10n/sl.php6
-rw-r--r--core/l10n/sr.php6
-rw-r--r--core/l10n/sr@latin.php1
-rw-r--r--core/l10n/sv.php5
-rw-r--r--core/l10n/ta_LK.php6
-rw-r--r--core/l10n/th_TH.php6
-rw-r--r--core/l10n/tr.php5
-rw-r--r--core/l10n/uk.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_TW.php64
-rw-r--r--core/templates/exception.php2
-rw-r--r--core/templates/logout.php1
-rw-r--r--core/templates/verify.php18
66 files changed, 377 insertions, 411 deletions
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index 99f0e039334..31c8ef88eb9 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -5,15 +5,25 @@
ul.multiselectoptions {
background-color:#fff;
border:1px solid #ddd;
- border-bottom-left-radius:.5em;
- border-bottom-right-radius:.5em;
border-top:none;
box-shadow:0 1px 1px #ddd;
padding-top:.5em;
position:absolute;
+ max-height: 20em;
+ overflow-y: auto;
z-index:49;
}
+ ul.multiselectoptions.down {
+ border-bottom-left-radius:.5em;
+ border-bottom-right-radius:.5em;
+ }
+
+ ul.multiselectoptions.up {
+ border-top-left-radius:.5em;
+ border-top-right-radius:.5em;
+ }
+
ul.multiselectoptions>li {
overflow:hidden;
white-space:nowrap;
@@ -30,11 +40,20 @@
div.multiselect.active {
background-color:#fff;
+ position:relative;
+ z-index:50;
+ }
+
+ div.multiselect.up {
+ border-top:0 none;
+ border-top-left-radius:0;
+ border-top-right-radius:0;
+ }
+
+ div.multiselect.down {
border-bottom:none;
border-bottom-left-radius:0;
border-bottom-right-radius:0;
- position:relative;
- z-index:50;
}
div.multiselect>span:first-child {
diff --git a/core/css/styles.css b/core/css/styles.css
index 6e1cef72eda..496320561f8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -34,7 +34,7 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC
/* INPUTS */
input[type="text"], input[type="password"] { cursor:text; }
-input:not([type="checkbox"]), textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
+input, textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
width:10em; margin:.3em; padding:.6em .5em .4em;
font-size:1em; font-family:Arial, Verdana, sans-serif;
background:#fff; color:#333; border:1px solid #ddd; outline:none;
@@ -56,7 +56,7 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#
/* BUTTONS */
input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a {
width:auto; padding:.4em;
- background-color:rgba(230,230,230,.5); font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid rgba(180,180,180,.5); cursor:pointer;
+ background-color:rgba(230,230,230,.5); font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid #bbb; border:1px solid rgba(180,180,180,.5); cursor:pointer;
-moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset;
-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
}
diff --git a/core/js/config.js b/core/js/config.js
index f7a29276f7d..563df4e6632 100644
--- a/core/js/config.js
+++ b/core/js/config.js
@@ -50,6 +50,6 @@ OC.AppConfig={
},
deleteApp:function(app){
OC.AppConfig.postCall('deleteApp',{app:app});
- },
+ }
};
//TODO OC.Preferences
diff --git a/core/js/js.js b/core/js/js.js
index 610950995db..95889ac8a27 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -343,8 +343,15 @@ if(typeof localStorage !=='undefined' && localStorage !== null){
return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item));
},
getItem:function(name){
- if(localStorage.getItem(OC.localStorage.namespace+name)===null){return null;}
- return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name));
+ var item = localStorage.getItem(OC.localStorage.namespace+name);
+ if(item===null) {
+ return null;
+ } else if (typeof JSON === 'undefined') {
+ //fallback to jquery for IE6/7/8
+ return $.parseJSON(item);
+ } else {
+ return JSON.parse(item);
+ }
}
};
}else{
@@ -615,7 +622,7 @@ $(document).ready(function(){
$('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true});
$('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true});
$('.password .action').tipsy({gravity:'se', fade:true, live:true});
- $('#upload a').tipsy({gravity:'w', fade:true});
+ $('#upload').tipsy({gravity:'w', fade:true});
$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
$('a.delete').tipsy({gravity: 'e', fade:true, live:true});
$('a.action').tipsy({gravity:'s', fade:true, live:true});
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index c4fd74b0475..623c6e0f7e1 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -1,20 +1,44 @@
+/**
+ * @param 'createCallback' A function to be called when a new entry is created. Two arguments are supplied to this function:
+ * The select element used and the value of the option. If the function returns false addition will be cancelled. If it returns
+ * anything else it will be used as the value of the newly added option.
+ * @param 'createText' The placeholder text for the create action.
+ * @param 'title' The title to show if no options are selected.
+ * @param 'checked' An array containing values for options that should be checked. Any options which are already selected will be added to this array.
+ * @param 'labels' The corresponding labels to show for the checked items.
+ * @param 'oncheck' Callback function which will be called when a checkbox/radiobutton is selected. If the function returns false the input will be unchecked.
+ * @param 'onuncheck' @see 'oncheck'.
+ * @param 'singleSelect' If true radiobuttons will be used instead of checkboxes.
+ */
(function( $ ){
var multiSelectId=-1;
- $.fn.multiSelect=function(options){
+ $.fn.multiSelect=function(options) {
multiSelectId++;
var settings = {
'createCallback':false,
'createText':false,
+ 'singleSelect':false,
+ 'selectedFirst':false,
+ 'sort':true,
'title':this.attr('title'),
'checked':[],
+ 'labels':[],
'oncheck':false,
'onuncheck':false,
'minWidth': 'default;',
};
+ $(this).attr('data-msid', multiSelectId);
$.extend(settings,options);
- $.each(this.children(),function(i,option){
- if($(option).attr('selected') && settings.checked.indexOf($(option).val())==-1){
+ $.each(this.children(),function(i,option) {
+ // If the option is selected, but not in the checked array, add it.
+ if($(option).attr('selected') && settings.checked.indexOf($(option).val()) === -1) {
settings.checked.push($(option).val());
+ settings.labels.push($(option).text().trim());
+ }
+ // If the option is in the checked array but not selected, select it.
+ else if(settings.checked.indexOf($(option).val()) !== -1 && !$(option).attr('selected')) {
+ $(option).attr('selected', 'selected');
+ settings.labels.push($(option).text().trim());
}
});
var button=$('<div class="multiselect button"><span>'+settings.title+'</span><span>▾</span></div>');
@@ -24,24 +48,36 @@
button.selectedItems=[];
this.hide();
this.before(span);
- if(settings.minWidth=='default'){
+ if(settings.minWidth=='default') {
settings.minWidth=button.width();
}
button.css('min-width',settings.minWidth);
settings.minOuterWidth=button.outerWidth()-2;
button.data('settings',settings);
- if(settings.checked.length>0){
- button.children('span').first().text(settings.checked.join(', '));
+
+ if(!settings.singleSelect && settings.checked.length>0) {
+ button.children('span').first().text(settings.labels.join(', '));
+ } else if(settings.singleSelect) {
+ button.children('span').first().text(this.find(':selected').text());
}
+ var self = this;
+ self.menuDirection = 'down';
button.click(function(event){
var button=$(this);
- if(button.parent().children('ul').length>0){
- button.parent().children('ul').slideUp(400,function(){
- button.parent().children('ul').remove();
- button.removeClass('active');
- });
+ if(button.parent().children('ul').length>0) {
+ if(self.menuDirection === 'down') {
+ button.parent().children('ul').slideUp(400,function() {
+ button.parent().children('ul').remove();
+ button.removeClass('active down');
+ });
+ } else {
+ button.parent().children('ul').fadeOut(400,function() {
+ button.parent().children('ul').remove();
+ button.removeClass('active up');
+ });
+ }
return;
}
var lists=$('ul.multiselectoptions');
@@ -54,49 +90,69 @@
event.stopPropagation();
var options=$(this).parent().next().children();
var list=$('<ul class="multiselectoptions"/>').hide().appendTo($(this).parent());
- function createItem(element,checked){
+ var inputType = settings.singleSelect ? 'radio' : 'checkbox';
+ function createItem(element, checked){
element=$(element);
var item=element.val();
var id='ms'+multiSelectId+'-option-'+item;
- var input=$('<input type="checkbox"/>');
+ var input=$('<input type="' + inputType + '"/>');
input.attr('id',id);
+ if(settings.singleSelect) {
+ input.attr('name', 'ms'+multiSelectId+'-option');
+ }
var label=$('<label/>');
label.attr('for',id);
- label.text(item);
- if(settings.checked.indexOf(item)!=-1 || checked){
- input.attr('checked',true);
+ label.text(element.text() || item);
+ if(settings.checked.indexOf(item)!=-1 || checked) {
+ input.attr('checked', true);
}
if(checked){
- settings.checked.push(item);
+ if(settings.singleSelect) {
+ settings.checked = [item];
+ settings.labels = [item];
+ } else {
+ settings.checked.push(item);
+ settings.labels.push(item);
+ }
}
input.change(function(){
- var groupname=$(this).next().text();
- if($(this).is(':checked')){
+ var value = $(this).attr('id').substring(String('ms'+multiSelectId+'-option').length+1);
+ var label = $(this).next().text().trim();
+ if($(this).is(':checked')) {
+ if(settings.singleSelect) {
+ settings.checked = [];
+ settings.labels = [];
+ $.each(self.find('option'), function() {
+ $(this).removeAttr('selected');
+ });
+ }
element.attr('selected','selected');
- if(settings.oncheck){
- if(settings.oncheck(groupname)===false){
+ if(typeof settings.oncheck === 'function') {
+ if(settings.oncheck(value)===false) {
$(this).attr('checked', false);
return;
}
}
- settings.checked.push(groupname);
- }else{
- var index=settings.checked.indexOf(groupname);
+ settings.checked.push(value);
+ settings.labels.push(label);
+ $(this).parent().addClass('checked');
+ } else {
+ var index=settings.checked.indexOf(value);
element.attr('selected',null);
- if(settings.onuncheck){
- if(settings.onuncheck(groupname)===false){
+ if(typeof settings.onuncheck === 'function') {
+ if(settings.onuncheck(value)===false) {
$(this).attr('checked',true);
return;
}
}
+ $(this).parent().removeClass('checked');
settings.checked.splice(index,1);
+ settings.labels.splice(index,1);
}
var oldWidth=button.width();
- if(settings.checked.length>0){
- button.children('span').first().text(settings.checked.join(', '));
- }else{
- button.children('span').first().text(settings.title);
- }
+ button.children('span').first().text(settings.labels.length > 0
+ ? settings.labels.join(', ')
+ : settings.title);
var newOuterWidth=Math.max((button.outerWidth()-2),settings.minOuterWidth)+'px';
var newWidth=Math.max(button.width(),settings.minWidth);
var pos=button.position();
@@ -110,6 +166,9 @@
});
var li=$('<li></li>');
li.append(input).append(label);
+ if(input.is(':checked')) {
+ li.addClass('checked');
+ }
return li;
}
$.each(options,function(index,item){
@@ -117,13 +176,13 @@
});
button.parent().data('preventHide',false);
if(settings.createText){
- var li=$('<li>+ <em>'+settings.createText+'<em></li>');
+ var li=$('<li class="creator">+ <em>'+settings.createText+'<em></li>');
li.click(function(event){
li.empty();
var input=$('<input class="new">');
li.append(input);
input.focus();
- input.css('width',button.width());
+ input.css('width',button.innerWidth());
button.parent().data('preventHide',true);
input.keypress(function(event) {
if(event.keyCode == 13) {
@@ -132,7 +191,7 @@
var value = $(this).val();
var exists = false;
$.each(options,function(index, item) {
- if ($(item).val() == value) {
+ if ($(item).val() == value || $(item).text() == value) {
exists = true;
return false;
}
@@ -141,22 +200,39 @@
return false;
}
var li=$(this).parent();
+ var val = $(this).val()
+ var select=button.parent().next();
+ if(typeof settings.createCallback === 'function') {
+ var response = settings.createCallback(select, val);
+ if(response === false) {
+ return false;
+ } else if(typeof response !== 'undefined') {
+ val = response;
+ }
+ }
+ if(settings.singleSelect) {
+ $.each(select.find('option:selected'), function() {
+ $(this).removeAttr('selected');
+ });
+ }
$(this).remove();
li.text('+ '+settings.createText);
li.before(createItem(this));
- var select=button.parent().next();
var option=$('<option selected="selected"/>');
- option.attr('value',value);
- option.text($(this).val());
+ option.text($(this).val()).val(val).attr('selected', 'selected');
select.append(option);
- li.prev().children('input').trigger('click');
+ li.prev().children('input').prop('checked', true).trigger('change');
button.parent().data('preventHide',false);
- if(settings.createCallback){
- settings.createCallback($(this).val());
+ button.children('span').first().text(settings.labels.length > 0
+ ? settings.labels.join(', ')
+ : settings.title);
+ if(self.menuDirection === 'up') {
+ var list = li.parent();
+ list.css('top', list.position().top-li.outerHeight());
}
}
});
- input.blur(function(){
+ input.blur(function() {
event.preventDefault();
event.stopPropagation();
$(this).remove();
@@ -168,21 +244,72 @@
});
list.append(li);
}
+
+ var doSort = function(list, selector) {
+ var rows = list.find('li'+selector).get();
+
+ if(settings.sort) {
+ rows.sort(function(a, b) {
+ return $(a).text().toUpperCase().localeCompare($(b).text().toUpperCase());
+ });
+ }
+
+ $.each(rows, function(index, row) {
+ list.append(row);
+ });
+ };
+ if(settings.sort && settings.selectedFirst) {
+ doSort(list, '.checked');
+ doSort(list, ':not(.checked)');
+ } else if(settings.sort && !settings.selectedFirst) {
+ doSort(list, '');
+ }
+ list.append(list.find('li.creator'));
var pos=button.position();
- list.css('top',pos.top+button.outerHeight()-5);
- list.css('left',pos.left+3);
- list.css('width',(button.outerWidth()-2)+'px');
- list.slideDown();
- list.click(function(event){
+ if($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height())
+ || $(document).height()/2 > pos.top
+ ) {
+ list.css({
+ top:pos.top+button.outerHeight()-5,
+ left:pos.left+3,
+ width:(button.outerWidth()-2)+'px',
+ 'max-height':($(document).height()-(button.offset().top+button.outerHeight()+10))+'px'
+ });
+ list.addClass('down');
+ button.addClass('down');
+ list.slideDown();
+ } else {
+ list.css('max-height', $(document).height()-($(document).height()-(pos.top)+50)+'px');
+ list.css({
+ top:pos.top - list.height(),
+ left:pos.left+3,
+ width:(button.outerWidth()-2)+'px'
+
+ });
+ list.detach().insertBefore($(this));
+ list.addClass('up');
+ button.addClass('up');
+ list.fadeIn();
+ self.menuDirection = 'up';
+ }
+ list.click(function(event) {
event.stopPropagation();
});
});
- $(window).click(function(){
- if(!button.parent().data('preventHide')){
- button.parent().children('ul').slideUp(400,function(){
- button.parent().children('ul').remove();
- button.removeClass('active');
- });
+ $(window).click(function() {
+ if(!button.parent().data('preventHide')) {
+ // How can I save the effect in a var?
+ if(self.menuDirection === 'down') {
+ button.parent().children('ul').slideUp(400,function() {
+ button.parent().children('ul').remove();
+ button.removeClass('active down');
+ });
+ } else {
+ button.parent().children('ul').fadeOut(400,function() {
+ button.parent().children('ul').remove();
+ button.removeClass('active up');
+ });
+ }
}
});
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index d33de577b3d..38450f8d54f 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -98,10 +98,6 @@
"Lost your password?" => "هل نسيت كلمة السر؟",
"remember" => "تذكر",
"Log in" => "أدخل",
-"You are logged out." => "تم الخروج بنجاح.",
"prev" => "السابق",
-"next" => "التالي",
-"Security Warning!" => "تحذير أمان!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "الرجاء التحقق من كلمة السر. <br/>من الممكن أحياناً أن نطلب منك إعادة إدخال كلمة السر مرة أخرى.",
-"Verify" => "تحقيق"
+"next" => "التالي"
);
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 0033324cb1d..a7cba523be2 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -1,62 +1,19 @@
<?php $TRANSLATIONS = array(
-"This category already exists: " => "Категорията вече съществува:",
-"No categories selected for deletion." => "Няма избрани категории за изтриване",
"Settings" => "Настройки",
-"Cancel" => "Отказ",
-"No" => "Не",
-"Yes" => "Да",
-"Ok" => "Добре",
-"Error" => "Грешка",
+"seconds ago" => "преди секунди",
+"1 minute ago" => "преди 1 минута",
+"1 hour ago" => "преди 1 час",
+"today" => "днес",
+"yesterday" => "вчера",
+"last month" => "последният месец",
+"last year" => "последната година",
+"years ago" => "последните години",
"Password" => "Парола",
-"You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
-"Username" => "Потребител",
-"Request reset" => "Нулиране на заявка",
-"Your password was reset" => "Вашата парола е нулирана",
-"New password" => "Нова парола",
-"Reset password" => "Нулиране на парола",
"Personal" => "Лични",
"Users" => "Потребители",
-"Apps" => "Програми",
+"Apps" => "Приложения",
"Admin" => "Админ",
"Help" => "Помощ",
-"Access forbidden" => "Достъпът е забранен",
-"Cloud not found" => "облакът не намерен",
-"Edit categories" => "Редактиране на категориите",
"Add" => "Добавяне",
-"Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
-"Advanced" => "Разширено",
-"Data folder" => "Директория за данни",
-"Configure the database" => "Конфигуриране на базата",
-"will be used" => "ще се ползва",
-"Database user" => "Потребител за базата",
-"Database password" => "Парола за базата",
-"Database name" => "Име на базата",
-"Database host" => "Хост за базата",
-"Finish setup" => "Завършване на настройките",
-"Sunday" => "Неделя",
-"Monday" => "Понеделник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Сряда",
-"Thursday" => "Четвъртък",
-"Friday" => "Петък",
-"Saturday" => "Събота",
-"January" => "Януари",
-"February" => "Февруари",
-"March" => "Март",
-"April" => "Април",
-"May" => "Май",
-"June" => "Юни",
-"July" => "Юли",
-"August" => "Август",
-"September" => "Септември",
-"October" => "Октомври",
-"November" => "Ноември",
-"December" => "Декември",
-"Log out" => "Изход",
-"Lost your password?" => "Забравена парола?",
-"remember" => "запомни",
-"Log in" => "Вход",
-"You are logged out." => "Вие излязохте.",
-"prev" => "пред.",
-"next" => "следващо"
+"web services under your control" => "уеб услуги под Ваш контрол"
);
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index a3350761386..333e4bf0be5 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -1,12 +1,15 @@
<?php $TRANSLATIONS = array(
"User %s shared a file with you" => "%s নামের ব্যবহারকারি আপনার সাথে একটা ফাইল ভাগাভাগি করেছেন",
"User %s shared a folder with you" => "%s নামের ব্যবহারকারি আপনার সাথে একটা ফোল্ডার ভাগাভাগি করেছেন",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s নামের ব্যবহারকারী \"%s\" ফাইলটি আপনার সাথে ভাগাভাগি করেছেন। এটি এখন এখানে ডাউনলোড করার জন্য সুলভঃ %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s নামের ব্যবহারকারী \"%s\" ফোল্ডারটি আপনার সাথে ভাগাভাগি করেছেন। এটি এখন এখানে ডাউনলোড করার জন্য সুলভঃ %s",
"Category type not provided." => "ক্যাটেগরির ধরণটি প্রদান করা হয় নি।",
"No category to add?" => "যোগ করার মত কোন ক্যাটেগরি নেই ?",
-"This category already exists: " => "এই ক্যাটেগরিটি বিদ্যমানঃ",
+"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." => "মুছে ফেলার জন্য কোন ক্যাটেগরি নির্বাচন করা হয় নি।",
+"No categories selected for deletion." => "মুছে ফেলার জন্য কোন ক্যাটেগরি নির্বাচন করা হয় নি ।",
"Error removing %s from favorites." => "প্রিয় থেকে %s সরিয়ে ফেলতে সমস্যা দেখা দিয়েছে।",
"Settings" => "নিয়ামকসমূহ",
"seconds ago" => "সেকেন্ড পূর্বে",
@@ -22,8 +25,8 @@
"months ago" => "মাস পূর্বে",
"last year" => "গত বছর",
"years ago" => "বছর পূর্বে",
-"Choose" => "নির্বাচন",
-"Cancel" => "বাতিল",
+"Choose" => "বেছে নিন",
+"Cancel" => "বাতির",
"No" => "না",
"Yes" => "হ্যাঁ",
"Ok" => "তথাস্তু",
@@ -31,64 +34,67 @@
"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" => "অনুমতি পরিবর্তন করার সময় সমস্যা দেখা দিয়েছে",
-"Share with" => "যাদের সাথে ভাগাভাগি করবে",
-"Share with link" => "লিংক সহযোগে ভাগাভাগি",
-"Password protect" => "কূটশব্দদ্বারা সুরক্ষিত",
+"Error while sharing" => "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে ",
+"Error while unsharing" => "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
+"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 link" => "লিংকের সাথে ভাগাভাগি কর",
+"Password protect" => "কূটশব্দ সুরক্ষিত",
"Password" => "কূটশব্দ",
"Email link to person" => "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
"Send" => "পাঠাও",
"Set expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
"Expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
-"Share via email:" => "ই-মেইলের মাধ্যমে ভাগাভাগি করঃ",
+"Share via email:" => "ই-মেইলের মাধ্যমে ভাগাভাগি করুনঃ",
"No people found" => "কোন ব্যক্তি খুঁজে পাওয়া গেল না",
-"Resharing is not allowed" => "পূনরায় ভাগাভাগি করার অনুমতি নেই",
-"Unshare" => "ভাগাভাগি বাতিল",
-"can edit" => "সম্পাদনা করতে পারবে",
-"access control" => "অধিগম্যতার নিয়ন্ত্রণ",
-"create" => "তৈরি কর",
+"Resharing is not allowed" => "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
+"Shared in {item} with {user}" => "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
+"Unshare" => "ভাগাভাগি বাতিল কর",
+"can edit" => "সম্পাদনা করতে পারবেন",
+"access control" => "অধিগম্যতা নিয়ন্ত্রণ",
+"create" => "তৈরী করুন",
"update" => "পরিবর্ধন কর",
"delete" => "মুছে ফেল",
"share" => "ভাগাভাগি কর",
"Password protected" => "কূটশব্দদ্বারা সুরক্ষিত",
-"Error unsetting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা",
-"Error setting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা",
+"Error unsetting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে",
+"Error setting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
"Sending ..." => "পাঠানো হচ্ছে......",
"Email sent" => "ই-মেইল পাঠানো হয়েছে",
"ownCloud password reset" => "ownCloud কূটশব্দ পূনঃনির্ধারণ",
-"Use the following link to reset your password: {link}" => "কূটশব্দ পূনঃনির্ধারণ করতে নিম্নোক্ত লিংকে ক্লিক করুন:{link}",
-"You will receive a link to reset your password via Email." => "কূটশব্দ পূনঃনির্ধারণের জন্য একটি লিংক ই-মেইলের মাধ্যমে পাঠানো হয়েছে।",
+"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" => "আপনার কূটশব্দটি পূনঃনির্ধারণ করা হয়েছে",
-"To login page" => "প্রবেশ পাতায়",
+"Username" => "ব্যবহারকারী",
+"Request reset" => "অনুরোধ পূনঃনির্ধারণ",
+"Your password was reset" => "আপনার কূটশব্দটি পূনঃনির্ধারণ করা হয়েছে",
+"To login page" => "প্রবেশ পৃষ্ঠায়",
"New password" => "নতুন কূটশব্দ",
-"Reset password" => "কূটশব্দ পূনঃনির্ধারণ",
+"Reset password" => "কূটশব্দ পূনঃনির্ধারণ কর",
"Personal" => "ব্যক্তিগত",
-"Users" => "ব্যবহারকারিবৃন্দ",
+"Users" => "ব্যবহারকারী",
"Apps" => "অ্যাপস",
-"Admin" => "প্রশাসক",
+"Admin" => "প্রশাসন",
"Help" => "সহায়িকা",
"Access forbidden" => "অধিগমনের অনুমতি নেই",
"Cloud not found" => "ক্লাউড খুঁজে পাওয়া গেল না",
"Edit categories" => "ক্যাটেগরি সম্পাদনা",
"Add" => "যোগ কর",
"Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
-"Create an <strong>admin account</strong>" => "<strong>প্রশাসক একাউন্ট</strong> তৈরি কর",
+"Create an <strong>admin account</strong>" => "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
"Advanced" => "সুচারু",
-"Data folder" => "ডাটা ফোল্ডার",
-"Configure the database" => "ডাটাবেজ কনফিগার কর",
+"Data folder" => "ডাটা ফোল্ডার ",
+"Configure the database" => "ডাটাবেচ কনফিগার করুন",
"will be used" => "ব্যবহৃত হবে",
-"Database user" => "ডাটাবেজ ব্যবহারকারি",
+"Database user" => "ডাটাবেজ ব্যবহারকারী",
"Database password" => "ডাটাবেজ কূটশব্দ",
"Database name" => "ডাটাবেজের নাম",
-"Database tablespace" => "ডাটাবেজ টেবিলস্পেস",
+"Database tablespace" => "ডাটাবেজ টেবলস্পেস",
"Database host" => "ডাটাবেজ হোস্ট",
-"Finish setup" => "সেট-আপ সুসম্পন্ন কর",
+"Finish setup" => "সেটআপ সুসম্পন্ন কর",
"Sunday" => "রবিবার",
"Monday" => "সোমবার",
"Tuesday" => "মঙ্গলবার",
@@ -103,19 +109,17 @@
"May" => "মে",
"June" => "জুন",
"July" => "জুলাই",
-"August" => "অগাস্ট",
+"August" => "অগাষ্ট",
"September" => "সেপ্টেম্বর",
"October" => "অক্টোবর",
"November" => "নভেম্বর",
"December" => "ডিসেম্বর",
-"web services under your control" => "ওয়েব সেবাসমূহ এখন আপনার হাতের মুঠোয়",
+"web services under your control" => "ওয়েব সার্ভিসের নিয়ন্ত্রণ আপনার হাতের মুঠোয়",
"Log out" => "প্রস্থান",
-"Lost your password?" => "আপনার কূটশব্দটি হারিয়েছেন ?",
+"Lost your password?" => "কূটশব্দ হারিয়েছেন?",
"remember" => "মনে রাখ",
"Log in" => "প্রবেশ",
-"You are logged out." => "আপনি প্রস্থান করেছেন",
"prev" => "পূর্ববর্তী",
"next" => "পরবর্তী",
-"Security Warning!" => "নিরাপত্তাবিষয়ক সতর্কবাণী",
-"Verify" => "যাচাই কর"
+"Updating ownCloud to version %s, this may take a while." => "%s ভার্সনে ownCloud পরিবর্ধন করা হচ্ছে, এজন্য কিছু সময় প্রয়োজন।"
);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index f98922f8f38..e66bad25e43 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Heu perdut la contrasenya?",
"remember" => "recorda'm",
"Log in" => "Inici de sessió",
-"You are logged out." => "Heu tancat la sessió.",
"prev" => "anterior",
"next" => "següent",
-"Security Warning!" => "Avís de seguretat!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Comproveu la vostra contrasenya. <br/>Per raons de seguretat se us pot demanar escriure de nou la vostra contrasenya.",
-"Verify" => "Comprova"
+"Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona."
);
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 96252ea8bba..7a766bd7176 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Ztratili jste své heslo?",
"remember" => "zapamatovat si",
"Log in" => "Přihlásit",
-"You are logged out." => "Jste odhlášeni.",
"prev" => "předchozí",
"next" => "následující",
-"Security Warning!" => "Bezpečnostní upozornění.",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ověřte, prosím, své heslo. <br/>Z bezpečnostních důvodů můžete být občas požádáni o jeho opětovné zadání.",
-"Verify" => "Ověřit"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat."
);
diff --git a/core/l10n/da.php b/core/l10n/da.php
index a792e1d9bae..e8155c298c0 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -125,10 +125,6 @@
"Lost your password?" => "Mistet dit kodeord?",
"remember" => "husk",
"Log in" => "Log ind",
-"You are logged out." => "Du er nu logget ud.",
"prev" => "forrige",
-"next" => "næste",
-"Security Warning!" => "Sikkerhedsadvarsel!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verificer din adgangskode.<br/>Af sikkerhedsårsager kan du lejlighedsvist blive bedt om at indtaste din adgangskode igen.",
-"Verify" => "Verificer"
+"next" => "næste"
);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index c5867eda8c3..89846301a58 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Passwort vergessen?",
"remember" => "merken",
"Log in" => "Einloggen",
-"You are logged out." => "Du wurdest abgemeldet.",
"prev" => "Zurück",
"next" => "Weiter",
-"Security Warning!" => "Sicherheitswarnung!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte bestätige Dein Passwort. <br/> Aus Sicherheitsgründen wirst Du hierbei gebeten, Dein Passwort erneut einzugeben.",
-"Verify" => "Bestätigen"
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
);
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index ed0bc0e0ffb..d62b000c0ab 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Passwort vergessen?",
"remember" => "merken",
"Log in" => "Einloggen",
-"You are logged out." => "Sie wurden abgemeldet.",
"prev" => "Zurück",
"next" => "Weiter",
-"Security Warning!" => "Sicherheitshinweis!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte überprüfen Sie Ihr Passwort. <br/>Aus Sicherheitsgründen werden Sie gelegentlich aufgefordert, Ihr Passwort erneut einzugeben.",
-"Verify" => "Überprüfen"
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
);
diff --git a/core/l10n/el.php b/core/l10n/el.php
index d8a5d7aef51..579550fc92d 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -125,10 +125,6 @@
"Lost your password?" => "Ξεχάσατε το συνθηματικό σας;",
"remember" => "απομνημόνευση",
"Log in" => "Είσοδος",
-"You are logged out." => "Έχετε αποσυνδεθεί.",
"prev" => "προηγούμενο",
-"next" => "επόμενο",
-"Security Warning!" => "Προειδοποίηση Ασφαλείας!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Παρακαλώ επιβεβαιώστε το συνθηματικό σας. <br/>Για λόγους ασφαλείας μπορεί να ερωτάστε να εισάγετε ξανά το συνθηματικό σας.",
-"Verify" => "Επαλήθευση"
+"next" => "επόμενο"
);
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index a605b27ed80..0319eeef2d4 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -121,10 +121,6 @@
"Lost your password?" => "Ĉu vi perdis vian pasvorton?",
"remember" => "memori",
"Log in" => "Ensaluti",
-"You are logged out." => "Vi estas elsalutita.",
"prev" => "maljena",
-"next" => "jena",
-"Security Warning!" => "Sekureca averto!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bonvolu kontroli vian pasvorton. <br/>Pro sekureco, oni okaze povas peti al vi enigi vian pasvorton ree.",
-"Verify" => "Kontroli"
+"next" => "jena"
);
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 2a9f5682dfb..4f8f1936c7f 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -125,10 +125,7 @@
"Lost your password?" => "¿Has perdido tu contraseña?",
"remember" => "recuérdame",
"Log in" => "Entrar",
-"You are logged out." => "Has cerrado la sesión.",
"prev" => "anterior",
"next" => "siguiente",
-"Security Warning!" => "¡Advertencia de seguridad!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique su contraseña. <br/>Por razones de seguridad se le puede volver a preguntar ocasionalmente la contraseña.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
);
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 830281dabbe..374a679260b 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -125,10 +125,7 @@
"Lost your password?" => "¿Perdiste tu contraseña?",
"remember" => "recordame",
"Log in" => "Entrar",
-"You are logged out." => "Terminaste la sesión.",
"prev" => "anterior",
"next" => "siguiente",
-"Security Warning!" => "¡Advertencia de seguridad!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verificá tu contraseña. <br/>Por razones de seguridad, puede ser que que te pregunte ocasionalmente la contraseña.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede domorar un rato."
);
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index b67dd13dd69..b79dd4761e7 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -101,9 +101,6 @@
"Lost your password?" => "Kaotasid oma parooli?",
"remember" => "pea meeles",
"Log in" => "Logi sisse",
-"You are logged out." => "Sa oled välja loginud",
"prev" => "eelm",
-"next" => "järgm",
-"Security Warning!" => "turvahoiatus!",
-"Verify" => "Kinnita"
+"next" => "järgm"
);
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 1a21ca34705..1239ee86034 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -125,10 +125,6 @@
"Lost your password?" => "Galdu duzu pasahitza?",
"remember" => "gogoratu",
"Log in" => "Hasi saioa",
-"You are logged out." => "Zure saioa bukatu da.",
"prev" => "aurrekoa",
-"next" => "hurrengoa",
-"Security Warning!" => "Segurtasun abisua",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Mesedez egiaztatu zure pasahitza. <br/>Segurtasun arrazoiengatik noizbehinka zure pasahitza berriz sartzea eska diezazukegu.",
-"Verify" => "Egiaztatu"
+"next" => "hurrengoa"
);
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 2f859dc31d2..a7c3c9ab2e5 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -71,7 +71,6 @@
"Lost your password?" => "آیا گذرواژه تان را به یاد نمی آورید؟",
"remember" => "بیاد آوری",
"Log in" => "ورود",
-"You are logged out." => "شما خارج شدید",
"prev" => "بازگشت",
"next" => "بعدی"
);
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 4b4a23b8c70..8d6afeb204c 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Käyttäjä %s jakoi tiedoston kanssasi",
+"User %s shared a folder with you" => "Käyttäjä %s jakoi kansion kanssasi",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Käyttäjä %s jakoi tiedoston \"%s\" kanssasi. Se on ladattavissa täältä: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Käyttäjä %s jakoi kansion \"%s\" kanssasi. Se on ladattavissa täältä: %s",
"No category to add?" => "Ei lisättävää luokkaa?",
"This category already exists: " => "Tämä luokka on jo olemassa: ",
"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
@@ -52,6 +56,7 @@
"ownCloud password reset" => "ownCloud-salasanan nollaus",
"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
+"Reset email send." => "Salasanan nollausviesti lähetetty.",
"Request failed!" => "Pyyntö epäonnistui!",
"Username" => "Käyttäjätunnus",
"Request reset" => "Tilaus lähetetty",
@@ -108,10 +113,7 @@
"Lost your password?" => "Unohditko salasanasi?",
"remember" => "muista",
"Log in" => "Kirjaudu sisään",
-"You are logged out." => "Olet kirjautunut ulos.",
"prev" => "edellinen",
"next" => "seuraava",
-"Security Warning!" => "Turvallisuusvaroitus!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vahvista salasanasi. <br/>Turvallisuussyistä sinulta saatetaan ajoittain kysyä salasanasi uudelleen.",
-"Verify" => "Vahvista"
+"Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken."
);
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 6b1449dd4ba..39269e43b5d 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Mot de passe perdu ?",
"remember" => "se souvenir de moi",
"Log in" => "Connexion",
-"You are logged out." => "Vous êtes désormais déconnecté.",
"prev" => "précédent",
"next" => "suivant",
-"Security Warning!" => "Alerte de sécurité !",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Veuillez vérifier votre mot de passe. <br/>Par sécurité il vous sera occasionnellement demandé d'entrer votre mot de passe de nouveau.",
-"Verify" => "Vérification"
+"Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
);
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 8daa8c6d1c4..2642debb288 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Perdeu o contrasinal?",
"remember" => "lembrar",
"Log in" => "Conectar",
-"You are logged out." => "Está desconectado",
"prev" => "anterior",
"next" => "seguinte",
-"Security Warning!" => "Advertencia de seguranza",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifique o seu contrasinal.<br/>Por motivos de seguranza pode que ocasionalmente se lle pregunte de novo polo seu contrasinal.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s, esto pode levar un anaco."
);
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 50addbd5278..59eb3ae14d4 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -125,10 +125,7 @@
"Lost your password?" => "שכחת את ססמתך?",
"remember" => "שמירת הססמה",
"Log in" => "כניסה",
-"You are logged out." => "לא התחברת.",
"prev" => "הקודם",
"next" => "הבא",
-"Security Warning!" => "אזהרת אבטחה!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "נא לאמת את הססמה שלך. <br/>מטעמי אבטחה יתכן שתופיע בקשה להזין את הססמה שוב.",
-"Verify" => "אימות"
+"Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה."
);
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index 0e4f18c6cd8..d7f9fd150b0 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -12,7 +12,6 @@
"Database user" => "डेटाबेस उपयोगकर्ता",
"Database password" => "डेटाबेस पासवर्ड",
"Finish setup" => "सेटअप समाप्त करे",
-"You are logged out." => "आप लोग आउट कर दिए गए हैं.",
"prev" => "पिछला",
"next" => "अगला"
);
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 69bdd3a4f83..43dbbe51ae0 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -91,7 +91,6 @@
"Lost your password?" => "Izgubili ste lozinku?",
"remember" => "zapamtiti",
"Log in" => "Prijava",
-"You are logged out." => "Odjavljeni ste.",
"prev" => "prethodan",
"next" => "sljedeći"
);
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 1c86e8b11d6..49b686423ab 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -125,10 +125,6 @@
"Lost your password?" => "Elfelejtette a jelszavát?",
"remember" => "emlékezzen",
"Log in" => "Bejelentkezés",
-"You are logged out." => "Kilépett.",
"prev" => "előző",
-"next" => "következő",
-"Security Warning!" => "Biztonsági figyelmeztetés!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Kérjük írja be a jelszavát! <br/>Biztonsági okokból néha a bejelentkezést követően is ellenőrzésképpen meg kell adnia a jelszavát.",
-"Verify" => "Ellenőrzés"
+"next" => "következő"
);
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 07cc118f0e6..d614f8381af 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -52,7 +52,6 @@
"Lost your password?" => "Tu perdeva le contrasigno?",
"remember" => "memora",
"Log in" => "Aperir session",
-"You are logged out." => "Tu session ha essite claudite.",
"prev" => "prev",
"next" => "prox"
);
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 99df16332f5..ee5fad95217 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -100,10 +100,6 @@
"Lost your password?" => "Lupa password anda?",
"remember" => "selalu login",
"Log in" => "Masuk",
-"You are logged out." => "Anda telah keluar.",
"prev" => "sebelum",
-"next" => "selanjutnya",
-"Security Warning!" => "peringatan keamanan!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "mohon periksa kembali kata kunci anda. <br/>untuk alasan keamanan,anda akan sesekali diminta untuk memasukan kata kunci lagi.",
-"Verify" => "periksa kembali"
+"next" => "selanjutnya"
);
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 53b2fe88839..e810eb359fd 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -4,7 +4,7 @@
"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Notandinn %s deildi skránni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s",
"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Notandinn %s deildi möppunni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s",
"Category type not provided." => "Flokkur ekki gefin",
-"No category to add?" => "Enginn flokkur til að <strong>bæta við</strong>?",
+"No category to add?" => "Enginn flokkur til að bæta við?",
"This category already exists: " => "Þessi flokkur er þegar til:",
"Object type not provided." => "Tegund ekki í boði.",
"%s ID not provided." => "%s ID ekki í boði.",
@@ -31,7 +31,7 @@
"Yes" => "Já",
"Ok" => "Í lagi",
"The object type is not specified." => "Tegund ekki tilgreind",
-"Error" => "<strong>Villa</strong>",
+"Error" => "Villa",
"The app name is not specified." => "Nafn forrits ekki tilgreint",
"The required file {file} is not installed!" => "Umbeðina skráin {file} ekki tiltæk!",
"Error while sharing" => "Villa við deilingu",
@@ -63,7 +63,7 @@
"Error setting expiration date" => "Villa við að setja gildistíma",
"Sending ..." => "Sendi ...",
"Email sent" => "Tölvupóstur sendur",
-"ownCloud password reset" => "endursetja ownCloud <strong>lykilorð</strong>",
+"ownCloud password reset" => "endursetja ownCloud lykilorð",
"Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
"You will receive a link to reset your password via Email." => "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
"Reset email send." => "Beiðni um endursetningu send.",
@@ -78,9 +78,9 @@
"Users" => "Notendur",
"Apps" => "Forrit",
"Admin" => "Vefstjórn",
-"Help" => "Help",
+"Help" => "Hjálp",
"Access forbidden" => "Aðgangur bannaður",
-"Cloud not found" => "Skýið finnst eigi",
+"Cloud not found" => "Ský finnst ekki",
"Edit categories" => "Breyta flokkum",
"Add" => "Bæta",
"Security Warning" => "Öryggis aðvörun",
@@ -92,12 +92,12 @@
"Data folder" => "Gagnamappa",
"Configure the database" => "Stilla gagnagrunn",
"will be used" => "verður notað",
-"Database user" => "Notandi gagnagrunns",
-"Database password" => "Lykilorð gagnagrunns",
+"Database user" => "Gagnagrunns notandi",
+"Database password" => "Gagnagrunns lykilorð",
"Database name" => "Nafn gagnagrunns",
"Database tablespace" => "Töflusvæði gagnagrunns",
"Database host" => "Netþjónn gagnagrunns",
-"Finish setup" => "Ljúka uppsetningu",
+"Finish setup" => "Virkja uppsetningu",
"Sunday" => "Sunnudagur",
"Monday" => "Mánudagur",
"Tuesday" => "Þriðjudagur",
@@ -125,10 +125,7 @@
"Lost your password?" => "Týndir þú lykilorðinu?",
"remember" => "muna eftir mér",
"Log in" => "<strong>Skrá inn</strong>",
-"You are logged out." => "Þú ert útskráð(ur).",
"prev" => "fyrra",
"next" => "næsta",
-"Security Warning!" => "Öryggis aðvörun!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vinsamlegast staðfestu lykilorðið þitt.<br/>Í öryggisskyni munum við biðja þig um að skipta um lykilorð af og til.",
-"Verify" => "Staðfesta"
+"Updating ownCloud to version %s, this may take a while." => "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund."
);
diff --git a/core/l10n/it.php b/core/l10n/it.php
index e97deb9fb5f..89b6a7952a9 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Hai perso la password?",
"remember" => "ricorda",
"Log in" => "Accedi",
-"You are logged out." => "Sei uscito.",
"prev" => "precedente",
"next" => "successivo",
-"Security Warning!" => "Avviso di sicurezza",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifica la tua password.<br/>Per motivi di sicurezza, potresti ricevere una richiesta di digitare nuovamente la password.",
-"Verify" => "Verifica"
+"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, potrebbe richiedere del tempo."
);
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 72615d36f62..7d4baf94583 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -125,10 +125,7 @@
"Lost your password?" => "パスワードを忘れましたか?",
"remember" => "パスワードを記憶する",
"Log in" => "ログイン",
-"You are logged out." => "ログアウトしました。",
"prev" => "前",
"next" => "次",
-"Security Warning!" => "セキュリティ警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "パスワードの確認<br/>セキュリティ上の理由によりパスワードの再入力をお願いします。",
-"Verify" => "確認"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。"
);
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index efb3998a77e..aafdacab4c6 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -98,9 +98,6 @@
"Lost your password?" => "დაგავიწყდათ პაროლი?",
"remember" => "დამახსოვრება",
"Log in" => "შესვლა",
-"You are logged out." => "თქვენ გამოხვედით სისტემიდან",
"prev" => "წინა",
-"next" => "შემდეგი",
-"Security Warning!" => "უსაფრთხოების გაფრთხილება!",
-"Verify" => "შემოწმება"
+"next" => "შემდეგი"
);
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 3846dff796b..3db5a501173 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -1,4 +1,8 @@
<?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "User %s 가 당신과 파일을 공유하였습니다.",
+"User %s shared a folder with you" => "User %s 가 당신과 폴더를 공유하였습니다.",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "User %s 가 파일 \"%s\"를 당신과 공유하였습니다. 다운로드는 여기서 %s 할 수 있습니다.",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "User %s 가 폴더 \"%s\"를 당신과 공유하였습니다. 다운로드는 여기서 %s 할 수 있습니다.",
"Category type not provided." => "분류 형식이 제공되지 않았습니다.",
"No category to add?" => "추가할 분류가 없습니까?",
"This category already exists: " => "이 분류는 이미 존재합니다:",
@@ -39,6 +43,8 @@
"Share with link" => "URL 링크로 공유",
"Password protect" => "암호 보호",
"Password" => "암호",
+"Email link to person" => "이메일 주소",
+"Send" => "전송",
"Set expiration date" => "만료 날짜 설정",
"Expiration date" => "만료 날짜",
"Share via email:" => "이메일로 공유:",
@@ -55,6 +61,8 @@
"Password protected" => "암호로 보호됨",
"Error unsetting expiration date" => "만료 날짜 해제 오류",
"Error setting expiration date" => "만료 날짜 설정 오류",
+"Sending ..." => "전송 중...",
+"Email sent" => "이메일 발송됨",
"ownCloud password reset" => "ownCloud 암호 재설정",
"Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
"You will receive a link to reset your password via Email." => "이메일로 암호 재설정 링크를 보냈습니다.",
@@ -117,10 +125,7 @@
"Lost your password?" => "암호를 잊으셨습니까?",
"remember" => "기억하기",
"Log in" => "로그인",
-"You are logged out." => "로그아웃되었습니다.",
"prev" => "이전",
"next" => "다음",
-"Security Warning!" => "보안 경고!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "암호를 확인해 주십시오.<br/>보안상의 이유로 종종 암호를 물어볼 것입니다.",
-"Verify" => "확인"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud 를 버젼 %s로 업데이트 하는 중, 시간이 소요됩니다."
);
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 7a1c462ffd1..407b8093a27 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -64,7 +64,6 @@
"Lost your password?" => "Passwuert vergiess?",
"remember" => "verhalen",
"Log in" => "Log dech an",
-"You are logged out." => "Du bass ausgeloggt.",
"prev" => "zeréck",
"next" => "weider"
);
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 9c5c8f90c5e..ec15c646191 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -104,10 +104,6 @@
"Lost your password?" => "Pamiršote slaptažodį?",
"remember" => "prisiminti",
"Log in" => "Prisijungti",
-"You are logged out." => "Jūs atsijungėte.",
"prev" => "atgal",
-"next" => "kitas",
-"Security Warning!" => "Saugumo pranešimas!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prašome patvirtinti savo vartotoją.<br/>Dėl saugumo, slaptažodžio patvirtinimas bus reikalaujamas įvesti kas kiek laiko.",
-"Verify" => "Patvirtinti"
+"next" => "kitas"
);
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 5543c7a56d6..8a6dc033de6 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -30,7 +30,6 @@
"Lost your password?" => "Aizmirsāt paroli?",
"remember" => "atcerēties",
"Log in" => "Ielogoties",
-"You are logged out." => "Jūs esat veiksmīgi izlogojies.",
"prev" => "iepriekšējā",
"next" => "nākamā"
);
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 401baf6efa0..d8fa16d44f3 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -125,10 +125,6 @@
"Lost your password?" => "Ја заборавивте лозинката?",
"remember" => "запамти",
"Log in" => "Најава",
-"You are logged out." => "Одјавени сте.",
"prev" => "претходно",
-"next" => "следно",
-"Security Warning!" => "Безбедносно предупредување.",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ве молам потврдете ја вашата лозинка. <br />Од безбедносни причини од време на време може да биде побарано да ја внесете вашата лозинка повторно.",
-"Verify" => "Потврди"
+"next" => "следно"
);
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 56a79572ef7..b08ccecf616 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -62,7 +62,6 @@
"Lost your password?" => "Hilang kata laluan?",
"remember" => "ingat",
"Log in" => "Log masuk",
-"You are logged out." => "Anda telah log keluar.",
"prev" => "sebelum",
"next" => "seterus"
);
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 4069e297a7b..d985e454b7c 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -100,9 +100,6 @@
"Lost your password?" => "Mistet passordet ditt?",
"remember" => "husk",
"Log in" => "Logg inn",
-"You are logged out." => "Du er logget ut",
"prev" => "forrige",
-"next" => "neste",
-"Security Warning!" => "Sikkerhetsadvarsel!",
-"Verify" => "Verifiser"
+"next" => "neste"
);
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index c3f5c887658..739d8181d6f 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Uw wachtwoord vergeten?",
"remember" => "onthoud gegevens",
"Log in" => "Meld je aan",
-"You are logged out." => "U bent afgemeld.",
"prev" => "vorige",
"next" => "volgende",
-"Security Warning!" => "Beveiligingswaarschuwing!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifieer uw wachtwoord!<br/>Om veiligheidsredenen wordt u regelmatig gevraagd uw wachtwoord in te geven.",
-"Verify" => "Verifieer"
+"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren."
);
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index e62e0dea730..8aaf0b705c8 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -52,7 +52,6 @@
"Lost your password?" => "Gløymt passordet?",
"remember" => "hugs",
"Log in" => "Logg inn",
-"You are logged out." => "Du er logga ut.",
"prev" => "førre",
"next" => "neste"
);
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 1ae67063572..be6d5aec285 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -93,7 +93,6 @@
"Lost your password?" => "L'as perdut lo senhal ?",
"remember" => "bremba-te",
"Log in" => "Dintrada",
-"You are logged out." => "Sias pas dintra (t/ada)",
"prev" => "dariièr",
"next" => "venent"
);
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 1208aec5a53..3324040209b 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Nie pamiętasz hasła?",
"remember" => "Zapamiętanie",
"Log in" => "Zaloguj",
-"You are logged out." => "Wylogowano użytkownika.",
"prev" => "wstecz",
"next" => "naprzód",
-"Security Warning!" => "Ostrzeżenie o zabezpieczeniach!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Sprawdź swoje hasło.<br/>Ze względów bezpieczeństwa możesz zostać czasami poproszony o wprowadzenie hasła ponownie.",
-"Verify" => "Zweryfikowane"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę."
);
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index f28b0035995..3b119650268 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -117,10 +117,6 @@
"Lost your password?" => "Esqueçeu sua senha?",
"remember" => "lembrete",
"Log in" => "Log in",
-"You are logged out." => "Você está desconectado.",
"prev" => "anterior",
-"next" => "próximo",
-"Security Warning!" => "Aviso de Segurança!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente.",
-"Verify" => "Verificar"
+"next" => "próximo"
);
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index a2bfcf4f882..6e3a558986c 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Esqueceu a sua password?",
"remember" => "lembrar",
"Log in" => "Entrar",
-"You are logged out." => "Estás desconetado.",
"prev" => "anterior",
"next" => "seguinte",
-"Security Warning!" => "Aviso de Segurança!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique a sua palavra-passe. <br/>Por razões de segurança, pode ser-lhe perguntada, ocasionalmente, a sua palavra-passe de novo.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "A Actualizar o ownCloud para a versão %s, esta operação pode demorar."
);
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 1c58e5fe2be..c3434706df8 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -109,10 +109,6 @@
"Lost your password?" => "Ai uitat parola?",
"remember" => "amintește",
"Log in" => "Autentificare",
-"You are logged out." => "Ai ieșit",
"prev" => "precedentul",
-"next" => "următorul",
-"Security Warning!" => "Advertisment de Securitate",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Te rog verifica parola. <br/>Pentru securitate va poate fi cerut ocazional introducerea parolei din nou",
-"Verify" => "Verifica"
+"next" => "următorul"
);
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 4db2a2f06fd..7434d6af7f8 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Забыли пароль?",
"remember" => "запомнить",
"Log in" => "Войти",
-"You are logged out." => "Вы вышли.",
"prev" => "пред",
"next" => "след",
-"Security Warning!" => "Предупреждение безопасности!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности, Вам иногда придется вводить свой пароль снова.",
-"Verify" => "Подтвердить"
+"Updating ownCloud to version %s, this may take a while." => "Производится обновление ownCloud до версии %s. Это может занять некоторое время."
);
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index c18fe245c9e..84bd8f93156 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -125,10 +125,6 @@
"Lost your password?" => "Забыли пароль?",
"remember" => "запомнить",
"Log in" => "Войти",
-"You are logged out." => "Вы вышли из системы.",
"prev" => "предыдущий",
-"next" => "следующий",
-"Security Warning!" => "Предупреждение системы безопасности!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности Вам может быть иногда предложено ввести пароль еще раз.",
-"Verify" => "Проверить"
+"next" => "следующий"
);
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index 35b0df3188c..a6aeb484ed7 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -85,7 +85,6 @@
"Lost your password?" => "මුරපදය අමතකද?",
"remember" => "මතක තබාගන්න",
"Log in" => "ප්‍රවේශවන්න",
-"You are logged out." => "ඔබ නික්මී ඇත.",
"prev" => "පෙර",
"next" => "ඊළඟ"
);
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 162d94e8242..7a5b10ca3e6 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -117,10 +117,6 @@
"Lost your password?" => "Zabudli ste heslo?",
"remember" => "zapamätať",
"Log in" => "Prihlásiť sa",
-"You are logged out." => "Ste odhlásený.",
"prev" => "späť",
-"next" => "ďalej",
-"Security Warning!" => "Bezpečnostné varovanie!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prosím, overte svoje heslo. <br />Z bezpečnostných dôvodov môžete byť občas požiadaný o jeho opätovné zadanie.",
-"Verify" => "Overenie"
+"next" => "ďalej"
);
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 0ee2eb03b3c..b2c924d412e 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -125,10 +125,6 @@
"Lost your password?" => "Ali ste pozabili geslo?",
"remember" => "Zapomni si me",
"Log in" => "Prijava",
-"You are logged out." => "Sta odjavljeni.",
"prev" => "nazaj",
-"next" => "naprej",
-"Security Warning!" => "Varnostno opozorilo!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prosimo, če preverite vaše geslo. Iz varnostnih razlogov vas lahko občasno prosimo, da ga ponovno vnesete.",
-"Verify" => "Preveri"
+"next" => "naprej"
);
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 406b92ff83f..6b64d1957e7 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -117,10 +117,6 @@
"Lost your password?" => "Изгубили сте лозинку?",
"remember" => "упамти",
"Log in" => "Пријава",
-"You are logged out." => "Одјављени сте.",
"prev" => "претходно",
-"next" => "следеће",
-"Security Warning!" => "Сигурносно упозорење!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Потврдите лозинку. <br />Из сигурносних разлога затрежићемо вам да два пута унесете лозинку.",
-"Verify" => "Потврди"
+"next" => "следеће"
);
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index af48a845720..efcb7c10f01 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -46,7 +46,6 @@
"Log out" => "Odjava",
"Lost your password?" => "Izgubili ste lozinku?",
"remember" => "upamti",
-"You are logged out." => "Odjavljeni ste.",
"prev" => "prethodno",
"next" => "sledeće"
);
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index a7698fb30ce..70a9871be26 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -125,10 +125,7 @@
"Lost your password?" => "Glömt ditt lösenord?",
"remember" => "kom ihåg",
"Log in" => "Logga in",
-"You are logged out." => "Du är utloggad.",
"prev" => "föregående",
"next" => "nästa",
-"Security Warning!" => "Säkerhetsvarning!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bekräfta ditt lösenord. <br/>Av säkerhetsskäl kan du ibland bli ombedd att ange ditt lösenord igen.",
-"Verify" => "Verifiera"
+"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund."
);
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 9a432d11c9b..65cfbbf965d 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -117,10 +117,6 @@
"Lost your password?" => "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?",
"remember" => "ஞாபகப்படுத்துக",
"Log in" => "புகுபதிகை",
-"You are logged out." => "நீங்கள் விடுபதிகை செய்துவிட்டீர்கள்.",
"prev" => "முந்தைய",
-"next" => "அடுத்து",
-"Security Warning!" => "பாதுகாப்பு எச்சரிக்கை!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "உங்களுடைய கடவுச்சொல்லை உறுதிப்படுத்துக. <br/> பாதுகாப்பு காரணங்களுக்காக நீங்கள் எப்போதாவது உங்களுடைய கடவுச்சொல்லை மீண்டும் நுழைக்க கேட்கப்படுவீர்கள்.",
-"Verify" => "உறுதிப்படுத்தல்"
+"next" => "அடுத்து"
);
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index e254ccf259f..183997e4c94 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -117,10 +117,6 @@
"Lost your password?" => "ลืมรหัสผ่าน?",
"remember" => "จำรหัสผ่าน",
"Log in" => "เข้าสู่ระบบ",
-"You are logged out." => "คุณออกจากระบบเรียบร้อยแล้ว",
"prev" => "ก่อนหน้า",
-"next" => "ถัดไป",
-"Security Warning!" => "คำเตือนเพื่อความปลอดภัย!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "กรุณายืนยันรหัสผ่านของคุณ <br/> เพื่อความปลอดภัย คุณจะถูกขอให้กรอกรหัสผ่านอีกครั้ง",
-"Verify" => "ยืนยัน"
+"next" => "ถัดไป"
);
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 86036e5ebd1..284a4d97130 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -104,9 +104,6 @@
"Lost your password?" => "Parolanızı mı unuttunuz?",
"remember" => "hatırla",
"Log in" => "Giriş yap",
-"You are logged out." => "Çıkış yaptınız.",
"prev" => "önceki",
-"next" => "sonraki",
-"Security Warning!" => "Güvenlik Uyarısı!",
-"Verify" => "Doğrula"
+"next" => "sonraki"
);
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 180d2a5c6bd..16258d22dce 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -125,10 +125,6 @@
"Lost your password?" => "Забули пароль?",
"remember" => "запам'ятати",
"Log in" => "Вхід",
-"You are logged out." => "Ви вийшли з системи.",
"prev" => "попередній",
-"next" => "наступний",
-"Security Warning!" => "Попередження про небезпеку!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Будь ласка, повторно введіть свій пароль. <br/>З питань безпеки, Вам інколи доведеться повторно вводити свій пароль.",
-"Verify" => "Підтвердити"
+"next" => "наступний"
);
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 38e909d3f4e..c827dc038e6 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -117,10 +117,6 @@
"Lost your password?" => "Bạn quên mật khẩu ?",
"remember" => "ghi nhớ",
"Log in" => "Đăng nhập",
-"You are logged out." => "Bạn đã đăng xuất.",
"prev" => "Lùi lại",
-"next" => "Kế tiếp",
-"Security Warning!" => "Cảnh báo bảo mật !",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vui lòng xác nhận mật khẩu của bạn. <br/> Vì lý do bảo mật thỉnh thoảng bạn có thể được yêu cầu nhập lại mật khẩu.",
-"Verify" => "Kiểm tra"
+"next" => "Kế tiếp"
);
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index a785a36afcc..74dd9ad8a3f 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -106,10 +106,6 @@
"Lost your password?" => "忘记密码?",
"remember" => "备忘",
"Log in" => "登陆",
-"You are logged out." => "你已经注销了",
"prev" => "后退",
-"next" => "前进",
-"Security Warning!" => "安全警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "请确认您的密码。<br/>处于安全原因你偶尔也会被要求再次输入您的密码。",
-"Verify" => "确认"
+"next" => "前进"
);
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 64b108ca1dd..6c098e211d3 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -124,10 +124,6 @@
"Lost your password?" => "忘记密码?",
"remember" => "记住",
"Log in" => "登录",
-"You are logged out." => "您已注销。",
"prev" => "上一页",
-"next" => "下一页",
-"Security Warning!" => "安全警告!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "请验证您的密码。 <br/>出于安全考虑,你可能偶尔会被要求再次输入密码。",
-"Verify" => "验证"
+"next" => "下一页"
);
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 45c7596e609..7537c764451 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -1,14 +1,22 @@
<?php $TRANSLATIONS = array(
-"No category to add?" => "無分類添加?",
-"This category already exists: " => "此分類已經存在:",
+"User %s shared a file with you" => "用戶 %s 與您分享了一個檔案",
+"User %s shared a folder with you" => "用戶 %s 與您分享了一個資料夾",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "用戶 %s 與您分享了檔案 \"%s\" ,您可以從這裡下載它: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "用戶 %s 與您分享了資料夾 \"%s\" ,您可以從這裡下載它: %s",
+"Category type not provided." => "未提供分類類型。",
+"No category to add?" => "沒有可增加的分類?",
+"This category already exists: " => "此分類已經存在:",
"Object type not provided." => "不支援的物件類型",
-"No categories selected for deletion." => "沒選擇要刪除的分類",
+"%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} 個小時前",
+"{hours} hours ago" => "{hours} 小時前",
"today" => "今天",
"yesterday" => "昨天",
"{days} days ago" => "{days} 天前",
@@ -22,18 +30,26 @@
"No" => "No",
"Yes" => "Yes",
"Ok" => "Ok",
+"The object type is not specified." => "未指定物件類型。",
"Error" => "錯誤",
-"The app name is not specified." => "沒有詳述APP名稱.",
+"The app name is not specified." => "沒有指定 app 名稱。",
+"The required file {file} is not installed!" => "沒有安裝所需的檔案 {file} !",
"Error while sharing" => "分享時發生錯誤",
"Error while unsharing" => "取消分享時發生錯誤",
+"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" => "密碼",
+"Email link to person" => "將連結 email 給別人",
+"Send" => "寄出",
"Set expiration date" => "設置到期日",
"Expiration date" => "到期日",
-"Share via email:" => "透過email分享:",
+"Share via email:" => "透過 email 分享:",
+"No people found" => "沒有找到任何人",
+"Resharing is not allowed" => "不允許重新分享",
"Shared in {item} with {user}" => "已和 {user} 分享 {item}",
"Unshare" => "取消共享",
"can edit" => "可編輯",
@@ -42,15 +58,18 @@
"update" => "更新",
"delete" => "刪除",
"share" => "分享",
-"Password protected" => "密碼保護",
+"Password protected" => "受密碼保護",
+"Error unsetting expiration date" => "解除過期日設定失敗",
"Error setting expiration date" => "錯誤的到期日設定",
+"Sending ..." => "正在寄出...",
+"Email sent" => "Email 已寄出",
"ownCloud password reset" => "ownCloud 密碼重設",
-"Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: (聯結) ",
-"You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱",
-"Reset email send." => "重設郵件已送出.",
-"Request failed!" => "請求失敗!",
+"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" => "要求重設",
+"Request reset" => "請求重設",
"Your password was reset" => "你的密碼已重設",
"To login page" => "至登入頁面",
"New password" => "新密碼",
@@ -60,12 +79,14 @@
"Apps" => "應用程式",
"Admin" => "管理者",
"Help" => "幫助",
-"Access forbidden" => "禁止存取",
+"Access forbidden" => "存取被拒",
"Cloud not found" => "未發現雲",
"Edit categories" => "編輯分類",
-"Add" => "添加",
+"Add" => "增加",
"Security Warning" => "安全性警告",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "沒有可用的隨機數字產生器, 請啟用 PHP 中 OpenSSL 擴充功能.",
+"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 your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效,我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取,或將您的資料目錄移出網頁伺服器的 document root 。",
"Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
"Advanced" => "進階",
"Data folder" => "資料夾",
@@ -96,14 +117,15 @@
"October" => "十月",
"November" => "十一月",
"December" => "十二月",
-"web services under your control" => "網路服務已在你控制",
+"web services under your control" => "網路服務在您控制之下",
"Log out" => "登出",
-"Lost your password?" => "忘記密碼?",
+"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." => "請更改您的密碼以再次取得您的帳戶的控制權。",
+"Lost your password?" => "忘記密碼?",
"remember" => "記住",
"Log in" => "登入",
-"You are logged out." => "你已登出",
"prev" => "上一頁",
"next" => "下一頁",
-"Security Warning!" => "安全性警告!",
-"Verify" => "驗證"
+"Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ,這可能需要一點時間。"
);
diff --git a/core/templates/exception.php b/core/templates/exception.php
index 4b951fca51b..47792225557 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -5,7 +5,7 @@
<p class="exception">
<?php
if($_['showsysinfo'] == true) {
- echo 'If you would like to support ownCloud\'s developers and report this error in our <a href="http://bugs.owncloud.org">Bugtracker</a>, please copy the following informations into the description. <br><br><textarea readonly>';
+ echo 'If you would like to support ownCloud\'s developers and report this error in our <a href="https://github.com/owncloud/core">bug tracker</a>, please copy the following informations into the description. <br><br><textarea readonly>';
echo 'Message: ' . $_['message'] . "\n";
echo 'Error Code: ' . $_['code'] . "\n";
echo 'File: ' . $_['file'] . "\n";
diff --git a/core/templates/logout.php b/core/templates/logout.php
deleted file mode 100644
index 2247ed8e70f..00000000000
--- a/core/templates/logout.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $l->t( 'You are logged out.' );
diff --git a/core/templates/verify.php b/core/templates/verify.php
deleted file mode 100644
index 600eaca05b7..00000000000
--- a/core/templates/verify.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<form method="post">
- <fieldset>
- <ul>
- <li class="errors">
- <?php echo $l->t('Security Warning!'); ?><br>
- <small><?php echo $l->t("Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again."); ?></small>
- </li>
- </ul>
- <p class="infield">
- <input type="text" value="<?php echo $_['username']; ?>" disabled="disabled" />
- </p>
- <p class="infield">
- <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
- <input type="password" name="password" id="password" value="" required />
- </p>
- <input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Verify' ); ?>" />
- </fieldset>
-</form>