Git

git@phpmyadmin.net

12 participants
38218 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10832-ge1f019b
by Marc Delisle 10 Nov '10

10 Nov '10

The branch, master has been updated via e1f019b2dc60b2e9a3b006163b0de6a1d7f5519f (commit) from b43375b735f7ae2e29ea83a2ba5ef10d7b3fc639 (commit) - Log ----------------------------------------------------------------- commit e1f019b2dc60b2e9a3b006163b0de6a1d7f5519f Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Nov 10 05:50:59 2010 -0500 Clarify the option about INSERT IGNORE ----------------------------------------------------------------------- Summary of changes: libraries/config/messages.inc.php | 4 ++-- libraries/import/csv.php | 2 +- libraries/import/ldi.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 65545b7..437ca71 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -235,14 +235,14 @@ $strConfigImport_charset_name = __('Character set of the file'); $strConfigImport_csv_col_names_name = __('Lines terminated by'); $strConfigImport_csv_enclosed_name = __('Columns enclosed by'); $strConfigImport_csv_escaped_name = __('Columns escaped by'); -$strConfigImport_csv_ignore_name = __('Ignore duplicate rows'); +$strConfigImport_csv_ignore_name = __('Do not abort on INSERT error'); $strConfigImport_csv_replace_name = __('Replace table data with file'); $strConfigImport_csv_terminated_name = __('Columns terminated by'); $strConfigImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available'); $strConfigImport_format_name = __('Format of imported file'); $strConfigImport_ldi_enclosed_name = __('Columns enclosed by'); $strConfigImport_ldi_escaped_name = __('Columns escaped by'); -$strConfigImport_ldi_ignore_name = __('Ignore duplicate rows'); +$strConfigImport_ldi_ignore_name = __('Do not abort on INSERT error'); $strConfigImport_ldi_local_option_name = __('Use LOCAL keyword'); $strConfigImport_ldi_replace_name = __('Replace table data with file'); $strConfigImport_ldi_terminated_name = __('Columns terminated by'); diff --git a/libraries/import/csv.php b/libraries/import/csv.php index b6e635b..db8d09c 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -23,7 +23,7 @@ if (isset($plugin_list)) { 'options' => array( array('type' => 'begin_group', 'name' => 'general_opts'), array('type' => 'bool', 'name' => 'replace', 'text' => __('Replace table data with file')), - array('type' => 'bool', 'name' => 'ignore', 'text' => __('Ignore duplicate rows')), + array('type' => 'bool', 'name' => 'ignore', 'text' => __('Do not abort on INSERT error')), array('type' => 'text', 'name' => 'terminated', 'text' => __('Columns separated with:'), 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed with:'), 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns escaped with:'), 'size' => 2, 'len' => 2), diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 39d42ed..e6eb56d 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -36,7 +36,7 @@ if (isset($plugin_list)) { 'options' => array( array('type' => 'begin_group', 'name' => 'general_opts'), array('type' => 'bool', 'name' => 'replace', 'text' => __('Replace table data with file')), - array('type' => 'bool', 'name' => 'ignore', 'text' => __('Ignore duplicate rows')), + array('type' => 'bool', 'name' => 'ignore', 'text' => __('Do not abort on INSERT error')), array('type' => 'text', 'name' => 'terminated', 'text' => __('Columns terminated by'), 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed by'), 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns escaped by'), 'size' => 2, 'len' => 2), hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 1dba678617085aed739e65fad249327c4290680e
by Michal Čihař 10 Nov '10

10 Nov '10

The branch, master has been updated via 1dba678617085aed739e65fad249327c4290680e (commit) from 9c750b3099f687f3d94d521f86913cb5b83aa24a (commit) - Log ----------------------------------------------------------------- commit 1dba678617085aed739e65fad249327c4290680e Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Nov 10 09:13:37 2010 +0100 More information on donate page (eg. directly list paypal address). ----------------------------------------------------------------------- Summary of changes: templates/donate.tpl | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/templates/donate.tpl b/templates/donate.tpl index c900f34..9efd06f 100644 --- a/templates/donate.tpl +++ b/templates/donate.tpl @@ -7,8 +7,13 @@ <div py:match="content" id="body"> <h2>Donations</h2> <p> -We invite you to <a href="https://sourceforge.net/donate/index.php?group_id=23067" rel="payment">contribute money</a> to our project. Donations will be used for -the promotion of phpMyAdmin. Thanks. Alternatively you can appreciate our work using <a href="https://flattr.com/thing/56976/phpMyAdmin">Flattr</a>. +We invite you to <a href="https://sourceforge.net/donate/index.php?group_id=23067" rel="payment">contribute money</a> to our project (or just send money using PayPal to donate(a)phpmyadmin.net). +</p> +<p> +Alternatively you can appreciate our work using <a href="https://flattr.com/thing/56976/phpMyAdmin">Flattr</a>. +</p> +<p> +Donations will be used for the promotion of phpMyAdmin, mostly by allowing team members to visit various conferences. Thanks. </p> <h2>Recent donors</h2> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10831-gb43375b
by Marc Delisle 09 Nov '10

