From 12d7f5d8761b179861d8961bea5d6499980e8474 Mon Sep 17 00:00:00 2001 From: Jan Erik Zassenhaus Date: Thu, 16 Aug 2012 15:15:23 +0200 Subject: [PATCH 01/34] Translated using Weblate. --- po/de.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index ff6e0fdb3d..2621e97829 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 3.5.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-08-06 09:31+0200\n" -"Last-Translator: J. M. \n" +"PO-Revision-Date: 2012-08-16 15:16+0200\n" +"Last-Translator: Jan Erik Zassenhaus \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -415,7 +415,7 @@ msgstr "Bitte wählen Sie mindestens eine anzuzeigende Spalte" #: db_qbe.php:186 #, php-format msgid "Switch to %svisual builder%s" -msgstr "Zu %svisual builder%s wechseln" +msgstr "Zum %sDesigner%s wechseln" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:1003 @@ -1720,10 +1720,9 @@ msgid "Import monitor configuration" msgstr "Konfiguration des Importmonitors" #: js/messages.php:218 -#, fuzzy #| msgid "Please select the primary key or a unique key" msgid "Please select the file you want to import" -msgstr "Bitte den PRIMARY KEY oder einen UNIQUE KEY wählen" +msgstr "Bitte wählen Sie die Datei, die Sie importieren möchten" #: js/messages.php:220 msgid "Analyse Query" From 6ef9fef29a195afb0494e8c0024b0c2be7e81ec2 Mon Sep 17 00:00:00 2001 From: Jan Erik Zassenhaus Date: Thu, 16 Aug 2012 15:36:44 +0200 Subject: [PATCH 02/34] Translated using Weblate. --- po/de.po | 86 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/po/de.po b/po/de.po index 2621e97829..36c18c7678 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 3.5.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-08-16 15:16+0200\n" +"PO-Revision-Date: 2012-08-16 15:36+0200\n" "Last-Translator: Jan Erik Zassenhaus \n" "Language-Team: German \n" "Language: de\n" @@ -800,7 +800,7 @@ msgstr "Nicht verfolgte Tabellen" #: db_tracking.php:201 tbl_structure.php:655 msgid "Track table" -msgstr "Verfolge Tabelle" +msgstr "Tabelle verfolgen" #: db_tracking.php:227 msgid "Database Log" @@ -1004,10 +1004,10 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" -"Es wurden keinen Daten zum importieren empfangen. Entweder wurde keine Datei " -"ausgewählt, oder die Dateigröße hat die maximal erlaubte Größe der PHP " -"Konfiguration überschritten. Siehe [a@./Documentation." -"html#faq1_16@Documentation]FAQ 1.16[/a]." +"Es wurden keinen Daten zum Importieren empfangen. Entweder wurde keine Datei " +"ausgewählt, oder die Dateigröße hat die maximal erlaubte Größe der PHP-" +"Konfiguration überschritten. Siehe " +"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." #: import.php:366 msgid "" @@ -1048,7 +1048,7 @@ msgid "" msgstr "" "Allerdings wurden hierbei keine Daten eingelesen. Das bedeutet in der Regel, " "dass phpMyAdmin nicht in der Lage sein wird, den Import zu beenden, sofern " -"nicht die Ausführungszeitbeschränkungen von php gelockert werden." +"nicht die Ausführungszeitbeschränkungen von PHP gelockert werden." #: import.php:472 libraries/Message.class.php:175 #: libraries/display_tbl.lib.php:2393 libraries/rte/rte_routines.lib.php:1205 @@ -2343,7 +2343,7 @@ msgstr "Sekunde" #, php-format msgid "Failed formatting string for rule '%s'. PHP threw following error: %s" msgstr "" -"Formatieren des Texts für Regel '%s' fehlgeschlagen. PHP Fehlermeldung: %s" +"Formatieren des Texts für Regel '%s' fehlgeschlagen. PHP-Fehlermeldung: %s" #: libraries/Advisor.class.php:326 server_status.php:955 msgid "per second" @@ -4779,12 +4779,12 @@ msgstr "Benutzung von INFORMATION_SCHEMA deaktivieren" #: libraries/config/messages.inc.php:393 msgid "What PHP extension to use; you should use mysqli if supported" msgstr "" -"Die zu verwendente PHP Erweiterung; sie sollten mysqli verwenden wenn es " +"Die zu verwendente PHP-Erweiterung; Sie sollten mysqli verwenden, wenn es " "verfügbar ist" #: libraries/config/messages.inc.php:394 msgid "PHP extension to use" -msgstr "PHP Erweiterung" +msgstr "PHP-Erweiterung" #: libraries/config/messages.inc.php:395 msgid "Hide databases matching regular expression (PCRE)" @@ -5562,7 +5562,7 @@ msgstr "de" #: libraries/core.lib.php:266 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "Die Erweiterung %s fehlt. Bitte die PHP Konfiguration überprüfen." +msgstr "Die Erweiterung %s fehlt. Bitte die PHP-Konfiguration überprüfen." #: libraries/core.lib.php:414 msgid "possible deep recursion attack" @@ -6682,8 +6682,8 @@ msgid "" "Display comments (includes info such as export timestamp, PHP version, " "and server version)" msgstr "" -"Kommentare anzeigen (beinhaltet Informationen wie Export Zeitstempel, PHP " -"Version und Serverversion)" +"Kommentare anzeigen (beinhaltet Informationen wie Export-Zeitstempel, " +"PHP-Version und Serverversion)" #: libraries/export/sql.php:45 msgid "Additional custom header comment (\\n splits lines):" @@ -7787,7 +7787,7 @@ msgstr "Trigger %1$s wurde erzeugt." #: libraries/rte/rte_triggers.lib.php:161 msgid "Edit trigger" -msgstr "Einen Trigger bearbeiten" +msgstr "Trigger bearbeiten" #: libraries/rte/rte_triggers.lib.php:305 msgid "Trigger name" @@ -7800,16 +7800,16 @@ msgstr "Zeit" #: libraries/rte/rte_triggers.lib.php:405 msgid "You must provide a trigger name" -msgstr "Sie müssen einen Trigger-Namen angeben" +msgstr "Sie müssen einen Trigger-Namen eingeben" #: libraries/rte/rte_triggers.lib.php:410 msgid "You must provide a valid timing for the trigger" -msgstr "Sie müssen einen Trigger-Namen angeben" +msgstr "Sie müssen eine gültige Zeit für den Trigger eingeben" #: libraries/rte/rte_triggers.lib.php:415 msgid "You must provide a valid event for the trigger" msgstr "" -"Sie müssen einen Namen und einen Typ für jeden Trigger-Parameter angeben" +"Sie müssen einen Namen und einen Typ für jeden Trigger-Parameter eingeben" #: libraries/rte/rte_triggers.lib.php:421 msgid "You must provide a valid table name" @@ -7821,7 +7821,7 @@ msgstr "Sie müssen die Definition des Triggers angeben." #: libraries/rte/rte_words.lib.php:18 msgid "Add routine" -msgstr "Prozedur hinzufügen" +msgstr "Routine hinzufügen" #: libraries/rte/rte_words.lib.php:20 #, php-format @@ -7844,11 +7844,11 @@ msgstr "Keine Prozedur mit dem Namen %1$s in der Datenbank %2$s gefunden" #: libraries/rte/rte_words.lib.php:24 msgid "There are no routines to display." -msgstr "Es sind keine Prozeduren zum Anzeigen vorhanden." +msgstr "Es sind keine Routinen zum Anzeigen vorhanden." #: libraries/rte/rte_words.lib.php:30 msgid "Add trigger" -msgstr "Einen Trigger hinzufügen" +msgstr "Trigger hinzufügen" #: libraries/rte/rte_words.lib.php:32 #, php-format @@ -7875,7 +7875,7 @@ msgstr "Es sind keine Trigger zum Anzeigen vorhanden." #: libraries/rte/rte_words.lib.php:42 msgid "Add event" -msgstr "Ein Ereignis hinzufügen" +msgstr "Ereignis hinzufügen" #: libraries/rte/rte_words.lib.php:44 #, php-format @@ -8241,7 +8241,7 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "Bei der Initialisierung des SQL-Validators ist ein Fehler aufgetreten. Bitte " -"überprüfen Sie, ob Sie die in der %sDokumentation%s beschriebenen php-" +"überprüfen Sie, ob Sie die in der %sDokumentation%s beschriebenen PHP-" "Erweiterungen installiert haben." #: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119 @@ -8424,9 +8424,9 @@ msgstr "" "zweite Option, um eine abweichende Datum-/Zeit-Format-Zeichenkette " "anzugeben. Die dritte Option bestimmt, ob Sie das lokale Datum oder das " "entsprechende UTC-Datum sehen wollen (\"local\" oder \"utc\" verwenden). " -"Dementsprechend hat das Datumsformat verschiedene Werte - für \"lokal\" " -"siehe die PHP Dokumentation für die strftime() Funktion und für \"utc\" wird " -"es mittels der gmdate() Funktion konvertiert." +"Dementsprechend hat das Datumsformat verschiedene Werte - für \"lokal\" siehe " +"PHP-Dokumentation für die strftime()-Funktion und für \"utc\" wird es mittels " +"der gmdate()-Funktion konvertiert." #: libraries/transformations/text_plain__external.inc.php:10 msgid "" @@ -8601,7 +8601,7 @@ msgstr "Datenbank-Client Version" #: main.php:213 msgid "PHP extension" -msgstr "PHP Erweiterung" +msgstr "PHP-Erweiterung" #: main.php:221 msgid "Show PHP information" @@ -8652,8 +8652,8 @@ msgid "" "multibyte charset. Without the mbstring extension phpMyAdmin is unable to " "split strings correctly and it may result in unexpected results." msgstr "" -"Die PHP-Erweiterung mbstring wurde nicht gefunden, trotzdem jedoch scheinen " -"Sie einen Mehrbyte-Zeichensatz zu verwenden. Ohne besagte Erweiterung ist " +"Die PHP-Erweiterung mbstring wurde nicht gefunden, trotzdem scheinen Sie " +"einen Mehrbyte-Zeichensatz zu verwenden. Ohne besagte Erweiterung ist " "phpMyAdmin nicht in der Lage Zeichenketten zu trennen, was zu unerwarteten " "Ergebnissen führen kann." @@ -8664,10 +8664,11 @@ msgid "" "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" -"Ihre PHP Einstellung [a@http://php.net/manual/en/session.configuration." -"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] ist niedriger als " -"die in phpMyAdmin konfigurierte Cookiegültigkeit, deshalb wird Ihre " -"Anmeldung eher ablaufen als in phpMyAdmin konfiguriert." +"Ihre PHP-Einstellung " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] ist niedriger als die in " +"phpMyAdmin konfigurierte Cookiegültigkeit, deshalb wird Ihre Anmeldung eher " +"ablaufen als in phpMyAdmin konfiguriert." #: main.php:299 msgid "" @@ -8719,8 +8720,9 @@ msgid "" "Your PHP MySQL library version %s differs from your MySQL server version %s. " "This may cause unpredictable behavior." msgstr "" -"Die Version der verwendeten PHP MySQL Bibliothek %s unterscheidet sich von " -"der Version des MySQL Servers %s. Dies kann zu unerwartetem Verhalten führen." +"Die Version der verwendeten PHP-MySQL-Bibliothek %s unterscheidet sich von " +"der Version des MySQL-Servers %s. Dies kann zu unerwartetem Verhalten " +"führen." #: main.php:378 #, php-format @@ -9137,7 +9139,7 @@ msgstr "Erlaubt das Verändern der Struktur bestehender Tabellen." #: server_privileges.php:36 server_privileges.php:303 #: server_privileges.php:636 msgid "Allows altering and dropping stored routines." -msgstr "Erlaubt das Verändern und Löschen von Routinen." +msgstr "Erlaubt das Verändern und Löschen von gespeicherten Routinen." #: server_privileges.php:37 server_privileges.php:213 #: server_privileges.php:629 @@ -9191,7 +9193,7 @@ msgstr "Erlaubt das Anlegen von Events für den Event-Scheduler" #: server_privileges.php:47 server_privileges.php:311 #: server_privileges.php:637 msgid "Allows executing stored routines." -msgstr "Erlaubt das Ausführen von Routinen." +msgstr "Erlaubt das Ausführen von gespeicherten Routinen." #: server_privileges.php:48 server_privileges.php:233 #: server_privileges.php:624 @@ -11389,7 +11391,7 @@ msgstr "ID der eingefügten Zeile: %1$d" #: sql.php:722 msgid "Showing as PHP code" -msgstr "Ansicht als PHP Code" +msgstr "Ansicht als PHP-Code" #: sql.php:725 tbl_replace.php:386 msgid "Showing SQL query" @@ -11957,7 +11959,7 @@ msgstr "Version %s Schnappschuss (SQL code)" #: tbl_tracking.php:388 msgid "Tracking data definition successfully deleted" -msgstr "Verfolge erfolgreich gelöschte Datendefinitionen" +msgstr "Verfolgungsdatendefinition erfolgreich gelöscht" #: tbl_tracking.php:390 tbl_tracking.php:407 msgid "Query error" @@ -11965,11 +11967,11 @@ msgstr "Abfrage-Fehler" #: tbl_tracking.php:405 msgid "Tracking data manipulation successfully deleted" -msgstr "Verfolge erfolgreich gelöschte Datenmanipulationen" +msgstr "Verfolgungsdatenmanipulation erfolgreich gelöscht" #: tbl_tracking.php:417 msgid "Tracking statements" -msgstr "Verfolge die Befehle" +msgstr "Befehle verfolgen" #: tbl_tracking.php:433 tbl_tracking.php:561 #, php-format @@ -12046,11 +12048,11 @@ msgstr "Version %s von %s.%s erzeugen" #: tbl_tracking.php:734 msgid "Track these data definition statements:" -msgstr "Verfolge diese Datenbeschreibungsbefehle (DDL):" +msgstr "Diese Datenbeschreibungsbefehle (DDL) verfolgen:" #: tbl_tracking.php:742 msgid "Track these data manipulation statements:" -msgstr "Verfolge diese Datenbearbeitungsbefehle (DML):" +msgstr "Diese Datenbearbeitungsbefehle (DML) verfolgen:" #: tbl_tracking.php:750 msgid "Create version" From 15162ed51933e48d5e408ad159b569eef764617a Mon Sep 17 00:00:00 2001 From: Thilina Buddika Date: Fri, 17 Aug 2012 17:34:44 +0530 Subject: [PATCH 03/34] missing div clossing tag --- libraries/structure.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index a6685b12c9..dd7086ee3c 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -1828,7 +1828,7 @@ function PMA_getHtmlDivsForStructureActionsDropdown($class, $isActionEnabled, ) { $common_functions = PMA_CommonFunctions::getInstance(); - $html_output = '
'; if (!empty ($isActionEnabled)) { if ($isActionEnabled) { $html_output .= ''; @@ -2150,7 +2150,7 @@ function PMA_getHtmlForActionsIntableStructure($type, $tbl_storage_engine, $url_query, $row, $titles); $html_output .= $fulltext; } - $html_output .= PMA_getHtmlForDistincValueAction($url_query, $row, $titles); + $html_output .= PMA_getHtmlForDistinctValueAction($url_query, $row, $titles); if ($GLOBALS['cfg']['PropertiesIconic'] !== true && $GLOBALS['cfg']['HideStructureActions'] === true From 456f3f3d6be92c6ef5e337c0d759c5ca524b9607 Mon Sep 17 00:00:00 2001 From: thilinaa Date: Fri, 17 Aug 2012 21:31:28 +0530 Subject: [PATCH 05/34] further refactoring for PMA_getHtmlForPrintViewAndDataDictionaryLinks() --- db_structure.php | 5 ++++- libraries/structure.lib.php | 25 ++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/db_structure.php b/db_structure.php index 80e1ee582d..db4e041f06 100644 --- a/db_structure.php +++ b/db_structure.php @@ -318,7 +318,10 @@ $response->addHTML('
'); */ /* DATABASE WORK */ /* Printable view of a table */ -$response->addHTML(PMA_getHtmlForPrintViewAndDataDictionaryLinks($url_query)); +$response->addHTML( + PMA_getTablePrintViewLink($url_query) + . PMA_getDataDictionaryLink($url_query) +); if (empty($db_is_information_schema)) { ob_start(); diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 2879143413..466477f5fd 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -349,32 +349,39 @@ function PMA_getHtmlForCheckTablesHavingOverheadlink($overhead_check) { /** - * Get HTML links for "Print view" and "Data Dictionary" options + * Get HTML links for "Print view" options * * @param string $url_query url query * * @return string $html_output */ -function PMA_getHtmlForPrintViewAndDataDictionaryLinks($url_query) +function PMA_getTablePrintViewLink($url_query) { - $common_functions = PMA_CommonFunctions::getInstance(); - $html_output = '

