From 459b2807fd7226e32895921448960ee504c00399 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Sun, 28 Apr 2013 12:00:11 +0200 Subject: [PATCH 1/4] Correct welcome message horizontal alignment for config auth --- libraries/plugins/auth/AuthenticationConfig.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/plugins/auth/AuthenticationConfig.class.php b/libraries/plugins/auth/AuthenticationConfig.class.php index 6bfc5e352d..cec0a445bb 100644 --- a/libraries/plugins/auth/AuthenticationConfig.class.php +++ b/libraries/plugins/auth/AuthenticationConfig.class.php @@ -77,6 +77,7 @@ class AuthenticationConfig extends AuthenticationPlugin $response = PMA_Response::getInstance(); $response->getFooter()->setMinimal(); $header = $response->getHeader(); + $header->setBodyId('loginform'); $header->setTitle(__('Access denied')); $header->disableMenu(); echo '

From 6514366611f72707911242c13cefd71b5e6ad356 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Apr 2013 11:35:08 +0200 Subject: [PATCH 2/4] Translated using Weblate (Hebrew) Currently translated at 22.9% (596 of 2605) --- po/he.po | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/po/he.po b/po/he.po index 730a9e9013..23ecc70d55 100644 --- a/po/he.po +++ b/po/he.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-04-27 21:15+0200\n" +"PO-Revision-Date: 2013-04-28 11:35+0200\n" "Last-Translator: Efraim Flashner \n" "Language-Team: Hebrew \n" "Language: he\n" @@ -601,7 +601,6 @@ msgid "Output" msgstr "פלט" #: gis_data_editor.php:402 -#, fuzzy #| msgid "" #| "Chose \"GeomFromText\" from the \"Function\" column and paste the below " #| "string into the \"Value\" field" @@ -609,11 +608,10 @@ msgid "" "Choose \"GeomFromText\" from the \"Function\" column and paste the string " "below into the \"Value\" field" msgstr "" -"יש לבחור ב„גאומטריה מטקסט” מהעמודה „פונקציה“ ולהדביק את המחרוזת שלהלן לשדה " -"„ערך“" +"בוחר \"GeomFromText\" מהעמודה \"פונקציה\" ולהדביק את המחרוזת מלמטה לשדה \"ערך\"" #: import.php:105 -#, fuzzy, php-format +#, php-format #| msgid "" #| "You probably tried to upload too large file. Please refer to " #| "%sdocumentation%s for ways to workaround this limit." @@ -621,8 +619,8 @@ msgid "" "You probably tried to upload a file that is too large. Please refer to " "%sdocumentation%s for a workaround for this limit." msgstr "" -"כפי הנראה ניסית להוריד קובץ גדול מדי. נא לפנות ל%sתיעוד%s לקבלת דרכים לעקיפת " -"הגבלה זו." +"כפי הנראה ניסית להעלות קובץ גדול מדי. נא לפנות ל%s תיעוד %s למצוא דרך לעקיפת " +"מגבלה זו." #: import.php:248 import.php:513 msgid "Showing bookmark" @@ -721,19 +719,17 @@ msgstr "קידוד חיבור MySQL" #: index.php:182 msgid "Appearance Settings" -msgstr "" +msgstr "הגדרות מראה" #: index.php:212 prefs_manage.php:275 -#, fuzzy #| msgid "General relation features" msgid "More settings" -msgstr "תכונות קשר כלליות" +msgstr "הגדרות נוספות" #: index.php:233 -#, fuzzy #| msgid "Databases" msgid "Database server" -msgstr "מאגרי נתונים" +msgstr "שרת מסד נתונים" #: index.php:236 libraries/Menu.class.php:150 #: libraries/ServerStatusData.class.php:339 libraries/common.inc.php:654 @@ -770,7 +766,7 @@ msgstr "בחירת שרת" #: index.php:269 msgid "Web server" -msgstr "" +msgstr "שרת אינטרנט" #: index.php:282 #, fuzzy From 4fa8633474b4ae51773e9644575d6b1c553a52fd Mon Sep 17 00:00:00 2001 From: "J.M" Date: Sun, 28 Apr 2013 12:31:21 +0200 Subject: [PATCH 3/4] Add rfe #1421 Add retry button on connection failure with config auth --- ChangeLog | 1 + libraries/plugins/auth/AuthenticationConfig.class.php | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dc7e89eead..eafbc4d2dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #3889 When login fails and error display is active, login data is displayed - bug #3890 [import] Web server upload directory import fails - bug #3891 [import] Server upload folder import file name missing in success message ++ rfe #1421 [auth] Add retry button on connection failure with config auth 4.0.0.0 (not yet released) + Patch #3481047 for rfe #3480477 Insert as new row enhancement diff --git a/libraries/plugins/auth/AuthenticationConfig.class.php b/libraries/plugins/auth/AuthenticationConfig.class.php index cec0a445bb..07ad7cb553 100644 --- a/libraries/plugins/auth/AuthenticationConfig.class.php +++ b/libraries/plugins/auth/AuthenticationConfig.class.php @@ -133,7 +133,16 @@ class AuthenticationConfig extends AuthenticationPlugin } $GLOBALS['error_handler']->dispUserErrors(); echo ' - '; + + + ' . "\n"; + echo '' + . __('Retry to connect') + . '' . "\n"; + echo ' + ' . "\n"; if (count($GLOBALS['cfg']['Servers']) > 1) { // offer a chance to login to other servers if the current one failed include_once './libraries/select_server.lib.php'; From 9b4d6f904171d4bcf5b1fc0d54263dcba2c25411 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Apr 2013 12:28:32 +0200 Subject: [PATCH 4/4] Translated using Weblate (Hebrew) Currently translated at 23.1% (601 of 2605) --- po/he.po | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/po/he.po b/po/he.po index 23ecc70d55..0fba24a081 100644 --- a/po/he.po +++ b/po/he.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-04-28 11:35+0200\n" +"PO-Revision-Date: 2013-04-28 12:28+0200\n" "Last-Translator: Efraim Flashner \n" "Language-Team: Hebrew \n" "Language: he\n" @@ -797,27 +797,25 @@ msgstr "תיעוד" #: index.php:339 libraries/config/FormDisplay.tpl.php:148 msgid "Wiki" -msgstr "" +msgstr "ויקי" #: index.php:348 msgid "Official Homepage" msgstr "דף הבית phpMyAdmin הרשמי" #: index.php:355 -#, fuzzy #| msgid "Attributes" msgid "Contribute" -msgstr "תכונות" +msgstr "תורם" #: index.php:362 msgid "Get support" -msgstr "" +msgstr "קבל תמיכה" #: index.php:369 -#, fuzzy #| msgid "No change" msgid "List of changes" -msgstr "ללא שינוי" +msgstr "רשימת שינויים" #: index.php:392 msgid "" @@ -831,11 +829,14 @@ msgstr "" "ואתה ממש צריך לתקן את חור אבטחה זה." #: index.php:403 +#, fuzzy msgid "" "You have enabled mbstring.func_overload in your PHP configuration. This " "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" msgstr "" +"הפכת mbstring.func_overload בתצורת ה-PHP שלך. אפשרות זו אינו תואם ל- " +"phpMyAdmin, עלול לגרום לנתונים פגומים!" #: index.php:414 msgid "" @@ -848,12 +849,18 @@ msgstr "" "לתוצאות לא רצויות." #: index.php:425 +#, fuzzy msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than " "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" +"פרמטר PHP שלך " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] הוא נמוך יותר מאשר עוגיה תוקפו " +"נקבעה ב phpMyAdmin, בגלל זה, הכניסה שלך יפוג מוקדם יותר מאשר נקבעה ב " +"phpMyAdmin." #: index.php:437 msgid "" @@ -863,7 +870,7 @@ msgstr "" #: index.php:449 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." -msgstr "" +msgstr "קובץ התצורה צריכה ביטוי סיסמה סודית (blowfish_secret)." #: index.php:460 msgid ""