The branch, master has been updated via 51ac7f9be25a43e8c6ea929d31c5d2e0548529ad (commit) via 31ac0a33f251d82e6145211cf36f23191f9237f0 (commit) via 0ff6c7e67b01a42881dfd50d7acc67adfb2555c2 (commit) via 6b51be97bdbe5bae80e04dd0123ec573e2501dd6 (commit) via d4094baa56060e0813e09112fa03b3bbcef69e9a (commit) via 6922d1b38043eeb250e5b6e8b8a13a52e1c11a6c (commit) via 84c8021a0e04a71cd04d64d021ebeb501259b10e (commit) via badc93d5d4eb2dcd02f6898e13977dafe11425db (commit) from 519024e05c16f6a586d139539b9c71dde08935bc (commit)

- Log ----------------------------------------------------------------- commit 51ac7f9be25a43e8c6ea929d31c5d2e0548529ad Merge: 31ac0a3 6b51be9 Author: Michal Čihař mcihar@suse.cz Date: Wed Jan 25 11:32:44 2012 +0100

Merge remote-tracking branch 'origin/QA_3_5'

commit 31ac0a33f251d82e6145211cf36f23191f9237f0 Merge: 0ff6c7e d4094ba Author: Michal Čihař mcihar@suse.cz Date: Wed Jan 25 11:32:38 2012 +0100

Merge commit 'd4094baa56060e0813e09112fa03b3bbcef69e9a'

commit 0ff6c7e67b01a42881dfd50d7acc67adfb2555c2 Merge: 519024e badc93d Author: Michal Čihař mcihar@suse.cz Date: Wed Jan 25 11:32:27 2012 +0100

Merge remote-tracking branch 'origin/QA_3_4'

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

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