- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_2_10_0_1, updated. RELEASE_2_10_0_1
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, RELEASE_2_10_0_1 has been updated to bbf2a74b509cce957fcd3f966648d21b920287a3 (tag) from a943f36b023086dbe58a0388981ce1e17e3b6994 (which is now obsolete) tagging 3ac25417fa45b88f1e1a2b652fa3c0bbb6c7088e (commit) replaces RELEASE_2_10_0 tagged by Michal Čihař on Tue Feb 16 13:58:50 2010 +0100 - Log ----------------------------------------------------------------- Imported SVN tag for RELEASE_2_10_0_1 Marc Delisle (1): set default value for ssl connection to MySQL to FALSE ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_2_10_0RC1, updated. RELEASE_2_10_0RC1
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, RELEASE_2_10_0RC1 has been updated to 874bfd4a8999c09df31d712290152d3547a1c2e4 (tag) from 8384b6a38d8e291a3fd874f33f9453e509f86808 (which is now obsolete) tagging be83bcc3372facec8de21900910afaccee9f7b7f (commit) replaces RELEASE_2_9_0 tagged by Michal Čihař on Tue Feb 16 13:58:50 2010 +0100 - Log ----------------------------------------------------------------- Imported SVN tag for RELEASE_2_10_0RC1 Marc Delisle (164): lang 2.9.10-dev oops 2.10.0-dev 2.10.0-dev bug #1534475, arbitrary server not taken into account bug #1533945, wrong table name in header (SELECT from query window) bug #1536112, config not loaded on MySQL error 2002 or 2003 bug 1492772, SQL parsing EXTRACT YEAR_MONTH bug 1534007, STD function not working update update update update update lang bug #1519799, imagelink error bug #1519799, imagelink error feature #1520222, calendar in Search more complete check before showing Relation View 2.8.2.2 sorting on column header do not display BLOBs on PDF export update update lang update lang bug #1542875 Cookie auth on IIS bug #1536112, better fix (in case of register_globals enabled) bug #1544692, version 2.8.2.3 breaks setup.php bug #1544779, undefined variable on db copy bug #1544734, error messages link outdated update lang bug #1543996 wrong link to doc typos typos removed leading tabs patch #1523543, possibility of vertical line between frames Windkiel is not his name typo bug #1542865, themes not switching update lang turkish ignore differences for doc_lang typo 2.9.0-rc1 bug #1549824, SQL history and quote escape bug #1554166, magic_quotes_runtime problems bug #1555760, export default parameter broken bug #1556934, SQL compatibility mode on export rename a function borrowed from Moodle to avoid double definition when PMA is called by Moodle update update lang remove profiling 2.9.0 bug #1560152, after renaming a table the navigation does not work bug #1519859, avoid overflow on 64-bit machines correct syntax for blocking access to libraries bug #1566904, typo fix for attack via FILES security fixes update trap error 1452 when adding a foreign key and the constraint fails bug #1550690, wrong export of constraints bug #1568341, case sensitivity in db names 2.9.0.2 starting changes for new distribution kits bug #1568341, last part of the fix use lang-cleanup.sh from kit because we will upgrade the release scripts in all branches list all files allow non-anonymous access allow non-anonymous access bug 1562533, unbuffered queries document FontFamily, FontFamilyFixed bug #1564409, default in FontFamily migration bug #1566219, automated timestamp values bug #1517428, CSS, IE 6 and output compression select all tables in the export list bug #1541189, views not displayed in export list export nothing if no tables are selected bug #1567316, renaming a db containing view bug #1567316, renaming a db containing a view must rebuild the db list after a CREATE DATABASE wrong parameter when calling error.php undefined index typo typo unused images support internal relations also on unique keys, not only on primary keys bug #1599173 bug #1597019, wrong error message when foreign key is not the same data type as referenced key french update remove references to phpMyDesigner.net, asked by Ivan typo (formated) missing strHelp get rid of pmd_config.php rename pmd_session.php to pmd_common.php designer missing messages designer: fix some of the js errors remove unneeded calls, and very if internal relations are enabled before trying to create one users can now toggle the display of the Function column from the interface missing message bug #1602335, browse distinct values and name containing a quote bug #1579701: error listing bookmarks spanish update patch #1605032, undefined index missing HTML tag grant all privileges on wildcard name: did not work as intended bug #1603660, incorrect escaping bug #1589611, problem on 64-bit systems checks that the header contains only one IP remove uva prefix patch #1595784, add charset information to SQL exported file allow caching of phpmyadmin.css.php duplicated line, committed too fast problem changing a TIMESTAMP to DEFAULT 0 bug #1610314, incomplete detection of binary columns bug #1607282, add warning for loss of auto_increment due to a bug in older MySQL bug #1615313, doc refers to auth_type HTTP so enable it wrong link for RFC bug #1619647, export of query results should not contain procedure definitions patch #1611684 part 2, other issues with the caching of phpmyadmin.css.php set local_query only if we are exporting data typos bug #1621280, support VIEW dependencies during export french updates patch #1592366, using a host name as a URL parameter FAQ 3.4 refers to older mysqldump versions RFE #1621025, show SQL statements in Relation View add functions HEX and UNHEX in the list of functions for Insert/Edit bug #1590083, DefaultConnectionCollation ignored in config.inc.php RFE #1602243, another cause for Missing parameter RFE #1548637, option to not display record counts for views designer: support for MSIE 6 and various fixes undefined pdf_page_number bug #1614087, deleting a user having a avoid text selection when moving a table object in MSIE 6 better icon for Designer bug #1538132, remove the setting of session.save_handler to 'files' patch #1627831, English language improvements - also, abstract some messages to lang prevent attack on the session name cookie estonian update designer: snap to grid/display field patch #1611684 additionnal change forgot this file 2.9.2 turkish update end of lines designer and display field bug #1638267, wrong reserved word recognition bug #1635377, superfluous backslash workaround for slow INFORMATION_SCHEMA queries about views button for direct/angular links French update French update get rid of propicon typo LeftLogoLinkWindow; main.php links target 2.10.0-rc1 2.10.0-rc1 Michal Čihař (88): Improve readibility (patch #1539976), thanks to Isaac Bennetch - ibennetch. translation update Fix charset header of exported HTML/XLS file (bug #1541100). Add single signon authentication method (patch #1545366, patch #1541379, patch #1531302 and RFE #1031391). Add support for LogoutURL. Fix typo. Add minimal sample configuration, so that lazy people won't copy libraries/config.default.php (RFE #1544570). Add minimal sample configuration, so that lazy people won't copy libraries/config.default.php (RFE #1544570). Add minimal sample configuration, so that lazy people won't copy libraries/config.default.php (RFE #1544570). translation update translation update Fix charset information. Internationalise link to MySQL documentation when translation exists, this needs to be defined in language file (RFE #1547130). forgot to commit changelog... Add link to wiki explaining configuration options. Fix table footer when MySQL does not support collations (bug #1554885, patch #1557269, thanks to Isaac Bennetch - ibennetch). Add phpdoc header comment. Removed unused file. Sync token name, move it's definition to one place (bug #1569612). Sync token name. Fix Wikipedia URLs (patch #1568498). Fix duplicate ids (patch #1568504). Add support for UTC_DATE, UTC_TIME and UTC_TIMESTAMP functions, based on patch #1563585, thanks to Alexander Schuch - ci-dev. Fix order of includes (bug #1569277). Improve create-release.sh, add scripts/lang-cleanup.sh for removing languages remove unused code Fix typo (translation #1570611). Fix typo (translation #1467138). Correctly fail if file is too short (bug #1574340). Fix displaying of entered query. Check for sent headers, provide backtrace in this case. Fix MIME type and extension to state before plugins were introduced (patch #1570742, thanks to ssevennm - ssevennm). Fix parsing of CHAR column type (bug #1573502). Finalise SVN migration. Mention wiki. Readd snapshot support. Move cleanup to separate function (bug #1569123). Switch to subversion. Mention wiki. Switch to subversion. Fix cvs/csv typo. Use HeadURL instead of Source keyword. Remove last CVS mentions. Rename left.php to navigation.php and modify all calls to that. Only config variables are kept as Left*. Switch to \n on Mac, as it is reported to be common EOL there now (bug #1577590). Fix HTML errors. Add support for ON DUPLICATE KEY (bug #1576226). Add support for hiding server information. Correctly handle unix timestamp (RFE #1440386). Support displaying in UTC (RFE #1440386). fix behaviour when invalid string is specified Write own parser so that quoting is optional (RFE #1579163). remove spaces from end/beginning Change help to fit current behaviour (RFE #1579163). Let's again obey TextareaRows (bug #1465906). Keep 0 in exported auto_increment fields (bug #1440544). Fix setting of navigation width when using RTL lang (bug #1579750). Rename left_header to navigation_header. argh, commited not final version... Rename db_details_db_info.inc.php to db_info.inc.php. Rename db_details_db_info.inc.php to db_info.inc.php. Fix escaping of long query with js (thanks to Erwin for report). Allow to edit small number of fields vertically and lange number horizontally (RFE #1581773). Fix cvs/csv typo (bug #1583509). Rename tbl_* files to drop useless _properties part. Rename db_* files to drop useless _details part. Add backward compatibility code to affect above renaming. Check before commit! Fix XSS on table comment. Fix path disclossure while passing array as some params. Trust only listed proxies for IP Allow/Deny. Define headers which to trust in configuration, thanks for help with this to Christian Schmidt, Peytz & Co. Fix XSS on database comment, thanks to laurent gaffié. Improve docs. Fix typos (bug #1597137). Fix check for encrypted file (bug #1596304). translation update Add IF NOT EXISTS to CREATE DATABASE query (RFE #1608372), reload navigation after creating database. Use correct links (patch #1607236). translation update translation update translation update Add <div> to allow selecting whole SQL by tripple click (patch #1611591). DELIMITER should not be commented out (bug #1612870). security fixes translation update Make server switching honour more server settings (patch #1630104). translation update Sebastian Mendel (21): updated themes to 2.9 and some minor fixes lang/german: Updated replaced $dblist with new PMA_List_Database class new PMA_List_Database class (i knew there was something missing ...) added error reporting if dblist retrieval from information_schema fails remember navigation frame width fixed initial navi width settings, replaced var/cookie name with pma_navi_width mhmpf fixed remembering navi width for Opera new PMA_List class moved some more code into class, some documentation improvements use @todo tag for todo items, to show up in generated documentation doc typo more documentation fixes refactored output buffer functions cleanup *new* JavaScript from left.php forgot closing script-tag refactored: added second optional parameter: $sql_query make use of new second PMA_showMessage() parameter ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_2_10_0, updated. RELEASE_2_10_0
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, RELEASE_2_10_0 has been updated to 76ad3e3dbb541fdb160818abc408db7c7b9bcc7a (tag) from aa24ab703a086a3979f52728b95bef31828c5566 (which is now obsolete) tagging faf2b099495ae9d4b6347381eb46502cec3b981c (commit) replaces RELEASE_2_10_0RC1 tagged by Michal Čihař on Tue Feb 16 13:58:50 2010 +0100 - Log ----------------------------------------------------------------- Imported SVN tag for RELEASE_2_10_0 Marc Delisle (16): 2005 ChangeLog available on phpmyadmin.net talk about the distribution kits newer formats bug 1658160, warning about mcrypt white page after uploading a 700 Kio BLOB avoid generating big links after an upload into a BLOB patch #1659347 undefined variable if AllowAnywhereRecoding is false bug #1650770, Designer and Mac OSX HEX and UNHEX were not available for a BINARY field bug 1667466, undefined variable when export + save on server bug ref missing bug #1665930, undefined PHP_SELF day names too wide for calendar bug #1668662, upgrade script can create the new pma_designer_coords table bug #1659176, memory error displaying a table with large BLOBs 2.10.0 release Sebastian Mendel (4): bug #1616486 server_databases does not show all databases typo function names updated, bug #1657045 Spatial functions not supported MySQL column names, reserved and forbidden words updated, bug #1657037 Missing column type "geometry" ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-390-g4606ddf
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, gettext has been updated via 4606ddf16f1c7c6247134e3b1ceafe4204b7d335 (commit) via 6da6d6296112fe0a0fa88c60ea9257741e4dda46 (commit) from da9bb3ceda71ec261aa0035c10777c2994985567 (commit) - Log ----------------------------------------------------------------- commit 4606ddf16f1c7c6247134e3b1ceafe4204b7d335 Author: rink <rink(a)initfour.nl> Date: Fri Mar 12 12:22:25 2010 +0200 Translation update done using Pootle. commit 6da6d6296112fe0a0fa88c60ea9257741e4dda46 Author: rink <rink(a)initfour.nl> Date: Fri Mar 12 12:21:33 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/nl.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/po/nl.po b/po/nl.po index b841123..8489506 100644 --- a/po/nl.po +++ b/po/nl.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-12 09:48+0100\n" -"PO-Revision-Date: 2010-03-12 09:13+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-03-12 12:22+0200\n" +"Last-Translator: <rink(a)initfour.nl>\n" "Language-Team: dutch <nl(a)li.org>\n" +"Language: nl\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 @@ -459,7 +461,6 @@ msgstr "" "schakelen. Weet u het zeker?" #: libraries/messages.inc.php:96 -#, fuzzy msgctxt "$strBLOBRepositoryDisabled" msgid "Disabled" msgstr "Uitgeschakeld" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. c00d602f1bd49a1bb387119cb5cc7ad37206beab
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, master has been updated via c00d602f1bd49a1bb387119cb5cc7ad37206beab (commit) from 279b9886d2e4ca5bf7f6b2633a5084291a3672ec (commit) - Log ----------------------------------------------------------------- commit c00d602f1bd49a1bb387119cb5cc7ad37206beab Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 11:27:07 2010 +0100 Make pull quiet. ----------------------------------------------------------------------- Summary of changes: helper/cache.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/helper/cache.py b/helper/cache.py index 28c288d..3cd3dd8 100644 --- a/helper/cache.py +++ b/helper/cache.py @@ -185,7 +185,7 @@ class GitCache(Cache): if not os.path.exists(self.dirname): os.system('git clone %s %s' % (url, self.dirname)) else: - os.system('cd %s ; git pull' % self.dirname) + os.system('cd %s ; git pull -q' % self.dirname) self.repo = git.Repo(self.dirname) self.tree = self.repo.tree() self.langtree = self.tree['lang'] hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. fcdc23cef198b324065ccad6c59837b520f0bd79
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, master has been updated via fcdc23cef198b324065ccad6c59837b520f0bd79 (commit) from 2438beef1ed1f0e2c8afd8a5c6fef79e16df47d7 (commit) - Log ----------------------------------------------------------------- commit fcdc23cef198b324065ccad6c59837b520f0bd79 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 10:31:28 2010 +0100 Correct code for Norwegian. ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- output/{no => nb}/docs.css | 0 output/{no => nb}/favicon.ico | Bin 18902 -> 18902 bytes output/{no => nb}/index-full-template.html | 0 output/{no => nb}/index.html | 0 .../themes/original/img/docs_menu_bg.png | Bin 148 -> 148 bytes .../{no => nb}/themes/original/img/logo_right.png | Bin 5658 -> 5658 bytes output/{no => nb}/translators.html | 0 po/{no.po => nb.po} | 0 9 files changed, 1 insertions(+), 1 deletions(-) rename output/{no => nb}/docs.css (100%) rename output/{no => nb}/favicon.ico (100%) rename output/{no => nb}/index-full-template.html (100%) rename output/{no => nb}/index.html (100%) rename output/{no => nb}/themes/original/img/docs_menu_bg.png (100%) rename output/{no => nb}/themes/original/img/logo_right.png (100%) rename output/{no => nb}/translators.html (100%) rename po/{no.po => nb.po} (100%) diff --git a/Makefile b/Makefile index c4afd3d..53f07fe 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # Makefile to build translations -LANGUAGES=it pl ja fr cs gl sv nl ka tr fi ca hu no es de lt ro mn pt_BR zh_CN zh_TW hy en_GB sk +LANGUAGES=it pl ja fr cs gl sv nl ka tr fi ca hu nb es de lt ro mn pt_BR zh_CN zh_TW hy en_GB sk PO4AOPTS=-M utf-8 -k 15 PO4A_PO_OPTS=--msgid-bugs-address phpmyadmin-devel(a)lists.sourceforge.net \ --copyright-holder "the phpMyAdmin project" \ diff --git a/output/no/docs.css b/output/nb/docs.css similarity index 100% rename from output/no/docs.css rename to output/nb/docs.css diff --git a/output/no/favicon.ico b/output/nb/favicon.ico similarity index 100% rename from output/no/favicon.ico rename to output/nb/favicon.ico diff --git a/output/no/index-full-template.html b/output/nb/index-full-template.html similarity index 100% rename from output/no/index-full-template.html rename to output/nb/index-full-template.html diff --git a/output/no/index.html b/output/nb/index.html similarity index 100% rename from output/no/index.html rename to output/nb/index.html diff --git a/output/no/themes/original/img/docs_menu_bg.png b/output/nb/themes/original/img/docs_menu_bg.png similarity index 100% rename from output/no/themes/original/img/docs_menu_bg.png rename to output/nb/themes/original/img/docs_menu_bg.png diff --git a/output/no/themes/original/img/logo_right.png b/output/nb/themes/original/img/logo_right.png similarity index 100% rename from output/no/themes/original/img/logo_right.png rename to output/nb/themes/original/img/logo_right.png diff --git a/output/no/translators.html b/output/nb/translators.html similarity index 100% rename from output/no/translators.html rename to output/nb/translators.html diff --git a/po/no.po b/po/nb.po similarity index 100% rename from po/no.po rename to po/nb.po hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-388-gda9bb3c
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, gettext has been updated via da9bb3ceda71ec261aa0035c10777c2994985567 (commit) from 322671f304dd86adeec97599a6708d6cde62710c (commit) - Log ----------------------------------------------------------------- commit da9bb3ceda71ec261aa0035c10777c2994985567 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 10:32:08 2010 +0100 Correct code for Norwegian. ----------------------------------------------------------------------- Summary of changes: libraries/select_lang.lib.php | 4 ++-- po/{no.po => nb.po} | 0 scripts/php2gettext.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename po/{no.po => nb.po} (100%) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 0ba75a3..50afc0d 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -262,8 +262,8 @@ function PMA_langDetails($lang) { return array('ms|malay', 'malay-utf-8', 'ms', 'Bahasa Melayu'); case 'nl': return array('nl|dutch', 'dutch-utf-8', 'nl', 'Nederlands'); - case 'no': - return array('no|norwegian', 'norwegian-utf-8', 'no', 'Norsk'); + case 'nb': + return array('nb|norwegian', 'norwegian-utf-8', 'nb', 'Norsk'); case 'pl': return array('pl|polish', 'polish-utf-8', 'pl', 'Polski'); case 'pt_BR': diff --git a/po/no.po b/po/nb.po similarity index 100% rename from po/no.po rename to po/nb.po diff --git a/scripts/php2gettext.sh b/scripts/php2gettext.sh index c0e0d2a..6750323 100755 --- a/scripts/php2gettext.sh +++ b/scripts/php2gettext.sh @@ -65,7 +65,7 @@ for lang in lang/*.inc.php ; do mongolian) langcode='mn';; malay) langcode='ms';; dutch) langcode='nl';; - norwegian) langcode='no';; + norwegian) langcode='nb';; polish) langcode='pl';; brazilian_portuguese) langcode='pt_BR';; portuguese) langcode='pt';; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-387-g322671f
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, gettext has been updated via 322671f304dd86adeec97599a6708d6cde62710c (commit) via 9baae4a635f02ce3468733bd2914d2fa297c6201 (commit) via 0846866e2d3fc23ea4182e243c5261f0e7eedd4a (commit) from 24b457f7d69305d108eea5f9f94f0b70f24a3e2c (commit) - Log ----------------------------------------------------------------- commit 322671f304dd86adeec97599a6708d6cde62710c Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:23:33 2010 +0200 Translation update done using Pootle. commit 9baae4a635f02ce3468733bd2914d2fa297c6201 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:22:39 2010 +0200 Translation update done using Pootle. commit 0846866e2d3fc23ea4182e243c5261f0e7eedd4a Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:22:34 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 11 ++++++----- po/ja.po | 12 ++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/po/es.po b/po/es.po index 5e17b91..bbc1961 100644 --- a/po/es.po +++ b/po/es.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-12 09:48+0100\n" -"PO-Revision-Date: 2010-03-12 09:19+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-03-12 11:23+0200\n" +"Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: spanish <es(a)li.org>\n" +"Language: es\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 "es" +msgstr "en" #. l10n: Language to use for MySQL 5.0 documentation #: libraries/common.lib.php:415 diff --git a/po/ja.po b/po/ja.po index bd73d30..aaca46a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,13 +3,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-12 09:48+0100\n" -"PO-Revision-Date: 2010-03-12 09:16+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-03-12 11:22+0200\n" +"Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: japanese <jp(a)li.org>\n" +"Language: ja\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=1; plural=0;\n" +"X-Generator: Pootle 2.0.1\n" #: libraries/auth/config.auth.lib.php:107 #, php-format @@ -33,17 +35,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 "ja" #. l10n: Language to use for MySQL 5.0 documentation #: libraries/common.lib.php:415 -#, fuzzy msgctxt "$mysql_5_0_doc_lang" msgid "en" -msgstr "ja" +msgstr "en" #. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:15 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-384-g24b457f
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, gettext has been updated via 24b457f7d69305d108eea5f9f94f0b70f24a3e2c (commit) via f652e63e4efd6e3a2a5a8357471cadcf89ee0874 (commit) via f6185e5341a154accbe179079128f62e0d34822e (commit) via 368bf583502dacb70fd0021c41dcda6e937d1010 (commit) via a96ae5e596b9e3fcd29e5e222c5a8c30720ae0fd (commit) via 2f26a58ad5fdc0cfd27377f97af38f0b863b61a0 (commit) via b0e1c8dbd1319672e9604cfeb00e8cdc70c1f002 (commit) via f87497e4a34f5c59a466efb88833d4a336b685a0 (commit) via e982dc0ca3a9d65730ff766d3393222213c0a6dd (commit) via 7dae6f125f0e26ce26662d91e65780d1f3537ba8 (commit) via f66514a09467f133ff726a15ba0107a33211216f (commit) via 445af4bfb0ed3cf76fac3bf7e443701334b888fb (commit) from 568be7147b2aa9796cb26f02fefa34f278c469c5 (commit) - Log ----------------------------------------------------------------- commit 24b457f7d69305d108eea5f9f94f0b70f24a3e2c Merge: 568be7147b2aa9796cb26f02fefa34f278c469c5 f652e63e4efd6e3a2a5a8357471cadcf89ee0874 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 10:19:31 2010 +0100 Merge remote branch 'pootle/gettext' into gettext commit f652e63e4efd6e3a2a5a8357471cadcf89ee0874 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:16:37 2010 +0200 Translation update done using Pootle. commit f6185e5341a154accbe179079128f62e0d34822e Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:16:34 2010 +0200 Translation update done using Pootle. commit 368bf583502dacb70fd0021c41dcda6e937d1010 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:16:17 2010 +0200 Translation update done using Pootle. commit a96ae5e596b9e3fcd29e5e222c5a8c30720ae0fd Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:15:50 2010 +0200 Translation update done using Pootle. commit 2f26a58ad5fdc0cfd27377f97af38f0b863b61a0 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:15:47 2010 +0200 Translation update done using Pootle. commit b0e1c8dbd1319672e9604cfeb00e8cdc70c1f002 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:15:15 2010 +0200 Translation update done using Pootle. commit f87497e4a34f5c59a466efb88833d4a336b685a0 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:13:17 2010 +0200 Translation update done using Pootle. commit e982dc0ca3a9d65730ff766d3393222213c0a6dd Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:13:14 2010 +0200 Translation update done using Pootle. commit 7dae6f125f0e26ce26662d91e65780d1f3537ba8 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:13:11 2010 +0200 Translation update done using Pootle. commit f66514a09467f133ff726a15ba0107a33211216f Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:13:08 2010 +0200 Translation update done using Pootle. commit 445af4bfb0ed3cf76fac3bf7e443701334b888fb Author: Michal Čihař <michal(a)cihar.com> Date: Fri Mar 12 11:13:04 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/de.po | 12 ++++++------ po/en_GB.po | 11 +++-------- po/fr.po | 11 ++++++----- po/zh_CN.po | 11 ++++++----- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/po/de.po b/po/de.po index 33d1d93..950883a 100644 --- a/po/de.po +++ b/po/de.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-12 09:48+0100\n" -"PO-Revision-Date: 2010-03-12 09:14+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-03-12 11:16+0200\n" +"Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: german <de(a)li.org>\n" +"Language: de\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 @@ -37,17 +39,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 "de" #. l10n: Language to use for MySQL 5.0 documentation #: libraries/common.lib.php:415 -#, fuzzy msgctxt "$mysql_5_0_doc_lang" msgid "en" -msgstr "de" +msgstr "en" #. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:15 diff --git a/po/en_GB.po b/po/en_GB.po index 0921592..cf4e10f 100644 --- a/po/en_GB.po +++ b/po/en_GB.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-03-12 09:48+0100\n" -"PO-Revision-Date: 2010-03-12 09:13+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-03-12 11:13+0200\n" +"Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -37,7 +37,6 @@ 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 "en" @@ -459,7 +458,6 @@ msgid "Are you sure you want to disable all BLOB references for database %s?" msgstr "Are you sure you want to disable all BLOB references for database %s?" #: libraries/messages.inc.php:96 -#, fuzzy msgctxt "$strBLOBRepositoryDisabled" msgid "Disabled" msgstr "Disabled" @@ -473,7 +471,6 @@ msgid "You are about to DISABLE a BLOB Repository!" msgstr "You are about to DISABLE a BLOB Repository!" #: libraries/messages.inc.php:99 -#, fuzzy msgctxt "$strBLOBRepositoryEnabled" msgid "Enabled" msgstr "Enabled" @@ -487,7 +484,6 @@ msgid "Remove BLOB Repository Reference" msgstr "Remove BLOB Repository Reference" #: libraries/messages.inc.php:102 -#, fuzzy msgctxt "$strBLOBRepositoryRepair" msgid "Repair" msgstr "Repair" @@ -941,7 +937,6 @@ msgid "Create database with same name and grant all privileges" msgstr "Create database with same name and grant all privileges" #: libraries/messages.inc.php:203 -#, fuzzy msgctxt "$strCreateUserDatabaseNone" msgid "None" msgstr "None" diff --git a/po/fr.po b/po/fr.po index cdf4335..c0d5d76 100644 --- a/po/fr.po +++ b/po/fr.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-12 09:48+0100\n" -"PO-Revision-Date: 2010-03-12 09:14+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-03-12 11:16+0200\n" +"Last-Translator: Michal <michal(a)cihar.com>\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" -"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 "fr" +msgstr "en" #. l10n: Language to use for MySQL 5.0 documentation #: libraries/common.lib.php:415 diff --git a/po/zh_CN.po b/po/zh_CN.po index 41fc740..5989f75 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,13 +3,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-12 09:48+0100\n" -"PO-Revision-Date: 2010-03-12 09:15+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-03-12 11:15+0200\n" +"Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" +"Language: zh_CN\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=1; plural=0;\n" +"X-Generator: Pootle 2.0.1\n" #: libraries/auth/config.auth.lib.php:107 #, php-format @@ -31,10 +33,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 "zh" +msgstr "en" #. l10n: Language to use for MySQL 5.0 documentation #: libraries/common.lib.php:415 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 2438beef1ed1f0e2c8afd8a5c6fef79e16df47d7
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, master has been updated via 2438beef1ed1f0e2c8afd8a5c6fef79e16df47d7 (commit) from 792ee2de491f08b9a035d357bb72c76f3698cb41 (commit) - Log ----------------------------------------------------------------- commit 2438beef1ed1f0e2c8afd8a5c6fef79e16df47d7 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 10:19:06 2010 +0100 Correct name for Japanese. ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- get-lang-name | 2 +- output/{jp => ja}/Documentation.html | 0 output/{jp => ja}/docs.css | 0 output/{jp => ja}/favicon.ico | Bin 18902 -> 18902 bytes output/{jp => ja}/index-full-template.html | 0 output/{jp => ja}/index.html | 0 .../themes/original/img/docs_menu_bg.png | Bin 148 -> 148 bytes .../{jp => ja}/themes/original/img/logo_right.png | Bin 5658 -> 5658 bytes output/{jp => ja}/translators.html | 0 po/{jp.po => ja.po} | 0 11 files changed, 2 insertions(+), 2 deletions(-) rename output/{jp => ja}/Documentation.html (100%) rename output/{jp => ja}/docs.css (100%) rename output/{jp => ja}/favicon.ico (100%) rename output/{jp => ja}/index-full-template.html (100%) rename output/{jp => ja}/index.html (100%) rename output/{jp => ja}/themes/original/img/docs_menu_bg.png (100%) rename output/{jp => ja}/themes/original/img/logo_right.png (100%) rename output/{jp => ja}/translators.html (100%) rename po/{jp.po => ja.po} (100%) diff --git a/Makefile b/Makefile index bd44883..c4afd3d 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # Makefile to build translations -LANGUAGES=it pl jp fr cs gl sv nl ka tr fi ca hu no es de lt ro mn pt_BR zh_CN zh_TW hy en_GB sk +LANGUAGES=it pl ja fr cs gl sv nl ka tr fi ca hu no es de lt ro mn pt_BR zh_CN zh_TW hy en_GB sk PO4AOPTS=-M utf-8 -k 15 PO4A_PO_OPTS=--msgid-bugs-address phpmyadmin-devel(a)lists.sourceforge.net \ --copyright-holder "the phpMyAdmin project" \ diff --git a/get-lang-name b/get-lang-name index fbe7450..b31e8d4 100755 --- a/get-lang-name +++ b/get-lang-name @@ -51,7 +51,7 @@ case $1 in pt_BR) echo "Brazilian Portuguese" ;; - jp) + ja) echo "Japanese" ;; pl) diff --git a/output/jp/Documentation.html b/output/ja/Documentation.html similarity index 100% rename from output/jp/Documentation.html rename to output/ja/Documentation.html diff --git a/output/jp/docs.css b/output/ja/docs.css similarity index 100% rename from output/jp/docs.css rename to output/ja/docs.css diff --git a/output/jp/favicon.ico b/output/ja/favicon.ico similarity index 100% rename from output/jp/favicon.ico rename to output/ja/favicon.ico diff --git a/output/jp/index-full-template.html b/output/ja/index-full-template.html similarity index 100% rename from output/jp/index-full-template.html rename to output/ja/index-full-template.html diff --git a/output/jp/index.html b/output/ja/index.html similarity index 100% rename from output/jp/index.html rename to output/ja/index.html diff --git a/output/jp/themes/original/img/docs_menu_bg.png b/output/ja/themes/original/img/docs_menu_bg.png similarity index 100% rename from output/jp/themes/original/img/docs_menu_bg.png rename to output/ja/themes/original/img/docs_menu_bg.png diff --git a/output/jp/themes/original/img/logo_right.png b/output/ja/themes/original/img/logo_right.png similarity index 100% rename from output/jp/themes/original/img/logo_right.png rename to output/ja/themes/original/img/logo_right.png diff --git a/output/jp/translators.html b/output/ja/translators.html similarity index 100% rename from output/jp/translators.html rename to output/ja/translators.html diff --git a/po/jp.po b/po/ja.po similarity index 100% rename from po/jp.po rename to po/ja.po hooks/post-receive -- phpMyAdmin localized documentation

1 0