The branch, master has been updated via 70bc1761c35543d6f00bbf5d8df1b29d425997cc (commit) from bbca0565ce5be3d1bd247c8ba11d2fcafa66990b (commit)

- Log ----------------------------------------------------------------- commit 70bc1761c35543d6f00bbf5d8df1b29d425997cc Author: Michal Čihař michal@cihar.com Date: Fri Dec 31 15:51:34 2010 +0100

Drop translators.html and all references to it.

The list is absolutely not up to date and it makes no sense in maintaining it in addition to history of po files in git.

-----------------------------------------------------------------------

Summary of changes: Documentation.html | 3 +- contrib/packaging/Fedora/phpMyAdmin.spec | 1 - libraries/common.inc.php | 3 +- libraries/display_select_lang.lib.php | 5 +- scripts/create-release.sh | 6 - translators.html | 469 ------------------------------ 6 files changed, 3 insertions(+), 484 deletions(-) delete mode 100644 translators.html

diff --git a/Documentation.html b/Documentation.html index 32dc8a1..e43875c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -35,7 +35,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <li><a href="Documentation.html#developers">Developers</a></li> <li><a href="Documentation.html#copyright">Copyright</a></li> <li><a href="Documentation.html#credits">Credits</a></li> - <li><a href="translators.html">Translators</a></li> <li><a href="Documentation.html#glossary">Glossary</a></li> </ul>

