[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-457-gea463f8
Michal Čihař
nijel at users.sourceforge.net
Tue Mar 16 13:00:26 CET 2010
The branch, gettext has been updated
via ea463f80a1c5b1f473e369c22878ef52d8d9f5ba (commit)
via e338388cce3e489f61bc04f3eeda29933753140c (commit)
via 87794051a44d6d54cdd1ae4be3818cd773b2ec2f (commit)
via b48e6681956d926329345e07107e10f22e2b820f (commit)
via b802e48917468ef990087d5af5a69b6f7d3325f3 (commit)
via a6d4653377469fab9731f6ba7d98f5786d52b5c4 (commit)
via 0999e9ad6809cda41b859c4fbe0151b1f8025f7b (commit)
via 1a82e63fb7b2e5d20d3a36fdb988d242d6f615da (commit)
via 831d4e62f18d893cf97a9e42932fd9dfd8d88185 (commit)
via 5685a141dc27df810976501dae29e5cd79aaf343 (commit)
via 9cfa7680d323f8dbc1d505b615dd0dac90f664b5 (commit)
via 2e243fb684cc04759f2bef773629798705897cc8 (commit)
via 582fbfbc8fddc0d4a1352a95515929013cc1c16c (commit)
via f9244aad5686e82d92818990735797b49064e1ae (commit)
via 9eaffa1e7f404e77c3a1cc4882f2ba472644cb2a (commit)
via 7ec6ae66de57fbe8073772537fb70ed24fc7efa1 (commit)
via 4ea114a7db63d6a666ec883b0a49b07fcf850ef8 (commit)
via d0767e7a352353a4c8fa8254233c36891cb0dd78 (commit)
via 0c3175f51e0662d7593f9de26711e758543ea5b7 (commit)
via 52fd55883975fcc6e75ea7aaa06346600e66544e (commit)
via 2aa8515b7744e29d25e635e3a4e9e422d5f6097c (commit)
via 8d9fc205519dc83b771471e075bcdcfb7533ca85 (commit)
via 5f5cd25eb8e3f99198303f35ba8e6c57c2fd3bd5 (commit)
via f24f40d993aaf372753d1b84df892a74e4dcf40d (commit)
via e5a2a4889216e8c4ac00988b24e8425cf2d543d0 (commit)
via 3a164a26e77e1ee95f2fd71bf0ca7dc13e311c29 (commit)
from 81eee5b45c8b84ceaabe8baa163815bf2fb6e158 (commit)
- Log -----------------------------------------------------------------
commit ea463f80a1c5b1f473e369c22878ef52d8d9f5ba
Merge: b48e6681956d926329345e07107e10f22e2b820f e338388cce3e489f61bc04f3eeda29933753140c
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Mar 16 13:00:10 2010 +0100
Merge branch 'master' into gettext
commit b48e6681956d926329345e07107e10f22e2b820f
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:30:36 2010 +0200
Translation update done using Pootle.
commit b802e48917468ef990087d5af5a69b6f7d3325f3
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:30:21 2010 +0200
Translation update done using Pootle.
commit a6d4653377469fab9731f6ba7d98f5786d52b5c4
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:30:13 2010 +0200
Translation update done using Pootle.
commit 0999e9ad6809cda41b859c4fbe0151b1f8025f7b
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:29:45 2010 +0200
Translation update done using Pootle.
commit 1a82e63fb7b2e5d20d3a36fdb988d242d6f615da
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:29:42 2010 +0200
Translation update done using Pootle.
commit 831d4e62f18d893cf97a9e42932fd9dfd8d88185
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:29:36 2010 +0200
Translation update done using Pootle.
commit 5685a141dc27df810976501dae29e5cd79aaf343
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:29:02 2010 +0200
Translation update done using Pootle.
commit 9cfa7680d323f8dbc1d505b615dd0dac90f664b5
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:28:35 2010 +0200
Translation update done using Pootle.
commit 2e243fb684cc04759f2bef773629798705897cc8
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:28:08 2010 +0200
Translation update done using Pootle.
commit 582fbfbc8fddc0d4a1352a95515929013cc1c16c
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:27:25 2010 +0200
Translation update done using Pootle.
commit f9244aad5686e82d92818990735797b49064e1ae
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:17:38 2010 +0200
Translation update done using Pootle.
commit 9eaffa1e7f404e77c3a1cc4882f2ba472644cb2a
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:17:25 2010 +0200
Translation update done using Pootle.
commit 7ec6ae66de57fbe8073772537fb70ed24fc7efa1
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:17:07 2010 +0200
Translation update done using Pootle.
commit 4ea114a7db63d6a666ec883b0a49b07fcf850ef8
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:16:52 2010 +0200
Translation update done using Pootle.
commit d0767e7a352353a4c8fa8254233c36891cb0dd78
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:15:31 2010 +0200
Translation update done using Pootle.
commit 0c3175f51e0662d7593f9de26711e758543ea5b7
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:15:10 2010 +0200
Translation update done using Pootle.
commit 52fd55883975fcc6e75ea7aaa06346600e66544e
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:15:06 2010 +0200
Translation update done using Pootle.
commit 2aa8515b7744e29d25e635e3a4e9e422d5f6097c
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:15:02 2010 +0200
Translation update done using Pootle.
commit 8d9fc205519dc83b771471e075bcdcfb7533ca85
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:14:59 2010 +0200
Translation update done using Pootle.
commit 5f5cd25eb8e3f99198303f35ba8e6c57c2fd3bd5
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:14:55 2010 +0200
Translation update done using Pootle.
commit f24f40d993aaf372753d1b84df892a74e4dcf40d
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:14:50 2010 +0200
Translation update done using Pootle.
commit e5a2a4889216e8c4ac00988b24e8425cf2d543d0
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:14:44 2010 +0200
Translation update done using Pootle.
commit 3a164a26e77e1ee95f2fd71bf0ca7dc13e311c29
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date: Mon Mar 15 16:14:00 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 ++-
po/nb.po | 50 ++++++++++++++++++++++++--------------------------
tbl_change.php | 6 ++++++
3 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6d14838..bd423eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,8 +56,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing
- bug #2967366 [Structure] Some results of Propose table structure are
shown in hex
+- bug #2967565 [insert] UNHEX not selected by default when inserting BINARY
-3.3.1.0 (not yet released)
+3.3.1.0 (2010-03-16)
- bug #2941037 [core] Database structure not sorted by table correctly
- bug #2948492 [interface] Slide effect masks some fields on search page
- bug #2959746 [interface] Unknown table status: TABLE_TYPE
diff --git a/po/nb.po b/po/nb.po
index 3fc482f..3d91696 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2010-03-12 09:48+0100\n"
-"PO-Revision-Date: 2010-03-12 09:17+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-03-15 16:30+0200\n"
+"Last-Translator: <sven.erik.andersen at gmail.com>\n"
"Language-Team: norwegian <no at li.org>\n"
+"Language: nb\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,17 +37,15 @@ 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 "Sendt"
+msgstr "nb"
#. l10n: Language to use for MySQL 5.0 documentation
#: libraries/common.lib.php:415
-#, fuzzy
msgctxt "$mysql_5_0_doc_lang"
msgid "en"
-msgstr "Sendt"
+msgstr "nb"
#. l10n: Text direction, use either ltr or rtl
#: libraries/messages.inc.php:15
@@ -457,7 +457,6 @@ msgstr ""
"Er du sikker på at du ønsker å slå av alle BLOB referanser for databasen %s?"
#: libraries/messages.inc.php:96
-#, fuzzy
msgctxt "$strBLOBRepositoryDisabled"
msgid "Disabled"
msgstr "Avslått"
@@ -471,7 +470,6 @@ msgid "You are about to DISABLE a BLOB Repository!"
msgstr "Du er i ferd med å SLÅ AV et BLOB lager!"
#: libraries/messages.inc.php:99
-#, fuzzy
msgctxt "$strBLOBRepositoryEnabled"
msgid "Enabled"
msgstr "Påslått"
@@ -485,7 +483,6 @@ msgid "Remove BLOB Repository Reference"
msgstr "Fjern BLOB lager referanse"
#: libraries/messages.inc.php:102
-#, fuzzy
msgctxt "$strBLOBRepositoryRepair"
msgid "Repair"
msgstr "Reparer"
@@ -925,7 +922,6 @@ msgid "Create table"
msgstr "Opprett tabell"
#: libraries/messages.inc.php:200
-#, fuzzy
msgctxt "$strCreateTableShort"
msgid "Create table"
msgstr "Opprett tabell"
@@ -939,7 +935,6 @@ msgid "Create database with same name and grant all privileges"
msgstr "Opprett database med samme navn og gi alle rettigheter"
#: libraries/messages.inc.php:203
-#, fuzzy
msgctxt "$strCreateUserDatabaseNone"
msgid "None"
msgstr "Ingen"
@@ -1969,7 +1964,7 @@ msgstr "Insatt rad id: %1$d"
#: libraries/messages.inc.php:440
msgid "Insert as new row and ignore errors"
-msgstr ""
+msgstr "Sett inn som ny rad og ignorer feil"
#: libraries/messages.inc.php:441
msgid "Insert"
@@ -2072,6 +2067,9 @@ msgid ""
"functionality will be missing. For example navigation frame will not refresh "
"automatically."
msgstr ""
+"Støtte for Javascript mangler eller er avslått i din nettleser, en del "
+"phpMyAdmin funksjonalitet vil mangle. F.eks. navigasjonsrammen vil ikke "
+"oppdatere seg automatisk."
#: libraries/messages.inc.php:464
msgid "Joins"
@@ -2498,9 +2496,8 @@ msgid "Filter"
msgstr "Filter"
#: libraries/messages.inc.php:555
-#, fuzzy
msgid "New table"
-msgstr "Ingen tabeller"
+msgstr "Ny tabell"
#: libraries/messages.inc.php:556
msgid "Next"
@@ -2947,13 +2944,12 @@ msgid "No tables"
msgstr "Ingen tabeller"
#: libraries/messages.inc.php:651
-#, fuzzy
msgid "Page has been created"
-msgstr "Tabellen %1$s har blitt opprettet."
+msgstr "Siden har blitt opprettet"
#: libraries/messages.inc.php:652
msgid "Page creation failed"
-msgstr ""
+msgstr "Sideopprettelsen feilet"
#: libraries/messages.inc.php:653
msgid "PDF"
@@ -3016,23 +3012,27 @@ msgid ""
"Enable advanced features in configuration file (<code>config.inc.php</"
"code>), for example by starting from <code>config.sample.inc.php</code>."
msgstr ""
+"Slå på avansert funksjonalitet i konfigurasjonsfila "
+"(<code>config.inc.php</code>), f.eks. med eksempel fra "
+"<code>config.sample.inc.php</code>."
#: libraries/messages.inc.php:668
msgid "Quick steps to setup advanced features:"
-msgstr ""
+msgstr "Raske steg for å sette opp avansert funksjonalitet:"
#: libraries/messages.inc.php:669
msgid ""
"Create the needed tables with the <code>script/create_tables.sql</code>."
-msgstr ""
+msgstr "Opprett nødvendige tabeller med <code>script/create_tables.sql</code>."
#: libraries/messages.inc.php:670
msgid "Create a pma user and give access to these tables."
-msgstr ""
+msgstr "Opprett en pma bruker og gi tilgang til disse tabellene."
#: libraries/messages.inc.php:671
msgid "Re-login to phpMyAdmin to load the updated configuration file."
msgstr ""
+"Re-logginn til phpMyAdmin for å laste den oppdaterte konfigurasjonsfila."
#: libraries/messages.inc.php:672
msgid "phpMyAdmin documentation"
@@ -3423,7 +3423,6 @@ msgid "Reloading the privileges"
msgstr "Oppfrisker privilegiene"
#: libraries/messages.inc.php:762
-#, fuzzy
msgid "Reload navigation frame"
msgstr "Endre navigasjonsrammen"
@@ -3466,7 +3465,6 @@ msgid "Rename table to"
msgstr "Endre tabellens navn"
#: libraries/messages.inc.php:772
-#, fuzzy
msgid "Rename view to"
msgstr "Endre tabellens navn"
@@ -3623,10 +3621,10 @@ msgstr "Kun IO tråd %s"
#: libraries/messages.inc.php:802
msgid "Slave IO Thread not running!"
-msgstr ""
+msgstr "Slave IO Thread kjører ikke!"
#: libraries/messages.inc.php:803
-#, fuzzy, php-format
+#, php-format
msgid ""
"This server is not configured as slave in a replication process. Would you "
"like to <a href=\"%s\">configure</a> it?"
@@ -3660,7 +3658,7 @@ msgstr "Slavereplikasjon"
#: libraries/messages.inc.php:810
msgid "Slave SQL Thread not running!"
-msgstr ""
+msgstr "Slave SQL Thread kjører ikke!"
#: libraries/messages.inc.php:811
#, php-format
diff --git a/tbl_change.php b/tbl_change.php
index f9ba56b..0c89a17 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -428,6 +428,7 @@ foreach ($rows as $row_id => $vrow) {
$real_null_value = FALSE;
$special_chars_encoded = '';
if (isset($vrow)) {
+ // (we are editing)
if (is_null($vrow[$field['Field']])) {
$real_null_value = TRUE;
$vrow[$field['Field']] = '';
@@ -460,6 +461,7 @@ foreach ($rows as $row_id => $vrow) {
. $field_name_appendix . '" value="'
. htmlspecialchars($vrow[$field['Field']]) . '" />';
} else {
+ // (we are inserting)
// display default values
if (!isset($field['Default'])) {
$field['Default'] = '';
@@ -475,6 +477,10 @@ foreach ($rows as $row_id => $vrow) {
}
$backup_field = '';
$special_chars_encoded = PMA_duplicateFirstNewline($special_chars);
+ // this will select the UNHEX function while inserting
+ if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields'] && ! $cfg['ProtectBinary']) {
+ $field['display_binary_as_hex'] = true;
+ }
}
$idindex = ($o_rows * $fields_cnt) + $i + 1;
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list