The branch, QA_3_5 has been updated via 0e3ce19cb01ee4bea7471eb30832e6640381d5a1 (commit) via b321d86ba0dbe5270de3983a0bba9eab9436ffe7 (commit) via c01d0c2d0e9ce71722a43bbb523ba824afd447a6 (commit) via fcda33478bf53319dfea9e7f07eb51a435c5a5e1 (commit) via eaa6bc049bf996efb41500aa4f5fcd371e17b772 (commit) via dc64dd47072722766505517092ca4825ad160bb1 (commit) via 123516c35f8b585562d3d01feadc89d1ce567020 (commit) via 7b159c91540084ef67888226161a53ef4369688d (commit) from 83a1844245d2536ed0d96929728948b21605df19 (commit)

- Log ----------------------------------------------------------------- commit 0e3ce19cb01ee4bea7471eb30832e6640381d5a1 Merge: 83a1844 b321d86 Author: Michal Čihař michal@cihar.com Date: Tue Jan 31 11:13:35 2012 +0100

Merge remote-tracking branch 'pootle/master' into QA_3_5

Conflicts: po/ro.po

commit b321d86ba0dbe5270de3983a0bba9eab9436ffe7 Author: alexukf alex.ukf@gmail.com Date: Tue Jan 31 12:12:17 2012 +0200

Translation update done using Pootle.

commit c01d0c2d0e9ce71722a43bbb523ba824afd447a6 Author: alexukf alex.ukf@gmail.com Date: Tue Jan 31 12:10:52 2012 +0200

Translation update done using Pootle.

commit fcda33478bf53319dfea9e7f07eb51a435c5a5e1 Author: alexukf alex.ukf@gmail.com Date: Tue Jan 31 12:10:08 2012 +0200

Translation update done using Pootle.

commit eaa6bc049bf996efb41500aa4f5fcd371e17b772 Author: alexukf alex.ukf@gmail.com Date: Tue Jan 31 12:10:01 2012 +0200

Translation update done using Pootle.

commit dc64dd47072722766505517092ca4825ad160bb1 Author: alexukf alex.ukf@gmail.com Date: Tue Jan 31 12:09:21 2012 +0200

Translation update done using Pootle.

commit 123516c35f8b585562d3d01feadc89d1ce567020 Author: alexukf alex.ukf@gmail.com Date: Tue Jan 31 12:07:29 2012 +0200

Translation update done using Pootle.

commit 7b159c91540084ef67888226161a53ef4369688d Author: alexukf alex.ukf@gmail.com Date: Tue Jan 31 12:06:03 2012 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: po/ro.po | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/po/ro.po b/po/ro.po index 3d98eb5..0dd4586 100644 --- a/po/ro.po +++ b/po/ro.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-31 11:09+0100\n" -"PO-Revision-Date: 2012-01-31 12:01+0200\n" +"PO-Revision-Date: 2012-01-31 12:10+0200\n" "Last-Translator: alexukf alex.ukf@gmail.com\n" "Language-Team: romanian ro@li.org\n" "Language: ro\n" @@ -4445,28 +4445,31 @@ msgstr "Ținta link-ului din logo"

#: libraries/config/messages.inc.php:288 msgid "Highlight server under the mouse cursor" -msgstr "" +msgstr "Evidenţiaţi server-ul deasupra căruia se află cursorul mouse-ului"

+# Activați evidențierea #: libraries/config/messages.inc.php:289 msgid "Enable highlighting" -msgstr "" +msgstr "Activați highlighting-ul"

#: libraries/config/messages.inc.php:290 msgid "Maximum number of recently used tables; set 0 to disable" -msgstr "" +msgstr "Numărul maxim de tabele recent folosite; setați 0 pentru dezactivare"

#: libraries/config/messages.inc.php:291 -#, fuzzy msgid "Recently used tables" -msgstr "Tabele fără monitorizare" +msgstr "Tabele recent folosite"

+# Folosiți file mai puțin intense grafic #: libraries/config/messages.inc.php:292 msgid "Use less graphically intense tabs" -msgstr "" +msgstr "Folosiți tab-uri mai puțin intense grafic"

+# File ușoare #: libraries/config/messages.inc.php:293 +#, fuzzy msgid "Light tabs" -msgstr "" +msgstr "Tab-uri ușoare"

#: libraries/config/messages.inc.php:294 msgid ""

hooks/post-receive