Merge branch 'master' into master-sqlserver

Conflicts:
	core/templates/installation.php

21 files changed, 275 insertions, 60 deletions

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 6704a00c5a2..332b6a0bed8 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -34,7 +34,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 						$shareWith = null;
 					}
 					
-					$token = OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], $shareType, $shareWith, $_POST['permissions']);
+					$token = OCP\Share::shareItem(
+						$_POST['itemType'],
+						$_POST['itemSource'],
+						$shareType,
+						$shareWith,
+						$_POST['permissions']
+					);
 					
 					if (is_string($token)) {
 						OC_JSON::success(array('data' => array('token' => $token)));
@@ -59,7 +65,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			break;
 		case 'setPermissions':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
-				$return = OCP\Share::setPermissions($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+				$return = OCP\Share::setPermissions(
+					$_POST['itemType'],
+					$_POST['itemSource'],
+					$_POST['shareType'],
+					$_POST['shareWith'],
+					$_POST['permissions']
+				);
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
@@ -86,9 +98,11 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			if ($type === 'dir')
 				$subject = (string)$l->t('User %s shared a folder with you', $displayName);
 
-			$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($displayName, $file, $link));
+			$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s',
+				array($displayName, $file, $link));
 			if ($type === 'dir')
-				$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($displayName, $file, $link));
+				$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s',
+					array($displayName, $file, $link));
 
 
 			$default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
@@ -112,14 +126,29 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			}
 			break;
 		case 'getItem':
-			if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkReshare']) && isset($_GET['checkShares'])) {
+			if (isset($_GET['itemType'])
+				&& isset($_GET['itemSource'])
+				&& isset($_GET['checkReshare'])
+				&& isset($_GET['checkShares'])) {
 				if ($_GET['checkReshare'] == 'true') {
-					$reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
+					$reshare = OCP\Share::getItemSharedWithBySource(
+						$_GET['itemType'],
+						$_GET['itemSource'],
+						OCP\Share::FORMAT_NONE,
+						null,
+						true
+					);
 				} else {
 					$reshare = false;
 				}
 				if ($_GET['checkShares'] == 'true') {
-					$shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
+					$shares = OCP\Share::getItemShared(
+						$_GET['itemType'],
+						$_GET['itemSource'],
+						OCP\Share::FORMAT_NONE,
+						null,
+						true
+					);
 				} else {
 					$shares = false;
 				}
@@ -165,8 +194,15 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 					}
 					$offset += $limit;
 					foreach ($users as $uid => $displayName) {
-						if ((!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $uid != OC_User::getUser()) {
-							$shareWith[] = array('label' => $displayName, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $uid));
+						if ((!isset($_GET['itemShares'])
+							|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])
+							|| !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]))
+							&& $uid != OC_User::getUser()) {
+							$shareWith[] = array(
+								'label' => $displayName,
+								'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER,
+								'shareWith' => $uid)
+							);
 							$count++;
 						}
 					}
@@ -179,7 +215,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 							|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
 							|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
 							|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
