[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4075-g80896af - Git

25 May 2010

The branch, master has been updated
       via  80896af172b5c3ec6fabc5cda153cf895430a0ca (commit)
       via  5dd82ed4842d1d1c4df39925554f57405be26ec5 (commit)
       via  19d2e17bb05e00fa0a323093de646c2493372c83 (commit)
       via  d765eaf3e6a743abd3098960e3fea3a431c8efef (commit)
       via  e5789c378b0829d581051940031f56b11c724ba1 (commit)
       via  e0e8013cb3ce41f7185c9d70a8948922be395c6a (commit)
       via  511d695d3c854cca3bb377f0b7db5653959cb743 (commit)
       via  d391c8b73fe9821b9c5682a08b8ec6ee3b12b548 (commit)
       via  84107e992a1999409ea167ac6cf76bc640479d35 (commit)
       via  5118bf0de65c2a7c53e5c5cdf64c0f89c6abf710 (commit)
       via  9ed3a8955701906a664b7ce8e9dffdff6ee38164 (commit)
       via  ac09398ad6ac949344122a882f1b56c2b8796d03 (commit)
       via  b76a83878e773ba0c81ba58448a762aa40461d24 (commit)
       via  a273966967a1e3d88e341eca978b968a2b9b74d9 (commit)
       via  f1a4404e8ed60acad8b7fbcca876d0bfaf3d220c (commit)
       via  3c3cdc43520a969d43e80b374638b11abccab865 (commit)
       via  ed626b183f102011082fc75f9979fac88df64673 (commit)
       via  3bcab4810928903f54d76f3ce95b7db14e2aa9ec (commit)
       via  119dc2e30e24e5d9ce934b81c3d5fcc5e0384f58 (commit)
      from  93ca7a35442543e01be130d072224b149f6b4b2c (commit)
- Log -----------------------------------------------------------------
commit 80896af172b5c3ec6fabc5cda153cf895430a0ca
Merge: 5dd82ed4842d1d1c4df39925554f57405be26ec5 19d2e17bb05e00fa0a323093de646c2493372c83
Author: Michal Čihař mcihar@novell.com
Date:   Tue May 25 14:26:27 2010 +0200
Merge remote branch 'pootle/master'
commit 5dd82ed4842d1d1c4df39925554f57405be26ec5
Author: Michal Čihař mcihar@novell.com
Date:   Tue May 25 14:26:05 2010 +0200
Use ngettext.
commit 19d2e17bb05e00fa0a323093de646c2493372c83
Author: Michal Čihař michal@cihar.com
Date:   Tue May 25 14:23:20 2010 +0200
Translation update done using Pootle.
commit d765eaf3e6a743abd3098960e3fea3a431c8efef
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:21:09 2010 +0200
Translation update done using Pootle.
commit e5789c378b0829d581051940031f56b11c724ba1
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:20:10 2010 +0200
Translation update done using Pootle.
commit e0e8013cb3ce41f7185c9d70a8948922be395c6a
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:19:48 2010 +0200
Translation update done using Pootle.
commit 511d695d3c854cca3bb377f0b7db5653959cb743
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:19:25 2010 +0200
Translation update done using Pootle.
commit d391c8b73fe9821b9c5682a08b8ec6ee3b12b548
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:18:55 2010 +0200
Translation update done using Pootle.
commit 84107e992a1999409ea167ac6cf76bc640479d35
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:18:47 2010 +0200
Translation update done using Pootle.
commit 5118bf0de65c2a7c53e5c5cdf64c0f89c6abf710
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:18:29 2010 +0200
Translation update done using Pootle.
commit 9ed3a8955701906a664b7ce8e9dffdff6ee38164
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:18:12 2010 +0200
Translation update done using Pootle.
commit ac09398ad6ac949344122a882f1b56c2b8796d03
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:17:48 2010 +0200
Translation update done using Pootle.
commit b76a83878e773ba0c81ba58448a762aa40461d24
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:17:13 2010 +0200
Translation update done using Pootle.
commit a273966967a1e3d88e341eca978b968a2b9b74d9
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:16:59 2010 +0200
Translation update done using Pootle.
commit f1a4404e8ed60acad8b7fbcca876d0bfaf3d220c
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:16:34 2010 +0200
Translation update done using Pootle.
commit 3c3cdc43520a969d43e80b374638b11abccab865
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:16:16 2010 +0200
Translation update done using Pootle.
commit ed626b183f102011082fc75f9979fac88df64673
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:15:48 2010 +0200
Translation update done using Pootle.
commit 3bcab4810928903f54d76f3ce95b7db14e2aa9ec
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:15:27 2010 +0200
Translation update done using Pootle.
commit 119dc2e30e24e5d9ce934b81c3d5fcc5e0384f58
Author: torsten.funck torsten.funck@googlemail.com
Date:   Tue May 25 14:14:59 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 db_printview.php |    2 +-
 db_structure.php |    2 +-
 po/cs.po         |    4 +++-
 po/de.po         |   36 +++++++++++++++++++-----------------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/db_printview.php b/db_printview.php
index d1ed79c..e91c04c 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -219,7 +219,7 @@ else {
     ?>
 <tr>
     <th align="center">
-        <?php echo sprintf(__('%s table(s)'), PMA_formatNumber($num_tables, 0)); ?>
+        <?php echo sprintf(_ngettext('%s table', '%s tables', $num_tables), PMA_formatNumber($num_tables, 0)); ?>
     </th>
     <th align="right" nowrap="nowrap">
         <?php echo PMA_formatNumber($sum_entries, 0); ?>
diff --git a/db_structure.php b/db_structure.php
index 0fa4873..65b78b7 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -477,7 +477,7 @@ if ($is_show_stats) {
             if ($num_tables == 0)
                 $tableReductionCount = 0;
-            echo sprintf(__('%s table(s)'), PMA_formatNumber($num_tables - $tableReductionCount, 0));
+            echo sprintf(_ngettext('%s table', '%s tables', $num_tables - $tableReductionCount), PMA_formatNumber($num_tables - $tableReductionCount, 0));
         ?>
     </th>
     <?php
diff --git a/po/cs.po b/po/cs.po
index 5c7a7af..dbbff97 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,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-22 14:33+0200\n"
+"PO-Revision-Date: 2010-05-25 14:23+0200\n"
 "Last-Translator: Michal michal@cihar.com\n"
 "Language-Team: czech cs@li.org\n"
 "Language: cs\n"
@@ -4772,6 +4772,8 @@ msgid ""
 "Converts an (IPv4) Internet network address into a string in Internet "
 "standard dotted format."
 msgstr ""
+"Převede internetovou síťovou adresu (IPv4) na text ve standardním formátu "
+"odděleném tečkami."
#: libraries/transformations/text_plain__sql.inc.php:10
 msgid "Formats text as SQL query with syntax highlighting."
diff --git a/po/de.po b/po/de.po
index fd8ab52..96f6deb 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 14:14+0200\n"
+"PO-Revision-Date: 2010-05-25 14:21+0200\n"
 "Last-Translator:  torsten.funck@googlemail.com\n"
 "Language-Team: german de@li.org\n"
 "Language: de\n"
@@ -7625,8 +7625,8 @@ msgstr "Serverbezeichnung"
 msgid ""
 "Whether a user should be displayed a &quot;show all (records)&quot; button"
 msgstr ""
-"Soll dem Benutzer ein &quot;show all (records)&quot; Button angezeigt "
-"werden?"
+"Ob dem Benutzer ein &quot;show all (records)&quot; Button angezeigt werden "
+"soll"
#: setup/lib/messages.inc.php:330
 msgid "Allow to display all the rows"
@@ -7639,8 +7639,8 @@ msgid ""
 "file; this does not limit the ability to execute the same command directly"
 msgstr ""
 "Bitte beachten, dass das Einschalten bei [kbd]config[/kbd] authentication "
-"mode keine Wirkung hat, da das Passwort in der Konfigurationsdatei steht. "
-"Dieses beschränkt nicht die Möglichkeit der direkten Ausführung des selben "
+"mode keine Wirkung hat, da das Passwort in der Konfigurationsdatei steht; "
+"dieses beschränkt nicht die Möglichkeit der direkten Ausführung des selben "
 "Befehls."
#: setup/lib/messages.inc.php:332
@@ -7657,7 +7657,7 @@ msgstr "Zeige Formular"
#: setup/lib/messages.inc.php:335
 msgid "Display the function fields in edit/insert mode"
-msgstr "Im Bearbeiten / Einfügen Modus Funktionsfelder anzeigen"
+msgstr "Im Bearbeiten/Einfügen Modus Funktionsfelder anzeigen"
#: setup/lib/messages.inc.php:336
 msgid "Show function fields"
@@ -7682,7 +7682,8 @@ msgstr "Zeige detailierte MySQL-Server Informationen"
 #: setup/lib/messages.inc.php:341
 msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed"
 msgstr ""
-"Legt fest, ob von phpMyAdmin generierte Abfragen angezeigt werden sollten"
+"Legt fest, ob von phpMyAdmin generierte SQL-Abfragen angezeigt werden "
+"sollten"
#: setup/lib/messages.inc.php:342
 msgid "Show SQL queries"
@@ -7691,8 +7692,8 @@ msgstr "Zeige SQL Anfragen"
 #: setup/lib/messages.inc.php:343
 msgid "Allow to display database and table statistics (eg. space usage)"
 msgstr ""
-"Erlaube die Anzeige von Datenbank- und Tabellen-Statistiken, z.B. "
-"Platzbedarf"
+"Erlaube die Anzeige von Datenbank- und Tabellen-Statistiken, ( z.B. "
+"Platzbedarf)"
#: setup/lib/messages.inc.php:344
 msgid "Show statistics"
@@ -7703,7 +7704,7 @@ msgid ""
 "If tooltips are enabled and a database comment is set, this will flip the "
 "comment and the real name"
 msgstr ""
-"Wenn "tooltips" eingeschaltet sind und Datenbank-Kommentare vorhanden sind, "
+"Wenn Tooltips eingeschaltet sind und Datenbank-Kommentare vorhanden sind, "
 "vertausch dies den Kommentar und den Namen"
#: setup/lib/messages.inc.php:346
@@ -7719,7 +7720,7 @@ msgid ""
 msgstr ""
 "Wird dies auf [kbd]nested[/kbd] gesetzt, so wird der Alias des "
 "Tabellennamens nur benutzt, um die Tabellen gemäß der "
-"$cfg['LeftFrameTableSeparator'] direktive zu teilen bzw. zu verschachteln. "
+"$cfg['LeftFrameTableSeparator'] Direktive zu teilen bzw. zu verschachteln. "
 "Nur der Ordner erhält den Alias, der Tabellename bleibt unverändert."
#: setup/lib/messages.inc.php:348
@@ -7751,7 +7752,7 @@ msgstr ""
#: setup/lib/messages.inc.php:358
 msgid "Suggest new database name"
-msgstr "Schlage einen neuen Datenbank-Namen vor "
+msgstr "Schlage einen neuen Datenbank-Namen vor"
#: setup/lib/messages.inc.php:359
 msgid "yes"
@@ -7765,9 +7766,9 @@ msgid ""
 "HTTP_X_FORWARDED_FOR[/kbd]"
 msgstr ""
 "Proxies als [kbd]IP: trusted HTTP header[/kbd] eingeben. Das folgende "
-"beispiel legt fest, das  phpMyAdmin einem HTTP_X_FORWARDED_FOR (X-Forwarded-"
-"For) header, der von demproxy 1.2.3.4:[br][kbd]1.2.3.4: "
-"HTTP_X_FORWARDED_FOR[/kbd] kommt, vertrauen soll"
+"Beispiel legt fest, das phpMyAdmin einem HTTP_X_FORWARDED_FOR (X-Forwarded-"
+"For) Header, der von dem proxy 1.2.3.4:[br][kbd]1.2.3.4: "
+"HTTP_X_FORWARDED_FOR[/kbd] kommt, vertrauen soll."
#: setup/lib/messages.inc.php:361
 msgid "List of trusted proxies for IP allow/deny"
@@ -8299,7 +8300,7 @@ msgstr "partitioniert"
 #: tbl_tracking.php:114
 #, php-format
 msgid "Tracking report for table `%s`"
-msgstr "Verlaufs-Report für Tabelle '%s'"
+msgstr "Verlaufs-Report für Tabelle %s"
#: tbl_tracking.php:187
 #, php-format
@@ -8331,7 +8332,8 @@ msgstr ""
#: tbl_tracking.php:221
 msgid "Comment out these two lines if you do not need them."
-msgstr "Kommentieren Sie diese beiden Zeilen aus, wenn Sie sie nicht benötigen"
+msgstr ""
+"Kommentieren Sie diese beiden Zeilen aus, wenn Sie diese nicht benötigen."
#: tbl_tracking.php:230
 msgid "SQL statements exported. Please copy the dump or execute it."
hooks/post-receive
-- 
phpMyAdmin


    