' + return '

' . '' - . $common_functions->getIcon( + . PMA_CommonFunctions::getInstance()->getIcon( 'b_print.png', __('Print view'), true ) . ''; +} - $html_output .= '' - . $common_functions->getIcon( +/** + * Get HTML links "Data Dictionary" options + * + * @param string $url_query url query + * + * @return string $html_output + */ +function PMA_getDataDictionaryLink($url_query) +{ + return '' + . PMA_CommonFunctions::getInstance()->getIcon( 'b_tblanalyse.png', __('Data Dictionary'), true ) . '' . '

'; - - return $html_output; } /** From e518d4f9c9c23bfad6c16131253cc4ab1ba650be Mon Sep 17 00:00:00 2001 From: thilinaa Date: Fri, 17 Aug 2012 21:34:44 +0530 Subject: [PATCH 06/34] changed function name --- libraries/structure.lib.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 466477f5fd..c50dc8e4e9 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -763,7 +763,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false .'' . "\n" .'' . "\n" .'' - . PMA_SortableTableHeader(__('Table'), 'table') + . PMA_sortableTableHeader(__('Table'), 'table') . '' . "\n"; if ($replication) { $html_output .= '' . "\n" @@ -774,7 +774,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false .' ' . __('Action') . "\n" .'' // larger values are more interesting so default sort order is DESC - .'' . PMA_SortableTableHeader(__('Rows'), 'records', 'DESC') + .'' . PMA_sortableTableHeader(__('Rows'), 'records', 'DESC') . PMA_CommonFunctions::getInstance()->showHint( PMA_sanitize( __('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]') @@ -782,43 +782,43 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false ) . "\n" .'' . "\n"; if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) { - $html_output .= '' . PMA_SortableTableHeader(__('Type'), 'type') + $html_output .= '' . PMA_sortableTableHeader(__('Type'), 'type') . '' . "\n"; $cnt++; $html_output .= '' - . PMA_SortableTableHeader(__('Collation'), 'collation') + . PMA_sortableTableHeader(__('Collation'), 'collation') . '' . "\n"; $cnt++; } if ($GLOBALS['is_show_stats']) { // larger values are more interesting so default sort order is DESC $html_output .= '' - . PMA_SortableTableHeader(__('Size'), 'size', 'DESC') + . PMA_sortableTableHeader(__('Size'), 'size', 'DESC') . '' . "\n" // larger values are more interesting so default sort order is DESC . '' - . PMA_SortableTableHeader(__('Overhead'), 'overhead', 'DESC') + . PMA_sortableTableHeader(__('Overhead'), 'overhead', 'DESC') . '' . "\n"; $cnt += 2; } if ($GLOBALS['cfg']['ShowDbStructureCreation']) { // larger values are more interesting so default sort order is DESC $html_output .= '' - . PMA_SortableTableHeader(__('Creation'), 'creation', 'DESC') + . PMA_sortableTableHeader(__('Creation'), 'creation', 'DESC') . '' . "\n"; $cnt += 2; } if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']) { // larger values are more interesting so default sort order is DESC $html_output .= '' - . PMA_SortableTableHeader(__('Last update'), 'last_update', 'DESC') + . PMA_sortableTableHeader(__('Last update'), 'last_update', 'DESC') . '' . "\n"; $cnt += 2; } if ($GLOBALS['cfg']['ShowDbStructureLastCheck']) { // larger values are more interesting so default sort order is DESC $html_output .= '' - . PMA_SortableTableHeader(__('Last check'), 'last_check', 'DESC') + . PMA_sortableTableHeader(__('Last check'), 'last_check', 'DESC') . '' . "\n"; $cnt += 2; } @@ -840,7 +840,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false * * @return string link to be displayed in the table header */ -function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC') +function PMA_sortableTableHeader($title, $sort, $initial_sort_order = 'ASC') { $common_functions = PMA_CommonFunctions::getInstance(); // Set some defaults From c658b4dddf7ce17e584c5d3628172454e82d836d Mon Sep 17 00:00:00 2001 From: thilinaa Date: Fri, 17 Aug 2012 21:36:10 +0530 Subject: [PATCH 07/34] correct camel case --- db_structure.php | 2 +- libraries/structure.lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db_structure.php b/db_structure.php index db4e041f06..467cc52070 100644 --- a/db_structure.php +++ b/db_structure.php @@ -218,7 +218,7 @@ foreach ($tables as $keyname => $current_table) { ); } - list($alias, $truename) = PMA_getAliasAndTruename( + list($alias, $truename) = PMA_getAliasAndTrueName( $tooltip_aliasname, $current_table, $tooltip_truename ); diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index c50dc8e4e9..56075e7cdc 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -921,7 +921,7 @@ function PMA_sortableTableHeader($title, $sort, $initial_sort_order = 'ASC') * * @return array ($alias, $truename) */ -function PMA_getAliasAndTruename($tooltip_aliasname, $current_table, +function PMA_getAliasAndTrueName($tooltip_aliasname, $current_table, $tooltip_truename ) { $alias = (! empty($tooltip_aliasname) From d0118569398cbdc69742c3719a16a4cc0e5423af Mon Sep 17 00:00:00 2001 From: thilinaa Date: Fri, 17 Aug 2012 21:39:08 +0530 Subject: [PATCH 08/34] changed function name --- db_structure.php | 2 +- libraries/structure.lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db_structure.php b/db_structure.php index 467cc52070..e0d7f74b75 100644 --- a/db_structure.php +++ b/db_structure.php @@ -167,7 +167,7 @@ foreach ($tables as $keyname => $current_table) { list($current_table, $formatted_size, $unit, $formatted_overhead, $overhead_unit, $overhead_size, $table_is_view, $sum_size) - = PMA_getStuffForEnginetable($current_table, $db_is_information_schema, + = PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schema, $is_show_stats, $table_is_view, $sum_size, $overhead_size ); diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 56075e7cdc..bc936eea49 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -1011,7 +1011,7 @@ function PMA_getServerSlaveStatus($server_slave_status, $truename) { * * @return array */ -function PMA_getStuffForEnginetable($current_table, $db_is_information_schema, +function PMA_getStuffForEngineTypeTable($current_table, $db_is_information_schema, $is_show_stats, $table_is_view, $sum_size, $overhead_size ) { $common_functions = PMA_CommonFunctions::getInstance(); From e5851bc2fa06272dcef9d9f40f6d4dd06857ad5d Mon Sep 17 00:00:00 2001 From: thilinaa Date: Fri, 17 Aug 2012 21:40:34 +0530 Subject: [PATCH 09/34] correct camel case --- libraries/structure.lib.php | 2 +- tbl_structure.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index bc936eea49..dd7a204d40 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -1358,7 +1358,7 @@ function PMA_getHtmlForDropColumn($tbl_is_view, $db_is_information_schema, * * @return string $html_output */ -function PMA_getHtmlForCheckAlltableColumn($pmaThemeImage, $text_dir, +function PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir, $tbl_is_view, $db_is_information_schema, $tbl_storage_engine ) { $common_functions = PMA_CommonFunctions::getInstance(); diff --git a/tbl_structure.php b/tbl_structure.php index 95ab1b39e9..f2d2c5bba2 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -339,7 +339,7 @@ $response->addHTML( ); $response->addHTML( - PMA_getHtmlForCheckAlltableColumn($pmaThemeImage, $text_dir, + PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir, $tbl_is_view, $db_is_information_schema, $tbl_storage_engine ) ); From 8fc7f571317902d79f9c085a446dd1c40a94d0b5 Mon Sep 17 00:00:00 2001 From: thilinaa Date: Fri, 17 Aug 2012 21:47:00 +0530 Subject: [PATCH 10/34] changed function name --- libraries/structure.lib.php | 2 +- tbl_structure.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index dd7a204d40..5272030dcd 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -1485,7 +1485,7 @@ function PMA_getHtmlForEditView($url_params) * * @return string $html_output */ -function PMA_getHtmlForSomeLinks($url_query, $tbl_is_view, +function PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view, $db_is_information_schema, $tbl_storage_engine, $cfgRelation ) { $common_functions = PMA_CommonFunctions::getInstance(); diff --git a/tbl_structure.php b/tbl_structure.php index f2d2c5bba2..793b6187b3 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -360,7 +360,7 @@ if ($tbl_is_view) { $response->addHTML(PMA_getHtmlForEditView($url_params)); } $response->addHTML( - PMA_getHtmlForSomeLinks($url_query, $tbl_is_view, + PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view, $db_is_information_schema, $tbl_storage_engine, $cfgRelation ) ); From 391b29473439090c3330d709cfb0863ff43aa5ec Mon Sep 17 00:00:00 2001 From: thilinaa Date: Fri, 17 Aug 2012 21:54:58 +0530 Subject: [PATCH 11/34] correct camel case --- libraries/structure.lib.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 5272030dcd..5054f83eda 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -1687,7 +1687,7 @@ function PMA_getHtmlForOptimizeLink($url_query) * * @return string $html_output */ -function PMA_getHtmlForRowStatstableRow($odd_row, $name, $value) +function PMA_getHtmlForRowStatsTableRow($odd_row, $name, $value) { $common_functions = PMA_CommonFunctions::getInstance(); @@ -1730,7 +1730,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation, } else { $value = $showtable['Row_format']; } - $html_output .= PMA_getHtmlForRowStatstableRow( + $html_output .= PMA_getHtmlForRowStatsTableRow( $odd_row, __('Format'), $value ); $odd_row = !$odd_row; @@ -1741,7 +1741,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation, } else { $value = $showtable['Create_options']; } - $html_output .= PMA_getHtmlForRowStatstableRow( + $html_output .= PMA_getHtmlForRowStatsTableRow( $odd_row, __('Options'), $value ); $odd_row = !$odd_row; @@ -1749,13 +1749,13 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation, if (!empty($tbl_collation)) { $value = '' . $tbl_collation . ''; - $html_output .= PMA_getHtmlForRowStatstableRow( + $html_output .= PMA_getHtmlForRowStatsTableRow( $odd_row, __('Collation'), $value ); $odd_row = !$odd_row; } if (!$is_innodb && isset($showtable['Rows'])) { - $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, + $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, __('Rows'), $common_functions->formatNumber($showtable['Rows'], 0) ); $odd_row = !$odd_row; @@ -1764,7 +1764,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation, && isset($showtable['Avg_row_length']) && $showtable['Avg_row_length'] > 0 ) { - $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, + $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, __('Row length'), $common_functions->formatNumber($showtable['Avg_row_length'], 0) ); @@ -1775,33 +1775,33 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation, && $showtable['Rows'] > 0 && $mergetable == false ) { - $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, + $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, __('Row size'), ($avg_size . ' ' . $avg_unit) ); $odd_row = !$odd_row; } if (isset($showtable['Auto_increment'])) { - $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, + $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, __('Next autoindex'), $common_functions->formatNumber($showtable['Auto_increment'], 0) ); $odd_row = !$odd_row; } if (isset($showtable['Create_time'])) { - $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, + $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, __('Creation'), $common_functions->localisedDate(strtotime($showtable['Create_time'])) ); } if (isset($showtable['Update_time'])) { - $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, + $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, __('Last update'), $common_functions->localisedDate(strtotime($showtable['Update_time'])) ); $odd_row = !$odd_row; } if (isset($showtable['Check_time'])) { - $html_output .= PMA_getHtmlForRowStatstableRow($odd_row, + $html_output .= PMA_getHtmlForRowStatsTableRow($odd_row, __('Last check'), $common_functions->localisedDate(strtotime($showtable['Check_time'])) ); From 8e232a81204dc1f5cba5dd5895c249ced732791f Mon Sep 17 00:00:00 2001 From: thilinaa Date: Fri, 17 Aug 2012 21:59:02 +0530 Subject: [PATCH 12/34] correct camel case --- libraries/structure.lib.php | 2 +- tbl_structure.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 5054f83eda..472812a0c4 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -2101,7 +2101,7 @@ function PMA_getHtmlForDistinctValueAction($url_query, $row, $titles) * * @return string $html_output; */ -function PMA_getHtmlForActionsIntableStructure($type, $tbl_storage_engine, +function PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine, $primary, $field_name, $url_query, $titles, $row, $rownum, $hidden_titles, $columns_with_unique_index ) { diff --git a/tbl_structure.php b/tbl_structure.php index 793b6187b3..4de2e5528f 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -321,7 +321,7 @@ foreach ($fields as $row) { if (! $tbl_is_view && ! $db_is_information_schema) { $response->addHTML( - PMA_getHtmlForActionsIntableStructure($type, $tbl_storage_engine, + PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine, $primary, $field_name, $url_query, $titles, $row, $rownum, $hidden_titles, $columns_with_unique_index ) From 2a48a13da1a601bea1f53c33eb9f2ea5f9311e4b Mon Sep 17 00:00:00 2001 From: thilinaa Date: Fri, 17 Aug 2012 22:27:04 +0530 Subject: [PATCH 13/34] missing action link --- libraries/structure.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 472812a0c4..712f988366 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -2034,7 +2034,7 @@ function PMA_getHtmlForFullTextAction($tbl_storage_engine, $type, $url_query, ) && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char')) ) { - $html_output = "\n"; + $html_output .= "\n"; $html_output .= '\n" +"PO-Revision-Date: 2012-08-16 22:05+0200\n" +"Last-Translator: Jan Mienert \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -1923,7 +1923,7 @@ msgstr ", aktuelle stabile Version:" #: js/messages.php:374 msgid "up to date" -msgstr "auf dem neusten Stand" +msgstr "auf dem neuesten Stand" #. l10n: Display text for calendar close link #: js/messages.php:393 From cd2177ec4b0fa58be20ca563cc7bcbd645126b93 Mon Sep 17 00:00:00 2001 From: thilinaa Date: Sat, 18 Aug 2012 07:35:04 +0530 Subject: [PATCH 15/34] missing links in more action drop down --- libraries/structure.lib.php | 48 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 712f988366..a000091f17 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -1836,28 +1836,26 @@ function PMA_getHtmlDivsForStructureActionsDropdown($class, $isActionEnabled, $common_functions = PMA_CommonFunctions::getInstance(); $html_output = '
'; - if (!empty ($isActionEnabled)) { - if ($isActionEnabled) { - $html_output .= 'backquote($GLOBALS['table']) + . ($isPrimary ? ($primary ? ' DROP PRIMARY KEY,' : '') : '') + . ' ' . $syntax . '(' + . $common_functions->backquote($row['Field']) . ');' + ) + . '&message_to_show=' . urlencode( + sprintf( + $message, + htmlspecialchars($row['Field']) ) - . '">' - . $hidden_titles - . ''; - } else { - $html_output .= $hidden_titles_no; - } + ) + . '">' + . $hidden_titles + . ''; + } else { + $html_output .= $hidden_titles_no; } $html_output .= '
'; @@ -1917,17 +1915,17 @@ function PMA_getHtmlForMoreOptionInTableStructure($rownum, $primary_enabled, if (!PMA_DRIZZLE) { $html_output .= PMA_getHtmlDivsForStructureActionsDropdown( 'action_spatial replace_in_more', - $fulltext_enabled, $url_query, $row, + $spatial_enabled, $url_query, $row, $hidden_titles['Spatial'], - $hidden_titles['NoSpatial'], false, 'ADD FULLTEXT', + $hidden_titles['NoSpatial'], false, 'ADD SPATIAL', __('An index has been added on %s'), false ); $html_output .= PMA_getHtmlDivsForStructureActionsDropdown( 'action_fulltext replace_in_more', - $spatial_enabled, $url_query, $row, + $fulltext_enabled, $url_query, $row, $hidden_titles['IdxFulltext'], - $hidden_titles['NoIdxFulltext'], false, 'ADD SPATIAL', + $hidden_titles['NoIdxFulltext'], false, 'ADD FULLTEXT', __('An index has been added on %s'), false ); From dc5d9f789cd3dda4176e79773a2df545e95529e9 Mon Sep 17 00:00:00 2001 From: thilinaa Date: Sat, 18 Aug 2012 08:34:40 +0530 Subject: [PATCH 16/34] missing bracket --- libraries/operations.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index eedaf5437d..2567a18787 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -1033,9 +1033,9 @@ function PMA_getHtmlForCopytable() $html_output .= ''; + : '' . '/>'); $html_output .= '' . ''; From 51588f39ef0f6bd45e1417bd1b9841ce61b04adb Mon Sep 17 00:00:00 2001 From: thilinaa Date: Sat, 18 Aug 2012 08:39:47 +0530 Subject: [PATCH 17/34] missing bracket --- libraries/operations.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 2567a18787..de42fde436 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -467,7 +467,7 @@ function PMA_getSqlQueryForCopyTable($tables_full, $sql_query, $move, $db) if (! PMA_Table::moveCopy( $db, $each_table, $_REQUEST['newname'], $each_table, - isset($this_what) ? $this_what : 'data', + (isset($this_what) ? $this_what : 'data'), $move, 'db_copy' )) { $error = true; From e5ba8a55accd4a894dfd6b4f40745e3dea3ec676 Mon Sep 17 00:00:00 2001 From: thilinaa Date: Sat, 18 Aug 2012 08:45:07 +0530 Subject: [PATCH 18/34] missing bracket --- db_structure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db_structure.php b/db_structure.php index e0d7f74b75..309454a83d 100644 --- a/db_structure.php +++ b/db_structure.php @@ -140,7 +140,7 @@ $overhead_check = ''; $create_time_all = ''; $update_time_all = ''; $check_time_all = ''; -$checked = !empty($checkall) ? ' checked="checked"' : ''; +$checked = (!empty($checkall) ? ' checked="checked"' : ''); $num_columns = $cfg['PropertiesNumColumns'] > 1 ? ceil($num_tables / $cfg['PropertiesNumColumns']) + 1 : 0; From 995e9fd8587f040e9f9467dc96ed2cb12db56528 Mon Sep 17 00:00:00 2001 From: thilinaa Date: Sat, 18 Aug 2012 08:58:06 +0530 Subject: [PATCH 19/34] functions name change --- db_structure.php | 4 ++-- libraries/structure.lib.php | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/db_structure.php b/db_structure.php index 309454a83d..c425e8af19 100644 --- a/db_structure.php +++ b/db_structure.php @@ -319,8 +319,8 @@ $response->addHTML('
'); /* DATABASE WORK */ /* Printable view of a table */ $response->addHTML( - PMA_getTablePrintViewLink($url_query) - . PMA_getDataDictionaryLink($url_query) + PMA_getHtmlForTablePrintViewLink($url_query) + . PMA_getHtmlForDataDictionaryLink($url_query) ); if (empty($db_is_information_schema)) { diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index a000091f17..837ec0e532 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -128,9 +128,9 @@ function PMA_getTableDropQueryAndMessage($table_is_view, $current_table) $current_table['TABLE_NAME'] ); $drop_message = sprintf( - ($table_is_view || $current_table['ENGINE'] == null) + (($table_is_view || $current_table['ENGINE'] == null) ? __('View %s has been dropped') - : __('Table %s has been dropped'), + : __('Table %s has been dropped')), str_replace( ' ', ' ', @@ -355,7 +355,7 @@ function PMA_getHtmlForCheckTablesHavingOverheadlink($overhead_check) { * * @return string $html_output */ -function PMA_getTablePrintViewLink($url_query) +function PMA_getHtmlForTablePrintViewLink($url_query) { return '

