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

2 files changed, 24 insertions, 36 deletions

diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 215cf358d96..dcab9dffb3a 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 16:01+0000\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,11 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/share.php:112 ajax/share.php:154
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,19 +42,6 @@ msgstr ""
 msgid "Updated database"
 msgstr "Bază de date actualizată"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -305,11 +296,11 @@ msgid "Share"
 msgstr "Partajează"
 
 #: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
-#: js/share.js:723 templates/installation.php:10
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Eroare"
 
-#: js/share.js:160 js/share.js:755
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
@@ -425,19 +416,19 @@ msgstr "Protejare cu parolă"
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:723
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:742
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Se expediază..."
 
-#: js/share.js:753
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Mesajul a fost expediat"
 
-#: js/share.js:777
+#: js/share.js:789
 msgid "Warning"
 msgstr "Atenție"
 
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index da074905ad9..2558dc5b3f4 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# andreiacob <andrei.iacob@y7mail.com>, 2014
 # roentgen <arthur.titeica@gmail.com>, 2014
 # corneliu.e <corneliueva@yahoo.com>, 2013
 # dimaursu16 <dima@ceata.org>, 2013
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 16:10+0000\n"
-"Last-Translator: roentgen <arthur.titeica@gmail.com>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +77,7 @@ msgstr ""
 
 #: ajax/newfile.php:155
 msgid "Error when creating the file"
-msgstr ""
+msgstr "Eroare la crearea fisierului"
 
 #: ajax/newfolder.php:21
 msgid "Folder name cannot be empty."
@@ -84,7 +85,7 @@ msgstr ""
 
 #: ajax/newfolder.php:65
 msgid "Error when creating the folder"
-msgstr ""
+msgstr "Eroare la crearea folderului"
 
 #: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
@@ -177,7 +178,7 @@ msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerup
 
 #: js/file-upload.js:562
 msgid "URL cannot be empty"
-msgstr ""
+msgstr "URL nu poate fi gol"
 
 #: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
@@ -189,11 +190,11 @@ msgstr "{new_name} există deja"
 
 #: js/file-upload.js:634
 msgid "Could not create file"
-msgstr ""
+msgstr "Nu s-a putut crea fisierul"
 
 #: js/file-upload.js:650
 msgid "Could not create folder"
-msgstr ""
+msgstr "Nu s-a putut crea folderul"
 
 #: js/file-upload.js:700
 msgid "Error fetching URL"
@@ -217,7 +218,7 @@ msgstr "În așteptare"
 
 #: js/filelist.js:456
 msgid "Could not rename file"
-msgstr ""
+msgstr "Nu s-a putut redenumi fisierul"
 
 #: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
@@ -392,7 +393,7 @@ msgstr "Anulează încărcarea"
 
 #: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "Nu aveti permisiunea de a incarca sau crea fisiere aici"
 
 #: templates/index.php:57
 msgid "Nothing in here. Upload something!"
@@ -423,7 +424,3 @@ msgstr "Fișierele sunt scanate, te rog așteaptă."
 #: templates/index.php:108
 msgid "Current scanning"
 msgstr "În curs de scanare"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Actualizare fișiere de sistem cache..."