Merge branch 'QA_3_4'

Conflicts:
	po/nl.po
This commit is contained in:
Michal Čihař
2010-12-01 10:37:44 +01:00

View File

@@ -4,7 +4,7 @@ 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"
"PO-Revision-Date: 2010-11-30 16:19+0200\n"
"PO-Revision-Date: 2010-12-01 10:52+0200\n"
"Last-Translator: Herman van Rink <rink@initfour.nl>\n"
"Language-Team: dutch <nl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -98,7 +98,6 @@ msgid "No blob streaming server configured!"
msgstr "Geen blob streaming server geconfigureerd!"
#: bs_disp_as_mime_type.php:35
#, fuzzy
#| msgid "Failed to write file to disk."
msgid "Failed to fetch headers"
msgstr "Ophalen van headers mislukt"