diff --git a/ChangeLog b/ChangeLog index 352380147..e638cc76d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,11 @@ $Source$ 2003-02-25 Garvin Hicking * tbl_properties.inc.php3: Fixed duped display of comments due to merging diff conflict. + * lang/german*: German translations, only missing transformation + descriptions. They shouldn't be translated at that early point, I guess. + * libraries/config_import.lib.php3, libraries/relation.lib.php3, + libraries/transformations.lib.php3: 'column_info', they were somehow + not included in rabus' commit?! 2003-02-24 Alexander M. Turek * common.lib.php3: Backwards compatibility. diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3 index 1ff438c77..042f6db24 100644 --- a/lang/german-iso-8859-1.inc.php3 +++ b/lang/german-iso-8859-1.inc.php3 @@ -580,25 +580,25 @@ $strYes = 'Ja'; $strZeroRemovesTheLimit = 'Anmerkung: Der Wert 0 (null) entfernt die Beschränkung.'; $strZip = 'Zip-komprimiert'; -$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';//to translate -$strQueryTime = 'Query took %01.4f sec';//to translate -$strDumpComments = 'Include column comments as inline SQL-comments';//to translate -$strDBComment = 'Database comment: ';//to translate -$strQueryFrame = 'Query window';//to translate -$strQueryFrameDebug = 'Debugging information';//to translate -$strQueryFrameDebugBox = 'Active variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nCurrent variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nOpener location: %s\nFrameset location: %s.';//to translate -$strQuerySQLHistory = 'SQL-history';//to translate -$strMIME_MIMEtype = 'MIME-type';//to translate -$strMIME_transformation = 'Browser transformation';//to translate -$strMIME_transformation_options = 'Transformation options';//to translate -$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...
If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';//to translate -$strMIME_transformation_note = 'For a list of available transformation options and their MIME-type transformations, click on %stransformation descriptions%s';//to translate -$strMIME_available_mime = 'Available MIME-types';//to translate -$strMIME_available_transform = 'Available transformations';//to translate -$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';//to translate -$strMIME_description = 'Description';//to translate -$strMIME_nodescription = 'No Description is available for this transformation.
Please ask the author, what %s does.';//to translate -$strMIME_file = 'Filename';//to translate +$strRowsModeFlippedHorizontal = 'horizontal (gedrehte Bezeichner)'; +$strQueryTime = 'Die Abfrage dauerte %01.4f sek'; +$strDumpComments = 'Spaltenkommentare als SQL-Kommentare einbetten'; +$strDBComment = 'Datenbankkommentar: '; +$strQueryFrame = 'Abfragefenster'; +$strQueryFrameDebug = 'Debugging Information'; +$strQueryFrameDebugBox = 'Aktive Variablen des Abfrageformulars:\nDB: %s\nTabellle: %s\nServer: %s\n\nMomentate Variablen des Abfrageofrmulars:\nDB: %s\nTabelle: %s\nServer: %s\n\nQuelle des öffnenden Fensters: %s\nQuelle des Framesets: %s.'; +$strQuerySQLHistory = 'SQL-Verlaufsprotokoll'; +$strMIME_MIMEtype = 'MIME-Typ'; +$strMIME_transformation = 'Darstellungsumwandlung'; +$strMIME_transformation_options = 'Umwandlungsoptionen'; +$strMIME_transformation_options_note = 'Bitte die Werte für die Umwandlungsoptionen in folgendem Format angeben:: \'a\',\'b\',\'c\'...
Wann immer Sie ein Backslash ("\") oder ein einfaches Anführungszeichen ("\'") verwenden,
setzen Sie bitte ein Backslash vor das Zeichen. (z.B.: \'\\\\xyz\' or \'a\\\'b\').'; +$strMIME_transformation_note = 'Eine Liste aller verfügbaren MIME-Typen Umwandlungen und deren Optionen, klicken Sie bitte auf %sUmwandlungen%s'; +$strMIME_available_mime = 'Verfügbare MIME-Typen'; +$strMIME_available_transform = 'Verfügbare Umwandlungen'; +$strMIME_without = 'Kursiv dargestellte MIME-Typen besitzen keine untergliederten Umwandlungen.'; +$strMIME_description = 'Beschreibung'; +$strMIME_nodescription = 'Für diese Umwandlung ist keine Beschreibung verfügar.
Bitte fragen Sie den Authoren der Funktion namens %s.'; +$strMIME_file = 'Dateiname'; $strTransformation_image_jpeg__plain = 'Takes an imagefile and outputs a link for it. First options argument is a possible prepended string like http://...';//to translate $strTransformation_text_plain__formatted = 'Preserves original formatting of the field. No Escaping is done.';//to translate $strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entities. No HTML formatting is shown.';//to translate diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3 index 1dbaee540..098a0db4e 100644 --- a/lang/german-utf-8.inc.php3 +++ b/lang/german-utf-8.inc.php3 @@ -581,25 +581,25 @@ $strYes = 'Ja'; $strZeroRemovesTheLimit = 'Anmerkung: Der Wert 0 (null) entfernt die Beschränkung.'; $strZip = 'Zip-komprimiert'; -$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';//to translate -$strQueryTime = 'Query took %01.4f sec';//to translate -$strDumpComments = 'Include column comments as inline SQL-comments';//to translate -$strDBComment = 'Database comment: ';//to translate -$strQueryFrame = 'Query window';//to translate -$strQueryFrameDebug = 'Debugging information';//to translate -$strQueryFrameDebugBox = 'Active variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nCurrent variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nOpener location: %s\nFrameset location: %s.';//to translate -$strQuerySQLHistory = 'SQL-history';//to translate -$strMIME_MIMEtype = 'MIME-type';//to translate -$strMIME_transformation = 'Browser transformation';//to translate -$strMIME_transformation_options = 'Transformation options';//to translate -$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...
If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';//to translate -$strMIME_transformation_note = 'For a list of available transformation options and their MIME-type transformations, click on %stransformation descriptions%s';//to translate -$strMIME_available_mime = 'Available MIME-types';//to translate -$strMIME_available_transform = 'Available transformations';//to translate -$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';//to translate -$strMIME_description = 'Description';//to translate -$strMIME_nodescription = 'No Description is available for this transformation.
Please ask the author, what %s does.';//to translate -$strMIME_file = 'Filename';//to translate +$strRowsModeFlippedHorizontal = 'horizontal (gedrehte Bezeichner)'; +$strQueryTime = 'Die Abfrage dauerte %01.4f sek'; +$strDumpComments = 'Spaltenkommentare als SQL-Kommentare einbetten'; +$strDBComment = 'Datenbankkommentar: '; +$strQueryFrame = 'Abfragefenster'; +$strQueryFrameDebug = 'Debugging Information'; +$strQueryFrameDebugBox = 'Aktive Variablen des Abfrageformulars:\nDB: %s\nTabellle: %s\nServer: %s\n\nMomentate Variablen des Abfrageofrmulars:\nDB: %s\nTabelle: %s\nServer: %s\n\nQuelle des öffnenden Fensters: %s\nQuelle des Framesets: %s.'; +$strQuerySQLHistory = 'SQL-Verlaufsprotokoll'; +$strMIME_MIMEtype = 'MIME-Typ'; +$strMIME_transformation = 'Darstellungsumwandlung'; +$strMIME_transformation_options = 'Umwandlungsoptionen'; +$strMIME_transformation_options_note = 'Bitte die Werte für die Umwandlungsoptionen in folgendem Format angeben:: \'a\',\'b\',\'c\'...
Wann immer Sie ein Backslash ("\") oder ein einfaches Anführungszeichen ("\'") verwenden,
setzen Sie bitte ein Backslash vor das Zeichen. (z.B.: \'\\\\xyz\' or \'a\\\'b\').'; +$strMIME_transformation_note = 'Eine Liste aller verfügbaren MIME-Typen Umwandlungen und deren Optionen, klicken Sie bitte auf %sUmwandlungen%s'; +$strMIME_available_mime = 'Verfügbare MIME-Typen'; +$strMIME_available_transform = 'Verfügbare Umwandlungen'; +$strMIME_without = 'Kursiv dargestellte MIME-Typen besitzen keine untergliederten Umwandlungen.'; +$strMIME_description = 'Beschreibung'; +$strMIME_nodescription = 'Für diese Umwandlung ist keine Beschreibung verfügar.
Bitte fragen Sie den Authoren der Funktion namens %s.'; +$strMIME_file = 'Dateiname'; $strTransformation_image_jpeg__plain = 'Takes an imagefile and outputs a link for it. First options argument is a possible prepended string like http://...';//to translate $strTransformation_text_plain__formatted = 'Preserves original formatting of the field. No Escaping is done.';//to translate $strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entities. No HTML formatting is shown.';//to translate diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3 index 87d207427..64325b31e 100644 --- a/libraries/config_import.lib.php3 +++ b/libraries/config_import.lib.php3 @@ -107,9 +107,14 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { $cfg['Servers'][$i]['table_coords'] = ''; } - if (!isset($cfg['Servers'][$i]['column_comments'])) { - $cfg['Servers'][$i]['column_comments'] = ''; + if (!isset($cfg['Servers'][$i]['column_info'])) { + $cfg['Servers'][$i]['column_info'] = ''; } + + if ($cfg['Servers'][$i]['column_info'] == '' && isset($cfg['Servers'][$i]['column_comments']) && $cfg['Servers'][$i]['column_comments'] != '') { + $cfg['Servers'][$i]['column_info'] = $cfg['Servers'][$i]['column_comments']; + } + if (!isset($cfg['Servers'][$i]['pdf_pages'])) { $cfg['Servers'][$i]['pdf_pages'] = ''; diff --git a/libraries/relation.lib.php3 b/libraries/relation.lib.php3 index b6570f8da..088a09d4e 100644 --- a/libraries/relation.lib.php3 +++ b/libraries/relation.lib.php3 @@ -123,8 +123,8 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){ $cfgRelation['table_info'] = $curr_table[0]; } else if ($curr_table[0] == $cfg['Server']['table_coords']) { $cfgRelation['table_coords'] = $curr_table[0]; - } else if ($curr_table[0] == $cfg['Server']['column_comments']) { - $cfgRelation['column_comments'] = $curr_table[0]; + } else if ($curr_table[0] == $cfg['Server']['column_info']) { + $cfgRelation['column_info'] = $curr_table[0]; } else if ($curr_table[0] == $cfg['Server']['pdf_pages']) { $cfgRelation['pdf_pages'] = $curr_table[0]; } @@ -137,7 +137,7 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){ if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) { $cfgRelation['pdfwork'] = TRUE; } - if (isset($cfgRelation['column_comments'])) { + if (isset($cfgRelation['column_info'])) { $cfgRelation['commwork'] = TRUE; } } // end if @@ -191,8 +191,8 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){ . '' . "\n"; echo '  ' . "\n"; - echo ' $cfg[\'Servers\'][$i][\'column_comments\'] ... ' - . ((isset($cfgRelation['column_comments'])) ? $hit : sprintf($shit, 'col_com')) + echo ' $cfg[\'Servers\'][$i][\'column_info\'] ... ' + . ((isset($cfgRelation['column_info'])) ? $hit : sprintf($shit, 'col_com')) . '' . "\n"; echo ' ' . $GLOBALS['strColComFeat'] . ': ' . (($cfgRelation['commwork'] == TRUE) ? $enabled : $disabled) @@ -298,12 +298,12 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){ global $cfgRelation; if ($table != '') { - $com_qry = 'SELECT column_name, ' . PMA_backquote('comment') . ' FROM ' . PMA_backquote($cfgRelation['column_comments']) + $com_qry = 'SELECT column_name, ' . PMA_backquote('comment') . ' FROM ' . PMA_backquote($cfgRelation['column_info']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; $com_rs = PMA_query_as_cu($com_qry); } else { - $com_qry = 'SELECT comment FROM ' . PMA_backquote($cfgRelation['column_comments']) + $com_qry = 'SELECT comment FROM ' . PMA_backquote($cfgRelation['column_info']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'\'' . ' AND column_name = \'(db_comment)\''; @@ -360,7 +360,7 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){ global $cfgRelation; if ($removekey != '' AND $removekey != $key) { - $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_comments']) + $remove_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_info']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND column_name = \'' . PMA_handleSlashes($removekey) . '\''; @@ -368,7 +368,7 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){ unset($rmv_query); } - $test_qry = 'SELECT ' . PMA_backquote('comment') . ', mimetype, transformation, transformation_options FROM ' . PMA_backquote($cfgRelation['column_comments']) + $test_qry = 'SELECT ' . PMA_backquote('comment') . ', mimetype, transformation, transformation_options FROM ' . PMA_backquote($cfgRelation['column_info']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND column_name = \'' . PMA_handleSlashes($key) . '\''; @@ -378,19 +378,19 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){ $row = @PMA_mysql_fetch_array($test_rs); if (strlen($value) > 0 || strlen($row['mimetype']) > 0 || strlen($row['transformation']) > 0 || strlen($row['transformation_options']) > 0) { - $upd_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_comments']) + $upd_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_info']) . ' SET ' . PMA_backquote('comment') . ' = \'' . PMA_handleSlashes($value) . '\'' . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND column_name = \'' . PMA_handleSlashes($key) . '\''; } else { - $upd_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_comments']) + $upd_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_info']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND column_name = \'' . PMA_handleSlashes($key) . '\''; } } else if (strlen($value) > 0) { - $upd_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['column_comments']) + $upd_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['column_info']) . ' (db_name, table_name, column_name, ' . PMA_backquote('comment') . ') ' . ' VALUES(' . '\'' . PMA_sqlAddslashes($db) . '\',' diff --git a/libraries/transformations.lib.php3 b/libraries/transformations.lib.php3 index 10a4453f3..f38824e59 100644 --- a/libraries/transformations.lib.php3 +++ b/libraries/transformations.lib.php3 @@ -95,7 +95,7 @@ if (!defined('PMA_TRANSFORMATION_LIB_INCLUDED')){ function PMA_getMIME($db, $table, $strict = false) { global $cfgRelation; - $com_qry = 'SELECT column_name, mimetype, transformation, transformation_options FROM ' . PMA_backquote($cfgRelation['column_comments']) + $com_qry = 'SELECT column_name, mimetype, transformation, transformation_options FROM ' . PMA_backquote($cfgRelation['column_info']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND (mimetype != \'\'' . (!$strict ? ' OR transformation != \'\' OR transformation_options != \'\'' : '') . ')'; @@ -135,7 +135,7 @@ if (!defined('PMA_TRANSFORMATION_LIB_INCLUDED')){ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, $transformation_options, $forcedelete = false) { global $cfgRelation; - $test_qry = 'SELECT mimetype, ' . PMA_backquote('comment') . ' FROM ' . PMA_backquote($cfgRelation['column_comments']) + $test_qry = 'SELECT mimetype, ' . PMA_backquote('comment') . ' FROM ' . PMA_backquote($cfgRelation['column_info']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND column_name = \'' . PMA_handleSlashes($key) . '\''; @@ -145,7 +145,7 @@ if (!defined('PMA_TRANSFORMATION_LIB_INCLUDED')){ $row = @PMA_mysql_fetch_array($test_rs); if (!$forcedelete && (strlen($mimetype) > 0 || strlen($transformation) > 0 || strlen($transformation_options) > 0 || strlen($row['comment']) > 0)) { - $upd_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_comments']) + $upd_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_info']) . ' SET mimetype = \'' . PMA_handleSlashes($mimetype) . '\',' . ' transformation = \'' . PMA_handleSlashes($transformation) . '\',' . ' transformation_options = \'' . PMA_handleSlashes($transformation_options) . '\'' @@ -153,13 +153,13 @@ if (!defined('PMA_TRANSFORMATION_LIB_INCLUDED')){ . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND column_name = \'' . PMA_handleSlashes($key) . '\''; } else { - $upd_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_comments']) + $upd_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['column_info']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND column_name = \'' . PMA_handleSlashes($key) . '\''; } } else if (strlen($mimetype) > 0 || strlen($transformation) > 0 || strlen($transformation_options) > 0) { - $upd_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['column_comments']) + $upd_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['column_info']) . ' (db_name, table_name, column_name, mimetype, transformation, transformation_options) ' . ' VALUES(' . '\'' . PMA_sqlAddslashes($db) . '\','