The branch, master has been updated via e1854dd5422d5785ea7862c32a34a28584e8ebe9 (commit) via dd19a2a52a1bfde4e147ea71179307ec04367c20 (commit) via 6384eb46f276915436987e2d1ebecb5857e985a8 (commit) via db297164bb3c09d8f9ad760364e37a6d667ea5cc (commit) via 90b9a18d963ff80b1377847435c1a9ac43d967ee (commit) via cf11d843e91d2bccc1dbfcf3a7c54483dbac7f51 (commit) via c87ed3e2cd4c7029d0d197b3e6b91e207095ad0d (commit) via 279f87e0f45c163bf20b3e48c691c866b3fcbe31 (commit) via 5d5df720f2c59cbcbf56462e0a203a2f98318e1b (commit) via 5bad07fd9d65a3629c28965f5b1f0eb296b7b533 (commit) via 224d8e8538c93869c13db552b0cdd5960509c83d (commit) via 83d204bf51cad68eb70f813dc12bbaa6b76bda5d (commit) via 59de8f4a3f613c84c9c96a3b70f54bae0019d913 (commit) via eee9fe033fe459311217043cc367f737a5eeaf85 (commit) via b5cba3fff9c85e954324e4f6404d30d5c947aacf (commit) via 1a40befe3ae2c491dd500491b44b63c13d20f052 (commit) from 36fd3ce68bb5f841e49468058ad27136b026e7de (commit)
- Log ----------------------------------------------------------------- commit e1854dd5422d5785ea7862c32a34a28584e8ebe9 Merge: 36fd3ce68bb5f841e49468058ad27136b026e7de dd19a2a52a1bfde4e147ea71179307ec04367c20 Author: Michal Čihař mcihar@novell.com Date: Tue May 25 13:35:44 2010 +0200
Merge remote branch 'pootle/master'
Conflicts: po/de.po
commit dd19a2a52a1bfde4e147ea71179307ec04367c20 Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:34:21 2010 +0200
Translation update done using Pootle.
commit 6384eb46f276915436987e2d1ebecb5857e985a8 Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:33:15 2010 +0200
Translation update done using Pootle.
commit db297164bb3c09d8f9ad760364e37a6d667ea5cc Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:32:28 2010 +0200
Translation update done using Pootle.
commit 90b9a18d963ff80b1377847435c1a9ac43d967ee Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:32:15 2010 +0200
Translation update done using Pootle.
commit cf11d843e91d2bccc1dbfcf3a7c54483dbac7f51 Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:31:41 2010 +0200
Translation update done using Pootle.
commit c87ed3e2cd4c7029d0d197b3e6b91e207095ad0d Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:31:29 2010 +0200
Translation update done using Pootle.
commit 279f87e0f45c163bf20b3e48c691c866b3fcbe31 Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:31:00 2010 +0200
Translation update done using Pootle.
commit 5d5df720f2c59cbcbf56462e0a203a2f98318e1b Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:30:42 2010 +0200
Translation update done using Pootle.
commit 5bad07fd9d65a3629c28965f5b1f0eb296b7b533 Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:29:13 2010 +0200
Translation update done using Pootle.
commit 224d8e8538c93869c13db552b0cdd5960509c83d Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:28:00 2010 +0200
Translation update done using Pootle.
commit 83d204bf51cad68eb70f813dc12bbaa6b76bda5d Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:27:02 2010 +0200
Translation update done using Pootle.
commit 59de8f4a3f613c84c9c96a3b70f54bae0019d913 Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:26:30 2010 +0200
Translation update done using Pootle.
commit eee9fe033fe459311217043cc367f737a5eeaf85 Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:25:56 2010 +0200
Translation update done using Pootle.
commit b5cba3fff9c85e954324e4f6404d30d5c947aacf Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:25:21 2010 +0200
Translation update done using Pootle.
commit 1a40befe3ae2c491dd500491b44b63c13d20f052 Author: torsten.funck torsten.funck@googlemail.com Date: Tue May 25 13:24:37 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/de.po | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/po/de.po b/po/de.po index 5e1dc85..1e73453 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@lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-25 13:21+0200\n" -"PO-Revision-Date: 2010-05-25 13:22+0200\n" +"PO-Revision-Date: 2010-05-25 13:34+0200\n" "Last-Translator: torsten.funck@googlemail.com\n" "Language-Team: german de@li.org\n" "Language: de\n" @@ -7440,10 +7440,14 @@ msgid "" "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for " "no support. Suggested: [kbd]phpmyadmin[/kbd]" msgstr "" +"Datenbank für Relationen, Bookmarks, and PDF Features. Siehe " +"[a@http://wiki.phpmyadmin.net/pma/pmadb%5Dpmadb%5B/a] für komplette " +"Information. Leer lassen für keien Unterstützung. Vorschlag: " +"[kbd]phpmyadmin[/kbd]"
#: setup/lib/messages.inc.php:294 msgid "Port on which MySQL server is listening, leave empty for default" -msgstr "" +msgstr "Port, auf dem der MySQL-Server horcht, leer lassen für Voreinstellung"
#: setup/lib/messages.inc.php:295 msgid "Server port" @@ -7454,6 +7458,8 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation%5Drelation-links" "[/a] support, suggested: [kbd]pma_relation[/kbd]" msgstr "" +"Leer lassen für keine [a@http://wiki.phpmyadmin.net/pma/relation%5Drelation-" +"links[/a] Unterstützung, Vorschlag: [kbd]pma_relation[/kbd]"
#: setup/lib/messages.inc.php:297 msgid "Relation table" @@ -7461,7 +7467,7 @@ msgstr "Relation Table"
#: setup/lib/messages.inc.php:298 msgid "SQL command to fetch available databases" -msgstr "" +msgstr "SQL Komando, um verfügbare Datenbanken abzurufen"
#: setup/lib/messages.inc.php:299 msgid "SHOW DATABASES command" @@ -7472,6 +7478,8 @@ msgid "" "See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon%5Dauthentication types" "[/a] for an example" msgstr "" +"Siehe [a@http://wiki.phpmyadmin.net/pma/auth_types#signon%5Dauthentication " +"types[/a] für ein Beispiel"
#: setup/lib/messages.inc.php:301 msgid "Signon session name" @@ -7486,6 +7494,8 @@ msgid "" "Whether the tracking mechanism creates versions for tables and views " "automatically." msgstr "" +"Automatische Versionserstellung für Tabellen und Ansichten durch den " +"Verlaufs-mechanismus"
#: setup/lib/messages.inc.php:304 #| msgid "Automatic recovery mode" @@ -7495,6 +7505,8 @@ msgstr "Versionen automatisch erzeugen" #: setup/lib/messages.inc.php:305 msgid "Defines the list of statements the auto-creation uses for new versions." msgstr "" +"Legt die Liste der Statements fest, die die automatische Versionserstellung " +"für neue Versionen verwendeet"
#: setup/lib/messages.inc.php:306 #| msgid "Statements" @@ -7506,30 +7518,36 @@ msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view." msgstr "" +"DROP VIEW IF EXISTS statement beim Erstellen einer neuen Ansicht als erste " +"Zeile loggen"
#: setup/lib/messages.inc.php:308 msgid "Add DROP VIEW" -msgstr "" +msgstr "DROP VIEW hinzufügen"
#: setup/lib/messages.inc.php:309 msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table." msgstr "" +"DROP TABLE IF EXISTS statement beim Erstellen einer neuen Ansicht als erste " +"Zeile loggen"
#: setup/lib/messages.inc.php:310 msgid "Add DROP TABLE" -msgstr "" +msgstr "DROP TABLE hinzufügen"
#: setup/lib/messages.inc.php:311 msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." msgstr "" +"DROP DATABASE IF EXISTS statement beim Erstellen einer neuen Datenbank als " +"erste Zeile loggen"
#: setup/lib/messages.inc.php:312 msgid "Add DROP DATABASE" -msgstr "" +msgstr "DROP DATABASE hinzufügen"
#: setup/lib/messages.inc.php:313 msgid "You should use SSL connections if your web server supports it" @@ -7538,7 +7556,7 @@ msgstr ""
#: setup/lib/messages.inc.php:314 msgid "Socket on which MySQL server is listening, leave empty for default" -msgstr "" +msgstr "Socket, auf dem der MySQL-Server horcht, leer lassen für Voreinstellung"
#: setup/lib/messages.inc.php:315 msgid "Server socket" @@ -7556,6 +7574,8 @@ msgstr "Benutze SSL" msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]" msgstr "" +"Leer lassen für keine PDF Schema Unterstützung, Vorschlag: " +"[kbd]pma_table_coords[/kbd]"
#: setup/lib/messages.inc.php:319 msgid "PDF schema: table coordinates"
hooks/post-receive
-
Michal Čihař