From c74ed185d4958f52c6b21a67fcbb7f3b89c0653c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 10 Feb 2015 02:42:16 -0500 Subject: [PATCH 1/3] New icon for Pin text Signed-off-by: Marc Delisle --- libraries/db_designer.lib.php | 4 ++-- themes/pmahomme/img/pmd/anchor.png | Bin 0 -> 523 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 themes/pmahomme/img/pmd/anchor.png diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index f1f760ef4e..45382ee59b 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -414,8 +414,8 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page) $html .= ''; $html .= '>getImgPath('pmd/2leftarrow_m.png'); - $html .= '" src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/2rightarrow_m.png') . '" />'; + $html .= ' data-right="' . $_SESSION['PMA_Theme']->getImgPath('pmd/anchor.png'); + $html .= '" src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/anchor.png') . '" />'; $html .= '' . __('Pin text') . ''; $html .= ''; diff --git a/themes/pmahomme/img/pmd/anchor.png b/themes/pmahomme/img/pmd/anchor.png new file mode 100644 index 0000000000000000000000000000000000000000..9b3422c61e5d23434d085834b82eed7a7363976e GIT binary patch literal 523 zcmV+m0`&cfP)JNR5;6} zQ!#78Koq{K0R;zL3K^ueKcPdX4$`e#^8*A?$4(UrP73NEC=L?Wb`e}#+M#4AI28&O z(h7D{iBLo^6ibLnntoS;4W+RSeem(_-M#O-mv=AJwr%ns(1oktvOHk&-Wjo2=gN^Bj3SRR*}a0NpG5_ zolK`M<47b@MJ$6*<9VLqM#|QJ9FOl*`~9c!VzJ0#yuW&YL-uTJXs#7SsfEK~0YXX4 z0b#F1DNRn42?6;6#8Y4fXr9klsZ Date: Tue, 10 Feb 2015 08:43:59 +0100 Subject: [PATCH 2/3] Translated using Weblate (Estonian) Currently translated at 100.0% (3010 of 3010 strings) [CI skip] --- po/et.po | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/po/et.po b/po/et.po index 7fd742196c..eb824319ab 100644 --- a/po/et.po +++ b/po/et.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-02-09 10:48-0500\n" -"PO-Revision-Date: 2015-02-05 08:31+0200\n" +"PO-Revision-Date: 2015-02-10 08:43+0200\n" "Last-Translator: Kristjan Räts \n" -"Language-Team: Estonian \n" +"Language-Team: Estonian " +"\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: et\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.2-dev\n" @@ -7239,7 +7239,6 @@ msgid "Suhosin warning" msgstr "Suhosin'i hoiatus" #: libraries/config/messages.inc.php:757 -#, fuzzy #| msgid "" #| "Disable the default warning that is displayed on the main page if session." #| "gc_maxlifetime is less than `LoginCookieValidity`." @@ -7248,8 +7247,8 @@ msgid "" "of the PHP setting session.gc_maxlifetime is less than the value of " "`LoginCookieValidity`." msgstr "" -"Keela vaikimisi hoiatus, mida näidatakse põhilehel siis, kui session." -"gc_maxlifetime on väiksem kui `LoginCookieValidity`." +"Keela vaikimisi hoiatus, mida näidatakse põhilehel siis, kui PHP sätte " +"session.gc_maxlifetime väärtus on väiksem kui `LoginCookieValidity` väärtus." #: libraries/config/messages.inc.php:758 msgid "Login cookie validity warning" @@ -7645,10 +7644,9 @@ msgid "Move Menu" msgstr "Liiguta menüü" #: libraries/db_designer.lib.php:416 libraries/db_designer.lib.php:419 -#, fuzzy #| msgid "Partial texts" msgid "Pin text" -msgstr "Osalised tekstid" +msgstr "Jäta tekst nähtavaks" #: libraries/db_designer.lib.php:458 msgid "Hide/Show all" @@ -13445,13 +13443,11 @@ msgid "Showing create queries" msgstr "Kuvatakse loomise päringuid" #: libraries/structure.lib.php:3259 -#, fuzzy #| msgid "Table structure" msgid "Table Structure" msgstr "Tabeli struktuur" #: libraries/structure.lib.php:3264 -#, fuzzy #| msgid "Relation view" msgid "Relation View" msgstr "Seoste vaade" From eca87c132f68f1e4772b7822ed96bb4b841f52e5 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 10 Feb 2015 02:50:37 -0500 Subject: [PATCH 3/3] Clarify function name Signed-off-by: Marc Delisle --- db_designer.php | 2 +- libraries/db_designer.lib.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db_designer.php b/db_designer.php index 6cd1e6a654..2582048285 100644 --- a/db_designer.php +++ b/db_designer.php @@ -137,7 +137,7 @@ $response->addHTML( ) ); $response->addHTML( - PMA_getDesignerPageTopMenu(isset($_REQUEST['query']), $selected_page) + PMA_getDesignerPageMenu(isset($_REQUEST['query']), $selected_page) ); $response->addHTML('
'); diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index 45382ee59b..fc4a8cfa5b 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -223,14 +223,14 @@ function PMA_getHtmlForJSFields( } /** - * Returns HTML for the top menu bar of the designer page + * Returns HTML for the menu bar of the designer page * * @param boolean $visualBuilder whether this is visual query builder * @param string $selected_page name of the selected page * * @return string html */ -function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page) +function PMA_getDesignerPageMenu($visualBuilder, $selected_page) { $iconClass = ''; $textClass = 'hidable hide';