1 files changed, 67 insertions, 26 deletions

diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 171346b912a..5e6a50773fd 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:33+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-09-22 12:55-0400\n"
+"PO-Revision-Date: 2013-09-21 20:00+0000\n"
+"Last-Translator: corneliu.e <corneliueva@yahoo.com>\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"
@@ -40,7 +40,7 @@ msgstr ""
 
 #: ajax/update.php:17
 msgid "Updated database"
-msgstr ""
+msgstr "Bază de date actualizată"
 
 #: ajax/update.php:20
 msgid "Updating filecache, this may take really long..."
@@ -100,11 +100,11 @@ msgstr ""
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
-msgstr ""
+msgstr "Tip fișier necunoscut"
 
 #: avatar/controller.php:85
 msgid "Invalid image"
-msgstr ""
+msgstr "Imagine invalidă"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
@@ -194,59 +194,59 @@ msgstr "Decembrie"
 msgid "Settings"
 msgstr "Setări"
 
-#: js/js.js:853
+#: js/js.js:866
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/js.js:854
+#: js/js.js:867
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "acum %n minut"
+msgstr[1] "acum %n minute"
+msgstr[2] "acum %n minute"
 
-#: js/js.js:855
+#: js/js.js:868
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "acum %n oră"
+msgstr[1] "acum %n ore"
+msgstr[2] "acum %n ore"
 
-#: js/js.js:856
+#: js/js.js:869
 msgid "today"
 msgstr "astăzi"
 
-#: js/js.js:857
+#: js/js.js:870
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:858
+#: js/js.js:871
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "acum %n zi"
+msgstr[1] "acum %n zile"
+msgstr[2] "acum %n zile"
 
-#: js/js.js:859
+#: js/js.js:872
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/js.js:860
+#: js/js.js:873
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:861
+#: js/js.js:874
 msgid "months ago"
 msgstr "luni în urmă"
 
-#: js/js.js:862
+#: js/js.js:875
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:863
+#: js/js.js:876
 msgid "years ago"
 msgstr "ani în urmă"
 
@@ -274,6 +274,47 @@ msgstr "Ok"
 msgid "Error loading message template: {error}"
 msgstr ""
 
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr "Un conflict de fișier"
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr "Ce fișiere vrei să păstrezi?"
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa."
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Anulare"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr "Continuă"
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."