Merge branch 'master' into fixing-998-master

Conflicts:
	apps/files/js/files.js

21 files changed, 143 insertions, 124 deletions

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 e2775fa7220..10758a90722 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -375,8 +375,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{
@@ -647,7 +654,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/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..a0322ffe23f 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,20 @@
 "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." => "আপনি প্রস্থান করেছেন",
+"You are logged out." => "আপনি প্রস্থান করেছেন।",
 "prev" => "পূর্ববর্তী",
 "next" => "পরবর্তী",
+"Updating ownCloud to version %s, this may take a while." => "%s ভার্সনে ownCloud পরিবর্ধন করা হচ্ছে, এজন্য কিছু সময় প্রয়োজন।",
 "Security Warning!" => "নিরাপত্তাবিষয়ক সতর্কবাণী",
 "Verify" => "যাচাই কর"
 );
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index f98922f8f38..c4e134cdf36 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -128,6 +128,7 @@
 "You are logged out." => "Heu tancat la sessió.",
 "prev" => "anterior",
 "next" => "següent",
+"Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona.",
 "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"
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 96252ea8bba..3a15bd1ae90 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -128,6 +128,7 @@
 "You are logged out." => "Jste odhlášeni.",
 "prev" => "předchozí",
 "next" => "následující",
+"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat.",
 "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"
diff --git a/core/l10n/de.php b/core/l10n/de.php
index c5867eda8c3..9c80d1cb14e 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -128,6 +128,7 @@
 "You are logged out." => "Du wurdest abgemeldet.",
 "prev" => "Zurück",
 "next" => "Weiter",
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
 "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"
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index ed0bc0e0ffb..777725b2cd6 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -128,6 +128,7 @@
 "You are logged out." => "Sie wurden abgemeldet.",
 "prev" => "Zurück",
 "next" => "Weiter",
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
 "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"
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 2a9f5682dfb..bc72944340b 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -128,6 +128,7 @@
 "You are logged out." => "Has cerrado la sesión.",
 "prev" => "anterior",
 "next" => "siguiente",
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
 "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"
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 6b1449dd4ba..8777309d9b7 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -128,6 +128,7 @@
 "You are logged out." => "Vous êtes désormais déconnecté.",
 "prev" => "précédent",
 "next" => "suivant",
+"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.",
 "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"
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 53b2fe88839..e820b655d55 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",
@@ -128,6 +128,7 @@
 "You are logged out." => "Þú ert útskráð(ur).",
 "prev" => "fyrra",
 "next" => "næsta",
+"Updating ownCloud to version %s, this may take a while." => "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund.",
 "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"
diff --git a/core/l10n/it.php b/core/l10n/it.php
index e97deb9fb5f..952ae4d06b6 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -128,6 +128,7 @@
 "You are logged out." => "Sei uscito.",
 "prev" => "precedente",
 "next" => "successivo",
+"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, potrebbe richiedere del tempo.",
 "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"
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 72615d36f62..46d40e2e73e 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -128,6 +128,7 @@
 "You are logged out." => "ログアウトしました。",
 "prev" => "前",
 "next" => "次",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。",
 "Security Warning!" => "セキュリティ警告！",
 "Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "パスワードの確認<br/>セキュリティ上の理由によりパスワードの再入力をお願いします。",
 "Verify" => "確認"
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 3846dff796b..4b7df81fa85 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." => "이메일로 암호 재설정 링크를 보냈습니다.",
@@ -120,6 +128,7 @@
 "You are logged out." => "로그아웃되었습니다.",
 "prev" => "이전",
 "next" => "다음",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud 를 버젼 %s로 업데이트 하는 중, 시간이 소요됩니다.",
 "Security Warning!" => "보안 경고!",
 "Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "암호를 확인해 주십시오.<br/>보안상의 이유로 종종 암호를 물어볼 것입니다.",
 "Verify" => "확인"
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index c3f5c887658..726dbf20161 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -128,6 +128,7 @@
 "You are logged out." => "U bent afgemeld.",
 "prev" => "vorige",
 "next" => "volgende",
+"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren.",
 "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"
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 1208aec5a53..5758afc09ba 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -128,6 +128,7 @@
 "You are logged out." => "Wylogowano użytkownika.",
 "prev" => "wstecz",
 "next" => "naprzód",
+"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s, może to potrwać chwilę.",
 "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"
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index a2bfcf4f882..d09344fe140 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -128,6 +128,7 @@
 "You are logged out." => "Estás desconetado.",
 "prev" => "anterior",
 "next" => "seguinte",
+"Updating ownCloud to version %s, this may take a while." => "A Actualizar o ownCloud para a versão %s, esta operação pode demorar.",
 "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"
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index a7698fb30ce..7020e4b28d6 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -128,6 +128,7 @@
 "You are logged out." => "Du är utloggad.",
 "prev" => "föregående",
 "next" => "nästa",
+"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund.",
 "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"
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 45c7596e609..0df7ee42785 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,19 @@
 "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!" => "安全性警告!",
+"Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ，這可能需要一點時間。",
+"Security Warning!" => "安全性警告！",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "請輸入您的密碼。<br/>基於安全性的理由，您有時候可能會被要求再次輸入密碼。",
 "Verify" => "驗證"
 );
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 28fbf29b540..3128c4f2e70 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -113,7 +113,7 @@
 			</p>
 			<p class="infield groupmiddle">
 				<label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label>
-				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_]+" />
+				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
 			</p>
 		</div>
 		<?php endif; ?>