The branch, QA_3_5 has been updated via 6b51be97bdbe5bae80e04dd0123ec573e2501dd6 (commit) via 6922d1b38043eeb250e5b6e8b8a13a52e1c11a6c (commit) via 84c8021a0e04a71cd04d64d021ebeb501259b10e (commit) from d4094baa56060e0813e09112fa03b3bbcef69e9a (commit)

- Log ----------------------------------------------------------------- commit 6b51be97bdbe5bae80e04dd0123ec573e2501dd6 Merge: 6922d1b d4094ba Author: Pootle server pootle@cihar.com Date: Wed Jan 25 11:29:51 2012 +0100

Merge remote-tracking branch 'origin/QA_3_5'

commit 6922d1b38043eeb250e5b6e8b8a13a52e1c11a6c Author: Domen dbc334@gmail.com Date: Tue Jan 24 23:36:13 2012 +0200

Translation update done using Pootle.

commit 84c8021a0e04a71cd04d64d021ebeb501259b10e Author: Domen dbc334@gmail.com Date: Tue Jan 24 23:36:06 2012 +0200

Translation update done using Pootle.

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

Summary of changes: po/sl.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/po/sl.po b/po/sl.po index f971383..9889505 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-22 04:34-0500\n" -"PO-Revision-Date: 2012-01-19 21:28+0200\n" +"PO-Revision-Date: 2012-01-24 23:36+0200\n" "Last-Translator: Domen dbc334@gmail.com\n" "Language-Team: slovenian sl@li.org\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.1.6\n"

#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:350 @@ -7704,7 +7704,6 @@ msgid "Trigger name" msgstr "Ime sprožilca"

#: libraries/rte/rte_triggers.lib.php:326 -#, fuzzy #| msgid "Time" msgctxt "Trigger action time" msgid "Time"

hooks/post-receive