09 Nov '10

The branch, master has been updated via b43375b735f7ae2e29ea83a2ba5ef10d7b3fc639 (commit) from f7169036bc2bfc29c592a4debc8466e475ccfacf (commit) - Log ----------------------------------------------------------------- commit b43375b735f7ae2e29ea83a2ba5ef10d7b3fc639 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Nov 9 07:55:55 2010 -0500 remove unneeded wrapper for jQuery objects; do not generate ajax_request hidden field more than once ----------------------------------------------------------------------- Summary of changes: js/functions.js | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/js/functions.js b/js/functions.js index 4ccafed..8bd9449 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1671,12 +1671,14 @@ $(document).ready(function() { /** * @var the_form object referring to the create table form */ - var the_form = $("#create_table_form"); + var $form = $("#create_table_form"); PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - $(the_form).append('<input type="hidden" name="ajax_request" value="true" />'); + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } //User wants to submit the form - $.post($(the_form).attr('action'), $(the_form).serialize() + "&do_save_data=" + $(this).val(), function(data) { + $.post($form.attr('action'), $form.serialize() + "&do_save_data=" + $(this).val(), function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); $("#create_table_dialog").dialog("close").remove(); @@ -1749,13 +1751,15 @@ $(document).ready(function() { /** * @var the_form object referring to the create table form */ - var the_form = $("#create_table_form"); + var $form = $("#create_table_form"); PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - $(the_form).append('<input type="hidden" name="ajax_request" value="true" />'); + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } //User wants to add more fields to the table - $.post($(the_form).attr('action'), $(the_form).serialize() + "&submit_num_fields=" + $(this).val(), function(data) { + $.post($form.attr('action'), $form.serialize() + "&submit_num_fields=" + $(this).val(), function(data) { $("#create_table_dialog").html(data); }) //end $.post() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10830-gf716903
by Marc Delisle 09 Nov '10

09 Nov '10

The branch, master has been updated via f7169036bc2bfc29c592a4debc8466e475ccfacf (commit) via 0d40953143a739db762b49c75177f49c6cd60bbf (commit) from 7a139d1cccb7bad55f748a82da5af106935c39d8 (commit) - Log ----------------------------------------------------------------- commit f7169036bc2bfc29c592a4debc8466e475ccfacf Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Nov 9 07:44:17 2010 -0500 in this case we need to use "this" commit 0d40953143a739db762b49c75177f49c6cd60bbf Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Nov 9 07:25:21 2010 -0500 do not generate the hidden ajax_request more than once; use a variable to refer to the form object ----------------------------------------------------------------------- Summary of changes: js/functions.js | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index 9015564..4ccafed 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1626,6 +1626,7 @@ $(document).ready(function() { */ $("#create_table_form_minimal").live('submit', function(event) { event.preventDefault(); + $form = $(this); /* @todo Validate this form! */ @@ -1634,12 +1635,15 @@ $(document).ready(function() { * dialog */ var button_options = {}; + // in the following function we need to use $(this) button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} PMA_ajaxShowMessage(); - $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } - $.get($(this).attr('action'), $(this).serialize(), function(data) { + $.get($form.attr('action'), $form.serialize(), function(data) { $('<div id="create_table_dialog"></div>') .append(data) .dialog({ @@ -1650,7 +1654,7 @@ $(document).ready(function() { }) // end $.get() // empty table name and number of columns from the minimal form - $(this).find('input[name=table],input[name=num_fields]').val(''); + $form.find('input[name=table],input[name=num_fields]').val(''); }); /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10828-g7a139d1
by Michal Čihař 09 Nov '10

09 Nov '10

The branch, master has been updated via 7a139d1cccb7bad55f748a82da5af106935c39d8 (commit) via 47e361424cac800aaa1bcc5c8fcfcc56685b0c79 (commit) via 94c418e97aa28755ae53dc9ee2c5bea07d406d10 (commit) via a497c01bdad7edd0cdd9b7de57c61e43c11680d4 (commit) via d75311acfc7942fe10b61d25866b07d142d256a5 (commit) from 8834ecdaa54e4783fe465a0bc48828a2dc69a030 (commit) - Log ----------------------------------------------------------------- commit 7a139d1cccb7bad55f748a82da5af106935c39d8 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 8 13:29:36 2010 +0200 Translation update done using Pootle. commit 47e361424cac800aaa1bcc5c8fcfcc56685b0c79 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 8 13:28:37 2010 +0200 Translation update done using Pootle. commit 94c418e97aa28755ae53dc9ee2c5bea07d406d10 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 8 13:27:20 2010 +0200 Translation update done using Pootle. commit a497c01bdad7edd0cdd9b7de57c61e43c11680d4 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 8 13:25:27 2010 +0200 Translation update done using Pootle. commit d75311acfc7942fe10b61d25866b07d142d256a5 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 8 13:24:51 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6d29fcc..802e04f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-07 07:20-0500\n" -"PO-Revision-Date: 2010-11-07 14:27+0200\n" +"PO-Revision-Date: 2010-11-08 13:29+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -2871,8 +2871,8 @@ msgid "" "storage[/a] in documentation" msgstr "" "Configurez le stockage de configuration phpMyAdmin pour activer des " -"fonctionnalités additionnelles, voir [a@../Documentation.html#linked-tables]" -"phpMyAdmin configuration storage[/a] dans la documentation" +"fonctionnalités additionnelles, voir [a(a)Documentation.html#linked-" +"tables]phpMyAdmin configuration storage[/a] dans la documentation" #: libraries/config/messages.inc.php:201 msgid "Changes tracking" @@ -5367,9 +5367,7 @@ msgstr "" #: libraries/export/sql.php:35 msgid "Additional custom header comment (\\n splits lines):" -msgstr "" -"Commentaires mis en en-tête (\n" -" sépare les lignes) :" +msgstr "Commentaires mis en en-tête (séparer les lignes par «\\» suivi de «n») :" #: libraries/export/sql.php:37 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. c9c03183c322ceee8f29b437592e1877e869976a
by Michal Čihař 08 Nov '10

08 Nov '10

The branch, master has been updated via c9c03183c322ceee8f29b437592e1877e869976a (commit) via 74be81b6ac31b8cd104ac8fdd95f603f74a52833 (commit) via 9304f56a78b84fa294b1ade981723af81d9d599a (commit) via 9a823c1b5a363a4cee422251d48e47fc6d524ecf (commit) via 6f44a7d367510f759b38ac99694f26f50fbb5ac7 (commit) via 655413a2fddb67fbfaae0b1e4cbd4fbe8f41e75b (commit) via 4cb5dab69acddd0b4e8216de23f14e342724dd52 (commit) via 3206c99842df814e23baf48a938ce0a9ad5ace27 (commit) from 600fc7730425318dd92b2ccbd085dffdb596c7ff (commit) - Log ----------------------------------------------------------------- commit c9c03183c322ceee8f29b437592e1877e869976a Author: Michal Čihař <michal(a)cihar.com> Date: Mon Nov 8 01:10:49 2010 +0100 Regenerate. commit 74be81b6ac31b8cd104ac8fdd95f603f74a52833 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:46:58 2010 +0200 Translation update done using Pootle. commit 9304f56a78b84fa294b1ade981723af81d9d599a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:46:31 2010 +0200 Translation update done using Pootle. commit 9a823c1b5a363a4cee422251d48e47fc6d524ecf Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:46:25 2010 +0200 Translation update done using Pootle. commit 6f44a7d367510f759b38ac99694f26f50fbb5ac7 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:46:04 2010 +0200 Translation update done using Pootle. commit 655413a2fddb67fbfaae0b1e4cbd4fbe8f41e75b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:45:46 2010 +0200 Translation update done using Pootle. commit 4cb5dab69acddd0b4e8216de23f14e342724dd52 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:43:40 2010 +0200 Translation update done using Pootle. commit 3206c99842df814e23baf48a938ce0a9ad5ace27 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:43:18 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/tr/README | 4 ++-- po/tr.po | 23 ++++++++++------------- pot/de-full.pot | 2 +- pot/de-html.pot | 2 +- pot/de-txt.pot | 2 +- pot/en_GB-full.pot | 14 +------------- pot/en_GB-html.pot | 2 +- pot/en_GB-txt.pot | 2 +- pot/hy-full.pot | 2 +- pot/hy-html.pot | 2 +- pot/hy-txt.pot | 2 +- pot/lt-full.pot | 14 +++++++++++++- pot/lt-html.pot | 2 +- pot/lt-txt.pot | 2 +- pot/mn-full.pot | 2 +- pot/mn-html.pot | 2 +- pot/mn-txt.pot | 2 +- pot/pt_BR-full.pot | 2 +- pot/pt_BR-html.pot | 2 +- pot/pt_BR-txt.pot | 2 +- pot/ro-full.pot | 2 +- pot/ro-html.pot | 2 +- pot/ro-txt.pot | 2 +- pot/sk-full.pot | 2 +- pot/sk-html.pot | 2 +- pot/sk-txt.pot | 2 +- pot/sl-full.pot | 2 +- pot/sl-html.pot | 2 +- pot/sl-txt.pot | 2 +- pot/zh_CN-full.pot | 2 +- pot/zh_CN-html.pot | 2 +- pot/zh_CN-txt.pot | 2 +- pot/zh_TW-full.pot | 2 +- pot/zh_TW-html.pot | 2 +- pot/zh_TW-txt.pot | 2 +- 35 files changed, 57 insertions(+), 60 deletions(-) diff --git a/output/tr/README b/output/tr/README index 21eedc0..a0c1568 100644 --- a/output/tr/README +++ b/output/tr/README @@ -3,7 +3,7 @@ phpMyAdmin - Benioku A set of PHP-scripts to manage MySQL over the web. -Version 3.4.0-dev +Sürüm 3.4.0-dev ----------------- http://www.phpmyadmin.net/ @@ -39,7 +39,7 @@ Gereksinimler * PHP 5.2 veya üzeri * MySQL 5.0 veya üzeri -* a web-browser (doh!) +* web tarayıcısı (doh!) Özet ~~~~~ diff --git a/po/tr.po b/po/tr.po index d9b8cf9..3493893 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-01 10:20+0100\n" -"PO-Revision-Date: 2010-09-28 12:55+0200\n" +"PO-Revision-Date: 2010-11-05 17:46+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -2920,16 +2920,14 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1385 -#, fuzzy msgid "" "Define how long login cookie should be stored in browser. Default 0 means " "that it will be kept for existing session. This is recommended for not " "trusted environments." msgstr "" -"Oturum açma tanımlama bilgisinin ne kadar (saniye olarak) tarayıcıda " -"depolanacağını tanımlar. Varsayılan 0 değeri anlamı sadece var olan oturum " -"için tutulacağıdır, ve tarayıcı penceresini kapatır kapatmaz silinecektir. " -"Bu güvenli olmayan ortamlar için önerilir." +"Oturum açma tanımlama bilgisinin ne kadar tarayıcıda depolanacağını " +"tanımlar. Varsayılan 0 değeri anlamı sadece var olan oturum için " +"tutulacağıdır. Bu güvenli olmayan ortamlar için önerilir." #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1389 @@ -10317,9 +10315,8 @@ msgstr "" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4828 -#, fuzzy msgid "Charts" -msgstr "Karakter Grupları" +msgstr "Çizelgeler" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4831 @@ -11648,12 +11645,12 @@ msgstr "" #: ../phpmyadmin/TODO:7 #, no-wrap msgid " http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n" -msgstr "" +msgstr " http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n" #. type: Plain text #: ../phpmyadmin/TODO:8 msgid "-- swix/20010704" -msgstr "" +msgstr "-- swix/20010704" #. type: Title = #: ../phpmyadmin/README:2 @@ -11670,12 +11667,12 @@ msgstr "" #: ../phpmyadmin/README:7 #, no-wrap msgid "Version 3.4.0-dev\n" -msgstr "" +msgstr "Sürüm 3.4.0-dev\n" #. type: Plain text #: ../phpmyadmin/README:10 msgid "http://www.phpmyadmin.net/" -msgstr "" +msgstr "http://www.phpmyadmin.net/" #. type: Plain text #: ../phpmyadmin/README:23 @@ -11714,7 +11711,7 @@ msgstr "MySQL 5.0 veya üzeri" #. type: Plain text #: ../phpmyadmin/README:43 msgid "a web-browser (doh!)" -msgstr "" +msgstr "web tarayıcısı (doh!)" #. type: Title ~ #: ../phpmyadmin/README:45 diff --git a/pot/de-full.pot b/pot/de-full.pot index e16b4b3..17b3924 100644 --- a/pot/de-full.pot +++ b/pot/de-full.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/de-html.pot b/pot/de-html.pot index 344f06c..bf558b6 100644 --- a/pot/de-html.pot +++ b/pot/de-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/de-txt.pot b/pot/de-txt.pot index d09099b..58b0d83 100644 --- a/pot/de-txt.pot +++ b/pot/de-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/en_GB-full.pot b/pot/en_GB-full.pot index 6c98770..5d15040 100644 --- a/pot/en_GB-full.pot +++ b/pot/en_GB-full.pot @@ -6,21 +6,9 @@ #, fuzzy msgid "" msgstr "" -"#-#-#-#-# en_GB-html.pot (phpMyAdmin documentation VERSION) #-#-#-#-#\n" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# en_GB-txt.pot (phpMyAdmin documentation VERSION) #-#-#-#-#\n" -"Project-Id-Version: phpMyAdmin documentation VERSION\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:21+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/en_GB-html.pot b/pot/en_GB-html.pot index a54c95c..1e4d1f1 100644 --- a/pot/en_GB-html.pot +++ b/pot/en_GB-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/en_GB-txt.pot b/pot/en_GB-txt.pot index f2ebb72..4454416 100644 --- a/pot/en_GB-txt.pot +++ b/pot/en_GB-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:21+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/hy-full.pot b/pot/hy-full.pot index f04c483..2476236 100644 --- a/pot/hy-full.pot +++ b/pot/hy-full.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/hy-html.pot b/pot/hy-html.pot index 0d674b4..a347099 100644 --- a/pot/hy-html.pot +++ b/pot/hy-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/hy-txt.pot b/pot/hy-txt.pot index d09099b..4454416 100644 --- a/pot/hy-txt.pot +++ b/pot/hy-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/lt-full.pot b/pot/lt-full.pot index 745794d..c5fb465 100644 --- a/pot/lt-full.pot +++ b/pot/lt-full.pot @@ -6,9 +6,21 @@ #, fuzzy msgid "" msgstr "" +"#-#-#-#-# lt-html.pot (phpMyAdmin documentation VERSION) #-#-#-#-#\n" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:06+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# lt-txt.pot (phpMyAdmin documentation VERSION) #-#-#-#-#\n" +"Project-Id-Version: phpMyAdmin documentation VERSION\n" +"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/lt-html.pot b/pot/lt-html.pot index f3c24db..5f99327 100644 --- a/pot/lt-html.pot +++ b/pot/lt-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/lt-txt.pot b/pot/lt-txt.pot index d09099b..4454416 100644 --- a/pot/lt-txt.pot +++ b/pot/lt-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/mn-full.pot b/pot/mn-full.pot index 4e8241e..f8aca37 100644 --- a/pot/mn-full.pot +++ b/pot/mn-full.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/mn-html.pot b/pot/mn-html.pot index 1467407..51ac5fc 100644 --- a/pot/mn-html.pot +++ b/pot/mn-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/mn-txt.pot b/pot/mn-txt.pot index d09099b..4454416 100644 --- a/pot/mn-txt.pot +++ b/pot/mn-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/pt_BR-full.pot b/pot/pt_BR-full.pot index 0d30145..6601549 100644 --- a/pot/pt_BR-full.pot +++ b/pot/pt_BR-full.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/pt_BR-html.pot b/pot/pt_BR-html.pot index bd87953..541568f 100644 --- a/pot/pt_BR-html.pot +++ b/pot/pt_BR-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/pt_BR-txt.pot b/pot/pt_BR-txt.pot index d09099b..4454416 100644 --- a/pot/pt_BR-txt.pot +++ b/pot/pt_BR-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/ro-full.pot b/pot/ro-full.pot index b719a3b..3c52ee6 100644 --- a/pot/ro-full.pot +++ b/pot/ro-full.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/ro-html.pot b/pot/ro-html.pot index 73a534d..acc5c25 100644 --- a/pot/ro-html.pot +++ b/pot/ro-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/ro-txt.pot b/pot/ro-txt.pot index d09099b..4454416 100644 --- a/pot/ro-txt.pot +++ b/pot/ro-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/sk-full.pot b/pot/sk-full.pot index 951e9e2..5791dae 100644 --- a/pot/sk-full.pot +++ b/pot/sk-full.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:21+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/sk-html.pot b/pot/sk-html.pot index fc946cd..cc8b655 100644 --- a/pot/sk-html.pot +++ b/pot/sk-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:21+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/sk-txt.pot b/pot/sk-txt.pot index f2ebb72..4454416 100644 --- a/pot/sk-txt.pot +++ b/pot/sk-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:21+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/sl-full.pot b/pot/sl-full.pot index fe8ed90..690348a 100644 --- a/pot/sl-full.pot +++ b/pot/sl-full.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:21+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/sl-html.pot b/pot/sl-html.pot index 030eb77..24eea1f 100644 --- a/pot/sl-html.pot +++ b/pot/sl-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:21+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/sl-txt.pot b/pot/sl-txt.pot index f2ebb72..4454416 100644 --- a/pot/sl-txt.pot +++ b/pot/sl-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:21+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/zh_CN-full.pot b/pot/zh_CN-full.pot index d3ac7f1..591109a 100644 --- a/pot/zh_CN-full.pot +++ b/pot/zh_CN-full.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/zh_CN-html.pot b/pot/zh_CN-html.pot index 90870af..298e4b5 100644 --- a/pot/zh_CN-html.pot +++ b/pot/zh_CN-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/zh_CN-txt.pot b/pot/zh_CN-txt.pot index d09099b..4454416 100644 --- a/pot/zh_CN-txt.pot +++ b/pot/zh_CN-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/zh_TW-full.pot b/pot/zh_TW-full.pot index f3b986b..a003494 100644 --- a/pot/zh_TW-full.pot +++ b/pot/zh_TW-full.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/zh_TW-html.pot b/pot/zh_TW-html.pot index 9529ee1..27d55ad 100644 --- a/pot/zh_TW-html.pot +++ b/pot/zh_TW-html.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/pot/zh_TW-txt.pot b/pot/zh_TW-txt.pot index d09099b..4454416 100644 --- a/pot/zh_TW-txt.pot +++ b/pot/zh_TW-txt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin documentation VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-01 10:20+0100\n" +"POT-Creation-Date: 2010-11-08 01:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10823-g8834ecd
by Michal Čihař 08 Nov '10

08 Nov '10

The branch, master has been updated via 8834ecdaa54e4783fe465a0bc48828a2dc69a030 (commit) via 137027138bc01e1eb91a82fb9e16edca57a5f81d (commit) via a77cf8ef1292d326b16c47ac3386130595d99aa3 (commit) via e6d72ffeb2905f20fdb7ec027e93e5092cb9aaee (commit) via 33d307dc666ee5bfe16b430e61cc1c3b5748cbce (commit) via e7b73ad8d28b51c2822829179c40e656aac7b97c (commit) via 0a9faeccbc2e2fe6c7f7e92ca141d9fd2e761ab9 (commit) via 92879394e7bebfbb94010c320605ef4aea91e31c (commit) via 98b08149ec3e9ec354acb32b7e75d826a27f3998 (commit) via f68838904789f030579aa91470fba2a4ae790bd9 (commit) via e7735febd692b5c34659e0e72db633ce4ca2fadb (commit) from f26a91317cb6cacf73093ab4082c9cd63917de2f (commit) - Log ----------------------------------------------------------------- commit 8834ecdaa54e4783fe465a0bc48828a2dc69a030 Merge: f26a91317cb6cacf73093ab4082c9cd63917de2f 137027138bc01e1eb91a82fb9e16edca57a5f81d Author: Michal Čihař <michal(a)cihar.com> Date: Mon Nov 8 01:03:38 2010 +0100 Merge remote branch 'pootle/master' Conflicts: po/fr.po po/tr.po commit 137027138bc01e1eb91a82fb9e16edca57a5f81d Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 7 14:27:40 2010 +0200 Translation update done using Pootle. commit a77cf8ef1292d326b16c47ac3386130595d99aa3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 7 14:26:17 2010 +0200 Translation update done using Pootle. commit e6d72ffeb2905f20fdb7ec027e93e5092cb9aaee Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 7 14:23:34 2010 +0200 Translation update done using Pootle. commit 33d307dc666ee5bfe16b430e61cc1c3b5748cbce Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 7 14:23:29 2010 +0200 Translation update done using Pootle. commit e7b73ad8d28b51c2822829179c40e656aac7b97c Merge: 0a9faeccbc2e2fe6c7f7e92ca141d9fd2e761ab9 850556978b89629dde667a482937755dde21fc0c Author: Pootle server <pootle(a)cihar.com> Date: Sun Nov 7 00:40:11 2010 +0100 Merge remote branch 'origin/master' commit 0a9faeccbc2e2fe6c7f7e92ca141d9fd2e761ab9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:48:46 2010 +0200 Translation update done using Pootle. commit 92879394e7bebfbb94010c320605ef4aea91e31c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:48:21 2010 +0200 Translation update done using Pootle. commit 98b08149ec3e9ec354acb32b7e75d826a27f3998 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:47:50 2010 +0200 Translation update done using Pootle. commit f68838904789f030579aa91470fba2a4ae790bd9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:40:47 2010 +0200 Translation update done using Pootle. commit e7735febd692b5c34659e0e72db633ce4ca2fadb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Nov 5 17:40:38 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 11 +++++------ po/tr.po | 14 +++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2191e8a..6d29fcc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-07 07:20-0500\n" -"PO-Revision-Date: 2010-11-04 18:59+0200\n" +"PO-Revision-Date: 2010-11-07 14:27+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "MIME-Version: 1.0\n" @@ -34,9 +34,10 @@ msgid "" "parent window, or your browser's security settings are configured to block " "cross-window updates." msgstr "" -"La fenêtre principale n'a pu être mise à jour. Il est possible que vous " -"l'ayiez fermée, ou encore que votre navigateur bloque les mises à jour inter-" -"fenêtres pour des raisons de sécurité." +"La fenêtre demandée depuis votre navigateur ne peut être rafraîchie. Il est " +"possible que vous ayez fermé la fenêtre source , ou encore que votre " +"navigateur bloque les mises à jour inter-fenêtres pour des raisons de " +"sécurité." #: browse_foreigners.php:148 libraries/common.lib.php:2823 #: libraries/common.lib.php:2830 libraries/common.lib.php:3005 @@ -4715,13 +4716,11 @@ msgid "Options" msgstr "Options" #: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" msgstr "Textes réduits" #: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572 -#, fuzzy #| msgid "Full Texts" msgid "Full texts" msgstr "Textes complets" diff --git a/po/tr.po b/po/tr.po index 3c17090..ec387ee 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-07 07:20-0500\n" -"PO-Revision-Date: 2010-11-03 00:21+0200\n" +"PO-Revision-Date: 2010-11-05 17:48+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -4700,16 +4700,14 @@ msgid "Options" msgstr "Seçenekler" #: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" -msgstr "Kısmi Metinler" +msgstr "Kısmi metinler" #: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572 -#, fuzzy #| msgid "Full Texts" msgid "Full texts" -msgstr "Tam Metinler" +msgstr "Tam metinler" #: libraries/display_tbl.lib.php:585 msgid "Relational key" @@ -5345,7 +5343,9 @@ msgstr "" #: libraries/export/sql.php:35 msgid "Additional custom header comment (\\n splits lines):" -msgstr "İlave özel başlık yorumu (\\ n satırları böler):" +msgstr "" +"İlave özel başlık yorumu (\n" +" satırları böler):" #: libraries/export/sql.php:37 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10812-gf26a913
by Marc Delisle 07 Nov '10

07 Nov '10

The branch, master has been updated via f26a91317cb6cacf73093ab4082c9cd63917de2f (commit) from 67eb6f6ca6c71837ea344aba8f7ea5b30c25a672 (commit) - Log ----------------------------------------------------------------- commit f26a91317cb6cacf73093ab4082c9cd63917de2f Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 7 07:49:55 2010 -0500 Designer: the new relation box is often not completely visible ----------------------------------------------------------------------- Summary of changes: pmd/scripts/move.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js index a2f1dcd..93180cb 100644 --- a/pmd/scripts/move.js +++ b/pmd/scripts/move.js @@ -517,7 +517,7 @@ function Click_field(T, f, PK) // table field } var left = Glob_X - (document.getElementById('layer_new_relation').offsetWidth>>1); document.getElementById('layer_new_relation').style.left = left + 'px'; - var top = Glob_Y - document.getElementById('layer_new_relation').offsetHeight - 10; + var top = Glob_Y - document.getElementById('layer_new_relation').offsetHeight + 40; document.getElementById('layer_new_relation').style.top = top + 'px'; document.getElementById('layer_new_relation').style.visibility = "visible"; link_relation += '&T2=' + T + '&F2=' + f; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10810-gab58b2c
by Marc Delisle 07 Nov '10

07 Nov '10

The branch, master has been updated via ab58b2cf6f0a2d721df1d2a0bb0e4ee44e4053b1 (commit) from 850556978b89629dde667a482937755dde21fc0c (commit) - Log ----------------------------------------------------------------- commit ab58b2cf6f0a2d721df1d2a0bb0e4ee44e4053b1 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 7 07:18:53 2010 -0500 undefined messages in Designer ----------------------------------------------------------------------- Summary of changes: js/messages.php | 10 +--------- pmd/scripts/ajax.js | 6 +++--- pmd_relation_new.php | 2 +- pmd_save_pos.php | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/js/messages.php b/js/messages.php index 16e1a83..c034d74 100644 --- a/js/messages.php +++ b/js/messages.php @@ -88,15 +88,7 @@ $js_messages['strInlineEdit'] = __('Inline Edit'); /* For tbl_change.js */ $js_messages['strIgnore'] = __('Ignore'); -/* Designer */ -$js_messages['strModifications'] = __('Modifications have been saved'); -$js_messages['strRelationDeleted'] = __('Relation deleted'); -$js_messages['strForeignKeyRelationAdded'] = __('FOREIGN KEY relation added'); -$js_messages['strInternalRelationAdded'] = __('Internal relation added'); -$js_messages['strErrorRelationAdded'] = __('Error: Relation not added.'); -$js_messages['strErrorRelationExists'] = __('Error: relation already exists.'); -$js_messages['strErrorSaveTable'] = __('Error saving coordinates for Designer.'); -$js_messages['strGeneralRelationFeat:strDisabled'] = __('General relation features') . ': ' . __('Disabled'); +/* Designer (pmd/scripts/move.js) */ $js_messages['strSelectReferencedKey'] = __('Select referenced key'); $js_messages['strSelectForeignKey'] = __('Select Foreign Key'); $js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key'); diff --git a/pmd/scripts/ajax.js b/pmd/scripts/ajax.js index a26246d..7f48147 100644 --- a/pmd/scripts/ajax.js +++ b/pmd/scripts/ajax.js @@ -103,17 +103,17 @@ function PrintXML() //xmldoc.getElementsByTagName('root')[0].getAttribute("act") if (root.getAttribute('act') == 'save_pos') { - layer_alert(PMA_messages[root.getAttribute('return')]); + layer_alert(root.getAttribute('return')); } if (root.getAttribute('act') == 'relation_upd') { - layer_alert(PMA_messages[root.getAttribute('return')]); + layer_alert(root.getAttribute('return')); if (root.getAttribute('b') == '1') { contr.splice(root.getAttribute('K'), 1); Re_load(); } } if (root.getAttribute('act') == 'relation_new') { - layer_alert(PMA_messages[root.getAttribute('return')]); + layer_alert(root.getAttribute('return')); if (root.getAttribute('b') == '1') { var i = contr.length; var t1 = root.getAttribute('DB1') + '.' + root.getAttribute('T1'); diff --git a/pmd_relation_new.php b/pmd_relation_new.php index 32d42ef..6ea4485 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -65,7 +65,7 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && // internal (pmadb) relation } else { if ($GLOBALS['cfgRelation']['relwork'] == false) { - PMD_return_new(0, 'strGeneralRelationFeat:strDisabled'); + PMD_return_new(0, _('General relation features') . ':' . _('Disabled')); } else { // no need to recheck if the keys are primary or unique at this point, // this was checked on the interface part diff --git a/pmd_save_pos.php b/pmd_save_pos.php index cea1001..fb9d1eb 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -41,7 +41,7 @@ function PMD_err_sav() { if (! empty($die_save_pos)) { header("Content-Type: text/xml; charset=utf-8"); header("Cache-Control: no-cache"); - die('<root act="save_pos" return="strErrorSaveTable"></root>'); + die('<root act="save_pos" return="' . __('Error saving coordinates for Designer.') . '"></root>'); } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10809-g8505569
by Marc Delisle 06 Nov '10

06 Nov '10

The branch, master has been updated via 850556978b89629dde667a482937755dde21fc0c (commit) from 888931369557c6db0e1701307bb7e3e1e97692a6 (commit) - Log ----------------------------------------------------------------- commit 850556978b89629dde667a482937755dde21fc0c Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 6 18:20:20 2010 -0400 Designer: their could be an internal relation to delete even if engine is InnoDB ----------------------------------------------------------------------- Summary of changes: pmd_relation_upd.php | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index f05ffbd..564395b 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -21,6 +21,8 @@ $type_T1 = strtoupper($tables[$T1]['ENGINE']); $tables = PMA_DBI_get_tables_full($db, $T2); $type_T2 = strtoupper($tables[$T2]['ENGINE']); +$try_to_delete_internal_relation = false; + if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && $type_T1 == $type_T2) { // InnoDB $existrel_foreign = PMA_getForeigners($DB2, $T2, '', 'foreign'); @@ -30,8 +32,14 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && . ' DROP FOREIGN KEY ' . PMA_backquote($existrel_foreign[$F2]['constraint']); $upd_rs = PMA_DBI_query($upd_query); + } else { + // there can be an internal relation even if InnoDB + $try_to_delete_internal_relation = true; } } else { + $try_to_delete_internal_relation = true; +} +if ($try_to_delete_internal_relation) { // internal relations PMA_query_as_controluser('DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git