Merge branch 'master' of github.com:owncloud/core into vcategories_db

5 files changed, 71 insertions, 18 deletions

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 2467af61121..28dec97fd30 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -66,39 +66,42 @@ var OCdialogs = {
 	/**
 	* prompt user for input with custom form
 	* fields should be passed in following format: [{text:'prompt text', name:'return name', type:'input type', value: 'dafault value'},...]
+	* select example 	var fields=[{text:'Test', name:'test', type:'select', options:[{text:'hallo',value:1},{text:'hallo1',value:2}] }];
 	* @param fields to display 
 	* @param title dialog title
 	* @param callback which will be triggered when user press OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...])
 	*/
 	form:function(fields, title, callback, modal) {
 		var content = '<table>';
-		for (var a in fields) {
-			content += '<tr><td>'+fields[a].text+'</td><td>';
-			var type=fields[a].type;
+		$.each(fields, function(index, val){
+			content += '<tr><td>'+val.text+'</td><td>';
+			var type=val.type;
+			
 			if (type == 'text' || type == 'checkbox' || type == 'password') {
-				content += '<input type="'+type+'" name="'+fields[a].name+'"';
+				content += '<input type="'+type+'" name="'+val.name+'"';
 				if (type == 'checkbox') {
-					if (fields[a].value != undefined && fields[a].value == true) {
+					if (val.value != undefined && val.value == true) {
 						content += ' checked="checked">';
 					} else {
 						content += '>';
 					}
-				} else if (type == 'text' || type == 'password' && fields[a].value) {
-					content += ' value="'+fields[a].value+'">';
+				} else if (type == 'text' || type == 'password' && val.value) {
+					content += ' value="'+val.value+'">';
 				}
 			} else if (type == 'select') {
-				content += '<select name="'+fields[a].name+'"';
-				if (fields[a].value != undefined) {
-					content += ' value="'+fields[a].value+'"';
+				content += '<select name="'+val.name+'"';
+				if (val.value != undefined) {
+					content += ' value="'+val.value+'"';
 				}
 				content += '>';
-				for (var o in fields[a].options) {
-					content += '<option value="'+fields[a].options[o].value+'">'+fields[a].options[o].text+'</option>';
-				}
+				$.each(val.options, function(index, valo){
+					content += '<option value="'+valo.value+'">'+valo.text+'</option>';
+				});
 				content += '</select>';
 			}
 			content += '</td></tr>';
-		}
+
+		});
 		content += '</table>';
 		OCdialogs.message(content, title, OCdialogs.FORM_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, callback, modal);
 	},
@@ -215,9 +218,10 @@ var OCdialogs = {
 	fillFilePicker:function(r, dialog_content_id) {
 		var entry_template = '<div onclick="javascript:OC.dialogs.handlePickerClick(this, \'*ENTRYNAME*\',\''+dialog_content_id+'\')" data="*ENTRYTYPE*"><img src="*MIMETYPEICON*" style="margin-right:1em;"><span id="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div></div>';
 		var names = '';
-		for (var a in r.data) {
-			names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(r.data[a].mtime)).replace('*NAME*', r.data[a].name).replace('*MIMETYPEICON*', r.data[a].mimetype_icon).replace('*ENTRYNAME*', r.data[a].name).replace('*ENTRYTYPE*', r.data[a].type);
-		}
+		$.each(r.data, function(index, a) {
+			names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(a.mtime)).replace('*NAME*', a.name).replace('*MIMETYPEICON*', a.mimetype_icon).replace('*ENTRYNAME*', a.name).replace('*ENTRYTYPE*', a.type);
+		});
+		
 		$(dialog_content_id + ' #filelist').html(names);
 		$(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden');
 	},
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 1242109e35e..d210485fd9f 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -3,15 +3,31 @@
 "No category to add?" => "Ingen kategorier å legge til?",
 "This category already exists: " => "Denne kategorien finnes allerede:",
 "Settings" => "Innstillinger",
+"Choose" => "Velg",
 "Cancel" => "Avbryt",
 "No" => "Nei",
 "Yes" => "Ja",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Ingen kategorier merket for sletting.",
 "Error" => "Feil",
+"Error while sharing" => "Feil under deling",
+"Share with" => "Del med",
+"Share with link" => "Del med link",
+"Password protect" => "Passordbeskyttet",
 "Password" => "Passord",
+"Set expiration date" => "Set utløpsdato",
+"Expiration date" => "Utløpsdato",
+"Share via email:" => "Del på epost",
+"No people found" => "Ingen personer funnet",
 "Unshare" => "Avslutt deling",
+"can edit" => "kan endre",
+"access control" => "tilgangskontroll",
 "create" => "opprett",
+"update" => "oppdater",
+"delete" => "slett",
+"share" => "del",
+"Password protected" => "Passordbeskyttet",
+"Error setting expiration date" => "Kan ikke sette utløpsdato",
 "ownCloud password reset" => "Tilbakestill ownCloud passord",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
@@ -63,10 +79,15 @@
 "December" => "Desember",
 "web services under your control" => "nettjenester under din kontroll",
 "Log out" => "Logg ut",
+"Automatic logon rejected!" => "Automatisk pålogging avvist!",
+"If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert",
+"Please change your password to secure your account again." => "Vennligst skift passord for å gjøre kontoen din sikker igjen.",
 "Lost your password?" => "Mistet passordet ditt?",
 "remember" => "husk",
 "Log in" => "Logg inn",
 "You are logged out." => "Du er logget ut",
 "prev" => "forrige",
-"next" => "neste"
+"next" => "neste",
+"Security Warning!" => "Sikkerhetsadvarsel!",
+"Verify" => "Verifiser"
 );
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 7131beff98b..ff5f30fbe18 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -38,6 +38,8 @@
 "ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
+"Reset email send." => "Отправка письма с информацией для сброса.",
+"Request failed!" => "Запрос не удался!",
 "Username" => "Имя пользователя",
 "Request reset" => "Запросить сброс",
 "Your password was reset" => "Ваш пароль был сброшен",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index ad7ac98b8a8..97d83f037b0 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -8,9 +8,22 @@
 "Ok" => "හරි",
 "No categories selected for deletion." => "මකා දැමීම සඳහා ප්‍රවර්ගයන් තෝරා නොමැත.",
 "Error" => "දෝෂයක්",
+"Share with" => "බෙදාගන්න",
+"Share with link" => "යොමුවක් මඟින් බෙදාගන්න",
+"Password protect" => "මුර පදයකින් ආරක්ශාකරන්න",
 "Password" => "මුර පදය ",
+"Set expiration date" => "කල් ඉකුත් විමේ දිනය දමන්න",
+"Expiration date" => "කල් ඉකුත් විමේ දිනය",
+"Share via email:" => "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: ",
 "Unshare" => "නොබෙදු",
+"can edit" => "සංස්කරණය කළ හැක",
+"access control" => "ප්‍රවේශ පාලනය",
 "create" => "සදන්න",
+"delete" => "මකන්න",
+"share" => "බෙදාහදාගන්න",
+"Password protected" => "මුර පදයකින් ආරක්ශාකර ඇත",
+"Error unsetting expiration date" => "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
+"Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
 "Username" => "පරිශීලක නම",
 "To login page" => "පිවිසුම් පිටුවට",
 "New password" => "නව මුර පදයක්",
@@ -19,10 +32,18 @@
 "Apps" => "යෙදුම්",
 "Admin" => "පරිපාලක",
 "Help" => "උදව්",
+"Access forbidden" => "ඇතුල් වීම තහනම්",
 "Edit categories" => "ප්‍රභේදයන් සංස්කරණය",
 "Add" => "එක් කරන්න",
+"Security Warning" => "ආරක්ෂක නිවේදනයක්",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිත අහඹු සංඛ්‍යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්‍ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක.",
 "Advanced" => "දියුණු/උසස්",
 "Data folder" => "දත්ත ෆෝල්ඩරය",
+"Database user" => "දත්තගබඩා භාවිතාකරු",
+"Database password" => "දත්තගබඩාවේ මුරපදය",
+"Database name" => "දත්තගබඩාවේ නම",
+"Database host" => "දත්තගබඩා සේවාදායකයා",
+"Finish setup" => "ස්ථාපනය කිරීම අවසන් කරන්න",
 "Sunday" => "ඉරිදා",
 "Monday" => "සඳුදා",
 "Tuesday" => "අඟහරුවාදා",
@@ -43,5 +64,8 @@
 "November" => "නොවැම්බර්",
 "December" => "දෙසැම්බර්",
 "web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
+"remember" => "මතක තබාගන්න",
+"Log in" => "ප්‍රවේශවන්න",
+"prev" => "පෙර",
 "next" => "ඊළඟ"
 );
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 808929b8f3e..faf82fd1f9c 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -38,6 +38,8 @@
 "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!" => "வேண்டுகோள் தோல்வியுற்றது!",
 "Username" => "பயனாளர் பெயர்",
 "Request reset" => "கோரிக்கை மீளமைப்பு",
 "Your password was reset" => "உங்களுடைய கடவுச்சொல் மீளமைக்கப்பட்டது",