The branch, master has been updated via 40c48e0853c1188584962cc2acfca94968d0e9ac (commit) via d832827f882e2021bae8e2d25f03c8de4adb0c27 (commit) via cc10a7635b9b1494904ce567c390213719c3b240 (commit) via b1476d9d2c6c1e190a2385fce05d04c5403690ea (commit) via 35a616c3c1b7224b0ec57d41f574b85a41481746 (commit) from 48a5309632cb47055dd6d9cec66718a99875f6bb (commit)

- Log ----------------------------------------------------------------- commit 40c48e0853c1188584962cc2acfca94968d0e9ac Merge: d832827f882e2021bae8e2d25f03c8de4adb0c27 35a616c3c1b7224b0ec57d41f574b85a41481746 Author: Michal Čihař mcihar@novell.com Date: Wed Dec 1 10:38:00 2010 +0100

Merge remote branch 'pootle/master'

Conflicts: po/nl.po

commit d832827f882e2021bae8e2d25f03c8de4adb0c27 Merge: 48a5309632cb47055dd6d9cec66718a99875f6bb cc10a7635b9b1494904ce567c390213719c3b240 Author: Michal Čihař mcihar@novell.com Date: Wed Dec 1 10:37:44 2010 +0100

Merge branch 'QA_3_4'

Conflicts: po/nl.po

commit 35a616c3c1b7224b0ec57d41f574b85a41481746 Author: Herman van Rink rink@initfour.nl Date: Wed Dec 1 10:52:01 2010 +0200

Translation update done using Pootle.

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

Summary of changes: po/nl.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/po/nl.po b/po/nl.po index 7bb7033..0d4105f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -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"

hooks/post-receive