The branch, master has been updated via 4d23c71fec0aaa0540285e365fec508cb498ad85 (commit) via 714756122561e21e175a553f615b42a1060ac584 (commit) via 20fffcae40cca6e73de1734a5d494fc6a85a06f5 (commit) via 0dc1c538f3b9e7ee36d6233369ce3d695080944e (commit) via 140c767cf76cb1c313cb39fbafab668e088aecae (commit) via d2ad3c63d2360e4d61067984fda7ca7a78b0351c (commit) via 8d6f79b54d0559fa2429dac76e563c50677ddb5a (commit) via f310251a503175f34047ea7d0b54ce8646d29735 (commit) via e275c3cec168833859824df06a416f3bc22065e9 (commit) via 9e24739de44ed47ddf528fb3004c5d9c2dd83ed1 (commit) via cd788681f53d555293914fdec26b976ad5d97176 (commit) via 8d5deec2052c4e6ab19a1e668e3fbbfd18329c9e (commit) via ba7586fb19b66928e826168c950d0d72948b719a (commit) via 0d952d0193786af101dae7d63b2ffeec0f16e517 (commit) via 60b74be12324c523a9ddfeb7a84f1745c744696f (commit) via 90c678d4832a2aa8a6d61e09a4581cd5584f62f0 (commit) via a92bb262dc418746e88d9a3c457cc10469f88533 (commit) via da98330dcc507e4f3db5d90f6a2016fba6a23ff3 (commit) via 894936de58c47de73422b037e400b47342d63c36 (commit) via a5ff19a4a4a574ca80d354a85a79b7c83316769d (commit) via 425b43c21041d4d330305d2ac510ffb27eb31146 (commit) via 5f4b86e5af4e9a70721edc4c2e48f18ebec72aef (commit) via 7e22d37c46002d73b1c4b285d95d7a8b0256f173 (commit) via b0445a22a5da41043dde5165aacec5d402a19e91 (commit) via c686803253fa19725c42657ba6827421a5295d20 (commit) via b92a38d97384ea0c2a4f8af3e7e7dd4e115bc970 (commit) via d146ca55bed8bfafe5a84f7a533d907b9017e553 (commit) from 898f921e31970a6aa37b81af4472fbb7f25e8b70 (commit)
- Log ----------------------------------------------------------------- commit 4d23c71fec0aaa0540285e365fec508cb498ad85 Merge: 20fffca 7147561 Author: Michal Čihař michal@cihar.com Date: Sat Feb 4 11:10:56 2012 +0100
Merge branch 'QA_3_5'
commit 20fffcae40cca6e73de1734a5d494fc6a85a06f5 Merge: 898f921 0dc1c53 Author: Michal Čihař michal@cihar.com Date: Sat Feb 4 10:37:50 2012 +0100
Merge branch 'QA_3_5'
-----------------------------------------------------------------------
Summary of changes: po/cs.po | 14 +++++----- po/de.po | 78 +++++++++++++++++++++++++++++++------------------------------ 2 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/po/cs.po b/po/cs.po index 3b9a81c..a6b1cb8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-31 11:09+0100\n" -"PO-Revision-Date: 2012-02-03 17:12+0100\n" +"PO-Revision-Date: 2012-02-04 10:37+0100\n" "Last-Translator: Michal Čihař michal@cihar.com\n" "Language-Team: czech cs@li.org\n" "Language: cs\n" @@ -12860,10 +12860,9 @@ msgid "%s%% of all connections are aborted. This value should be below 1%%" msgstr ""
#: po/advisory_rules.php:235 -#, fuzzy #| msgid "Persistent connections" msgid "Rate of aborted connections" -msgstr "Trvalé připojení" +msgstr "Četnost přerušených spojení"
#: po/advisory_rules.php:238 #, php-format @@ -12891,13 +12890,12 @@ msgstr "" #: po/advisory_rules.php:243 #, php-format msgid "%s%% of all clients are aborted. This value should be below 2%%" -msgstr "" +msgstr "%s%% všech klientů bylo přerušeno. Tato hodnota by měla být pod 2%%"
#: po/advisory_rules.php:245 -#, fuzzy #| msgid "Format of imported file" msgid "Rate of aborted clients" -msgstr "Formát importovaného souboru" +msgstr "Četnost přerušení klientů"
#: po/advisory_rules.php:248 #, php-format @@ -12954,6 +12952,8 @@ msgid "" "Your InnoDB log size is at %s%% in relation to the InnoDB buffer pool size, " "it should not be below 20%%" msgstr "" +"Poměr velikosti záznamu a rezervy vyrovnávací paměti InnoDB je %s%%, ale " +"neměla by být pod 20%%"
#: po/advisory_rules.php:260 msgid "Max InnoDB log size" @@ -12980,7 +12980,7 @@ msgstr "" #: po/advisory_rules.php:263 #, php-format msgid "Your absolute InnoDB log size is %s MiB" -msgstr "" +msgstr "Velikost záznamu InnoDB je %s MiB"
#: po/advisory_rules.php:265 msgid "InnoDB buffer pool size" diff --git a/po/de.po b/po/de.po index bf09702..840c3b5 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-31 11:09+0100\n" -"PO-Revision-Date: 2012-02-02 14:27+0200\n" -"Last-Translator: cybot pma@sebastianmendel.de\n" +"PO-Revision-Date: 2012-02-04 06:10+0200\n" +"Last-Translator: minichip holger@ronecker.com\n" "Language-Team: german de@li.org\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -789,9 +789,8 @@ msgid "Versions" msgstr "Versionen"
#: db_tracking.php:136 tbl_tracking.php:415 tbl_tracking.php:683 -#, fuzzy msgid "Tracking report" -msgstr "Verfolgungs-Report" +msgstr "Verfolgungs-Bericht"
#: db_tracking.php:137 tbl_tracking.php:235 tbl_tracking.php:685 msgid "Structure snapshot" @@ -878,7 +877,7 @@ msgstr "Auflistung wurde in Datei %s gespeichert."
#: file_echo.php:21 msgid "Invalid export type" -msgstr "Ungültiger Typ für Export." +msgstr "Ungültiger Typ für Export"
#: gis_data_editor.php:84 #, php-format @@ -927,14 +926,15 @@ msgstr "Punkt hinzufügen" msgid "Linestring" msgstr "LineString"
+# Ankreis ist richtig http://de.wikipedia.org/wiki/Ankreis #: gis_data_editor.php:223 gis_data_editor.php:279 js/messages.php:325 -#, fuzzy msgid "Outer Ring" msgstr "Ankreis"
-# Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis +# Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis
+#
+# Ja #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:324 -#, fuzzy msgid "Inner Ring" msgstr "Inkreis"
@@ -943,7 +943,6 @@ msgid "Add a linestring" msgstr "LineString hinzufügen"
#: gis_data_editor.php:252 gis_data_editor.php:304 js/messages.php:327 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" msgstr "Inkreis hinzufügen" @@ -1105,7 +1104,7 @@ msgstr ""
#: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "Sie sind dabei ein BLOB-Repository zu deaktivieren!" +msgstr "Sie sind dabei ein BLOB-Repository zu DEAKTIVIEREN!"
#: js/messages.php:41 #, php-format @@ -1537,10 +1536,10 @@ msgid "Differential" msgstr "Unterschied"
#: js/messages.php:171 -#, fuzzy, php-format +#, php-format #| msgid "Divided by %s:" msgid "Divided by %s" -msgstr "Geteilt durch %s:" +msgstr "Geteilt durch %s"
#: js/messages.php:172 msgid "Unit" @@ -2871,7 +2870,7 @@ msgid "" "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your " "configuration file!" msgstr "" -"Das <tt>$cfg['PmaAbsoluteUri']</tt>-Verzeichnis MUSS in Ihrer " +"Das <tt>$cfg['PmaAbsoluteUri']</tt> Verzeichnis MUSS in Ihrer " "Konfigurationsdatei angegeben werden!"
#: libraries/common.inc.php:650 @@ -5760,7 +5759,7 @@ msgstr "Anfangsdatensatz:"
#: libraries/display_export.lib.php:168 msgid "Dump all rows" -msgstr "Alle Datensätze ausgeben" +msgstr "Alle Datensätze exportieren"
#: libraries/display_export.lib.php:176 libraries/display_export.lib.php:197 msgid "Output:" @@ -6910,10 +6909,10 @@ msgstr "" "Zum Ändern der Struktur auf den entsprechenden "Struktur"-Link klicken"
#: libraries/import.lib.php:1106 -#, fuzzy, php-format +#, php-format #| msgid "Go to database" msgid "Go to database: %s" -msgstr "Gehe zur Datenbank" +msgstr "Gehe zur Datenbank: %s"
#: libraries/import.lib.php:1109 libraries/import.lib.php:1132 #, php-format @@ -6921,10 +6920,10 @@ msgid "Edit settings for %s" msgstr "Einstellung für %s bearbeiten"
#: libraries/import.lib.php:1127 -#, fuzzy, php-format +#, php-format #| msgid "Go to table" msgid "Go to table: %s" -msgstr "Gehe zur Tabelle" +msgstr "Gehe zur Tabelle: %s"
#: libraries/import.lib.php:1130 #, php-format @@ -6932,10 +6931,10 @@ msgid "Structure of %s" msgstr "Struktur von %s"
#: libraries/import.lib.php:1136 -#, fuzzy, php-format +#, php-format #| msgid "Go to view" msgid "Go to view: %s" -msgstr "Gehe zum View" +msgstr "Gehe zur Ansicht: %s"
#: libraries/import/csv.php:38 libraries/import/ods.php:33 msgid "" @@ -8809,10 +8808,9 @@ msgid "Toggle small/big" msgstr "Wechseln klein/groß"
#: pmd_general.php:99 -#, fuzzy #| msgid "To select relation, click :" msgid "Toggle relation lines" -msgstr "Um eine Relation auszuwählen, klicken Sie :" +msgstr "Beziehungen anzeigen an/aus"
#: pmd_general.php:104 pmd_pdf.php:76 msgid "Import/Export coordinates for PDF schema" @@ -10767,7 +10765,6 @@ msgid "Monitor Instructions" msgstr "Einführung zur Überwachung"
#: server_status.php:1605 -#, fuzzy msgid "" "The phpMyAdmin Monitor can assist you in optimizing the server configuration " "and track down time intensive queries. For the latter you will need to set " @@ -11640,7 +11637,6 @@ msgid "Index name:" msgstr "Indexname:"
#: tbl_indexes.php:188 -#, fuzzy msgid "" "("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)" msgstr "" @@ -12429,10 +12425,10 @@ msgid "" msgstr ""
#: po/advisory_rules.php:80 -#, fuzzy, php-format +#, php-format #| msgid "Query cache efficiency (%)" msgid "Query cache efficiency (%%)" -msgstr "Anfragen-Zwischenspeicher Effizienz (%)" +msgstr "Anfragen-Zwischenspeicher Effizienz (%%)"
#: po/advisory_rules.php:81 msgid "Query cache not running efficiently, it has a low hit rate." @@ -12767,13 +12763,14 @@ msgid "" "%s%% of all temporary tables are being written to disk, this value should be " "below 25%%" msgstr "" +"%s%% aller temporären Tabellen werden auf die Festplatte geschrieben, dieser " +"Wert sollte unter 25%% liegen"
#: po/advisory_rules.php:155 -#, fuzzy #| msgid "%s table" #| msgid_plural "%s tables" msgid "Temp disk rate" -msgstr "%s Tabelle" +msgstr "Temp Disk Rate"
#: po/advisory_rules.php:157 msgid "" @@ -12794,35 +12791,38 @@ msgid "" msgstr ""
#: po/advisory_rules.php:160 -#, fuzzy #| msgid "Sort buffer size" msgid "MyISAM key buffer size" -msgstr "Größe des Sortierungspuffers" +msgstr "Größe des MyISAM Schlüssel-Cache"
#: po/advisory_rules.php:161 msgid "Key buffer is not initialized. No MyISAM indexes will be cached." msgstr "" +"Schlüssel-Cache nicht initialisiert. Es werden keine MyISAM Indizes " +"gecached."
#: po/advisory_rules.php:162 msgid "" "Set {key_buffer_size} depending on the size of your MyISAM indexes. 64M is a " "good start." msgstr "" +"Setze {key_buffer_size} auf einen Wert, abhängig von Deinen MyISAM Indizes. " +"64M ist ein guter Anfang."
#: po/advisory_rules.php:163 msgid "key_buffer_size is 0" msgstr "key_buffer_size ist 0"
#: po/advisory_rules.php:165 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "Max %% MyISAM key buffer ever used" -msgstr "Größe des Sortierungspuffers" +msgstr "Max %% des MyISAM Schlüssel-Cache jemals benutzt"
#: po/advisory_rules.php:166 po/advisory_rules.php:171 #, php-format msgid "MyISAM key buffer (index cache) %% used is low." -msgstr "Größe des Sortierungspuffers" +msgstr "MyISAM Schlüssel-Cache (Indize Cache) %% benutz ist niedrig."
#: po/advisory_rules.php:167 po/advisory_rules.php:172 msgid "" @@ -12832,11 +12832,13 @@ msgid "" msgstr ""
#: po/advisory_rules.php:168 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "" "max %% MyISAM key buffer ever used: %s%%, this value should be above 95%%" -msgstr "Größe des Sortierungspuffers" +msgstr "" +"maximal wurden %% des MyISAM Sortierungspuffers benutzt: %s%%, dieser Wert " +"sollte über 95%% liegen"
#: po/advisory_rules.php:170 #, fuzzy @@ -12932,10 +12934,10 @@ msgid "Opened files rate: %s, this value should be less than 5 per hour" msgstr ""
#: po/advisory_rules.php:195 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Immediate table locks %%" -msgstr "Neue Tabelle in Datenbank %s erstellen" +msgstr ""
#: po/advisory_rules.php:196 po/advisory_rules.php:201 #, fuzzy @@ -12984,7 +12986,7 @@ msgstr "" #: po/advisory_rules.php:210 #, php-format msgid "Thread cache hit rate %%" -msgstr "Tracking ist nicht aktiviert." +msgstr ""
#: po/advisory_rules.php:211 #, fuzzy
hooks/post-receive