' . '' @@ -373,7 +373,7 @@ function PMA_getTablePrintViewLink($url_query) * * @return string $html_output */ -function PMA_getDataDictionaryLink($url_query) +function PMA_getHtmlForDataDictionaryLink($url_query) { return '' . PMA_CommonFunctions::getInstance()->getIcon( @@ -1122,7 +1122,7 @@ function PMA_getValuesForAriaTable($db_is_information_schema, $current_table, list($formatted_overhead, $overhead_unit) = $common_functions->formatByteDown( $current_table['Data_free'], 3, - ($current_table['Data_free'] > 0) ? 1 : 0 + (($current_table['Data_free'] > 0) ? 1 : 0) ); $overhead_size += $current_table['Data_free']; } @@ -1163,7 +1163,7 @@ function PMA_getValuesForPbmsTable($current_table, $is_show_stats, $sum_size) $tblsize = $current_table['Data_length'] + $current_table['Index_length']; $sum_size += $tblsize; list($formatted_size, $unit) = $common_functions->formatByteDown( - $tblsize, 3, ($tblsize > 0) ? 1 : 0 + $tblsize, 3, (($tblsize > 0) ? 1 : 0) ); } From f49c9d8500798d88ffd1df65d5530a78d3c3d9f8 Mon Sep 17 00:00:00 2001 From: thilinaa Date: Sat, 18 Aug 2012 12:04:16 +0530 Subject: [PATCH 20/34] remove php notices --- server_privileges.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 26114a00f2..b69a3ab653 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -215,7 +215,9 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { $_add_user_error = true; } else { list($create_user_real, $create_user_show, $real_sql_query, $sql_query) - = PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password); + = PMA_getSqlQueriesForDisplayAndAddUser( + $username, $hostname, (isset ($password) ? $password : '') + ); if (empty($_REQUEST['change_copy'])) { $_error = false; @@ -479,7 +481,7 @@ if (empty($_REQUEST['adduser']) } elseif (isset($_REQUEST['adduser'])) { // Add user $response->addHTML( - PMA_getHtmlForAddUser($random_n, $dbname) + PMA_getHtmlForAddUser($random_n, (isset($dbename) ? $dbname : '')) ); } else { // check the privileges for a particular database. From 69145ac7133f9238a3d4ff1f0099b9d66b4a2ed4 Mon Sep 17 00:00:00 2001 From: thilinaa Date: Sat, 18 Aug 2012 13:37:40 +0530 Subject: [PATCH 21/34] typo --- server_privileges.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_privileges.php b/server_privileges.php index b69a3ab653..c7298b2099 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -481,7 +481,7 @@ if (empty($_REQUEST['adduser']) } elseif (isset($_REQUEST['adduser'])) { // Add user $response->addHTML( - PMA_getHtmlForAddUser($random_n, (isset($dbename) ? $dbname : '')) + PMA_getHtmlForAddUser($random_n, (isset($dbname) ? $dbname : '')) ); } else { // check the privileges for a particular database. From d37f6866dadf85c05a07359ae693d6d94c162281 Mon Sep 17 00:00:00 2001 From: Ahmed Ameen Date: Sat, 18 Aug 2012 12:25:49 +0200 Subject: [PATCH 22/34] Translated using Weblate. --- po/ckb.po | 91 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 36 deletions(-) diff --git a/po/ckb.po b/po/ckb.po index 2255625cdb..17d897c6a3 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-08-10 12:59+0200\n" -"PO-Revision-Date: 2012-08-04 12:39+0200\n" -"Last-Translator: renwar kurd \n" -"Language-Team: Kurdish Sorani \n" +"PO-Revision-Date: 2012-08-18 12:25+0200\n" +"Last-Translator: Ahmed Ameen \n" +"Language-Team: Kurdish Sorani " +"\n" "Language: ckb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -428,6 +428,8 @@ msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." msgstr "" +"لەم تێڕوانیینە بەلایەنی کەم ئەم ژمارە دێڕە بوونی هەیە.تکایە سەردانی %" +"sبەڵگەسازی%s بکە ." #: db_structure.php:548 db_structure.php:582 libraries/Menu.class.php:191 #: libraries/tbl_info.inc.php:59 tbl_structure.php:212 @@ -470,7 +472,7 @@ msgstr "پشکنینی هەموو" #: db_structure.php:693 msgid "Check tables having overhead" -msgstr "" +msgstr "پشکنین بۆ ئەو خشتانە بکەن کە ژوورسەریان هەیە." #: db_structure.php:701 libraries/CommonFunctions.class.php:3608 #: libraries/CommonFunctions.class.php:3609 @@ -510,7 +512,7 @@ msgstr "پشکنینی خشتە" #: db_structure.php:714 libraries/operations.lib.php:1164 #: tbl_structure.php:880 msgid "Optimize table" -msgstr "" +msgstr "چاکسازی خشتە" #: db_structure.php:716 libraries/operations.lib.php:1149 msgid "Repair table" @@ -612,8 +614,9 @@ msgid "Tracking report" msgstr "ڕاپۆرتە شوێنکەتووەکان" #: db_tracking.php:139 tbl_tracking.php:282 tbl_tracking.php:755 +#, fuzzy msgid "Structure snapshot" -msgstr "" +msgstr "وێنەی هەنووکەیی پێکهاتە" #: db_tracking.php:185 msgid "Untracked tables" @@ -621,44 +624,47 @@ msgstr "خشتە شوێن نەکەوتوەکان" #: db_tracking.php:204 tbl_structure.php:681 msgid "Track table" -msgstr "" +msgstr "شوێنکەوتنی خشتە" #: db_tracking.php:230 msgid "Database Log" -msgstr "" +msgstr "پێشینەی کارکردی بنکەی زانیاری" #: export.php:44 msgid "Bad type!" -msgstr "" +msgstr "جۆری هەڵە !" #: export.php:95 msgid "Selected export type has to be saved in file!" msgstr "دەستنیشانکردنی جۆری هەناردن بۆ پاشەکەوتکردنی لە پەڕگە!" #: export.php:124 +#, fuzzy msgid "Bad parameters!" -msgstr "" +msgstr "ڕاگه‌یێنە هەڵەکان!" #: export.php:195 export.php:226 export.php:782 -#, fuzzy, php-format +#, php-format msgid "Insufficient space to save the file %s." -msgstr "پاشکەوتکردنی فایل وەک" +msgstr "شوێنی پێویست بۆ پاشەکەوت کردنی فایل %s ." #: export.php:363 #, php-format msgid "" "File %s already exists on server, change filename or check overwrite option." msgstr "" +"فایلی %s لە ئێستادا بوونی هەیە , ناوی فایلەکە بگۆڕن وە یان ڕێکخستنەکانی " +"لەسەرنوسین بپشکنە ." #: export.php:370 export.php:376 #, php-format msgid "The web server does not have permission to save the file %s." -msgstr "" +msgstr "وێبڕاژه‌كار مۆڵەتی پاشه‌كه‌وت کردنی فایلی %s نییە ." #: export.php:788 #, php-format msgid "Dump has been saved to file %s." -msgstr "" +msgstr "زانیاری وەدەست هاتوو لە فایلی %s پاشەکەوت کرا." #: file_echo.php:21 msgid "Invalid export type" @@ -667,11 +673,12 @@ msgstr "هەناردنی ئەم جۆرە ڕێگەپێدراو نییە" #: gis_data_editor.php:75 #, php-format msgid "Value for the column \"%s\"" -msgstr "" +msgstr "نرخی ستوون \"%s\"" #: gis_data_editor.php:104 tbl_gis_visualization.php:171 +#, fuzzy msgid "Use OpenStreetMaps as Base Layer" -msgstr "" +msgstr "بەکارهێنانی OpenStreetMaps وەک چینی بنچینەیی." #: gis_data_editor.php:124 msgid "SRID" @@ -680,7 +687,7 @@ msgstr "SRID" #: gis_data_editor.php:141 js/messages.php:326 #: libraries/DisplayResults.class.php:1649 msgid "Geometry" -msgstr "" +msgstr "ئەندازەزانی" #: gis_data_editor.php:161 js/messages.php:322 msgid "Point" @@ -689,18 +696,18 @@ msgstr "خاڵ" #: gis_data_editor.php:162 gis_data_editor.php:186 gis_data_editor.php:234 #: gis_data_editor.php:286 js/messages.php:320 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:164 gis_data_editor.php:188 gis_data_editor.php:236 #: gis_data_editor.php:288 js/messages.php:321 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:184 gis_data_editor.php:232 gis_data_editor.php:284 #: js/messages.php:323 #, php-format msgid "Point %d" -msgstr "" +msgstr "خاڵ %d" #: gis_data_editor.php:193 gis_data_editor.php:239 gis_data_editor.php:291 #: js/messages.php:329 @@ -709,31 +716,31 @@ msgstr "زیادکردنی خاڵ" #: gis_data_editor.php:209 js/messages.php:324 msgid "Linestring" -msgstr "" +msgstr "ڕیزبه‌ندی هێڵی" #: gis_data_editor.php:212 gis_data_editor.php:268 js/messages.php:328 msgid "Outer Ring" -msgstr "" +msgstr "ئەڵفەی دەرەکی" #: gis_data_editor.php:214 gis_data_editor.php:270 js/messages.php:327 msgid "Inner Ring" -msgstr "" +msgstr "ئەڵقەی ناوەکی" #: gis_data_editor.php:241 msgid "Add a linestring" -msgstr "" +msgstr "زیاد کردنی ڕیزبەندە هێڵ" #: gis_data_editor.php:241 gis_data_editor.php:293 js/messages.php:330 msgid "Add an inner ring" -msgstr "" +msgstr "زیاد کردنی ئەڵقەیەکی ناوەکی" #: gis_data_editor.php:255 js/messages.php:325 msgid "Polygon" -msgstr "" +msgstr "فرە گۆشە" #: gis_data_editor.php:295 js/messages.php:331 msgid "Add a polygon" -msgstr "" +msgstr "زیاد کردنی فرە گۆشەیەک" #: gis_data_editor.php:299 msgid "Add geometry" @@ -741,13 +748,15 @@ msgstr "زیادکردنی ئەندازەگەری" #: gis_data_editor.php:306 msgid "Output" -msgstr "بەرهەم" +msgstr "دەرچە" #: gis_data_editor.php:307 msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" +"هەڵبژاردەی \"GeomFromText\" لە ستوونی \"Function\" هەڵبژێرن وە ڕیزبەنی خوارەوە " +"لە خانەی \"نرخ(value)\" داخڵ بکەن." #: import.php:94 #, php-format @@ -755,14 +764,16 @@ msgid "" "You probably tried to upload too large file. Please refer to %sdocumentation" "%s for ways to workaround this limit." msgstr "" +"لەوانەیە ئێوە هەوڵتان دابێت فایلێک بە قەبارەیەکی زۆر بار بکەن.تکایە بۆ ڕیگە " +"چارەیەک بۆ ئەم سنوردار کردنە سەردانی %sبەڵگەسازی%s بکەن." #: import.php:232 import.php:485 msgid "Showing bookmark" -msgstr "" +msgstr "پیشاندانی شوێندۆز" #: import.php:247 import.php:481 msgid "The bookmark has been deleted." -msgstr "" +msgstr "شوێندۆز سڕایەوە" #: import.php:342 import.php:395 libraries/File.class.php:426 #: libraries/File.class.php:517 @@ -776,38 +787,46 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" +"ئێوە فایلێک بە پەستێنەر سازێکی پاڵپشتی نەکراو بار ئەکەن (%s).لەوانەیە لە " +"ڕێکخستنەکان ناچالاک بێت وە یان پاڵپشتی بەردەست نییە بۆ ئەم فایلە." #: import.php:400 msgid "" "No data was received to import. Either no file name was submitted, or the " "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." -msgstr "هێنان" +msgstr "" +"هیچ داتایەک وەرنەگیرا بۆ هاوردە کردن. یان فایلێک دیاری نەکراوە ، یان فایلەکە " +"لە ڕێژە دیاری کراوەکە زیاترە. سەردانی " +"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a] بکەن." #: import.php:418 msgid "" "Cannot convert file's character set without character set conversion library" -msgstr "" +msgstr "ناکرێت فایلەکانی نوسە بگۆڕدرێن بە بێ نوسەى کتێبخانەی تایبەت بەم کارە" #: import.php:454 libraries/display_import.lib.php:29 msgid "Could not load import plugins, please check your installation!" -msgstr "" +msgstr "هەڵە لە بارکردنی پێوەکراەکان, تکایە فۆناغەکانی دامەزراندن بپشکنن!" #: import.php:488 sql.php:1109 #, php-format msgid "Bookmark %s created" -msgstr "" +msgstr "شوێندۆز %s دروستکرا" #: import.php:496 import.php:502 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "" +msgstr "داخڵ کردنی زانیاریەکان بە سەرکەوتوویی بە کۆتا هات، %d پرسگە دامەزرا ." #: import.php:511 msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." msgstr "" +"کاتی جێ بە جێ کردنی کردار بە کۆتا هاتووە، ئەگەر دەتانەوێت کردارەکە بە کۆتا " +"بینن، فایلی مەبەست دووبارە تۆمار بکەن تاکوو درێژە بە داخڵ کردنی زانیاریەکان " +"بدەن." #: import.php:513 msgid "" From e11d959a4e701a54a6adb33aa120148c55932474 Mon Sep 17 00:00:00 2001 From: thilinaa Date: Sat, 18 Aug 2012 20:12:29 +0530 Subject: [PATCH 23/34] missing comma --- libraries/operations.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index de42fde436..76804ba6c0 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -57,7 +57,7 @@ function PMA_getHtmlForRenameDatabase($db) . '

