From 2a58116a968dbf5483279244dba12070afb141c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mirc=C9=99lal?= <01youknowme@gmail.com> Date: Thu, 6 Nov 2014 17:08:04 +0100 Subject: [PATCH 1/2] Translated using Weblate (Azerbaijani) Currently translated at 48.3% (1338 of 2767 strings) [CI skip] --- po/az.po | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/po/az.po b/po/az.po index 11738ab139..46e50eefd9 100644 --- a/po/az.po +++ b/po/az.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-11-05 10:03+0100\n" -"PO-Revision-Date: 2014-11-02 08:54+0200\n" -"Last-Translator: Sevdimali İsa \n" -"Language-Team: Azerbaijani \n" +"PO-Revision-Date: 2014-11-06 17:08+0200\n" +"Last-Translator: Mircəlal <01youknowme@gmail.com>\n" +"Language-Team: Azerbaijani " +"\n" "Language: az\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.0-dev\n" +"X-Generator: Weblate 2.0\n" #: changelog.php:36 license.php:28 #, php-format @@ -2185,7 +2185,7 @@ msgstr "" #. #: js/messages.php:555 msgid "calendar-month-year" -msgstr "calendar-month-year" +msgstr "təqvim-ay-il" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:558 @@ -2259,7 +2259,7 @@ msgstr "saniyədə" #: libraries/Advisor.class.php:475 msgid "per minute" -msgstr "deqiqede" +msgstr "dəqiqədə" #: libraries/Advisor.class.php:478 libraries/server_status.lib.php:137 #: libraries/server_status.lib.php:221 @@ -2283,7 +2283,7 @@ msgstr "" #: libraries/Config.class.php:1771 msgid "Font size" -msgstr "Font ölçüsü" +msgstr "Şrift ölçüsü" #: libraries/DBQbe.class.php:391 libraries/DisplayResults.class.php:1322 #: libraries/DisplayResults.class.php:2146 @@ -2587,7 +2587,7 @@ msgstr "Açara görə sırala" #: libraries/plugins/import/ImportXml.class.php:58 #: libraries/rte/rte_routines.lib.php:988 libraries/structure.lib.php:1734 msgid "Options" -msgstr "Parametrlər" +msgstr "Seçimlər" #: libraries/DisplayResults.class.php:1627 #: libraries/DisplayResults.class.php:1734 @@ -3341,11 +3341,11 @@ msgstr "Operator" #: libraries/server_status_variables.lib.php:220 pmd_general.php:563 #: pmd_general.php:623 pmd_general.php:752 pmd_general.php:871 msgid "Value" -msgstr "Deyer" +msgstr "Dəyər" #: libraries/TableSearch.class.php:205 msgid "Table Search" -msgstr "Cədvəl Axtarma" +msgstr "Cədvəl axtarışı" #: libraries/TableSearch.class.php:212 #, fuzzy @@ -3355,7 +3355,7 @@ msgstr "Axtarış" #: libraries/TableSearch.class.php:217 libraries/TableSearch.class.php:1230 msgid "Find and Replace" -msgstr "" +msgstr "Tap və əvəz et" #: libraries/TableSearch.class.php:240 libraries/insert_edit.lib.php:1399 msgid "Edit/Insert" @@ -3372,15 +3372,15 @@ msgstr "ya da" #: libraries/TableSearch.class.php:822 msgid "Add search conditions (body of the \"where\" clause):" -msgstr "Axtarış şertlerini gir (\"where\" ifadesinin esas metni):" +msgstr "Axtarış şərtlərini əlavə edin (\"where\" ifadəsinin əsas mətni):" #: libraries/TableSearch.class.php:832 msgid "Number of rows per page" -msgstr "Sehife başına düşen setir sayı" +msgstr "Hər səhifədəki sətir sayı" #: libraries/TableSearch.class.php:843 msgid "Display order:" -msgstr "Sıralama şekli:" +msgstr "Görünüş sırası:" #: libraries/TableSearch.class.php:879 msgid "Use this column to label each point" @@ -3405,7 +3405,7 @@ msgstr "İki fərqli sütun üçün \"nümunə ilə sorğu\" (wildcard: \"%\")" #: libraries/TableSearch.class.php:1219 msgid "Do a \"query by example\" (wildcard: \"%\")" -msgstr "\"nümuneye göre sorğu\" gönderin (xüsusi işare: \"%\")" +msgstr "\"Nümunəyə görə sorğu\" göndərin (xüsusi işarə: \"%\")" #: libraries/TableSearch.class.php:1276 msgid "Browse/Edit the points" @@ -3413,7 +3413,7 @@ msgstr "" #: libraries/TableSearch.class.php:1283 msgid "How to use" -msgstr "" +msgstr "Necə istifadə etmək lazımdır" #: libraries/TableSearch.class.php:1288 #, fuzzy @@ -3452,7 +3452,7 @@ msgstr "" #: libraries/Theme.class.php:402 msgid "No preview available." -msgstr "" +msgstr "Görünüş mövcud deyil." #: libraries/Theme.class.php:404 msgid "take it" @@ -3799,11 +3799,12 @@ msgstr "PHP Kodunu Hazırla" #: libraries/Util.class.php:1239 libraries/config/messages.inc.php:751 #: libraries/server_status_variables.lib.php:42 msgid "Refresh" -msgstr "" +msgstr "Yenilə" #: libraries/Util.class.php:1270 libraries/sql.lib.php:483 +#, fuzzy msgid "Profiling" -msgstr "" +msgstr "Profilləmə" #: libraries/Util.class.php:1282 msgctxt "Inline edit query" @@ -3894,7 +3895,7 @@ msgstr "En son yoxlama" #: libraries/bookmark.lib.php:83 msgid "shared" -msgstr "" +msgstr "paylaşılan" #: libraries/browse_foreigners.lib.php:43 msgid "Search:" @@ -6406,7 +6407,7 @@ msgstr "" #: libraries/config/messages.inc.php:786 msgid "ZIP" -msgstr "" +msgstr "ZIP" #: libraries/config/messages.inc.php:787 msgid "Enter your public key for your domain reCaptcha service." @@ -11326,7 +11327,7 @@ msgstr "%s me'lumat bazasına SQL sorğusu(-ları) gönder" #: libraries/sql_query_form.lib.php:275 setup/frames/index.inc.php:297 msgid "Clear" -msgstr "" +msgstr "Təmizlə" #: libraries/sql_query_form.lib.php:318 #, fuzzy @@ -11868,7 +11869,7 @@ msgstr "İndex adı :" #: libraries/tbl_indexes.lib.php:263 msgid "" "\"PRIMARY\" must be the name of and only of a primary key!" -msgstr "\"PRIMARY\" sadece birinci dereceli açarın adı olmalıdır!" +msgstr "\"PRIMARY\" sadəcə birinci dərəcəli açarın adı olmalıdır!" #: libraries/tbl_indexes.lib.php:282 #, fuzzy From 1ed62c3fcaf6445d3fbbf0d8e8bb188ad11773b7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 8 Nov 2014 06:46:25 -0500 Subject: [PATCH 2/2] bug Incorrect text/icon display in Tracking report Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/tbl_tracking.lib.php | 2 +- test/libraries/PMA_tbl_tracking_test.php | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59e8fdc223..32bf72e480 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #4574 Blank/white page when JavaScript disabled - bug #4577 Multi row actions cause full page reloads - bug ReferenceError: targeurl is not defined +- bug Incorrect text/icon display in Tracking report 4.2.11.0 (2014-10-31) - bug ReferenceError: Table_onover is not defined diff --git a/libraries/tbl_tracking.lib.php b/libraries/tbl_tracking.lib.php index 95d050658d..5195325bb2 100644 --- a/libraries/tbl_tracking.lib.php +++ b/libraries/tbl_tracking.lib.php @@ -364,7 +364,7 @@ function PMA_getHtmlForTrackingReport($url_query, $data, $url_params, // Prepare delete link content here $drop_image_or_text = ''; - if (PMA_Util::showIcons('ActionsLinksMode')) { + if (PMA_Util::showIcons('ActionLinksMode')) { $drop_image_or_text .= PMA_Util::getImage( 'b_drop.png', __('Delete tracking data row from report') ); diff --git a/test/libraries/PMA_tbl_tracking_test.php b/test/libraries/PMA_tbl_tracking_test.php index d5ab410906..4c0a260ae5 100644 --- a/test/libraries/PMA_tbl_tracking_test.php +++ b/test/libraries/PMA_tbl_tracking_test.php @@ -47,7 +47,6 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['Server']['pmadb'] = 'pmadb'; $GLOBALS['cfg']['ServerDefault'] = "server"; $GLOBALS['cfg']['Server']['tracking'] = "tracking"; - $GLOBALS['cfg']['ActionsLinksMode'] = 'ActionsLinksMode'; $GLOBALS['cfg']['ActionLinksMode'] = 'ActionLinksMode'; $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;