merge master into filesystem

4 files changed, 62 insertions, 48 deletions

diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 8d6afeb204c..751293e1fd5 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -5,7 +5,9 @@
 "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: ",
+"Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.",
 "No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
+"Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.",
 "Settings" => "Asetukset",
 "seconds ago" => "sekuntia sitten",
 "1 minute ago" => "1 minuutti sitten",
@@ -31,6 +33,9 @@
 "Error while sharing" => "Virhe jaettaessa",
 "Error while unsharing" => "Virhe jakoa peruttaessa",
 "Error while changing permissions" => "Virhe oikeuksia muuttaessa",
+"Shared with you and the group {group} by {owner}" => "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
+"Shared with you by {owner}" => "Jaettu kanssasi käyttäjän {owner} toimesta",
+"Share with" => "Jaa",
 "Share with link" => "Jaa linkillä",
 "Password protect" => "Suojaa salasanalla",
 "Password" => "Salasana",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 7a5b10ca3e6..286642ace7a 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Používateľ %s zdieľa s Vami súbor",
+"User %s shared a folder with you" => "Používateľ %s zdieľa s Vami adresár",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami súbor \"%s\".  Môžete si ho stiahnuť tu: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami adresár \"%s\".  Môžete si ho stiahnuť tu: %s",
 "Category type not provided." => "Neposkytnutý kategorický typ.",
 "No category to add?" => "Žiadna kategória pre pridanie?",
 "This category already exists: " => "Táto kategória už existuje:",
@@ -39,6 +43,8 @@
 "Share with link" => "Zdieľať cez odkaz",
 "Password protect" => "Chrániť heslom",
 "Password" => "Heslo",
+"Email link to person" => "Odoslať odkaz osobe e-mailom",
+"Send" => "Odoslať",
 "Set expiration date" => "Nastaviť dátum expirácie",
 "Expiration date" => "Dátum expirácie",
 "Share via email:" => "Zdieľať cez e-mail:",
@@ -55,6 +61,8 @@
 "Password protected" => "Chránené heslom",
 "Error unsetting expiration date" => "Chyba pri odstraňovaní dátumu vypršania platnosti",
 "Error setting expiration date" => "Chyba pri nastavení dátumu vypršania platnosti",
+"Sending ..." => "Odosielam ...",
+"Email sent" => "Email odoslaný",
 "ownCloud password reset" => "Obnovenie hesla pre ownCloud",
 "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
@@ -118,5 +126,6 @@
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
 "prev" => "späť",
-"next" => "ďalej"
+"next" => "ďalej",
+"Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
 );
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 3128c4f2e70..03c580c9b0b 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,7 +1,7 @@
-<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'></input>
-<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'></input>
-<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'></input>
-<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'></input>
+<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'>
+<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'>
+<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'>
+<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'>
 <form action="index.php" method="post">
 <input type="hidden" name="install" value="true" />
 	<?php if(count($_['errors']) > 0): ?>
diff --git a/core/templates/login.php b/core/templates/login.php
index 10093baabf7..43e45997803 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,50 +1,50 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
 <form method="post">
-    <fieldset>
-        <?php if (!empty($_['redirect_url'])) {
-        echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
-    } ?>
-        <ul>
-            <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
-            <li class="errors">
-                <?php echo $l->t('Automatic logon rejected!'); ?><br>
-                <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
-                <br>
-                <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
-            </li>
-            <?php endif; ?>
-            <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
-            <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
-                <li class="errors">
-                    <?php echo $l->t('Lost your password?'); ?>
-                </li>
-            </a>
-            <?php endif; ?>
-        </ul>
-        <p class="infield grouptop">
-            <input type="text" name="user" id="user"
-                   value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
-                   autocomplete="on" required/>
-            <label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
-            <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
-        </p>
+	<fieldset>
+	<?php if (!empty($_['redirect_url'])) {
+		echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
+	} ?>
+		<ul>
+			<?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
+			<li class="errors">
+				<?php echo $l->t('Automatic logon rejected!'); ?><br>
+				<small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
+				<br>
+				<small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
+			</li>
+			<?php endif; ?>
+			<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
+			<a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
+				<li class="errors">
+					<?php echo $l->t('Lost your password?'); ?>
+				</li>
+			</a>
+			<?php endif; ?>
+		</ul>
+		<p class="infield grouptop">
+			<input type="text" name="user" id="user"
+				   value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
+				   autocomplete="on" required/>
+			<label for="user" 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="password" id="password" value=""
-                   required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
-            <label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
-            <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
-        </p>
-        <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
-            for="remember_login"><?php echo $l->t('remember'); ?></label>
-        <input type="hidden" name="timezone-offset" id="timezone-offset"/>
-        <input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
-    </fieldset>
+		<p class="infield groupbottom">
+			<input type="password" name="password" id="password" value=""
+				   required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
+			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+		</p>
+		<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
+			for="remember_login"><?php echo $l->t('remember'); ?></label>
+		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
+		<input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
+	</fieldset>
 </form>
 <script>
-    $(document).ready(function () {
-        var visitortimezone = (-new Date().getTimezoneOffset() / 60);
-        $('#timezone-offset').val(visitortimezone);
-    });
+	$(document).ready(function () {
+		var visitortimezone = (-new Date().getTimezoneOffset() / 60);
+		$('#timezone-offset').val(visitortimezone);
+	});
 
 </script>