'; + . 'onsubmit="return emptyFormElements(this, \'newname\')">'; if (isset($_REQUEST['db_collation'])) { $html_output .= ''; + . 'onsubmit="return emptyFormElements(this, \'newname\')">'; if (isset($_REQUEST['db_collation'])) { $html_output .= ' Date: Sun, 19 Aug 2012 00:23:30 +0530 Subject: [PATCH 24/34] formatting for server_privileges-lib --- libraries/server_privileges.lib.php | 450 ++++++++++++++++++---------- 1 file changed, 292 insertions(+), 158 deletions(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 278883b2d7..0a9be05db2 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -26,17 +26,17 @@ if (! defined('PHPMYADMIN')) { */ function PMA_wildcardEscapeForGrant($dbname, $tablename) { + $common_functions = PMA_CommonFunctions::getInstance(); if (! strlen($dbname)) { $db_and_table = '*.*'; } else { if (strlen($tablename)) { - $db_and_table - = PMA_CommonFunctions::getInstance()->backquote( - PMA_CommonFunctions::getInstance()->unescapeMysqlWildcards($dbname) + $db_and_table = $common_functions->backquote( + $common_functions->unescapeMysqlWildcards($dbname) ) . '.' - . PMA_CommonFunctions::getInstance()->backquote($tablename); + . $common_functions->backquote($tablename); } else { - $db_and_table = PMA_CommonFunctions::getInstance()->backquote($dbname) . '.*'; + $db_and_table = $common_functions->backquote($dbname) . '.*'; } } return $db_and_table; @@ -51,13 +51,14 @@ function PMA_wildcardEscapeForGrant($dbname, $tablename) */ function PMA_rangeOfUsers($initial = '') { + $common_functions = PMA_CommonFunctions::getInstance(); // strtolower() is used because the User field // might be BINARY, so LIKE would be case sensitive if (! empty($initial)) { $ret = " WHERE `User` LIKE '" - . PMA_CommonFunctions::getInstance()->sqlAddSlashes($initial, true) . "%'" + . $common_functions->sqlAddSlashes($initial, true) . "%'" . " OR `User` LIKE '" - . PMA_CommonFunctions::getInstance()->sqlAddSlashes(strtolower($initial), true) . "%'"; + . $common_functions->sqlAddSlashes(strtolower($initial), true) . "%'"; } else { $ret = ''; } @@ -309,11 +310,15 @@ function PMA_getHtmlForDisplayColumnPrivileges($columns, $row, $name_for_select, . $name_for_select . '[]" multiple="multiple" size="8">' . "\n"; foreach ($columns as $current_column => $current_column_privileges) { - $html_output .= '' . "\n"; } $html_output .= '' . "\n" @@ -465,12 +470,16 @@ function PMA_getHtmlToDisplayPrivilegesTable($random_n, $db = '*', ); } else { // g l o b a l o r d b - s p e c i f i c - $html_output .= PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row, $random_n); + $html_output .= PMA_getHtmlForGlobalOrDbSpecificPrivs( + $db, $table, $row, $random_n + ); } $html_output .= '' . "\n"; if ($submit) { - $html_output .= '