gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-02-10 16:10:06 +05:30
commit 7d411677bd
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_designer.php
View File

@ -137,7 +137,7 @@ $response->addHTML(
)
);
$response->addHTML(
PMA_getDesignerPageTopMenu(isset($_REQUEST['query']), $selected_page)
PMA_getDesignerPageMenu(isset($_REQUEST['query']), $selected_page)
);
$response->addHTML('<div id="canvas_outer">');

8
libraries/db_designer.lib.php
View File

@ -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';
@ -414,8 +414,8 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page)
$html .= '<a href="#" class="M_butt" target="_self" id="pin_Text">';
$html .= '<img class="' . $iconClass . '" title="' . __('Pin text') . '" alt=">"';
$html .= ' data-right="' . $_SESSION['PMA_Theme']->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 .= '<span class="' . $textClass . '">' . __('Pin text') . '</span>';
$html .= '</a>';

18
po/et.po
View File

@ -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 <kristjanrats@gmail.com>\n"
"Language-Team: Estonian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/et/>\n"
"Language-Team: Estonian "
"<https://hosted.weblate.org/projects/phpmyadmin/master/et/>\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"

BIN
themes/pmahomme/img/pmd/anchor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 523 B