Merge branch 'master' into moviepreviewfallback

Conflicts:
	lib/private/preview/movies.php

1 files changed, 25 insertions, 25 deletions

diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index e26400dc096..424c54fba7d 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-30 03:32-0400\n"
-"PO-Revision-Date: 2013-10-30 07:32+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2013-11-11 05:45-0500\n"
+"PO-Revision-Date: 2013-11-11 08:11+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -282,12 +282,12 @@ msgstr "Kopīgs"
 msgid "Share"
 msgstr "Dalīties"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:690
-#: js/share.js:702
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:692
+#: js/share.js:704
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/share.js:160 js/share.js:730
+#: js/share.js:160 js/share.js:732
 msgid "Error while sharing"
 msgstr "Kļūda, daloties"
 
@@ -343,79 +343,79 @@ msgstr "Iestaties termiņa datumu"
 msgid "Expiration date"
 msgstr "Termiņa datums"
 
-#: js/share.js:272
+#: js/share.js:274
 msgid "Share via email:"
 msgstr "Dalīties, izmantojot e-pastu:"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "No people found"
 msgstr "Nav atrastu cilvēku"
 
-#: js/share.js:305 js/share.js:342
+#: js/share.js:307 js/share.js:344
 msgid "group"
 msgstr "grupa"
 
-#: js/share.js:316
+#: js/share.js:318
 msgid "Resharing is not allowed"
 msgstr "Atkārtota dalīšanās nav atļauta"
 
-#: js/share.js:358
+#: js/share.js:360
 msgid "Shared in {item} with {user}"
 msgstr "Dalījās ar {item} ar {user}"
 
-#: js/share.js:380
+#: js/share.js:382
 msgid "Unshare"
 msgstr "Pārtraukt dalīšanos"
 
-#: js/share.js:388
+#: js/share.js:390
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:391
+#: js/share.js:393
 msgid "can edit"
 msgstr "var rediģēt"
 
-#: js/share.js:393
+#: js/share.js:395
 msgid "access control"
 msgstr "piekļuves vadība"
 
-#: js/share.js:396
+#: js/share.js:398
 msgid "create"
 msgstr "izveidot"
 
-#: js/share.js:399
+#: js/share.js:401
 msgid "update"
 msgstr "atjaunināt"
 
-#: js/share.js:402
+#: js/share.js:404
 msgid "delete"
 msgstr "dzēst"
 
-#: js/share.js:405
+#: js/share.js:407
 msgid "share"
 msgstr "dalīties"
 
-#: js/share.js:447 js/share.js:677
+#: js/share.js:449 js/share.js:679
 msgid "Password protected"
 msgstr "Aizsargāts ar paroli"
 
-#: js/share.js:690
+#: js/share.js:692
 msgid "Error unsetting expiration date"
 msgstr "Kļūda, noņemot termiņa datumu"
 
-#: js/share.js:702
+#: js/share.js:704
 msgid "Error setting expiration date"
 msgstr "Kļūda, iestatot termiņa datumu"
 
-#: js/share.js:717
+#: js/share.js:719
 msgid "Sending ..."
 msgstr "Sūta..."
 
-#: js/share.js:728
+#: js/share.js:730
 msgid "Email sent"
 msgstr "Vēstule nosūtīta"
 
-#: js/share.js:752
+#: js/share.js:754
 msgid "Warning"
 msgstr "Brīdinājums"