Merge branch 'master' into ocs_api

Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot

1 files changed, 77 insertions, 53 deletions

diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index f963f93caf9..1d2ba8f01d2 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"POT-Creation-Date: 2012-12-30 00:04+0100\n"
+"PO-Revision-Date: 2012-12-29 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -121,29 +121,29 @@ msgstr "Vizualizează pagina applicației pe apps.owncloud.com"
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>"
 
-#: templates/help.php:9
-msgid "Documentation"
-msgstr "Documetație"
+#: templates/help.php:3
+msgid "User Documentation"
+msgstr ""
 
-#: templates/help.php:10
-msgid "Managing Big Files"
-msgstr "Gestionînd fișiere mari"
+#: templates/help.php:4
+msgid "Administrator Documentation"
+msgstr ""
 
-#: templates/help.php:11
-msgid "Ask a question"
-msgstr "Întreabă"
+#: templates/help.php:6
+msgid "Online Documentation"
+msgstr ""
 
-#: templates/help.php:22
-msgid "Problems connecting to help database."
-msgstr "Probleme de conectare la baza de date."
+#: templates/help.php:7
+msgid "Forum"
+msgstr ""
 
-#: templates/help.php:23
-msgid "Go there manually."
-msgstr "Pe cale manuală."
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
 
-#: templates/help.php:31
-msgid "Answer"
-msgstr "Răspuns"
+#: templates/help.php:11
+msgid "Commercial Support"
+msgstr ""
 
 #: templates/personal.php:8
 #, php-format
@@ -151,62 +151,82 @@ msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
 #: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr "Clienți de sincronizare pentru telefon mobil și desktop"
+msgid "Clients"
+msgstr "Clienți"
 
 #: templates/personal.php:13
-msgid "Download"
-msgstr "Descărcări"
+msgid "Download Desktop Clients"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Download Android Client"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Download iOS Client"
+msgstr ""
 
-#: templates/personal.php:19
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+msgid "Password"
+msgstr "Parolă"
+
+#: templates/personal.php:22
 msgid "Your password was changed"
 msgstr "Parola a fost modificată"
 
-#: templates/personal.php:20
+#: templates/personal.php:23
 msgid "Unable to change your password"
 msgstr "Imposibil de-ați schimbat parola"
 
-#: templates/personal.php:21
+#: templates/personal.php:24
 msgid "Current password"
 msgstr "Parola curentă"
 
-#: templates/personal.php:22
+#: templates/personal.php:25
 msgid "New password"
 msgstr "Noua parolă"
 
-#: templates/personal.php:23
+#: templates/personal.php:26
 msgid "show"
 msgstr "afișează"
 
-#: templates/personal.php:24
+#: templates/personal.php:27
 msgid "Change password"
 msgstr "Schimbă parola"
 
-#: templates/personal.php:30
+#: templates/personal.php:33
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:31
+#: templates/personal.php:34
 msgid "Your email address"
 msgstr "Adresa ta de email"
 
-#: templates/personal.php:32
+#: templates/personal.php:35
 msgid "Fill in an email address to enable password recovery"
 msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
 
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:41 templates/personal.php:42
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Help translate"
 msgstr "Ajută la traducere"
 
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "folosește această adresă pentru a te conecta la managerul tău de fișiere din ownCloud"
+#: templates/personal.php:52
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:54
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/personal.php:63
+msgid "Version"
+msgstr ""
 
-#: templates/personal.php:61
+#: templates/personal.php:65
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,15 +236,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/users.php:21 templates/users.php:76
+#: templates/users.php:21 templates/users.php:81
 msgid "Name"
 msgstr "Nume"
 
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
-msgstr "Parolă"
-
-#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+#: templates/users.php:26 templates/users.php:83 templates/users.php:103
 msgid "Groups"
 msgstr "Grupuri"
 
@@ -233,21 +249,29 @@ msgid "Create"
 msgstr "Crează"
 
 #: templates/users.php:35
-msgid "Default Quota"
-msgstr "Cotă implicită"
+msgid "Default Storage"
+msgstr ""
 
-#: templates/users.php:55 templates/users.php:138
+#: templates/users.php:42 templates/users.php:138
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:60 templates/users.php:153
 msgid "Other"
 msgstr "Altele"
 
-#: templates/users.php:80 templates/users.php:112
+#: templates/users.php:85 templates/users.php:117
 msgid "Group Admin"
 msgstr "Grupul Admin "
 
-#: templates/users.php:82
-msgid "Quota"
-msgstr "Cotă"
+#: templates/users.php:87
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:133
+msgid "Default"
+msgstr ""
 
-#: templates/users.php:146
+#: templates/users.php:161
 msgid "Delete"
 msgstr "Șterge"