diff --git a/Documentation.html b/Documentation.html index 32dc8a17b..e43875cc8 100644 --- a/Documentation.html +++ b/Documentation.html @@ -35,7 +35,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
  • Developers
  • Copyright
  • Credits
    • -
  • Translators
  • Glossary
    • @@ -138,7 +137,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 FAQ 3.6)
  • support mysqli, the improved MySQL extension (see FAQ 1.17)
    • -
  • communicate in 58 different languages +
  • communicate in 62 different languages
  • synchronize two databases residing on the same as well as remote servers (see FAQ 9.1) diff --git a/contrib/packaging/Fedora/phpMyAdmin.spec b/contrib/packaging/Fedora/phpMyAdmin.spec index 3441a9331..5906da1de 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 4a67cbc80..6628115ef 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 493939bba..5ce059953 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' ? ' - Language' : ''); if ($show_doc) { - $language_title .= ' ' . - ($cfg['ReplaceHelpImg'] - ? 'Info' - : '(*)') . ''; + $language_title .= PMA_showDocu('faq7_2'); } if ($use_fieldset) { echo '
    ' . $language_title . ''; diff --git a/scripts/create-release.sh b/scripts/create-release.sh index f0056d79b..87a1bff60 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 " phpMyAdmin $version - Documentation " "

    phpMyAdmin $version Documentation

    " - - 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 " phpMyAdmin 2.2.2-rc1 - Documentation " "

    phpMyAdmin 2.2.2-rc1 Documentation

    " - - 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=377408&add_group=1 diff --git a/translators.html b/translators.html deleted file mode 100644 index af0188e05..000000000 --- a/translators.html +++ /dev/null @@ -1,469 +0,0 @@ - - - - - - - - - phpMyAdmin 3.4.0-beta1 - Official translators - - - - - - - - - -
    - -

    Here is the list of the "official translators" of - phpMyAdmin.

    - -

    If you want to suggest some improvements on a - translation please ask them: 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!

    - -

    All translations listed here are included in this distribution. - Please do not ask the translators to send - you a localized phpMyAdmin version!

    - -

    Please do not expect the translators to - provide e-mail support.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    LanguageOfficial translator(s)
    Afrikaans - volunteer needed -
    Albanian - volunteer needed -
    Arabic - Mohammed Farag (meno25wiki@gmail.com) -
    Azerbaijani - volunteer needed -
    Bangla - Raquibul Islam (rana@ekushey.org) -
    Basque - volunteer needed -
    Belarusian - Jaska Zedlik (jz53@zedlik.com) -
    Bosnian - volunteer needed -
    Brazilian Portuguese - Airon Luis Pereira (thedarkness@users.sourceforge.net) -
    Bulgarian - Stanislav Yordanov (stan@stud.ru.acad.bg) -
    Catalan - Xavier Navarro (xvnavarro@gmail.com) -
    Chinese Traditional (BIG5) - Siu Sun (siusun@best-view.net) -
    Chinese Simplified (GB) - Shanyan Baishui (rimyxp@users.sourceforge.net) -
    Croatian - Renato Pavicic (renato@translator-shop.org) -
    Czech - Michal Čihař (michal@cihar.com)
    - Ondřej Vadinský (nicky726@gmail.com) -
    Danish - Finn Sorensen (dk_alleykat@users.sourceforge.net) -
    Dutch - Herman van Rink (rink@initfour.nl) -
    English - the phpMyAdmin development team (phpmyadmin-devel@lists.sourceforge.net) -
    English (United Kingdom) - Robert Readman (robert_readman@hotmail.com) -
    Estonian - Marko Ellermaa (uhuu@users.sourceforge.net) -
    Finnish - Jouni Kahkonen (address withdrawn) -
    French - Marc Delisle (marc@infomarc.info) -
    Galician - Xosé Calvo (xosecalvo@galizaweb.net) -
    Georgian - George Machitidze (gmachitidze@users.sourceforge.net) -
    German - volunteer needed -
    Greek - Panagiotis Papazoglou (panos78@users.sourceforge.net) -
    Hebrew - volunteer needed -
    Hindi - volunteer needed -
    Hungarian - Jozsef Tamas Herczeg (localicer@gmail.com) -
    Indonesian - volunteer needed -
    Italian - Luca Rebellato (rebeluca@ngi.it) -
    Japanese - Tadashi Jokagi (elf2000@users.sourceforge.net) -
    Korean - volunteer needed -
    Latvian - volunteer needed -
    Lithuanian - Rytis Slatkevicius (rytis_s@users.sourceforge.net) -
    Malay - volunteer needed -
    Macedonian - volunteer needed -
    Mongolian - Bayarsaikhan Enkhtaivan (bayaraa@users.sourceforge.net) -
    Norwegian (bokmål) - Sven-Erik Andersen (sven.erik.andersen@gmail.com) -
    Persian - volunteer needed -
    Polish - volunteer needed -
    Portuguese - volunteer needed -
    Romanian - Sergiu Bivol (sbivol@users.sourceforge.net) -
    Russian - Victor Volkov and project php-myadmin.ru -
    Serbian - Mihailo Stefanovic (mikis@users.sourceforge.net) -
    Sinhala - H.Malinda Siriwardana (malindahs@users.sourceforge.net) -
    Slovak - Ivan Kuriscak (shylauda69@users.sourceforge.net) -
    Slovenian - volunteer needed -
    Spanish - Dr. med. Daniel Hinostroza C. (phpmyadmin@cerebroperiferico.com) -
    Swedish - Björn T. Hallberg (bjornth@users.sourceforge.net) -
    Tatarish - Albert Fazlí (amichauer@gmx.de) -
    Telugu - veeven (veeven@gmail.com) -
    Thai - volunteer needed -
    Turkish - Burak Yavuz (bourock@users.sourceforge.net) -
    Ukrainian - volunteer needed -
    Uzbek - Orzu Samarqandiy (orzu@users.sourceforge.net)
    - Abdurashid Muhitdinov (cool_zero@list.ru -
    -
    - - - - -