Merge remote branch 'pootle/master'

Conflicts:
	po/sl.po
This commit is contained in:
Michal Čihař 2010-12-01 09:53:12 +01:00
commit 48a5309632

View File

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2010-11-30 12:47-0500\n"
"POT-Creation-Date: 2010-11-20 07:34-0500\n"
"PO-Revision-Date: 2010-11-30 17:31+0200\n"
"Last-Translator: Domen <dbc334@gmail.com>\n"
"Language-Team: slovenian <sl@li.org>\n"