The branch, master has been updated via 5e4f8bff546e00d5982cf88955b37a9b1b64feb4 (commit) via cf8803fd44bdf508ee9c5b032be40ad48aa914bc (commit) via e3903233f82e348c870d64c1a923872839ffb1c1 (commit) via bd943b2ed97ccd8411764d3447bb1426e1f0cf1f (commit) via da57391c98ad82742f2104e327556efc8081fe28 (commit) via 6463f542cb49626744bce00d1cb70e3dc256798e (commit) via 33642bb9050e8bfb47c0b7250f386b0a50264ef0 (commit) via 3f4d65ba1e6dcb955f80b82395c9e4f8243335e5 (commit) via 13cf3f615e7a23a6f4c4ee6c23e6eba329015dca (commit) from d1684d6d965cbe2a029644c14871d668470dbad8 (commit)

- Log ----------------------------------------------------------------- commit 5e4f8bff546e00d5982cf88955b37a9b1b64feb4 Merge: d1684d6 cf8803f Author: Michal Čihař michal@cihar.com Date: Wed Aug 17 16:58:20 2011 +0200

Merge remote-tracking branch 'pootle/master'

commit cf8803fd44bdf508ee9c5b032be40ad48aa914bc Merge: e390323 79b5bd6 Author: Pootle server pootle@cihar.com Date: Wed Aug 17 16:40:13 2011 +0200

Merge remote-tracking branch 'origin/master'

commit e3903233f82e348c870d64c1a923872839ffb1c1 Merge: bd943b2 c04a557 Author: Pootle server pootle@cihar.com Date: Wed Aug 17 14:40:12 2011 +0200

Merge remote-tracking branch 'origin/master'

commit bd943b2ed97ccd8411764d3447bb1426e1f0cf1f Author: franz.georg franz.georg@neurieser.eu Date: Wed Aug 17 13:24:55 2011 +0200

Translation update done using Pootle.

commit da57391c98ad82742f2104e327556efc8081fe28 Author: franz.georg franz.georg@neurieser.eu Date: Wed Aug 17 13:23:37 2011 +0200

Translation update done using Pootle.

commit 6463f542cb49626744bce00d1cb70e3dc256798e Author: franz.georg franz.georg@neurieser.eu Date: Wed Aug 17 13:21:00 2011 +0200

Translation update done using Pootle.

commit 33642bb9050e8bfb47c0b7250f386b0a50264ef0 Author: franz.georg franz.georg@neurieser.eu Date: Wed Aug 17 13:16:58 2011 +0200

Translation update done using Pootle.

commit 3f4d65ba1e6dcb955f80b82395c9e4f8243335e5 Author: franz.georg franz.georg@neurieser.eu Date: Wed Aug 17 13:14:37 2011 +0200

Translation update done using Pootle.

commit 13cf3f615e7a23a6f4c4ee6c23e6eba329015dca Author: franz.georg franz.georg@neurieser.eu Date: Wed Aug 17 13:13:08 2011 +0200

Translation update done using Pootle.

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

Summary of changes: po/de.po | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/po/de.po b/po/de.po index 2c037fc..d8418ed 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-16 19:11+0200\n" -"PO-Revision-Date: 2011-08-13 02:00+0200\n" -"Last-Translator: Sven Strickroth email@cs-ware.de\n" +"PO-Revision-Date: 2011-08-17 13:24+0200\n" +"Last-Translator: franz.georg@neurieser.eu\n" "Language-Team: german de@li.org\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -415,10 +415,10 @@ msgid "You have to choose at least one column to display" msgstr "Bitte wählen Sie mindestens eine anzuzeigende Spalte"

#: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "Wechseln zu %svisual builder%s" +msgstr "Zu %svisual builder%s wechseln"

#: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:955 @@ -1132,10 +1132,9 @@ msgid "Query statistics" msgstr "Abfrage-Statistiken"

#: js/messages.php:93 -#, fuzzy #| msgid "Local monitor configuration icompatible" msgid "Local monitor configuration incompatible" -msgstr "Lokale Monitor-Konfiguration ist inkompatibel" +msgstr "Die lokale Bildschirmkonfiguration ist nicht kompatibel."

#: js/messages.php:94 msgid "" @@ -1694,7 +1693,7 @@ msgstr "Suche"

#: js/messages.php:264 msgid "Each point represents a data row." -msgstr "" +msgstr "Jeder Punkt stellt eine Datenreihe dar"

#: js/messages.php:266 msgid "Hovering over a point will show its label." @@ -1711,10 +1710,14 @@ msgstr "" #: js/messages.php:272 msgid "Click a data point to view and possibly edit the data row." msgstr "" +"Auf einen Datenpunkt klicken, um eine Datenzeile anzuzeigen bzw. zu " +"editieren."

#: js/messages.php:274 msgid "The plot can be resized by dragging it along the bottom right corner." msgstr "" +"Die Größe der Darstellung kann durch Ziehen in die rechte untere Ecke " +"verändert werden."

#: js/messages.php:276 msgid "Strings are converted into integer for plotting" @@ -1728,7 +1731,7 @@ msgstr "Spalten hinzufügen/entfernen"

#: js/messages.php:279 msgid "Select two different columns" -msgstr "" +msgstr "2 unterschiedliche Spalten auswählen"

#: js/messages.php:282 tbl_change.php:307 tbl_indexes.php:211 #: tbl_indexes.php:238

hooks/post-receive