The branch, gettext has been updated
via 465ec50efae8d6294f2ca356dbd848c4308270a9 (commit)
via 8fac76138004d6d811cf464b5f224382d287391d (commit)
via ee1ac10531a0d4e154ba80cbb52b4efeafeb1bd4 (commit)
via 37dec40c527f88ca06c161d049ed81d3985fdbcb (commit)
via e775610205daadf61f1fe443d2b1dca1c3372291 (commit)
via ca2b8520e52775f7e2515e5cf953de8d0a323834 (commit)
via ec7f2ee94c824b2ec6dd6407aa008e698d75df81 (commit)
via 46afd9d410cdaa3d471eaf40c308f12196840a76 (commit)
via a7b4d9c4c051456b9fffce793ef9789611bd7cf5 (commit)
via 252d7f92335dc57015a6adcf1eb7238b5a3afe4d (commit)
via b78fe06b38e6095cc3424fb7ef467b465c10ef3b (commit)
via 6a0ef059c675091b91e3340a2d98fd6b5aba7e15 (commit)
via 1b691149825d2eb5e64e2932b58b3734ddbe3fe6 (commit)
via 9fc19bc0568c53ee2a86cf433390dec209e1c84b (commit)
via 435931457115e5673b1c79d61e4a3de5a6af667c (commit)
via 5b7d44ca5472938101b8ffe0065adeca92b35bd6 (commit)
via e7a1705b6df83d52c4e26a7f09cd8db367151b81 (commit)
via b774459169467ca5c0980f308358330dac950ba4 (commit)
via 3459098babee9b911107a6776e87cbdf569816ec (commit)
via 775d2ce26417a2c52b42f719a0dbccc3e63e468b (commit)
via d8765ad5fb3e773361a68b788c53a231790e84b2 (commit)
via 031d315b3c1d7507a1f39e52bf93f7917dbe7eee (commit)
via 605727dd9857edafcea279e5f6384f75a145ac48 (commit)
via f3286a0d214c0ed03e04350dbf17369686963b84 (commit)
via e58626c1888f22027d26df749be475fc28800086 (commit)
via a0fb4c04b96da4ca82968b355a271614d5e7bde5 (commit)
via f7418693d783d1ae694cf392e19e0ff7dfe0d95d (commit)
via 6ff307b546471fd556cdfe3ac924a89217134e5d (commit)
from 1ce73794ea669c0a37ad65a83c14a1286b7b2371 (commit)
- Log -----------------------------------------------------------------
commit 465ec50efae8d6294f2ca356dbd848c4308270a9
Merge: 8fac76138004d6d811cf464b5f224382d287391d ee1ac10531a0d4e154ba80cbb52b4efeafeb1bd4
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Mar 29 09:06:32 2010 +0200
Merge remote branch 'pootle/gettext' into gettext
commit 8fac76138004d6d811cf464b5f224382d287391d
Merge: 1ce73794ea669c0a37ad65a83c14a1286b7b2371 775d2ce26417a2c52b42f719a0dbccc3e63e468b
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Mar 29 09:06:15 2010 +0200
Merge branch 'master' into gettext
commit ee1ac10531a0d4e154ba80cbb52b4efeafeb1bd4
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:26:56 2010 +0200
Translation update done using Pootle.
commit 37dec40c527f88ca06c161d049ed81d3985fdbcb
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:26:11 2010 +0200
Translation update done using Pootle.
commit e775610205daadf61f1fe443d2b1dca1c3372291
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:25:20 2010 +0200
Translation update done using Pootle.
commit ca2b8520e52775f7e2515e5cf953de8d0a323834
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:24:34 2010 +0200
Translation update done using Pootle.
commit ec7f2ee94c824b2ec6dd6407aa008e698d75df81
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:24:08 2010 +0200
Translation update done using Pootle.
commit 46afd9d410cdaa3d471eaf40c308f12196840a76
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:23:56 2010 +0200
Translation update done using Pootle.
commit a7b4d9c4c051456b9fffce793ef9789611bd7cf5
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:23:51 2010 +0200
Translation update done using Pootle.
commit 252d7f92335dc57015a6adcf1eb7238b5a3afe4d
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:23:23 2010 +0200
Translation update done using Pootle.
commit b78fe06b38e6095cc3424fb7ef467b465c10ef3b
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:23:16 2010 +0200
Translation update done using Pootle.
commit 6a0ef059c675091b91e3340a2d98fd6b5aba7e15
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:22:45 2010 +0200
Translation update done using Pootle.
commit 1b691149825d2eb5e64e2932b58b3734ddbe3fe6
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:22:06 2010 +0200
Translation update done using Pootle.
commit 9fc19bc0568c53ee2a86cf433390dec209e1c84b
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:21:54 2010 +0200
Translation update done using Pootle.
commit 435931457115e5673b1c79d61e4a3de5a6af667c
Author: rebeluca <rebeluca(a)gmail.com>
Date: Mon Mar 29 00:21:28 2010 +0200
Translation update done using Pootle.
commit 5b7d44ca5472938101b8ffe0065adeca92b35bd6
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 13:56:28 2010 +0200
Translation update done using Pootle.
commit e7a1705b6df83d52c4e26a7f09cd8db367151b81
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 13:55:45 2010 +0200
Translation update done using Pootle.
commit b774459169467ca5c0980f308358330dac950ba4
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 13:54:34 2010 +0200
Translation update done using Pootle.
commit 3459098babee9b911107a6776e87cbdf569816ec
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 13:54:08 2010 +0200
Translation update done using Pootle.
commit d8765ad5fb3e773361a68b788c53a231790e84b2
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 07:24:32 2010 +0200
Translation update done using Pootle.
commit 031d315b3c1d7507a1f39e52bf93f7917dbe7eee
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 07:04:15 2010 +0200
Translation update done using Pootle.
commit 605727dd9857edafcea279e5f6384f75a145ac48
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 07:02:24 2010 +0200
Translation update done using Pootle.
commit f3286a0d214c0ed03e04350dbf17369686963b84
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 05:06:37 2010 +0200
Translation update done using Pootle.
commit e58626c1888f22027d26df749be475fc28800086
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 05:06:18 2010 +0200
Translation update done using Pootle.
commit a0fb4c04b96da4ca82968b355a271614d5e7bde5
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 05:04:19 2010 +0200
Translation update done using Pootle.
commit f7418693d783d1ae694cf392e19e0ff7dfe0d95d
Author: Azhari Harahap <azhari.harahap(a)yahoo.com>
Date: Sun Mar 28 05:03:57 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
js/main_custom_color.js | 28 +++++++++++++
libraries/config.default.php | 3 +-
main.php | 52 ++++++------------------
po/id.po | 24 +++++-----
po/it.po | 31 +++++++-------
themes/darkblue_orange/css/theme_right.css.php | 5 ++
themes/original/css/theme_right.css.php | 5 ++
7 files changed, 80 insertions(+), 68 deletions(-)
create mode 100644 js/main_custom_color.js
diff --git a/js/main_custom_color.js b/js/main_custom_color.js
new file mode 100644
index 0000000..eacc5b7
--- /dev/null
+++ b/js/main_custom_color.js
@@ -0,0 +1,28 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * for main custom color
+ *
+ */
+$(document).ready(function() {
+ $('#li_custom_color').show();
+ // Choosing another id does not work!
+ $('#colorSelector').ColorPicker({
+ color: '#0000ff',
+ onShow: function (colpkr) {
+ $(colpkr).fadeIn(500);
+ return false;
+ },
+ onHide: function (colpkr) {
+ $(colpkr).fadeOut(500);
+ return false;
+ },
+ onChange: function(hsb, hex, rgb) {
+ top.frame_content.document.body.style.backgroundColor = '#' + hex;
+ top.frame_navigation.document.body.style.backgroundColor = '#' + hex;
+ },
+ onSubmit: function(hsb, hex, rgb) {
+ $('#custom_color').val('#' + hex);
+ $('#colorform').submit();
+ }
+ });
+});
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 653fc53..35f603d 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -578,7 +578,8 @@ $cfg['ShowSQL'] = true;
$cfg['AllowUserDropDatabase'] = false;
/**
- * confirm 'DROP TABLE' & 'DROP DATABASE'
+ * confirm some commands that can result in loss of data
+ * (see "need_confirm" in the parser)
*
* @global boolean $cfg['Confirm']
*/
diff --git a/main.php b/main.php
index 8c65bc5..f942b40 100644
--- a/main.php
+++ b/main.php
@@ -14,6 +14,7 @@ require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
$GLOBALS['js_include'][] = 'colorpicker/js/colorpicker.js';
+$GLOBALS['js_include'][] = 'main_custom_color.js';
// Handles some variables that may have been sent by the calling script
$GLOBALS['db'] = '';
@@ -153,45 +154,18 @@ if ($GLOBALS['cfg']['ThemeManager']) {
echo '<li id="li_select_theme">';
echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox();
echo '</li>';
-?>
- <script type="text/javascript">
- //<![CDATA[
- document.write('<li id="li_custom_color">');
- document.write('<?php echo PMA_escapeJsString($strCustomColor) . ': '; ?>');
- document.write('<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">');
- document.write('<?php echo PMA_generate_common_hidden_inputs(); ?>');
- document.write('<input type="hidden" id="custom_color" name="custom_color" value="" />');
- document.write('<input type="submit" name="custom_color_reset" value="<?php echo $strReset; ?>" />');
- document.write('</form>');
- document.write('<div id="colorSelector">');
- document.write('</div>');
- document.write('</li>');
-
- $(document).ready(function() {
- // Choosing another id does not work!
- $('#colorSelector').ColorPicker({
- color: '#0000ff',
- onShow: function (colpkr) {
- $(colpkr).fadeIn(500);
- return false;
- },
- onHide: function (colpkr) {
- $(colpkr).fadeOut(500);
- return false;
- },
- onChange: function(hsb, hex, rgb) {
- top.frame_content.document.body.style.backgroundColor = '#' + hex;
- top.frame_navigation.document.body.style.backgroundColor = '#' + hex;
- },
- onSubmit: function(hsb, hex, rgb) {
- $('#custom_color').val('#' + hex);
- $('#colorform').submit();
- }
- });
- });
- //]]>
- </script>
- <?php
+
+ // see js/main_custom_color.js
+ echo '<li id="li_custom_color" class="hide">';
+ echo PMA_escapeJsString($strCustomColor) . ': ';
+ echo '<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">';
+ echo PMA_generate_common_hidden_inputs();
+ echo '<input type="hidden" id="custom_color" name="custom_color" value="" />';
+ echo '<input type="submit" name="custom_color_reset" value="' . $strReset . '" />';
+ echo '</form>';
+ echo '<div id="colorSelector">';
+ echo '</div>';
+ echo '</li>';
}
echo '<li id="li_select_fontsize">';
echo PMA_Config::getFontsizeForm();
diff --git a/po/id.po b/po/id.po
index fa1e604..6fc979d 100644
--- a/po/id.po
+++ b/po/id.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-03-19 00:28+0100\n"
-"PO-Revision-Date: 2010-03-24 04:59+0200\n"
+"PO-Revision-Date: 2010-03-28 13:56+0200\n"
"Last-Translator: Azhari Harahap <azhari.harahap(a)yahoo.com>\n"
"Language-Team: indonesian <id(a)li.org>\n"
"Language: id\n"
@@ -6520,7 +6520,7 @@ msgstr "Pemeliharaan tabel"
#: libraries/messages.inc.php:1455
msgid "Table name"
-msgstr ""
+msgstr "Nama tabel"
#: libraries/messages.inc.php:1456
msgid "Table of contents"
@@ -6674,16 +6674,16 @@ msgstr "Jumlah"
#: libraries/messages.inc.php:1490
#, php-format
msgid "Tracking of %s.%s is activated."
-msgstr ""
+msgstr "Pelacakan dari %s.%s diaktifkan"
#: libraries/messages.inc.php:1491
msgid "Activate now"
-msgstr ""
+msgstr "Aktifkan sekarang"
#: libraries/messages.inc.php:1492
#, php-format
msgid "Activate tracking for %s.%s"
-msgstr ""
+msgstr "Aktifkan pelacakan untuk %s.%s"
#: libraries/messages.inc.php:1493
msgid "Comment out these two lines if you do not need them."
@@ -6726,32 +6726,32 @@ msgstr "Nonaktifkan pelacakan untuk %s.%s"
#: libraries/messages.inc.php:1502
#, php-format
msgid "Export as %s"
-msgstr ""
+msgstr "Ekspor sebagai %s"
#: libraries/messages.inc.php:1503
msgid "Tracking is active."
-msgstr ""
+msgstr "Pelacakan aktif"
#: libraries/messages.inc.php:1504
msgid "Tracking is not active."
-msgstr ""
+msgstr "Pelacakan tidak aktif."
#: libraries/messages.inc.php:1505
msgid "Tracking Mechanism"
-msgstr ""
+msgstr "Mekanisme pelacakan"
#: libraries/messages.inc.php:1506
msgid "Close"
-msgstr ""
+msgstr "Tutup"
#: libraries/messages.inc.php:1507
#, php-format
msgid "Tracking report for table `%s`"
-msgstr ""
+msgstr "Laporan pelacakan untuk table '%s'"
#: libraries/messages.inc.php:1508
msgid "Tracking report"
-msgstr ""
+msgstr "Laporan pelacakan"
#: libraries/messages.inc.php:1509
#, php-format
diff --git a/po/it.po b/po/it.po
index 4d74005..36cf40a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,13 +4,15 @@ 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-03-19 00:28+0100\n"
-"PO-Revision-Date: 2010-03-12 09:16+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-03-29 00:26+0200\n"
+"Last-Translator: <rebeluca(a)gmail.com>\n"
"Language-Team: italian <it(a)li.org>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#: libraries/auth/config.auth.lib.php:107
#, php-format
@@ -35,10 +37,9 @@ msgstr ""
#. l10n: Language to use for MySQL 5.1 documentation
#: libraries/common.lib.php:411
-#, fuzzy
msgctxt "$mysql_5_1_doc_lang"
msgid "en"
-msgstr "Spediti"
+msgstr "en"
#. l10n: Language to use for MySQL 5.0 documentation
#: libraries/common.lib.php:415
@@ -347,7 +348,7 @@ msgstr "Qualsiasi utente"
#: libraries/messages.inc.php:68
msgid "Apply Selected Changes"
-msgstr ""
+msgstr "Applica i cambiamenti selezionati"
#: libraries/messages.inc.php:69
msgid ""
@@ -446,7 +447,7 @@ msgstr "ID del server"
#: libraries/messages.inc.php:93
msgid "BLOB Repository"
-msgstr ""
+msgstr "Repository BLOB"
#: libraries/messages.inc.php:94
msgid "Damaged"
@@ -456,9 +457,9 @@ msgstr "Danneggiato"
#, php-format
msgid "Are you sure you want to disable all BLOB references for database %s?"
msgstr ""
+"Sei sicuro di voler disabilitare tutte le referenze BLOB per il database %s?"
#: libraries/messages.inc.php:96
-#, fuzzy
msgctxt "$strBLOBRepositoryDisabled"
msgid "Disabled"
msgstr "Disabilitato"
@@ -469,10 +470,9 @@ msgstr "Disabilita"
#: libraries/messages.inc.php:98
msgid "You are about to DISABLE a BLOB Repository!"
-msgstr ""
+msgstr "Stai per DISABILITARE una repository BLOB!"
#: libraries/messages.inc.php:99
-#, fuzzy
msgctxt "$strBLOBRepositoryEnabled"
msgid "Enabled"
msgstr "Abilitato"
@@ -483,17 +483,16 @@ msgstr "Abilita"
#: libraries/messages.inc.php:101
msgid "Remove BLOB Repository Reference"
-msgstr ""
+msgstr "Rimuovi le referenze al REPOSITORY BLOB"
#: libraries/messages.inc.php:102
-#, fuzzy
msgctxt "$strBLOBRepositoryRepair"
msgid "Repair"
msgstr "Ripara"
#: libraries/messages.inc.php:103
msgid "Upload to BLOB repository"
-msgstr ""
+msgstr "Carica nella repository BLOB"
#: libraries/messages.inc.php:104
msgid "Let every user access this bookmark"
@@ -518,7 +517,7 @@ msgstr "Query SQL aggiunte ai preferiti"
#: libraries/messages.inc.php:109
msgid "Replace existing bookmark of same name"
-msgstr "Sostituzione dei segnalibri esistenti con lo stesso nome"
+msgstr "Sostituisci segnalibro esistente se con lo stesso nome"
#: libraries/messages.inc.php:110
msgid "Bookmark this SQL query"
@@ -538,7 +537,7 @@ msgstr "Naviga tra i valori DISTINCT"
#: libraries/messages.inc.php:114
msgid "Browse foreign values"
-msgstr "Sfoglia le opzioni straniere"
+msgstr "Naviga tra i valori esterni"
#: libraries/messages.inc.php:115
msgid "Buffer Pool Activity"
@@ -578,7 +577,7 @@ msgstr "Pagine occupate"
#: libraries/messages.inc.php:124
msgid "\"bzipped\""
-msgstr "\"compresso con bzip2\""
+msgstr "\"compresso con bzip\""
#: libraries/messages.inc.php:126
msgid "Calendar"
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index b3641b3..7fafa15 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1227,6 +1227,11 @@ code.sql {
margin-top: 0;
}
+/* for elements that should be revealed only via js */
+.hide {
+ display: none;
+}
+
#li_select_server {
padding-bottom: 0.3em;
border-bottom: 0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 0a5ae35..b550fab 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1178,6 +1178,11 @@ code.sql {
margin-top: 0;
}
+/* for elements that should be revealed only via js */
+.hide {
+ display: none;
+}
+
#li_select_server {
padding-bottom: 0.3em;
border-bottom: 0.3em solid <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
hooks/post-receive
--
phpMyAdmin