@@ -138,7 +137,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <abbr title="Frequently Asked Questions">FAQ</abbr> 3.6)</a></li> <li>support mysqli, the improved MySQL extension <a href="#faq1_17"> (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17)</a></li> - <li>communicate in <a href="./translators.html">58 different languages</a> + <li>communicate in <a href="http://www.phpmyadmin.net/home_page/translations.php">62 different languages</a> </li> <li>synchronize two databases residing on the same as well as remote servers <a href="#faq9_1">(see <abbr title="Frequently Asked Questions">FAQ</abbr> 9.1)</a> diff --git a/contrib/packaging/Fedora/phpMyAdmin.spec b/contrib/packaging/Fedora/phpMyAdmin.spec index 3441a93..5906da1 100644 --- a/contrib/packaging/Fedora/phpMyAdmin.spec +++ b/contrib/packaging/Fedora/phpMyAdmin.spec @@ -110,7 +110,6 @@ install RELEASE-DATE-* "${DOCROOT}"/ install CREDITS ChangeLog INSTALL LICENSE "${DOCROOT}"/ install README TODO "${DOCROOT}"/ install Documentation.* docs.css "${DOCROOT}"/ -install translators.html "${DOCROOT}"/ install lang/*.sh "${DOCROOT}"/lang/ install scripts/* "${DOCROOT}"/scripts/ install libraries/tcpdf/README "${DOCROOT}"/README.tcpdf diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 4a67cbc..6628115 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -58,7 +58,7 @@ $GLOBALS['error_handler'] = new PMA_Error_Handler(); $cfg['Error_Handler']['display'] = TRUE;

/* - * This setting was removed in PHP 5.3. But at this point PMA_PHP_INT_VERSION + * This setting was removed in PHP 5.3. But at this point PMA_PHP_INT_VERSION * is not yet defined so we use another way to find out the PHP version. */ if (version_compare(phpversion(), '5.3', 'lt')) { @@ -414,7 +414,6 @@ $goto_whitelist = array( //'themes.php', 'transformation_overview.php', 'transformation_wrapper.php', - 'translators.html', 'user_password.php', );

diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index 493939b..5ce0599 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -44,10 +44,7 @@ function PMA_select_language($use_fieldset = FALSE, $show_doc = TRUE) { $language_title = __('Language') . (__('Language') != 'Language' ? ' - <em>Language</em>' : ''); if ($show_doc) { - $language_title .= ' <a href="./translators.html" target="documentation">' . - ($cfg['ReplaceHelpImg'] - ? '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_info.png" width="11" height="11" alt="Info" />' - : '(*)') . '</a>'; + $language_title .= PMA_showDocu('faq7_2'); } if ($use_fieldset) { echo '<fieldset><legend xml:lang="en" dir="ltr">' . $language_title . '</legend>'; diff --git a/scripts/create-release.sh b/scripts/create-release.sh index f0056d7..87a1bff 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -60,7 +60,6 @@ Please ensure you have incremented rc count or version in the repository : - in Documentation.html the 2 lines " <title>phpMyAdmin $version - Documentation</title> " " <h1>phpMyAdmin $version Documentation</h1> " - - in translators.html - in README

Continue (y/n)? @@ -97,10 +96,6 @@ if ! grep -q "phpMyAdmin $version - Documentation" Documentation.html ; then echo "There seems to be wrong version in Documentation.html" exit 2 fi -if ! grep -q "phpMyAdmin $version - Official translators" translators.html ; then - echo "There seems to be wrong version in translators.html" - exit 2 -fi if ! grep -q "Version $version$" README ; then echo "There seems to be wrong version in README" exit 2 @@ -296,7 +291,6 @@ Todo now: - in Documentation.html the 2 lines " <title>phpMyAdmin 2.2.2-rc1 - Documentation</title> " " <h1>phpMyAdmin 2.2.2-rc1 Documentation</h1> " - - in translators.html

8. add a group for bug tracking this new version, at https://sourceforge.net/tracker/admin/index.php?group_id=23067&atid=3774... diff --git a/translators.html b/translators.html deleted file mode 100644 index af0188e..0000000 --- a/translators.html +++ /dev/null @@ -1,469 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" - "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" - version="-//W3C//DTD XHTML 1.1//EN" dir="ltr"> -<!-- - vim: expandtab ts=4 sw=4 sts=4 tw=78 ---> - -<head> - <link rel="icon" href="./favicon.ico" type="image/x-icon" /> - <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.0-beta1 - Official translators</title> - <link rel="stylesheet" type="text/css" href="docs.css" /> -</head> - -<body> -<div id="header"> - <h1> - <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.0-beta1 - official translators list - </h1> -</div> - -<!-- TOP MENU --> -<ul class="header"> - <li><a href="Documentation.html#top">Top</a></li> - <li><a href="Documentation.html#require">Requirements</a></li> - <li><a href="Documentation.html#intro">Introduction</a></li> - <li><a href="Documentation.html#setup">Installation</a></li> - <li><a href="Documentation.html#setup_script">Setup script</a></li> - <li><a href="Documentation.html#config">Configuration</a></li> - <li><a href="Documentation.html#transformations">Transformations</a></li> - <li><a href="Documentation.html#faq"><abbr title="Frequently Asked Questions"> FAQ</abbr></a></li> - <li><a href="Documentation.html#developers">Developers</a></li> - <li><a href="Documentation.html#copyright">Copyright</a></li> - <li><a href="Documentation.html#credits">Credits</a></li> - <li><a href="translators.html">Translators</a></li> - <li><a href="Documentation.html#glossary">Glossary</a></li> -</ul> - -<div id="body"> - -<p> Here is the list of the &quot;official translators&quot; of - phpMyAdmin.</p> - -<p> <span class="important">If you want to suggest some improvements on a - translation please ask them</span>: we (the phpMyAdmin developement team) - don't know anything about most of these languages and then we can't have - any opinion on grammar issues or bad translations!</p> - -<p> All translations listed here are included in this distribution. - <span class="important">Please do <b>not</b> ask the translators to send - you a localized phpMyAdmin version!</span></p> - -<p> <span class="important">Please do <b>not</b> expect the translators to - provide e-mail support.</span></p> - -<table class="translators"> -<tr> - <th>Language</th> - <th>Official translator(s)</th> -</tr> - -<tr id="afrikaans"> - <td>Afrikaans</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="albanian"> - <td>Albanian</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="arabic"> - <td>Arabic</td> - <td> - Mohammed Farag (meno25wiki@gmail.com) - </td> -</tr> - -<tr id="azerbaijani"> - <td>Azerbaijani</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="bangla"> - <td>Bangla</td> - <td> - Raquibul Islam (rana@ekushey.org) - </td> -</tr> - -<tr id="basque"> - <td>Basque</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="belarusian"> - <td>Belarusian</td> - <td> - Jaska Zedlik (jz53@zedlik.com) - </td> -</tr> - -<tr id="bosnian"> - <td>Bosnian</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="brazilian_portuguese"> - <td>Brazilian Portuguese</td> - <td> - Airon Luis Pereira (thedarkness@users.sourceforge.net) - </td> -</tr> - -<tr id="bulgarian"> - <td>Bulgarian</td> - <td> - Stanislav Yordanov (stan@stud.ru.acad.bg) - </td> -</tr> - -<tr id="catalan"> - <td>Catalan</td> - <td> - Xavier Navarro (xvnavarro@gmail.com) - </td> -</tr> - -<tr id="chinese_traditional"> - <td>Chinese Traditional (BIG5)</td> - <td> - Siu Sun (siusun@best-view.net) - </td> -</tr> - -<tr id="chinese_simplified"> - <td>Chinese Simplified (GB)</td> - <td> - Shanyan Baishui (rimyxp@users.sourceforge.net) - </td> -</tr> - -<tr id="croatian"> - <td>Croatian</td> - <td> - Renato Pavicic (renato@translator-shop.org) - </td> -</tr> - -<tr id="czech"> - <td>Czech</td> - <td> - Michal Čihař (michal@cihar.com)<br /> - Ondřej Vadinský (nicky726@gmail.com) - </td> -</tr> - -<tr id="danish"> - <td>Danish</td> - <td> - Finn Sorensen (dk_alleykat@users.sourceforge.net) - </td> -</tr> - -<tr id="dutch"> - <td>Dutch</td> - <td> - Herman van Rink (rink@initfour.nl) - </td> -</tr> - -<tr id="english"> - <td>English</td> - <td> - the phpMyAdmin development team (phpmyadmin-devel@lists.sourceforge.net) - </td> -</tr> - -<tr id="english-gb"> - <td>English (United Kingdom)</td> - <td> - Robert Readman (robert_readman@hotmail.com) - </td> -</tr> - -<tr id="estonian"> - <td>Estonian</td> - <td> - Marko Ellermaa (uhuu@users.sourceforge.net) - </td> -</tr> - -<tr id="finnish"> - <td>Finnish</td> - <td> - Jouni Kahkonen (address withdrawn) - </td> -</tr> - -<tr id="french"> - <td>French</td> - <td> - Marc Delisle (marc@infomarc.info) - </td> -</tr> - -<tr id="galician"> - <td>Galician</td> - <td> - Xosé Calvo (xosecalvo@galizaweb.net) - </td> -</tr> - -<tr id="georgian"> - <td>Georgian</td> - <td> - George Machitidze (gmachitidze@users.sourceforge.net) - </td> -</tr> - -<tr id="german"> - <td>German</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="greek"> - <td>Greek</td> - <td> - Panagiotis Papazoglou (panos78@users.sourceforge.net) - </td> -</tr> - -<tr id="hebrew"> - <td>Hebrew</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="hindi"> - <td>Hindi</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="hungarian"> - <td>Hungarian</td> - <td> - Jozsef Tamas Herczeg (localicer@gmail.com) - </td> -</tr> - -<tr id="indonesian"> - <td>Indonesian</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="italian"> - <td>Italian</td> - <td> - Luca Rebellato (rebeluca@ngi.it) - </td> -</tr> - -<tr id="japanese"> - <td>Japanese</td> - <td> - Tadashi Jokagi (elf2000@users.sourceforge.net) - </td> -</tr> - -<tr id="korean"> - <td>Korean</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="latvian"> - <td>Latvian</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="lithuanian"> - <td>Lithuanian</td> - <td> - Rytis Slatkevicius (rytis_s@users.sourceforge.net) - </td> -</tr> - -<tr id="malay"> - <td>Malay</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="macedonian"> - <td>Macedonian</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="mongolian"> - <td>Mongolian</td> - <td> - Bayarsaikhan Enkhtaivan (bayaraa@users.sourceforge.net) - </td> -</tr> - -<tr id="norwegian"> - <td>Norwegian (bokm&aring;l)</td> - <td> - Sven-Erik Andersen (sven.erik.andersen@gmail.com) - </td> -</tr> - -<tr id="persian"> - <td>Persian</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="polish"> - <td>Polish</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="portuguese"> - <td>Portuguese</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="romanian"> - <td>Romanian</td> - <td> - Sergiu Bivol (sbivol@users.sourceforge.net) - </td> -</tr> - -<tr id="russian"> - <td>Russian</td> - <td> - Victor Volkov and project php-myadmin.ru - </td> -</tr> - -<tr id="serbian"> - <td>Serbian</td> - <td> - Mihailo Stefanovic (mikis@users.sourceforge.net) - </td> -</tr> - -<tr id="sinhala"> - <td>Sinhala</td> - <td> - H.Malinda Siriwardana (malindahs@users.sourceforge.net) - </td> -</tr> - -<tr id="slovak"> - <td>Slovak</td> - <td> - Ivan Kuriscak (shylauda69@users.sourceforge.net) - </td> -</tr> - -<tr id="slovenian"> - <td>Slovenian</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="spanish"> - <td>Spanish</td> - <td> - Dr. med. Daniel Hinostroza C. (phpmyadmin@cerebroperiferico.com) - </td> -</tr> - -<tr id="swedish"> - <td>Swedish</td> - <td> - Björn T. Hallberg (bjornth@users.sourceforge.net) - </td> -</tr> - -<tr id="tatarish"> - <td>Tatarish</td> - <td> - Albert Fazlí (amichauer@gmx.de) - </td> -</tr> - -<tr id="telugu"> - <td>Telugu</td> - <td> - veeven (veeven@gmail.com) - </td> -</tr> - -<tr id="thai"> - <td>Thai</td> - <td> - volunteer needed - </td> -</tr> - -<tr id="turkish"> - <td>Turkish</td> - <td> - Burak Yavuz (bourock@users.sourceforge.net) - </td> -</tr> - -<tr id="ukrainian"> - <td>Ukrainian</td> - <td> - volunteer needed - </td> -</tr> -<tr id="uzbek"> - <td>Uzbek</td> - <td> - Orzu Samarqandiy (orzu@users.sourceforge.net)<br /> - Abdurashid Muhitdinov (cool_zero@list.ru - </td> -</tr> -</table> -</div> - - <ul id="footer"> - <li>Copyright &copy; 2003 - 2010 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> - <li><a href="LICENSE">License</a></li> - <li><a href="http://www.phpmyadmin.net/home_page/donate.php">Donate</a></li> - <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li> - </ul> - -</body> -</html>

hooks/post-receive