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

3 files changed, 76 insertions, 66 deletions

diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index a73a86f5f43..d920fe7b476 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-07 00:04+0100\n"
-"PO-Revision-Date: 2013-01-06 23:04+0000\n"
+"POT-Creation-Date: 2013-01-12 00:09+0100\n"
+"PO-Revision-Date: 2013-01-11 23:09+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -85,55 +85,55 @@ msgstr ""
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:704
+#: js/js.js:711
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:705
+#: js/js.js:712
 msgid "1 minute ago"
 msgstr "Prieš 1 minutę"
 
-#: js/js.js:706
+#: js/js.js:713
 msgid "{minutes} minutes ago"
 msgstr "Prieš {count} minutes"
 
-#: js/js.js:707
+#: js/js.js:714
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:708
+#: js/js.js:715
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:709
+#: js/js.js:716
 msgid "today"
 msgstr "šiandien"
 
-#: js/js.js:710
+#: js/js.js:717
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:711
+#: js/js.js:718
 msgid "{days} days ago"
 msgstr "Prieš {days}  dienas"
 
-#: js/js.js:712
+#: js/js.js:719
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:713
+#: js/js.js:720
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:721
 msgid "months ago"
 msgstr "prieš mėnesį"
 
-#: js/js.js:715
+#: js/js.js:722
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:716
+#: js/js.js:723
 msgid "years ago"
 msgstr "prieš metus"
 
@@ -554,10 +554,6 @@ msgstr "prisiminti"
 msgid "Log in"
 msgstr "Prisijungti"
 
-#: templates/logout.php:1
-msgid "You are logged out."
-msgstr "Jūs atsijungėte."
-
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "atgal"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 00d6ea26c63..0b5d2d78f5b 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-07 00:04+0100\n"
-"PO-Revision-Date: 2013-01-06 23:05+0000\n"
+"POT-Creation-Date: 2013-01-10 00:04+0100\n"
+"PO-Revision-Date: 2013-01-09 23:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,20 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:24
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:19
+msgid "Unable to rename file"
+msgstr ""
+
 #: ajax/upload.php:14
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -67,11 +81,11 @@ msgstr ""
 msgid "Files"
 msgstr "Failai"
 
-#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
+#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
+#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
 msgid "Delete"
 msgstr "Ištrinti"
 
@@ -79,39 +93,39 @@ msgstr "Ištrinti"
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:199 js/filelist.js:201
+#: js/filelist.js:205 js/filelist.js:207
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/filelist.js:199 js/filelist.js:201
+#: js/filelist.js:205 js/filelist.js:207
 msgid "replace"
 msgstr "pakeisti"
 
-#: js/filelist.js:199
+#: js/filelist.js:205
 msgid "suggest name"
 msgstr "pasiūlyti pavadinimą"
 
-#: js/filelist.js:199 js/filelist.js:201
+#: js/filelist.js:205 js/filelist.js:207
 msgid "cancel"
 msgstr "atšaukti"
 
-#: js/filelist.js:248
+#: js/filelist.js:254
 msgid "replaced {new_name}"
 msgstr "pakeiskite {new_name}"
 
-#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
+#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:250
+#: js/filelist.js:256
 msgid "replaced {new_name} with {old_name}"
 msgstr "pakeiskite {new_name} į {old_name}"
 
-#: js/filelist.js:282
+#: js/filelist.js:288
 msgid "unshared {files}"
 msgstr "nebesidalinti {files}"
 
-#: js/filelist.js:284
+#: js/filelist.js:290
 msgid "deleted {files}"
 msgstr "ištrinti {files}"
 
@@ -145,7 +159,7 @@ msgstr "Įkėlimo klaida"
 msgid "Close"
 msgstr "Užverti"
 
-#: js/files.js:260 js/files.js:374 js/files.js:404
+#: js/files.js:260 js/files.js:376 js/files.js:409
 msgid "Pending"
 msgstr "Laukiantis"
 
@@ -153,56 +167,60 @@ msgstr "Laukiantis"
 msgid "1 file uploading"
 msgstr "įkeliamas 1 failas"
 
-#: js/files.js:283 js/files.js:337 js/files.js:352
+#: js/files.js:283 js/files.js:338 js/files.js:353
 msgid "{count} files uploading"
 msgstr "{count}  įkeliami failai"
 
-#: js/files.js:355 js/files.js:388
+#: js/files.js:357 js/files.js:393
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/files.js:457
+#: js/files.js:464
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
 
-#: js/files.js:527
-msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
+#: js/files.js:537
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/files.js:543
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:711
+#: js/files.js:727
 msgid "{count} files scanned"
 msgstr "{count}  praskanuoti failai"
 
-#: js/files.js:719
+#: js/files.js:735
 msgid "error while scanning"
 msgstr "klaida skanuojant"
 
-#: js/files.js:792 templates/index.php:66
+#: js/files.js:808 templates/index.php:64
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:793 templates/index.php:77
+#: js/files.js:809 templates/index.php:75
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:794 templates/index.php:79
+#: js/files.js:810 templates/index.php:77
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:813
+#: js/files.js:829
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/files.js:815
+#: js/files.js:831
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/files.js:823
+#: js/files.js:839
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/files.js:825
+#: js/files.js:841
 msgid "{count} files"
 msgstr "{count} failai"
 
@@ -254,36 +272,36 @@ msgstr "Katalogas"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:35
+#: templates/index.php:18
 msgid "Upload"
 msgstr "Įkelti"
 
-#: templates/index.php:43
+#: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Atšaukti siuntimą"
 
-#: templates/index.php:58
+#: templates/index.php:56
 msgid "Nothing in here. Upload something!"
 msgstr "Čia tuščia. Įkelkite ką nors!"
 
-#: templates/index.php:72
+#: templates/index.php:70
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:104
+#: templates/index.php:102
 msgid "Upload too large"
 msgstr "Įkėlimui failas per didelis"
 
-#: templates/index.php:106
+#: templates/index.php:104
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje"
 
-#: templates/index.php:111
+#: templates/index.php:109
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, prašome palaukti."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Current scanning"
 msgstr "Šiuo metu skenuojama"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 8622a3a7a26..91d9a303f5e 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-30 00:04+0100\n"
-"PO-Revision-Date: 2012-12-29 23:05+0000\n"
+"POT-Creation-Date: 2013-01-12 00:09+0100\n"
+"PO-Revision-Date: 2013-01-11 23:09+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
-#: ajax/enableapp.php:12
+#: ajax/enableapp.php:11
 msgid "Could not enable app. "
 msgstr "Nepavyksta įjungti aplikacijos."
 
@@ -43,14 +43,6 @@ msgstr "El. paštas išsaugotas"
 msgid "Invalid email"
 msgstr "Netinkamas el. paštas"
 
-#: ajax/openid.php:13
-msgid "OpenID Changed"
-msgstr "OpenID pakeistas"
-
-#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20
-msgid "Invalid request"
-msgstr "Klaidinga užklausa"
-
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
 msgstr ""
@@ -67,6 +59,10 @@ msgstr ""
 msgid "Language changed"
 msgstr "Kalba pakeista"
 
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr "Klaidinga užklausa"
+
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
 msgstr ""