-							$shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group));
+							$shareWith[] = array(
+								'label' => $group.' (group)',
+								'value' => array(
+									'shareType' => OCP\Share::SHARE_TYPE_GROUP,
+									'shareWith' => $group
+								)
+							);
 							$count++;
 						}
 					} else {
diff --git a/core/css/styles.css b/core/css/styles.css
index 8a01211d8b0..0c16b36873f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -36,8 +36,8 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC
 .header-right > * { vertical-align:middle; }
 
 /* INPUTS */
-input[type="text"], input[type="password"] { cursor:text; }
-input[type="text"], input[type="password"], input[type="search"],
+input[type="text"], input[type="password"], input[type="number"] { cursor:text; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"],
 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;
@@ -46,10 +46,11 @@ textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
 	-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
 }
 input[type="hidden"] { height:0; width:0; }
-input[type="text"], input[type="password"], input[type="search"], textarea { background:#f8f8f8; color:#555; cursor:text; }
-input[type="text"], input[type="password"], input[type="search"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], textarea { background:#f8f8f8; color:#555; cursor:text; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; }
 input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
 input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active,
+input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active,
 .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active,
 textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
@@ -196,7 +197,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #show, #personal-show { display:none; }
 #show + label { right:1em; top:1.25em!important; }
 #show:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-#show + label, #personal-show + label { 
+#show + label, #personal-show + label {
 	position:absolute!important; height:14px; width:24px;
 	background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat;
 	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3;
diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
new file mode 100644
index 00000000000..ce7e1e69802
--- /dev/null
+++ b/core/img/actions/caret-dark.png
diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg
new file mode 100644
index 00000000000..abb1dc192d2
--- /dev/null
+++ b/core/img/actions/caret-dark.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="10"
+   height="10"
+   id="svg2403"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="caret.svg"
+   inkscape:export-filename="caret.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="773"
+     id="namedview3047"
+     showgrid="false"
+     inkscape:zoom="25.279067"
+     inkscape:cx="-3.063006"
+     inkscape:cy="6.0978375"
+     inkscape:window-x="0"
+     inkscape:window-y="-1"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2403"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata15">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2405">
+    <linearGradient
+       x1="11.644068"
+       y1="2.4988678"
+       x2="11.644068"
+       y2="15.00281"
+       id="linearGradient2392"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.0000001,1.1920928e-8)" />
+    <linearGradient
+       x1="8.4964771"
+       y1="-0.061573759"
+       x2="8.4964771"
+       y2="8.083209"
+       id="linearGradient2395"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3682"
+         style="stop-color:#e6e6e6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3768"
+     d="M 1,2 5,10 9,2.011 z"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="M 1,1 5,9 9,1.011 z"
+     id="path3716"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+</svg>
diff --git a/core/img/filetypes/application-msexcel.png b/core/img/filetypes/application-msexcel.png
index abcd93689a0..b977d7e52e2 100644
--- a/core/img/filetypes/application-msexcel.png
+++ b/core/img/filetypes/application-msexcel.png
diff --git a/core/img/filetypes/application-mspowerpoint.png b/core/img/filetypes/application-mspowerpoint.png
index b4aaad9a45c..c4eff0387d5 100644
--- a/core/img/filetypes/application-mspowerpoint.png
+++ b/core/img/filetypes/application-mspowerpoint.png
diff --git a/core/img/filetypes/application-msword.png b/core/img/filetypes/application-msword.png
index e8b230c59cb..ae8ecbf4767 100644
--- a/core/img/filetypes/application-msword.png
+++ b/core/img/filetypes/application-msword.png
diff --git a/core/img/filetypes/ms-excel.png b/core/img/filetypes/ms-excel.png
index abcd93689a0..b977d7e52e2 100644
--- a/core/img/filetypes/ms-excel.png
+++ b/core/img/filetypes/ms-excel.png
diff --git a/core/img/filetypes/ms-powerpoint.png b/core/img/filetypes/ms-powerpoint.png
index b4aaad9a45c..c4eff0387d5 100644
--- a/core/img/filetypes/ms-powerpoint.png
+++ b/core/img/filetypes/ms-powerpoint.png
diff --git a/core/js/config.php b/core/js/config.php
index 9069175ed6f..0aaa4482287 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -29,8 +29,33 @@ $array = array(
 	"oc_current_user" =>  "\"".OC_User::getUser(). "\"",
 	"oc_requesttoken" =>  "\"".OC_Util::callRegister(). "\"",
 	"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
-	"dayNames" =>  json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))),
-	"monthNames" => json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))),
+	"dayNames" =>  json_encode(
+		array(
+			(string)$l->t('Sunday'),
+			(string)$l->t('Monday'),
+			(string)$l->t('Tuesday'),
+			(string)$l->t('Wednesday'),
+			(string)$l->t('Thursday'),
+			(string)$l->t('Friday'),
+			(string)$l->t('Saturday')
+		)
+	),
+	"monthNames" => json_encode(
+		array(
+			(string)$l->t('January'),
+			(string)$l->t('February'),
+			(string)$l->t('March'),
+			(string)$l->t('April'),
+			(string)$l->t('May'),
+			(string)$l->t('June'),
+			(string)$l->t('July'),
+			(string)$l->t('August'),
+			(string)$l->t('September'),
+			(string)$l->t('October'),
+			(string)$l->t('November'),
+			(string)$l->t('December')
+		)
+	),
 	"firstDay" => json_encode($l->l('firstday', 'firstday')) ,
 	);
 
