25 May
2010
25 May
'10
2:37 p.m.
The branch, master has been updated
via c6c0e360bbfe98a7181ad4ff3005f9382924b531 (commit)
via d8d0607a154007326ef0dcf4491387d10735bd2f (commit)
via 91e61585ddb63b26adb784bb48339337098b8c9f (commit)
from e1854dd5422d5785ea7862c32a34a28584e8ebe9 (commit)
- Log -----------------------------------------------------------------
commit c6c0e360bbfe98a7181ad4ff3005f9382924b531
Merge: e1854dd5422d5785ea7862c32a34a28584e8ebe9 d8d0607a154007326ef0dcf4491387d10735bd2f
Author: Michal Čihař <mcihar(a)novell.com>
Date: Tue May 25 13:37:28 2010 +0200
Merge remote branch 'pootle/master'
Conflicts:
po/de.po
commit d8d0607a154007326ef0dcf4491387d10735bd2f
Author: torsten.funck <torsten.funck(a)googlemail.com>
Date: Tue May 25 13:35:50 2010 +0200
Translation update done using Pootle.
commit 91e61585ddb63b26adb784bb48339337098b8c9f
Author: torsten.funck <torsten.funck(a)googlemail.com>
Date: Tue May 25 13:35:32 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/de.po | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/po/de.po b/po/de.po
index 1e73453..14f79ca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-05-25 13:21+0200\n"
-"PO-Revision-Date: 2010-05-25 13:34+0200\n"
+"PO-Revision-Date: 2010-05-25 13:35+0200\n"
"Last-Translator: <torsten.funck(a)googlemail.com>\n"
"Language-Team: german <de(a)li.org>\n"
"Language: de\n"
@@ -7586,6 +7586,8 @@ msgid ""
"Table to describe the display fields, leave blank for no support; suggested:
"
"[kbd]pma_table_info[/kbd]"
msgstr ""
+"Tabelle zur Beschreibung der Anzeigefelder, leer lassen für keine "
+"Unterstützung; Vorschlag: [kbd]pma_table_info[/kbd]"
#: setup/lib/messages.inc.php:321
msgid "Display fields table"
@@ -7593,7 +7595,7 @@ msgstr "Table Info Table"
#: setup/lib/messages.inc.php:323
msgid "User for config auth"
-msgstr "Benutername für config Authentifikation"
+msgstr "Benutzername für config Authentifikation"
#: setup/lib/messages.inc.php:324
msgid ""
hooks/post-receive
--
phpMyAdmin