@@ -38,4 +63,3 @@ $array = array(
 foreach ($array as  $setting => $value) {
 	echo("var ". $setting ."=".$value.";\n");
 }
-?>
\ No newline at end of file
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 623c6e0f7e1..bc4223feb64 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -266,8 +266,9 @@
 			}
 			list.append(list.find('li.creator'));
 			var pos=button.position();
-			if($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height())
-				|| $(document).height()/2 > pos.top
+			if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height())
+				&& $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height()))
+				|| $(document).height()/2 > button.offset().top
 			) {
 				list.css({
 					top:pos.top+button.outerHeight()-5,
diff --git a/core/l10n/de.php b/core/l10n/de.php
index f1e892fee47..e60f061ff3c 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit dir geteilt",
-"User %s shared a folder with you" => "%s hat ein Verzeichnis mit dir geteilt",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s",
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit Dir geteilt",
+"User %s shared a folder with you" => "%s hat ein Verzeichnis mit Dir geteilt",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
@@ -58,10 +58,10 @@
 "Error while sharing" => "Fehler beim Teilen",
 "Error while unsharing" => "Fehler beim Aufheben der Teilung",
 "Error while changing permissions" => "Fehler beim Ändern der Rechte",
-"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit dir und der Gruppe {group} geteilt",
-"Shared with you by {owner}" => "{owner} hat dies mit dir geteilt",
+"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
+"Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt",
 "Share with" => "Teilen mit",
-"Share with link" => "Über einen Link teilen",
+"Share with link" => "Über einen Link freigegeben",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
 "Email link to person" => "Link per E-Mail verschicken",
@@ -72,7 +72,7 @@
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Für {user} in {item} freigegeben",
-"Unshare" => "Teilung aufheben",
+"Unshare" => "Freigabe aufheben",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
 "create" => "erstellen",
@@ -109,7 +109,7 @@
 "Security Warning" => "Sicherheitswarnung",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten  zu übernehmen.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
 "For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 34305258944..9a975ddcb87 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -72,7 +72,7 @@
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
-"Unshare" => "Teilung aufheben",
+"Unshare" => "Freigabe aufheben",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
 "create" => "erstellen",
@@ -84,7 +84,7 @@
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "Sending ..." => "Sende ...",
 "Email sent" => "Email gesendet",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Gemeinschaft</a>.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
@@ -109,7 +109,7 @@
 "Security Warning" => "Sicherheitshinweis",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
 "For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
new file mode 100644
index 00000000000..f8d2458081c
--- /dev/null
+++ b/core/l10n/my_MM.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"seconds ago" => "စက္ကန့်အနည်းငယ်က",
+"1 minute ago" => "၁ မိနစ်အရင်က",
+"1 hour ago" => "၁ နာရီ အရင်က",
+"today" => "ယနေ့",
+"yesterday" => "မနေ့က",
+"last month" => "ပြီးခဲ့သောလ",
+"last year" => "မနှစ်က",
+"years ago" => "နှစ် အရင်က",
+"Users" => "သုံးစွဲသူ",
+"Apps" => "Apps",
+"Help" => "အကူအညီ"
+);
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 3ef8eaf71aa..fbcf4a87f22 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -44,7 +44,11 @@ class OC_Core_LostPassword_Controller {
 				$msg = $tmpl->fetchPage();
 				$l = OC_L10N::get('core');
 				$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
-				OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
+				try {
+					OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
+				} catch (Exception $e) {
+					OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
+				}
 				self::displayLostPasswordPage(false, true);
 			} else {
 				self::displayLostPasswordPage(true, false);
diff --git a/core/templates/exception.php b/core/templates/exception.php
index 62d6cf2ade5..4059c7e047d 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -5,7 +5,9 @@
 		<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="https://github.com/owncloud/core">bug tracker</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/installation.php b/core/templates/installation.php
index a57506ef237..aca9648d0bf 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -23,7 +23,7 @@
 	<fieldset class="warning">
 		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
 		<p><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?><br/>
-		<?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></p>		
+		<?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></p>
 	</fieldset>
 	<?php endif; ?>
 	<?php if(!$_['htaccessWorking']): ?>
@@ -36,12 +36,14 @@
 	<fieldset id="adminaccount">
 		<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
 		<p class="infield grouptop">
-			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
+			<input type="text" name="adminlogin" id="adminlogin"
+				value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
 			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
 		</p>
 		<p class="infield groupbottom">
-			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" />
+			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
+				value="<?php print OC_Helper::init_var('adminpass'); ?>" />
 			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 			<img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
 			<input type="checkbox" id="show" name="show" />
@@ -50,15 +52,17 @@
 	</fieldset>
 
 	<fieldset id="datadirField">
-		<legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> <img class="svg" src="<?php echo image_path('', 'actions/triangle-s.svg'); ?>" /></a></legend>
+		<legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> <img class="svg" src="<?php echo image_path('', 'actions/caret-dark.svg'); ?>" /></a></legend>
 		<div id="datadirContent">
 			<label for="directory"><?php echo $l->t( 'Data folder' ); ?></label>
-			<input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" />
+			<input type="text" name="directory" id="directory"
+				value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" />
 		</div>
 	</fieldset>
 
 	<fieldset id='databaseField'>
-		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
+		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
+			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
 		<legend><?php echo $l->t( 'Configure the database' ); ?></legend>
 		<div id="selectDbType">
 		<?php if($_['hasSQLite']): ?>
@@ -67,7 +71,8 @@
 		<p>SQLite <?php echo $l->t( 'will be used' ); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="sqlite" />
 		<?php else: ?>
-		<input type="radio" name="dbtype" value="sqlite" id="sqlite" <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value="sqlite" id="sqlite"
+			<?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/>
 		<label class="sqlite" for="sqlite">SQLite</label>
 		<?php endif; ?>
 		<?php endif; ?>
@@ -78,7 +83,8 @@
 		<p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
 		<?php else: ?>
-		<input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value="mysql" id="mysql"
+			<?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
 		<label class="mysql" for="mysql">MySQL</label>
 		<?php endif; ?>
 		<?php endif; ?>
@@ -89,7 +95,8 @@
 		<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
 		<?php else: ?>
 		<label class="pgsql" for="pgsql">PostgreSQL</label>
-		<input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value='pgsql' id="pgsql"
+			<?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
 		<?php endif; ?>
 		<?php endif; ?>
 
@@ -99,7 +106,8 @@
 		<input type="hidden" id="dbtype" name="dbtype" value="oci" />
 		<?php else: ?>
 		<label class="oci" for="oci">Oracle</label>
-		<input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value='oci' id="oci"
+			<?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
 		<?php endif; ?>
 		<?php endif; ?>
         
@@ -119,15 +127,19 @@
 		<div id="use_other_db">
 			<p class="infield grouptop">
 				<label for="dbuser" class="infield"><?php echo $l->t( 'Database user' ); ?></label>
-				<input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" />
+				<input type="text" name="dbuser" id="dbuser"
+					value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" />
 			</p>
 			<p class="infield groupmiddle">
 				<label for="dbpass" class="infield"><?php echo $l->t( 'Database password' ); ?></label>
-				<input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" />
+				<input type="password" name="dbpass" id="dbpass"
+					value="<?php print OC_Helper::init_var('dbpass'); ?>" />
 			</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; ?>
@@ -135,13 +147,15 @@
 		<div id="use_oracle_db">
 			<p class="infield groupmiddle">
 				<label for="dbtablespace" class="infield"><?php echo $l->t( 'Database tablespace' ); ?></label>
-				<input type="text" name="dbtablespace" id="dbtablespace" value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" />
+				<input type="text" name="dbtablespace" id="dbtablespace"
+					value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" />
 			</p>
 		</div>
 		<?php endif; ?>
 		<p class="infield groupbottom">
 			<label for="dbhost" class="infield" id="dbhostlabel"><?php echo $l->t( 'Database host' ); ?></label>
-			<input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" />
+			<input type="text" name="dbhost" id="dbhost"
+				value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" />
 		</p>
 	</fieldset>
 
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 2049bcb36da..4233fd8300e 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -3,7 +3,8 @@
 	<head>
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" />
+		<link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
 		<?php foreach ($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 69330aa9fce..b26020b766b 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,7 +4,8 @@
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
-		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" />
+		<link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -30,6 +31,7 @@
 			</div></header>
 			<?php echo $_['content']; ?>
 		</div>
-		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t( 'web services under your control' ); ?></p></footer>
+		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash;
+			<?php echo $l->t( 'web services under your control' ); ?></p></footer>
 	</body>
 </html>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2d00bdb5c8e..d0869cb8404 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
+		<title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud
+			<?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
-		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" />
+		<link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -27,7 +29,8 @@
 		<div id="notification"></div>
 	</div>
 	<header><div id="header">
-			<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
+			<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg"
+				src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
 
 			<ul id="settings" class="svg">
 				<span id="expand">
@@ -37,7 +40,8 @@
 				<div id="expanddiv">
 				<?php foreach($_['settingsnavigation'] as $entry):?>
 					<li>
-						<a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
+						<a href="<?php echo $entry['href']; ?>" title=""
+							<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
 							<img class="svg" alt="" src="<?php echo $entry['icon']; ?>">
 							<?php echo $entry['name'] ?>
 						</a>
@@ -45,14 +49,17 @@
 				<?php endforeach; ?>
 					<li>
 						<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true">
-							<img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /> <?php echo $l->t('Log out');?>
+							<img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>" />
+							<?php echo $l->t('Log out');?>
 						</a>
 					</li>
 				</div>
 			</ul>
 
 			<form class="searchbox" action="#" method="post">
-				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech />
+				<input id="searchbox" class="svg" type="search" name="query"
+					value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>"
+					autocomplete="off" x-webkit-speech />
 			</form>
 		</div></header>
 
@@ -60,7 +67,8 @@
 			<ul id="apps" class="svg">
 				<?php foreach($_['navigation'] as $entry): ?>
 					<li data-id="<?php echo $entry['id']; ?>">
-						<a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
+						<a href="<?php echo $entry['href']; ?>" title=""
+							<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
 							<img class="icon svg" src="<?php echo $entry['icon']; ?>"/>
 							<?php echo $entry['name']; ?>
 						</a>
diff --git a/core/templates/update.php b/core/templates/update.php
index ae714dcfb92..685a5536d06 100644
--- a/core/templates/update.php
+++ b/core/templates/update.php
@@ -1,5 +1,6 @@
 <ul>
 	<li class='update'>
-		<?php echo $l->t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?><br /><br />
+		<?php echo $l->t('Updating ownCloud to version %s, this may take a while.',
+			array($_['version'])); ?><br /><br />
 	</li>
 </ul>