From 9274c69693c36611c47d6636cf74ac362f530a56 Mon Sep 17 00:00:00 2001 From: Aswani Prakash Date: Wed, 25 Apr 2018 10:44:13 +0530 Subject: [PATCH 01/16] #13893 issue fix Simulating queries produce unexpected results MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aswani Prakash (cherry picked from commit 594cb7b1f286e433899007dc0cbdd53c40d734b7) Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Import.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php index 7456685401..c9b9702504 100644 --- a/libraries/classes/Import.php +++ b/libraries/classes/Import.php @@ -1460,7 +1460,11 @@ class Import $diff = array(); foreach ($analyzed_sql_results['statement']->set as $set) { $columns[] = $set->column; - $diff[] = $set->column . ' <> ' . $set->value; + $not_equal_operator = ' <> '; + if(strtoupper($set->value) == 'NULL'){ + $not_equal_operator = ' IS NOT '; + } + $diff[] = $set->column . $not_equal_operator . $set->value; } if (!empty($diff)) { $where .= ' AND (' . implode(' OR ', $diff) . ')'; From f5c787e5263afd120a94aafd1f16faba48d75e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 16 May 2018 19:34:58 -0300 Subject: [PATCH 02/16] Add ChangeLog entry for #13893 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 4b3d413235..f188893076 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog - issue #14289 Fix multi-column sorting - issue #14278 Fix central columns in-line edit bug - issue #14066 Fix AUTO_INCREMENT error when only exporting table structure in database-level exports +- issue #13893 Simulating queries produces unexpected results 4.8.0.1 (2018-04-19) - issue [security] Multiple CSRF vulnerabilities, See PMASA-2018-02 From be4ddc0e2781b4115550474c1ac95c437c6fd1dd Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Thu, 17 May 2018 07:13:49 +0000 Subject: [PATCH 03/16] Translated using Weblate (Hebrew) Currently translated at 46.2% (1520 of 3288 strings) [CI skip] --- po/he.po | 498 ++++++++++++++++--------------------------------------- 1 file changed, 142 insertions(+), 356 deletions(-) diff --git a/po/he.po b/po/he.po index bf828ae9e6..8a71c7d4f1 100644 --- a/po/he.po +++ b/po/he.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-05-16 17:58+0000\n" +"PO-Revision-Date: 2018-05-18 08:37+0000\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" @@ -2193,7 +2193,7 @@ msgstr "" #: js/messages.php:551 msgid "Select referenced key" -msgstr "" +msgstr "בחירת מפתח עם הפניה" #: js/messages.php:552 msgid "Select Foreign Key" @@ -12426,22 +12426,16 @@ msgid "Group name:" msgstr "שמות עמודה" #: libraries/classes/Server/UserGroups.php:282 -#, fuzzy -#| msgid "Server version" msgid "Server-level tabs" -msgstr "גרסת שרת" +msgstr "טאבים ברמת השרת" #: libraries/classes/Server/UserGroups.php:285 -#, fuzzy -#| msgid "Database server" msgid "Database-level tabs" -msgstr "שרת מסד נתונים" +msgstr "לשוניות ברמת מסד הנתונים" #: libraries/classes/Server/UserGroups.php:288 -#, fuzzy -#| msgid "Table comments" msgid "Table-level tabs" -msgstr "הערות לטבלה" +msgstr "טאבים ברמת הטבלה" #: libraries/classes/Sql.php:248 libraries/classes/Util.php:1145 #: templates/console/display.twig:31 templates/console/display.twig:175 @@ -12449,13 +12443,10 @@ msgid "Profiling" msgstr "" #: libraries/classes/Sql.php:251 -#, fuzzy -#| msgid "Data files" msgid "Detailed profile" -msgstr "קבצי נתונים" +msgstr "פרופיל מפורט" #: libraries/classes/Sql.php:256 libraries/classes/Sql.php:272 -#, fuzzy msgid "State" msgstr "מצב" @@ -12464,48 +12455,36 @@ msgid "Summary by state" msgstr "" #: libraries/classes/Sql.php:275 -#, fuzzy -#| msgid "Total" msgid "Total Time" -msgstr "סה\"כ" +msgstr "סך כל הזמן" #: libraries/classes/Sql.php:277 -#, fuzzy -#| msgid "Time" msgid "% Time" -msgstr "זמן" +msgstr "% זמן" #: libraries/classes/Sql.php:279 -#, fuzzy -#| msgid "Close" msgid "Calls" -msgstr "סגירה" +msgstr "קריאות" #: libraries/classes/Sql.php:281 -#, fuzzy -#| msgid "Time" msgid "ø Time" -msgstr "זמן" +msgstr "ø זמן" #: libraries/classes/Sql.php:586 libraries/classes/Sql.php:604 msgid "Bookmark this SQL query" msgstr "הכנס שאילתת SQL זאת למועדפים" #: libraries/classes/Sql.php:590 -#, fuzzy -#| msgid "Label" msgid "Label:" -msgstr "תווית" +msgstr "תווית:" #: libraries/classes/Sql.php:597 libraries/classes/SqlQueryForm.php:316 msgid "Let every user access this bookmark" msgstr "אפשר לכל משתמש לגשת לכתובת מועדפת זאת" #: libraries/classes/Sql.php:813 -#, fuzzy -#| msgid "Bookmark %s created" msgid "Bookmark not created!" -msgstr "הסימנייה %s נוצרה" +msgstr "לא נוצרה סימנייה!" #: libraries/classes/Sql.php:923 #, php-format @@ -12536,9 +12515,9 @@ msgid "Problems with indexes of table `%s`" msgstr "בעיות עם אינדקסים של טבלה `%s`" #: libraries/classes/SqlQueryForm.php:140 -#, fuzzy, php-format +#, php-format msgid "Run SQL query/queries on server “%s”" -msgstr "הרצת את שאילתה/שאילתות על מסד הנתונים %s" +msgstr "הרצת את שאילתה/שאילתות על השרת „%s”" #: libraries/classes/SqlQueryForm.php:157 #, php-format @@ -12546,16 +12525,14 @@ msgid "Run SQL query/queries on database %s" msgstr "הרצת את שאילתה/שאילתות על מסד הנתונים %s" #: libraries/classes/SqlQueryForm.php:178 -#, fuzzy, php-format -#| msgid "Run SQL query/queries on database %s" +#, php-format msgid "Run SQL query/queries on table %s" -msgstr "הרצת את שאילתה/שאילתות על מסד הנתונים %s" +msgstr "הרצת את שאילתה/שאילתות על הטבלה „%s”" #: libraries/classes/SqlQueryForm.php:248 setup/frames/index.inc.php:254 #: templates/console/display.twig:7 -#, fuzzy msgid "Clear" -msgstr "לוח שנה" +msgstr "פינוי" #: libraries/classes/SqlQueryForm.php:254 msgid "Get auto-saved query" @@ -12568,10 +12545,8 @@ msgid "Bind parameters" msgstr "פרמטרים שגויים!" #: libraries/classes/SqlQueryForm.php:308 -#, fuzzy -#| msgid "Bookmark this SQL query" msgid "Bookmark this SQL query:" -msgstr "הכנס שאילתת SQL זאת למועדפים" +msgstr "הוספת שאילתת SQL זאת לסימניות:" #: libraries/classes/SqlQueryForm.php:322 msgid "Replace existing bookmark of same name" @@ -12624,42 +12599,36 @@ msgid "This MySQL server does not support the %s storage engine." msgstr "שרת MySQL לא תומך במנוע אחסון %s." #: libraries/classes/Table.php:332 -#, fuzzy -#| msgid "Show tables" msgid "Unknown table status:" -msgstr "ראיית טבלאות" +msgstr "מצב הטבלה אינו ידוע:" #: libraries/classes/Table.php:884 -#, fuzzy, php-format +#, php-format msgid "Source database `%s` was not found!" -msgstr "חפש במסד הנתונים" +msgstr "מסד נתוני המקור ‚%s’ לא נמצא!" #: libraries/classes/Table.php:892 -#, fuzzy, php-format +#, php-format msgid "Target database `%s` was not found!" -msgstr "חפש במסד הנתונים" +msgstr "מסד נתוני היעד ‚%s’ לא נמצא!" #: libraries/classes/Table.php:1435 -#, fuzzy msgid "Invalid database:" -msgstr "אין מאגרי נתונים" +msgstr "מסד נתונים שגוי:" #: libraries/classes/Table.php:1452 -#, fuzzy -#| msgid "Inside tables:" msgid "Invalid table name:" -msgstr "בתוך הטבלאות:" +msgstr "שם הטבלה שגוי:" #: libraries/classes/Table.php:1487 -#, fuzzy, php-format +#, php-format msgid "Failed to rename table %1$s to %2$s!" -msgstr "גרסת שרת" +msgstr "שינוי שם הטבלה מ־%1$s ל־%2$s נכשל!" #: libraries/classes/Table.php:1506 -#, fuzzy, php-format -#| msgid "Table %s has been renamed to %s." +#, php-format msgid "Table %1$s has been renamed to %2$s." -msgstr "טבלה %s שונתה אל %s" +msgstr "שם הטבלה %1$s הוחלף לשם %2$s." #: libraries/classes/Table.php:1737 msgid "Could not save table UI preferences!" @@ -12698,9 +12667,9 @@ msgid "Error creating foreign key on %1$s (check data types)" msgstr "" #: libraries/classes/Template.php:127 -#, fuzzy, php-format +#, php-format msgid "Error while working with template cache: %s" -msgstr "מאפשר מחיקת מידע." +msgstr "אירעה שגיאה בעת עבודה מול מטמון התבניות: %s" #: libraries/classes/Theme.php:186 #, php-format @@ -12727,9 +12696,8 @@ msgid "Theme:" msgstr "" #: libraries/classes/Tracking.php:158 templates/server/plugins/section.twig:11 -#, fuzzy msgid "Version" -msgstr "Persian" +msgstr "גרסה" #: libraries/classes/Tracking.php:159 #: templates/database/tracking/tracked_tables.twig:13 @@ -12742,9 +12710,8 @@ msgid "Updated" msgstr "עודכנה" #: libraries/classes/Tracking.php:169 libraries/classes/Tracking.php:233 -#, fuzzy msgid "Delete version" -msgstr "גרסת שרת" +msgstr "מחיקת גרסה" #: libraries/classes/Tracking.php:170 libraries/classes/Tracking.php:332 #: templates/database/tracking/tracked_tables.twig:60 @@ -12765,10 +12732,8 @@ msgid "Delete tracking data row from report" msgstr "" #: libraries/classes/Tracking.php:359 -#, fuzzy -#| msgid "No databases" msgid "No data" -msgstr "אין מאגרי נתונים" +msgstr "אין נתונים" #: libraries/classes/Tracking.php:449 libraries/classes/Tracking.php:499 #, php-format @@ -12847,9 +12812,9 @@ msgid "Tracking for %1$s was deactivated at version %2$s." msgstr "" #: libraries/classes/Tracking.php:995 -#, fuzzy, php-format +#, php-format msgid "Version %1$s of %2$s was deleted." -msgstr "גרסת שרת" +msgstr "גרסה %1$s מתוך %2$s נמחקה." #: libraries/classes/Tracking.php:1026 #, php-format @@ -12937,9 +12902,9 @@ msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" msgstr "" #: libraries/classes/Types.php:265 -#, fuzzy, php-format +#, php-format msgid "A date, supported range is %1$s to %2$s" -msgstr "גרסת שרת" +msgstr "תאריך, הטווח הנתמך הוא %1$s עד %2$s" #: libraries/classes/Types.php:270 #, php-format @@ -12953,9 +12918,9 @@ msgid "" msgstr "" #: libraries/classes/Types.php:281 -#, fuzzy, php-format +#, php-format msgid "A time, range is %1$s to %2$s" -msgstr "גרסת שרת" +msgstr "שעה, הטווח הוא %1$s עד %2$s" #: libraries/classes/Types.php:285 msgid "" @@ -13060,10 +13025,8 @@ msgid "A curve with linear interpolation between points" msgstr "" #: libraries/classes/Types.php:371 -#, fuzzy -#| msgid "Add a polygon" msgid "A polygon" -msgstr "הוספת מצולע" +msgstr "מצולע" #: libraries/classes/Types.php:373 msgid "A collection of points" @@ -13093,28 +13056,22 @@ msgid "Numeric" msgstr "" #: libraries/classes/Types.php:713 -#, fuzzy -#| msgid "Create an index" msgctxt "date and time types" msgid "Date and time" -msgstr "יצירת אינדקס חדש" +msgstr "תאריך ושעה" #: libraries/classes/Types.php:743 -#, fuzzy -#| msgid "Total" msgctxt "spatial types" msgid "Spatial" -msgstr "סה\"כ" +msgstr "מרחבי" #: libraries/classes/UserPassword.php:62 msgid "The profile has been updated." msgstr "הפרופיל עודכן בהצלחה." #: libraries/classes/UserPassword.php:74 -#, fuzzy -#| msgid "Password:" msgid "Password is too long!" -msgstr "סיסמא:" +msgstr "הססמה ארוכה מדי!" #: libraries/classes/UserPreferences.php:144 msgid "Could not save configuration" @@ -13144,24 +13101,18 @@ msgid "Analyze Explain at %s" msgstr "" #: libraries/classes/Util.php:1091 -#, fuzzy -#| msgid "Without PHP Code" msgid "Without PHP code" msgstr "ללא קוד PHP" #: libraries/classes/Util.php:1098 #: templates/database/multi_table_query/form.twig:161 -#, fuzzy -#| msgid "Submit Query" msgid "Submit query" msgstr "שליחת שאילתה" #: libraries/classes/Util.php:1164 -#, fuzzy -#| msgid "Add new field" msgctxt "Inline edit query" msgid "Edit inline" -msgstr "הוספת שדה חדש" +msgstr "עריכה במקום" #. l10n: Short week day name #: libraries/classes/Util.php:1504 @@ -13185,16 +13136,13 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s ימים, %s שעות, %s דקות ו- %s שניות" #: libraries/classes/Util.php:1872 -#, fuzzy -#| msgid "Add new field" msgid "Missing parameter:" -msgstr "הוספת שדה חדש" +msgstr "חסר משתנה:" #: libraries/classes/Util.php:2416 -#, fuzzy, php-format -#| msgid "Jump to database \"%s\"." +#, php-format msgid "Jump to database “%s”." -msgstr "קפיצה אל מאגר נתונים \"%s\"." +msgstr "קפיצה אל מסד הנתונים „%s”." #: libraries/classes/Util.php:2441 #, php-format @@ -13206,9 +13154,9 @@ msgid "Browse your computer:" msgstr "" #: libraries/classes/Util.php:3254 -#, fuzzy, php-format +#, php-format msgid "Select from the web server upload directory %s:" -msgstr "שמירת שרת בתוך תיקיית %s" +msgstr "נא לבחור מתיקיית ההעלאה של השרת %s:" #: libraries/classes/Util.php:3294 msgid "There are no files to upload!" @@ -13240,10 +13188,8 @@ msgid "SSL is used" msgstr "" #: libraries/classes/Util.php:3960 -#, fuzzy -#| msgid "User" msgid "Users" -msgstr "משתמש" +msgstr "משתמשים" #: libraries/classes/Util.php:4652 #: templates/database/multi_table_query/form.twig:46 @@ -13279,18 +13225,14 @@ msgstr "" #: libraries/config.values.php:56 libraries/config.values.php:76 #: libraries/config.values.php:88 -#, fuzzy -#| msgid "Ins" msgid "Icons" -msgstr "הכנסה" +msgstr "סמלים" #: libraries/config.values.php:57 libraries/config.values.php:77 #: libraries/config.values.php:89 #: templates/database/multi_table_query/form.twig:96 -#, fuzzy -#| msgid "Next" msgid "Text" -msgstr "הבא" +msgstr "טקסט" #: libraries/config.values.php:58 libraries/config.values.php:66 #: libraries/config.values.php:78 libraries/config.values.php:90 @@ -13328,10 +13270,8 @@ msgid "display column" msgstr "מציג הערות עמודה" #: libraries/config.values.php:103 -#, fuzzy -#| msgid "Welcome to %s" msgid "Welcome" -msgstr "ברוך הבא אל %s" +msgstr "ברוך בואך" #: libraries/config.values.php:123 msgid "Open" @@ -13354,21 +13294,16 @@ msgid "Never send error reports" msgstr "" #: libraries/config.values.php:133 -#, fuzzy msgid "Server default" -msgstr "קבצי ייבוא" +msgstr "בררת המחדל של השרת" #: libraries/config.values.php:134 -#, fuzzy -#| msgid "Enabled" msgid "Enable" -msgstr "מופעל" +msgstr "הפעלה" #: libraries/config.values.php:135 -#, fuzzy -#| msgid "Disabled" msgid "Disable" -msgstr "מבוטל" +msgstr "השבתה" #: libraries/config.values.php:169 msgid "Quick - display only the minimal options to configure" @@ -13407,22 +13342,16 @@ msgid "Success!" msgstr "" #: libraries/user_preferences.inc.php:31 -#, fuzzy -#| msgid "General relation features" msgid "Manage your settings" -msgstr "תכונות קשר כלליות" +msgstr "ניהול ההגדרות שלך" #: libraries/user_preferences.inc.php:38 -#, fuzzy -#| msgid "Documentation" msgid "Two-factor authentication" -msgstr "תיעוד" +msgstr "אימות דו־שלבי" #: libraries/user_preferences.inc.php:63 prefs_manage.php:296 -#, fuzzy -#| msgid "Modifications have been saved" msgid "Configuration has been saved." -msgstr "שינויים נשמרו" +msgstr "התצוגה נשמרה." #: libraries/user_preferences.inc.php:70 #, php-format @@ -13470,10 +13399,8 @@ msgid "Saved on: @DATE@" msgstr "" #: prefs_manage.php:234 -#, fuzzy -#| msgid "Import files" msgid "Import from file" -msgstr "קבצי ייבוא" +msgstr "ייבוא מקובץ" #: prefs_manage.php:242 msgid "Import from browser's storage" @@ -13503,10 +13430,8 @@ msgid "" msgstr "" #: prefs_manage.php:312 -#, fuzzy -#| msgid "Save as file" msgid "Save as PHP file" -msgstr "שמירה כקובץ" +msgstr "שמירה כקובץ PHP" #: prefs_manage.php:317 msgid "Save to browser's storage" @@ -13525,9 +13450,8 @@ msgid "You can reset all your settings and restore them to default values." msgstr "" #: prefs_twofactor.php:29 -#, fuzzy msgid "Two-factor authentication has been removed." -msgstr "יחסים פנימיים" +msgstr "האימות הדו־שלבי הוסר." #: prefs_twofactor.php:39 msgid "Two-factor authentication has been configured." @@ -13543,10 +13467,8 @@ msgid "No Privileges" msgstr "ללא הרשאות" #: server_privileges.php:150 -#, fuzzy -#| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have privileges to manipulate with the users!" -msgstr "אין לך הרשאות מספיקות להיות כאן כרגע!" +msgstr "אין לך מספיק הרשאות לערוך שינויים במשתמשים!" #: server_privileges.php:164 msgid "" @@ -13606,10 +13528,8 @@ msgid "Insecure connection" msgstr "" #: setup/frames/index.inc.php:84 -#, fuzzy -#| msgid "Modifications have been saved" msgid "Configuration saved." -msgstr "שינויים נשמרו" +msgstr "התצוגה נשמרה." #: setup/frames/index.inc.php:87 msgid "" @@ -13618,10 +13538,8 @@ msgid "" msgstr "" #: setup/frames/index.inc.php:97 -#, fuzzy -#| msgid "Modifications have been saved" msgid "Configuration not saved!" -msgstr "שינויים נשמרו" +msgstr "התצורה לא נשמרה!" #: setup/frames/index.inc.php:100 msgid "" @@ -13671,9 +13589,8 @@ msgid "Display" msgstr "" #: setup/frames/index.inc.php:264 -#, fuzzy msgid "phpMyAdmin homepage" -msgstr "תיעוד phpMyAdmin" +msgstr "דף הבית של phpMyAdmin" #: setup/frames/index.inc.php:266 msgid "Donate" @@ -13688,9 +13605,8 @@ msgid "Edit server" msgstr "" #: setup/frames/servers.inc.php:37 -#, fuzzy msgid "Add a new server" -msgstr "הוספת משתמש חדש" +msgstr "הוספת שרת חדש" #: setup/index.php:18 msgid "Configuration already exists, setup is disabled!" @@ -13717,9 +13633,8 @@ msgid "Ignore errors" msgstr "" #: setup/lib/FormProcessing.php:73 -#, fuzzy msgid "Show form" -msgstr "ראיית צבע" +msgstr "הצגת טופס" #: setup/lib/Index.php:124 msgid "" @@ -13747,10 +13662,8 @@ msgid "No newer stable version is available" msgstr "" #: setup/validate.php:26 -#, fuzzy -#| msgid "No databases" msgid "Wrong data" -msgstr "אין מאגרי נתונים" +msgstr "נתונים שגויים" #: setup/validate.php:32 #, php-format @@ -13763,9 +13676,9 @@ msgid "'%s' database does not exist." msgstr "" #: tbl_create.php:46 -#, fuzzy, php-format +#, php-format msgid "Table %s already exists!" -msgstr "שם המשתמש %s כבר קיים!" +msgstr "הטבלה %s כבר קיימת!" #: tbl_export.php:44 msgid "View dump (schema) of table" @@ -13781,10 +13694,8 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "" #: tbl_row_action.php:73 -#, fuzzy -#| msgid "No rows selected" msgid "No row selected." -msgstr "לא נבחרו שורות" +msgstr "לא נבחרו שורות." #: tbl_tracking.php:34 #, php-format @@ -13792,15 +13703,12 @@ msgid "Tracking of %s is activated." msgstr "" #: tbl_tracking.php:103 -#, fuzzy msgid "Tracking versions deleted successfully." -msgstr "%s מסדי נתונים נמחקו בהצלחה." +msgstr "גרסאות המעקב נמחקו בהצלחה." #: tbl_tracking.php:108 -#, fuzzy -#| msgid "No rows selected" msgid "No versions selected." -msgstr "לא נבחרו שורות" +msgstr "לא נבחרו גרסאות." #: tbl_tracking.php:139 msgid "SQL statements executed." @@ -13843,18 +13751,14 @@ msgid "Input transformation" msgstr "שינויי צורה זמינים" #: transformation_overview.php:55 -#, fuzzy -#| msgid "Description" msgctxt "for MIME transformation" msgid "Description" msgstr "תיאור" #: templates/table/structure/move_columns_dialog.twig:1 #: templates/table/structure/optional_action_links.twig:19 -#, fuzzy -#| msgid "Add %s field(s)" msgid "Move columns" -msgstr "הוספת %s תאים" +msgstr "העברת עמודות" #: templates/table/structure/move_columns_dialog.twig:2 msgid "Move the columns by dragging them up and down." @@ -13938,25 +13842,21 @@ msgstr "הגרסה האחרונה" #: templates/database/tracking/tracked_tables.twig:49 #: templates/database/tracking/tracked_tables.twig:77 -#, fuzzy -#| msgid "Deleting tracking data" msgid "Delete tracking" -msgstr "נתוני המעקב נמחקים" +msgstr "מחיקת מעקב" #: templates/database/tracking/tracked_tables.twig:55 msgid "Versions" msgstr "גרסאות" #: templates/display/import/import.twig:40 -#, fuzzy -#| msgid "Cannot log in to the MySQL server" msgid "Importing into the current server" -msgstr "נכשל בכניסה לשרת MySQL" +msgstr "מתבצע ייבוא לתוך השרת הנוכחי" #: templates/display/import/import.twig:42 -#, fuzzy, php-format +#, php-format msgid "Importing into the database \"%s\"" -msgstr "אין מאגרי נתונים" +msgstr "מתבצע ייבוא לתוך מסד הנתונים „%s”" #: templates/display/import/import.twig:44 #, fuzzy, php-format @@ -14098,48 +13998,34 @@ msgid "Define new aliases" msgstr "" #: templates/export/alias_add.twig:9 -#, fuzzy -#| msgid "Select Tables" msgid "Select database:" -msgstr "בחירת טבלאות" +msgstr "בחירת מסד נתונים:" #: templates/export/alias_add.twig:15 -#, fuzzy -#| msgid "Database" msgid "New database name" -msgstr "מאגר נתונים" +msgstr "שם חדש למסד הנתונים" #: templates/export/alias_add.twig:18 templates/export/alias_add.twig:32 #: templates/export/alias_add.twig:46 templates/console/display.twig:99 #: templates/columns_definitions/column_definitions_form.twig:32 -#, fuzzy -#| msgid "And" msgid "Add" -msgstr "וגם" +msgstr "הוספה" #: templates/export/alias_add.twig:23 -#, fuzzy -#| msgid "Select Tables" msgid "Select table:" -msgstr "בחירת טבלאות" +msgstr "בחירת טבלה:" #: templates/export/alias_add.twig:29 -#, fuzzy -#| msgid "New table" msgid "New table name" -msgstr "אין טבלאות" +msgstr "שם חדש לטבלה" #: templates/export/alias_add.twig:37 -#, fuzzy -#| msgid "Add/Delete Field Columns" msgid "Select column:" -msgstr "הוספת/מחיקת עמודות שדה" +msgstr "בחירת עמודה:" #: templates/export/alias_add.twig:43 -#, fuzzy -#| msgid "Column names" msgid "New column name" -msgstr "שמות עמודה" +msgstr "שם חדש לעמודה" #: templates/privileges/add_user_fieldset.twig:2 msgctxt "Create new user" @@ -14153,10 +14039,9 @@ msgstr "" #: templates/display/export/options_quick_export.twig:8 #: templates/display/export/options_output_save_dir.twig:5 -#, fuzzy, php-format -#| msgid "Save on server in %s directory" +#, php-format msgid "Save on server in the directory %s" -msgstr "שמירת שרת בתוך תיקיית %s" +msgstr "שמירה בשרת בתיקיית %s" #: templates/table/insert/continue_insertion_form.twig:18 #, php-format @@ -14170,9 +14055,9 @@ msgid "" msgstr "" #: templates/server/databases/table_row.twig:13 -#, fuzzy, php-format +#, php-format msgid "Jump to database '%s'" -msgstr "אין מאגרי נתונים" +msgstr "קפיצה למסד הנתונים ‚%s’" #: templates/server/databases/table_row.twig:61 #, php-format @@ -14180,8 +14065,6 @@ msgid "Check privileges for database \"%s\"." msgstr "בדיקת הראשות עבור מאגר נתונים \"%s\"." #: templates/server/databases/table_row.twig:62 -#, fuzzy -#| msgid "Check Privileges" msgid "Check privileges" msgstr "בדיקת הרשאות" @@ -14191,10 +14074,8 @@ msgstr "" #: templates/database/designer/aggregate_query_panel.twig:22 #: templates/database/designer/options_panel.twig:100 -#, fuzzy -#| msgid "Create" msgid "Aggregate" -msgstr "יצירה" +msgstr "צבירה" #: templates/database/designer/aggregate_query_panel.twig:30 #: templates/database/designer/where_query_panel.twig:30 @@ -14325,16 +14206,12 @@ msgid "Server variables and settings" msgstr "משתני והגדרות שרת" #: templates/server/sub_page_header.twig:2 -#, fuzzy -#| msgid "Storage Engines" msgid "Storage engines" msgstr "מנועי אחסון" #: templates/server/sub_page_header.twig:2 -#, fuzzy -#| msgid "Character Sets and Collations" msgid "Character sets and collations" -msgstr "חבילות קידוד" +msgstr "ערכות תווים ואוספים" #: templates/server/sub_page_header.twig:2 msgid "Databases statistics" @@ -14396,10 +14273,8 @@ msgstr "" #: templates/display/export/options_rows.twig:10 #: templates/start_and_number_of_rows_panel.twig:10 #: templates/display/results/additional_fields.twig:6 -#, fuzzy -#| msgid "Number of fields" msgid "Number of rows:" -msgstr "מספר שדות" +msgstr "מספר שורות:" #: templates/display/export/options_rows.twig:23 msgid "Row to begin at:" @@ -14411,10 +14286,8 @@ msgstr "" #: templates/view_create.twig:13 #: templates/table/structure/display_structure.twig:137 -#, fuzzy -#| msgid "Print view" msgid "Edit view" -msgstr "תצוגת הדפסה" +msgstr "עריכת תצוגה" #: templates/view_create.twig:65 msgid "VIEW name" @@ -14429,8 +14302,6 @@ msgid "No databases" msgstr "אין מאגרי נתונים" #: templates/table/structure/row_stats_table.twig:2 -#, fuzzy -#| msgid "Row Statistics" msgid "Row statistics" msgstr "סטטיסטיקת שורה" @@ -14492,16 +14363,12 @@ msgid "use this for future exports" msgstr "" #: templates/database/designer/database_tables.twig:31 -#, fuzzy -#| msgid "Add %s field(s)" msgid "Show/hide columns" -msgstr "הוספת %s תאים" +msgstr "הצגה/הסתרה של עמודות" #: templates/database/designer/database_tables.twig:39 -#, fuzzy -#| msgid "Databases" msgid "See table structure" -msgstr "מאגרי נתונים" +msgstr "הצגת מבנה הטבלה" #: templates/table/tracking/activate_deactivate.twig:7 #, php-format @@ -14547,23 +14414,18 @@ msgid "Convert to Kana" msgstr "" #: templates/display/export/template_options.twig:1 -#, fuzzy -#| msgid "Select Tables" msgid "Select a template" -msgstr "בחירת טבלאות" +msgstr "בחירת טבלה" #: templates/database/designer/rename_to_panel.twig:22 #: templates/database/designer/options_panel.twig:85 -#, fuzzy msgid "Rename to" -msgstr "שינוי שם טבלה אל" +msgstr "שינוי שם טבלה לשם" #: templates/database/designer/rename_to_panel.twig:30 #: templates/database/designer/options_panel.twig:91 -#, fuzzy -#| msgid "User name" msgid "New name" -msgstr "שם משתמש" +msgstr "שם חדש" #: templates/database/structure/table_header.twig:27 #, fuzzy @@ -14638,10 +14500,8 @@ msgstr "קח זאת" #: templates/columns_definitions/column_virtuality.twig:29 #: templates/table/structure/display_partitions.twig:26 -#, fuzzy -#| msgid "Compression" msgid "Expression" -msgstr "דחיסה" +msgstr "ביטוי" #: templates/prefs_autoload.twig:7 msgid "" @@ -14656,10 +14516,8 @@ msgid "Delete settings" msgstr "נתוני המעקב נמחקים" #: templates/database/designer/delete_relation_panel.twig:21 -#, fuzzy -#| msgid "Deleting tracking data" msgid "Delete relationship" -msgstr "נתוני המעקב נמחקים" +msgstr "מחיקת יחס" #: templates/database/structure/show_create.twig:2 #, fuzzy @@ -14700,10 +14558,8 @@ msgstr "יחסים" #: templates/login/twofactor/application.twig:2 #: templates/login/twofactor/application_configure.twig:9 -#, fuzzy -#| msgid "Documentation" msgid "Authentication code:" -msgstr "תיעוד" +msgstr "קוד אימות:" #: templates/login/twofactor/application.twig:4 msgid "" @@ -14712,14 +14568,14 @@ msgid "" msgstr "" #: templates/table/tracking/create_version.twig:11 -#, fuzzy, php-format +#, php-format msgid "Create version %1$s of %2$s" -msgstr "גרסת שרת" +msgstr "יצירת גרסה %1$s מתוך %2$s" #: templates/table/tracking/create_version.twig:16 -#, fuzzy, php-format +#, php-format msgid "Create version %1$s" -msgstr "גרסת שרת" +msgstr "יצירת גרסה %1$s" #: templates/table/tracking/create_version.twig:20 msgid "Track these data definition statements:" @@ -14730,9 +14586,8 @@ msgid "Track these data manipulation statements:" msgstr "" #: templates/table/tracking/create_version.twig:76 -#, fuzzy msgid "Create version" -msgstr "גרסת שרת" +msgstr "יצירת גרסה" #: templates/table/structure/optional_action_links.twig:6 msgid "Propose table structure" @@ -14779,72 +14634,52 @@ msgstr "חלון שאילתה" #: templates/database/multi_table_query/form.twig:18 #: templates/database/multi_table_query/form.twig:106 -#, fuzzy -#| msgid "Select Tables" msgid "select table" -msgstr "בחירת טבלאות" +msgstr "בחירת טבלה" #: templates/database/multi_table_query/form.twig:25 #: templates/database/multi_table_query/form.twig:114 -#, fuzzy -#| msgid "Add/Delete Field Columns" msgid "select column" -msgstr "הוספת/מחיקת עמודות שדה" +msgstr "בחירת עמודה" #: templates/database/multi_table_query/form.twig:31 -#, fuzzy -#| msgid "Tables" msgid "Table alias" -msgstr "טבלאות" +msgstr "כינוי לטבלה" #: templates/database/multi_table_query/form.twig:32 -#, fuzzy -#| msgid "Column names" msgid "Column alias" -msgstr "שמות עמודה" +msgstr "כינוי לעמודה" #: templates/database/multi_table_query/form.twig:35 msgid "Use this column in criteria" msgstr "" #: templates/database/multi_table_query/form.twig:38 -#, fuzzy -#| msgid "Criteria" msgid "criteria" msgstr "קריטריונים" #: templates/database/multi_table_query/form.twig:52 -#, fuzzy -#| msgid "Add %s" msgid "Add as" -msgstr "הוספת %s" +msgstr "הוספה בתור" #: templates/database/multi_table_query/form.twig:97 -#, fuzzy -#| msgid "Add/Delete Field Columns" msgid "Another column" -msgstr "הוספת/מחיקת עמודות שדה" +msgstr "עמודה אחרת" #: templates/database/multi_table_query/form.twig:125 msgid "Enter criteria as free text" msgstr "" #: templates/database/multi_table_query/form.twig:133 -#, fuzzy -#| msgid "Rename database to" msgid "Remove this column" -msgstr "שינוי שם מאגר נתונים אל" +msgstr "הסרת עמודה זו" #: templates/database/multi_table_query/form.twig:143 #: templates/table/relation/foreign_key_row.twig:91 -#, fuzzy -#| msgid "Add %s field(s)" msgid "+ Add column" -msgstr "הוספת %s תאים" +msgstr "+ הוספת עמודה" #: templates/database/multi_table_query/form.twig:160 -#, fuzzy -#| msgid "Update Query" msgid "Update query" msgstr "עדכון שאילתה" @@ -14855,14 +14690,12 @@ msgid "#" msgstr "" #: templates/table/tracking/report_table.twig:5 -#, fuzzy msgid "Date" -msgstr "נתונים" +msgstr "תאריך" #: templates/table/tracking/report_table.twig:6 -#, fuzzy msgid "Username" -msgstr "שם משתמש:" +msgstr "שם משתמש" #: templates/export/alias_item.twig:8 msgid "Remove" @@ -15129,24 +14962,18 @@ msgid "Foreign key constraint %s has been dropped" msgstr "הוספת הגבלות" #: templates/table/relation/foreign_key_row.twig:39 -#, fuzzy -#| msgid "Constraints for table" msgid "Constraint name" -msgstr "הגבלות לטבלה" +msgstr "שם האילוץ" #: templates/table/structure/check_all_table_column.twig:76 #: templates/table/structure/actions_in_table_structure.twig:131 -#, fuzzy -#| msgid "Add %s field(s)" msgid "Add to central columns" -msgstr "הוספת %s תאים" +msgstr "הוספה לעמודות המרכזיות" #: templates/table/structure/check_all_table_column.twig:83 #: templates/table/structure/actions_in_table_structure.twig:127 -#, fuzzy -#| msgid "Rename database to" msgid "Remove from central columns" -msgstr "שינוי שם מאגר נתונים אל" +msgstr "הסרה מהעמודות המרכזיות" #: templates/server/databases/databases_footer.twig:65 msgid "" @@ -15164,10 +14991,8 @@ msgid "Enable statistics" msgstr "הפעלת סטטיסטיקה" #: templates/display/export/selection.twig:3 -#, fuzzy -#| msgid "Databases" msgid "Databases:" -msgstr "מאגרי נתונים" +msgstr "מסדי נתונים:" #: templates/database/structure/tracking_icon.twig:3 msgid "Tracking is active." @@ -15181,19 +15006,15 @@ msgstr "המעקב אינו פעיל." #: templates/database/designer/having_query_panel.twig:90 #: templates/database/designer/options_panel.twig:63 #: templates/database/designer/options_panel.twig:229 -#, fuzzy -#| msgid "Export" msgid "Except" -msgstr "ייצוא" +msgstr "למעט" #: templates/database/designer/where_query_panel.twig:71 #: templates/database/designer/having_query_panel.twig:102 #: templates/database/designer/options_panel.twig:75 #: templates/database/designer/options_panel.twig:241 -#, fuzzy -#| msgid "in query" msgid "subquery" -msgstr "בשאילתה" +msgstr "תת־שאילתה" #: templates/columns_definitions/move_column.twig:7 msgid "first" @@ -15436,16 +15257,12 @@ msgid "Export templates:" msgstr "סוג ייצוא" #: templates/display/export/template_loading.twig:6 -#, fuzzy -#| msgid "File name template" msgid "New template:" -msgstr "תבנית שם קובץ" +msgstr "תבנית חדשה:" #: templates/display/export/template_loading.twig:8 -#, fuzzy -#| msgid "User name" msgid "Template name" -msgstr "שם משתמש" +msgstr "שם טבלה" #: templates/display/export/template_loading.twig:10 #: templates/server/databases/create.twig:30 @@ -15453,23 +15270,16 @@ msgid "Create" msgstr "יצירה" #: templates/display/export/template_loading.twig:16 -#, fuzzy -#| msgid "File name template" msgid "Existing templates:" -msgstr "תבנית שם קובץ" +msgstr "תבניות קיימות:" #: templates/display/export/template_loading.twig:17 -#, fuzzy -#| msgid "%s table(s)" msgid "Template:" -msgstr "%s טבלאות" +msgstr "תבנית:" #: templates/display/export/template_loading.twig:21 -#, fuzzy -#| msgctxt "Create UPDATE query" -#| msgid "Update" msgid "Update" -msgstr "עדכון שאילתה" +msgstr "עדכון" #: templates/database/designer/schema_export.twig:4 msgid "Select Export Relational Type" @@ -15477,10 +15287,8 @@ msgstr "" #: templates/server/databases/create.twig:8 #: templates/server/databases/create.twig:36 -#, fuzzy -#| msgid "Create new database" msgid "Create database" -msgstr "יצירת מאגר נתונים חדש" +msgstr "יצירת מסד נתונים" #: templates/server/variables/session_variable_row.twig:3 msgid "Session value" @@ -15615,10 +15423,8 @@ msgid "Reset zoom" msgstr "איפוס" #: templates/privileges/add_privileges_routine.twig:3 -#, fuzzy -#| msgid "Add privileges on the following table" msgid "Add privileges on the following routine:" -msgstr "הוספת הראשאות לטבלה הבאה" +msgstr "הוספת הרשאות לשגרה הבאה:" #: templates/login/twofactor/invalid.twig:2 msgid "" @@ -15635,16 +15441,12 @@ msgid "None" msgstr "ללא" #: templates/table/search/search_and_replace.twig:3 -#, fuzzy -#| msgid "Replace NULL by" msgid "Replace with:" -msgstr "החלפת NULL ע\"י" +msgstr "החלפה ב־:" #: templates/table/search/search_and_replace.twig:19 -#, fuzzy -#| msgid "as regular expression" msgid "Use regular expression" -msgstr "כביטוי רגולרי" +msgstr "שימוש בביטוי רגולרי" #: templates/table/search/options.twig:6 #, fuzzy @@ -15752,20 +15554,16 @@ msgid "Display GIS Visualization" msgstr "" #: templates/table/gis_visualization/gis_visualization.twig:8 -#, fuzzy -#| msgid "Add/Delete Field Columns" msgid "Label column" -msgstr "הוספת/מחיקת עמודות שדה" +msgstr "תווית עמודה" #: templates/table/gis_visualization/gis_visualization.twig:11 msgid "-- None --" msgstr "" #: templates/table/gis_visualization/gis_visualization.twig:19 -#, fuzzy -#| msgid "Total" msgid "Spatial column" -msgstr "סה\"כ" +msgstr "עמודה מרחבית" #: templates/display/export/method.twig:3 #, fuzzy @@ -15901,10 +15699,8 @@ msgid "Choose column to display:" msgstr "בחירת שדה להצגה" #: templates/privileges/delete_user_fieldset.twig:3 -#, fuzzy -#| msgid "Remove selected users" msgid "Remove selected user accounts" -msgstr "הסרת משתמשים שנבחרו" +msgstr "הסרת חשבונות המשתמשים שנבחרו" #: templates/privileges/delete_user_fieldset.twig:6 msgid "Revoke all active privileges from the users and delete them afterwards." @@ -15933,15 +15729,12 @@ msgid "Do a \"query by example\" (wildcard: \"%\")" msgstr "ביצוע \"שאילתה לדוגמה\" (תו כללי: \"%\")" #: templates/display/results/options_block.twig:30 -#, fuzzy msgid "Relational key" -msgstr "תצוגת יחסים" +msgstr "מפתח יחסי" #: templates/display/results/options_block.twig:30 -#, fuzzy -#| msgid "Displaying Column Comments" msgid "Display column for relationships" -msgstr "מציג הערות עמודה" +msgstr "הצגת עמודת יחסים" #: templates/display/results/options_block.twig:46 msgid "Show binary contents" @@ -15990,10 +15783,8 @@ msgid "Index choice:" msgstr "שם אינדקס:" #: templates/table/index_form.twig:42 -#, fuzzy -#| msgid "Table options" msgid "Advanced Options" -msgstr "אפשרויות טבלה" +msgstr "אפשרויות מתקדמות" #: templates/table/index_form.twig:48 msgid "Key block size:" @@ -16004,15 +15795,12 @@ msgid "Index type:" msgstr "סוג אינדקס:" #: templates/table/index_form.twig:77 -#, fuzzy -#| msgid "User:" msgid "Parser:" -msgstr "משתמש:" +msgstr "מפענח:" #: templates/table/index_form.twig:93 -#, fuzzy msgid "Comment:" -msgstr "הערות" +msgstr "הערה:" #: templates/table/index_form.twig:136 templates/table/index_form.twig:173 msgid "Drag to reorder" @@ -16047,10 +15835,8 @@ msgid "in use" msgstr "בשימוש" #: templates/privileges/add_privileges_table.twig:3 -#, fuzzy -#| msgid "Add privileges on the following table" msgid "Add privileges on the following table:" -msgstr "הוספת הראשאות לטבלה הבאה" +msgstr "הוספת הרשאות לטבלה הבאה:" #: templates/display/export/options_output_compression.twig:4 #, fuzzy From b7bbb9bf57f0658b996d3a6418e056b30f34e514 Mon Sep 17 00:00:00 2001 From: Xuan Hung Date: Thu, 17 May 2018 08:09:31 +0000 Subject: [PATCH 04/16] Translated using Weblate (Vietnamese) Currently translated at 83.7% (2754 of 3288 strings) [CI skip] --- po/vi.po | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/po/vi.po b/po/vi.po index 14765f0a4c..ce4360d7d9 100644 --- a/po/vi.po +++ b/po/vi.po @@ -9,16 +9,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-01-13 02:26+0000\n" -"Last-Translator: Dao Nguyen \n" +"PO-Revision-Date: 2018-05-18 08:42+0000\n" +"Last-Translator: Xuan Hung \n" "Language-Team: Vietnamese \n" +"4-8/vi/>\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.19-dev\n" +"X-Generator: Weblate 3.0-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 msgid "Bad type!" @@ -860,6 +860,8 @@ msgid "" "The $cfg['TempDir'] (%s) is not accessible. phpMyAdmin is not able to cache " "templates and will be slow because of this." msgstr "" +"Thư mục $cfg['TempDir'] (%s) không thể truy cập được. phpMyAdmin không thể " +"tạo được cache cho giao diện và điều này sẽ làm chậm quá trình tải trang." #: js/messages.php:43 msgid "Confirm" @@ -971,7 +973,6 @@ msgid "Do you really want to RESET SLAVE?" msgstr "Bạn có thực sự muốn RESET SLAVE?" #: js/messages.php:88 -#, fuzzy msgid "" "This operation will attempt to convert your data to the new collation. In " "rare cases, especially where a character doesn't exist in the new collation, " @@ -980,10 +981,10 @@ msgid "" "refer to the tips at " msgstr "" "Thao tác này sẽ cố gắng chuyển đổi dữ liệu của bạn sang sự đối chiếu mới. " -"Trong một số ít trường hợp, đặc biệt là khi một ký tự không tồn tại trong sự " -"đối chiếu mới, quá trình này có thể làm cho dữ liệu xuất hiện không đúng " -"theo đối chiếu mới; trong trường hợp này, chúng tôi khuyên bạn nên hoàn " -"nguyên về đối chiếu ban đầu và tham khảo các mẹo tại " +"Trong một số ít trường hợp, một số ký tự đặc biệt không tồn tại trong sự đối " +"chiếu mới, quá trình này có thể làm cho dữ liệu xuất hiện không đúng theo " +"đối chiếu mới; trong trường hợp này, chúng tôi khuyên bạn nên hoàn nguyên về " +"đối chiếu ban đầu và tham khảo các mẹo tại " #: js/messages.php:94 msgid "Garbled Data" @@ -1573,15 +1574,11 @@ msgid "Database" msgstr "Cơ sở dữ liệu" #: js/messages.php:296 libraries/classes/Display/Export.php:578 -#, fuzzy -#| msgid "Table" msgctxt "Alias" msgid "Table" msgstr "Bảng" #: js/messages.php:297 libraries/classes/Display/Export.php:589 -#, fuzzy -#| msgid "Column" msgctxt "Alias" msgid "Column" msgstr "Cột" From d34b00efea3ada7b1dbe22eed6554664604c4f2d Mon Sep 17 00:00:00 2001 From: Muhammad Rifqi Priyo Susanto Date: Sat, 19 May 2018 17:00:47 +0000 Subject: [PATCH 05/16] Translated using Weblate (Indonesian) Currently translated at 81.2% (2670 of 3288 strings) [CI skip] --- po/id.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/po/id.po b/po/id.po index f82f9da612..fa8df32e57 100644 --- a/po/id.po +++ b/po/id.po @@ -3,8 +3,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-04-29 13:54+0000\n" -"Last-Translator: Dadan Setia \n" +"PO-Revision-Date: 2018-05-19 17:03+0000\n" +"Last-Translator: Muhammad Rifqi Priyo Susanto " +"\n" "Language-Team: Indonesian \n" "Language: id\n" @@ -591,7 +592,7 @@ msgstr "Markah %s telah dibuat." #, php-format msgid "Import has been successfully finished, %d query executed." msgid_plural "Import has been successfully finished, %d queries executed." -msgstr[0] "Impor telah selesai, %d kueri dieksekusi." +msgstr[0] "Impor telah selesai, %d kueri dilakukan." #: import.php:626 #, php-format From afd21353b0be38a330e933254adff92866bedeef Mon Sep 17 00:00:00 2001 From: Deky Arifianto Date: Sat, 19 May 2018 17:02:36 +0000 Subject: [PATCH 06/16] Translated using Weblate (Indonesian) Currently translated at 81.2% (2670 of 3288 strings) [CI skip] --- po/id.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/id.po b/po/id.po index fa8df32e57..52d1b43172 100644 --- a/po/id.po +++ b/po/id.po @@ -4,8 +4,7 @@ msgstr "" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" "PO-Revision-Date: 2018-05-19 17:03+0000\n" -"Last-Translator: Muhammad Rifqi Priyo Susanto " -"\n" +"Last-Translator: Deky Arifianto \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -768,9 +767,10 @@ msgid "" "multibyte charset. Without the mbstring extension phpMyAdmin is unable to " "split strings correctly and it may result in unexpected results." msgstr "" -"Ekstensi PHP mbstring tidak ditemukan dan Anda juga menggunakan multibyte " -"charset. Tanpa ekstensi mbstring phpMyAdmin tidak bisa memecang string " -"secara benar dan juga akan menghasilkan hasil yang tak terduga." +"Ekstensi PHP mbstring tidak ditemukan dan sepertinya Anda menggunakan " +"Charset Multibyte. Tanpa ekstensi mbstring phpMyAdmin tidak bisa membagikan " +"baris-baris dengan benar. Hal ini mampu mengakibatkan hasil yang tidak " +"diinginkan." #: index.php:517 msgid "" From fc566dbc5f9a197d7a93af149d99690f566103ec Mon Sep 17 00:00:00 2001 From: Muhammad Rifqi Priyo Susanto Date: Sat, 19 May 2018 17:03:19 +0000 Subject: [PATCH 07/16] Translated using Weblate (Indonesian) Currently translated at 81.2% (2670 of 3288 strings) [CI skip] --- po/id.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/po/id.po b/po/id.po index 52d1b43172..be433e9011 100644 --- a/po/id.po +++ b/po/id.po @@ -3,8 +3,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-05-19 17:03+0000\n" -"Last-Translator: Deky Arifianto \n" +"PO-Revision-Date: 2018-05-19 17:06+0000\n" +"Last-Translator: Muhammad Rifqi Priyo Susanto " +"\n" "Language-Team: Indonesian \n" "Language: id\n" @@ -768,7 +769,7 @@ msgid "" "split strings correctly and it may result in unexpected results." msgstr "" "Ekstensi PHP mbstring tidak ditemukan dan sepertinya Anda menggunakan " -"Charset Multibyte. Tanpa ekstensi mbstring phpMyAdmin tidak bisa membagikan " +"multibyte charset. Tanpa ekstensi mbstring, phpMyAdmin tidak bisa membagikan " "baris-baris dengan benar. Hal ini mampu mengakibatkan hasil yang tidak " "diinginkan." @@ -4907,7 +4908,7 @@ msgstr "Apakah akan menonaktifkan kemungkinan ekspansi database atau tidak." #: libraries/classes/Config/Descriptions.php:835 msgid "Enable navigation tree expansion" -msgstr "Aktifkan Perluasan pada Cabang Navigasi" +msgstr "Bolehkan perluasan pohon navigasi" #: libraries/classes/Config/Descriptions.php:837 msgid "Show tables in tree" From 7482106f858e9d12580c71e59ef81d12ae13d1ce Mon Sep 17 00:00:00 2001 From: Hizkia Felix Date: Sat, 19 May 2018 17:03:37 +0000 Subject: [PATCH 08/16] Translated using Weblate (Indonesian) Currently translated at 81.2% (2670 of 3288 strings) [CI skip] --- po/id.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/id.po b/po/id.po index be433e9011..133f08ae28 100644 --- a/po/id.po +++ b/po/id.po @@ -3,9 +3,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-05-19 17:06+0000\n" -"Last-Translator: Muhammad Rifqi Priyo Susanto " -"\n" +"PO-Revision-Date: 2018-05-19 17:07+0000\n" +"Last-Translator: Hizkia Felix \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -2624,7 +2623,7 @@ msgstr "%s kueri tereksekusi %s kali dalam waktu %s detik." #: js/messages.php:727 #, php-format msgid "%s argument(s) passed" -msgstr "%s argumen cocok" +msgstr "%s argumen diberikan" #: js/messages.php:728 msgid "Show arguments" From 2efc2c867f820b7e9d90528678e74c5a79116be4 Mon Sep 17 00:00:00 2001 From: Muhammad Athallah Date: Sat, 19 May 2018 17:05:03 +0000 Subject: [PATCH 09/16] Translated using Weblate (Indonesian) Currently translated at 81.2% (2670 of 3288 strings) [CI skip] --- po/id.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/id.po b/po/id.po index 133f08ae28..63c527f059 100644 --- a/po/id.po +++ b/po/id.po @@ -4,7 +4,7 @@ msgstr "" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" "PO-Revision-Date: 2018-05-19 17:07+0000\n" -"Last-Translator: Hizkia Felix \n" +"Last-Translator: Muhammad Athallah \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -7612,8 +7612,8 @@ msgid "" "32MB. The memory allocated here is used only for caching index pages." msgstr "" "Ini adalah jumlah memori yang dialokasikan untuk cache indeks. Nilai default " -"adalah 32MB. Memori yang dialokasikan di sini hanya digunakan untuk " -"penyimpanan halaman indeks." +"adalah 32MB. Memori yang dialokasikan di sini hanya digunakan untuk caching " +"halaman indeks." #: libraries/classes/Engines/Pbxt.php:39 msgid "Record cache size" From d1fb1c98db670fed3b4de10e65c506455d467689 Mon Sep 17 00:00:00 2001 From: Muhammad Rifqi Priyo Susanto Date: Sat, 19 May 2018 17:07:15 +0000 Subject: [PATCH 10/16] Translated using Weblate (Indonesian) Currently translated at 81.2% (2670 of 3288 strings) [CI skip] --- po/id.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/po/id.po b/po/id.po index 63c527f059..ceafa8ff48 100644 --- a/po/id.po +++ b/po/id.po @@ -3,8 +3,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-05-19 17:07+0000\n" -"Last-Translator: Muhammad Athallah \n" +"PO-Revision-Date: 2018-05-19 17:08+0000\n" +"Last-Translator: Muhammad Rifqi Priyo Susanto " +"\n" "Language-Team: Indonesian \n" "Language: id\n" @@ -7611,9 +7612,9 @@ msgid "" "This is the amount of memory allocated to the index cache. Default value is " "32MB. The memory allocated here is used only for caching index pages." msgstr "" -"Ini adalah jumlah memori yang dialokasikan untuk cache indeks. Nilai default " -"adalah 32MB. Memori yang dialokasikan di sini hanya digunakan untuk caching " -"halaman indeks." +"Ini adalah jumlah memori yang dijatah untuk tembolok indeks. Nilai bawaan " +"adalah 32MB. Memori yang dijatah di sini hanya digunakan untuk pembuatan " +"tembolok halaman indeks." #: libraries/classes/Engines/Pbxt.php:39 msgid "Record cache size" From c52fc4f907293eea698741eba0be9270ac9ac00d Mon Sep 17 00:00:00 2001 From: fidella Date: Sat, 19 May 2018 17:08:00 +0000 Subject: [PATCH 11/16] Translated using Weblate (Indonesian) Currently translated at 81.2% (2670 of 3288 strings) [CI skip] --- po/id.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/id.po b/po/id.po index ceafa8ff48..09f5687cf8 100644 --- a/po/id.po +++ b/po/id.po @@ -4,8 +4,7 @@ msgstr "" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" "PO-Revision-Date: 2018-05-19 17:08+0000\n" -"Last-Translator: Muhammad Rifqi Priyo Susanto " -"\n" +"Last-Translator: fidella \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -8395,7 +8394,7 @@ msgstr "Apakah anda benar-benar ingin untuk mengesekusi queri di ikuti?" #: libraries/classes/Navigation/Navigation.php:56 msgid "An error has occurred while loading the navigation display" -msgstr "Sebuah kesalahan telah terjadi saat memuat tampilan navigasi" +msgstr "Sebuah kesalahan telah terjadi saat memuat display navigasi" #: libraries/classes/Navigation/Navigation.php:194 msgid "Groups:" From e84c7f60e313f7b9910059cb68247b2215027413 Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Wed, 9 May 2018 23:09:57 +0800 Subject: [PATCH 12/16] fixes broken links to icons in the setup page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes broken links to icons in the setup page Signed-off-by: Phoenix Eve Aspacio (cherry picked from commit bc1fee27beb58cfec62fdfd97d4fc52f019fa7f4) Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Config/FormDisplayTemplate.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php index 36678bc872..0cb5b47ad0 100644 --- a/libraries/classes/Config/FormDisplayTemplate.php +++ b/libraries/classes/Config/FormDisplayTemplate.php @@ -160,10 +160,10 @@ class FormDisplayTemplate // The first element contains the filename and the second // element is used for the "alt" and "title" attributes. $icon_init = array( - 'edit' => array('b_edit', ''), - 'help' => array('b_help', __('Documentation')), - 'reload' => array('s_reload', ''), - 'tblops' => array('b_tblops', '') + 'edit' => array('b_edit.png', ''), + 'help' => array('b_help.png', __('Documentation')), + 'reload' => array('s_reload.png', ''), + 'tblops' => array('b_tblops.png', '') ); if ($is_setup_script) { // When called from the setup script, we don't have access to the From 922bc1f998e6e88f6bf60f9a1f086dc2ee32186f Mon Sep 17 00:00:00 2001 From: Muhammad Rifqi Priyo Susanto Date: Sat, 19 May 2018 17:08:31 +0000 Subject: [PATCH 13/16] Translated using Weblate (Indonesian) Currently translated at 81.2% (2670 of 3288 strings) [CI skip] --- po/id.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/po/id.po b/po/id.po index 09f5687cf8..483c99d08b 100644 --- a/po/id.po +++ b/po/id.po @@ -3,8 +3,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-05-19 17:08+0000\n" -"Last-Translator: fidella \n" +"PO-Revision-Date: 2018-05-19 17:57+0000\n" +"Last-Translator: Muhammad Rifqi Priyo Susanto " +"\n" "Language-Team: Indonesian \n" "Language: id\n" @@ -8394,7 +8395,7 @@ msgstr "Apakah anda benar-benar ingin untuk mengesekusi queri di ikuti?" #: libraries/classes/Navigation/Navigation.php:56 msgid "An error has occurred while loading the navigation display" -msgstr "Sebuah kesalahan telah terjadi saat memuat display navigasi" +msgstr "Sebuah kesalahan terjadi saat memuat tampilan navigasi" #: libraries/classes/Navigation/Navigation.php:194 msgid "Groups:" From f020b4f2823446cb05c53655908f2fcd14ca90d2 Mon Sep 17 00:00:00 2001 From: Anawin Wongsadit Date: Sat, 19 May 2018 04:20:36 +0000 Subject: [PATCH 14/16] Translated using Weblate (Thai) Currently translated at 29.5% (972 of 3288 strings) [CI skip] --- po/th.po | 245 ++++++++++++++++++++++++------------------------------- 1 file changed, 107 insertions(+), 138 deletions(-) diff --git a/po/th.po b/po/th.po index 3070b00c97..bb378813b9 100644 --- a/po/th.po +++ b/po/th.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-03-11 12:00+0000\n" -"Last-Translator: Akom Chotiphantawanon \n" -"Language-Team: Thai " -"\n" +"PO-Revision-Date: 2018-05-19 17:57+0000\n" +"Last-Translator: Anawin Wongsadit \n" +"Language-Team: Thai " +"\n" "Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.20-dev\n" +"X-Generator: Weblate 3.0-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 msgid "Bad type!" @@ -626,7 +626,7 @@ msgstr "คำสั่ง \"DROP DATABASE\" ถูกปิดไว้" #: import_status.php:107 msgid "Could not load the progress of the import." -msgstr "" +msgstr "ไม่สามารถโหลดข้อมูลความคืบหน้าของการนำเข้าได้" #: import_status.php:116 js/messages.php:457 js/messages.php:622 #: libraries/classes/Export.php:514 @@ -640,6 +640,8 @@ msgid "" "You were logged out from one server, to logout completely from phpMyAdmin, " "you need to logout from all servers." msgstr "" +"คุณได้ออกจากระบบจากเครื่องแม่ข่ายหนึ่งแล้ว หากต้องการออกจากระบบ phpMyAdmin " +"โดยสมบูรณ์ คุณต้องออกจากระบบจากเครื่องแม่ข่ายทั้งหมด" #: index.php:193 libraries/classes/Footer.php:75 #: libraries/classes/Plugins/Auth/AuthenticationCookie.php:115 @@ -655,6 +657,9 @@ msgid "" "change root, debian-sys-maint and pma users. More information is available " "at %s." msgstr "" +"คุณกำลังใช้งานเครื่องแม่ข่ายตัวอย่าง คุณสามารถทำอะไรก็ได้ในนี้ " +"เพียงอย่าแก้ไขผู้ใช้ root, debian-sys-maint และ pma " +"ข้อมูลเพิ่มเติมสามารถดูได้ที่ %s" #: index.php:207 #, fuzzy @@ -787,7 +792,7 @@ msgstr "รายการของการเปลี่ยนแปลง" #: index.php:482 templates/server/plugins/section.twig:13 msgid "License" -msgstr "" +msgstr "ลิขสิทธิ์" #: index.php:502 msgid "" @@ -803,6 +808,8 @@ msgid "" "The curl extension was not found and allow_url_fopen is disabled. Due to " "this some features such as error reporting or version check are disabled." msgstr "" +"ไม่พบส่วนขยาย curl และ allow_url_fopen ถูกปิดใช้งานอยู่ " +"ทำให้บางคุณลักษณะอย่างการรายงานข้อผิดพลาดหรือตรวจสอบรุ่นล่าสุดจะถูกปิดไว้" #: index.php:532 msgid "" @@ -811,20 +818,28 @@ msgid "" "than cookie validity configured in phpMyAdmin, because of this, your login " "might expire sooner than configured in phpMyAdmin." msgstr "" +"พารามิเตอร์ PHP [a@https://secure.php.net/manual/en/" +"session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetim[/a] " +"ของคุณต่ำกว่าระยะเวลามีผลของคุกกี้ที่ได้กำหนดไว้ใน phpMyAdmin " +"สิ่งนี้จะทำให้การเข้าสู่ระบบของคุณอาจหมดอายุเร็วกว่าที่กำหนดไว้ใน phpMyAdmin" #: index.php:551 msgid "" "Login cookie store is lower than cookie validity configured in phpMyAdmin, " "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" +"การจัดเก็บคุกกี้เข้าสู่ระบบต่ำกว่าระยะเวลามีผลของคุกกี้ที่ได้กำหนดไว้ใน " +"phpMyAdmin สิ่งนี้จะทำให้การเข้าสู่ระบบของคุณอาจหมดอายุเร็วกว่าที่กำหนดไว้ใน " +"phpMyAdmin" #: index.php:566 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." -msgstr "ในขณะนี้ไฟล์การกำหนดค่าต้องการรหัสผ่านลับ (blowfish_secret)" +msgstr "จากนี้ไป ไฟล์การกำหนดค่าจะต้องมีการระบุชุดรหัสผ่านลับ (blowfish_secret)" #: index.php:573 msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "ชุดรหัสผ่านลับที่อยู่ในการกำหนดค่า (blowfish_secret) สั้นเกินไป" #: index.php:587 msgid "" @@ -833,22 +848,25 @@ msgid "" "once phpMyAdmin has been configured. Otherwise the security of your server " "may be compromised by unauthorized people downloading your configuration." msgstr "" +"ไดเรกทอรี [code]config[/code] " +"ซึ่งถูกใช้โดยสคริปต์ตัวติดตั้งยังคงอยู่ในไดเรกทอรี phpMyAdmin ของคุณ " +"เราขอแนะนำเป็นอย่างยิ่งว่าให้ลบออกหากได้กำหนดค่า phpMyAdmin เรียบร้อยแล้ว มิเ" +"ช่นนั้นความปลอดภัยของเครื่องแม่ข่ายของคุณอาจถูกบุกรุกโดยบุคคลที่ไม่ได้รับอนุญ" +"าตที่เข้ามาดาวน์โหลดไฟล์กำหนดค่าของคุณ" #: index.php:603 -#, fuzzy, php-format -#| msgid "" -#| " additional features for working with linked tables have been ctivated. " -#| "To find out why click %shere%s." +#, php-format msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. %sFind out why%s. " msgstr "" -"ความสามารถเพิ่มเติมสำหรับ linked Tables ได้ถูกระงับเอาไว้ ตามเหตุผลที่แจ้งไว้ใน %shere%s" +"พื้นที่จัดเก็บการกำหนดค่า phpMyAdmin ยังตั้งค่าไม่เสร็จสมบูรณ์ " +"คุณลักษณะเพิ่มเติมบางอย่างได้ถูกปิดใช้งานแล้ว %sเรียนรู้เพิ่มเติม%s " #: index.php:610 msgid "" "Or alternately go to 'Operations' tab of any database to set it up there." -msgstr "" +msgstr "หรือเข้าไปที่แท็บ 'การดำเนินการ' ของฐานข้อมูลใดๆ เพื่อตั้งค่า" #: index.php:635 #, php-format @@ -856,6 +874,8 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" +"เครื่องแม่ข่ายกำลังทำงานโดยใช้ Suhosin " +"โปรดศึกษา%sเอกสารกำกับโปรแกรม%sเพื่อดูปัญหาที่อาจเกิดขึ้นได้" #: index.php:649 #, php-format @@ -863,141 +883,117 @@ msgid "" "The $cfg['TempDir'] (%s) is not accessible. phpMyAdmin is not able to cache " "templates and will be slow because of this." msgstr "" +"ไม่สามารถเข้าถึง $cfg['TempDir'] (%s) ได้ phpMyAdmin " +"จึงไม่สามารถทำการแคชแม่แบบได้และจะทำงานช้าลง" #: js/messages.php:43 msgid "Confirm" -msgstr "" +msgstr "ยืนยัน" #: js/messages.php:44 #, php-format msgid "Do you really want to execute \"%s\"?" -msgstr "คุณแน่ใจที่ต้องการจะ \"%s\"?" +msgstr "คุณแน่ใจหรือว่าต้องการดำเนินการ \"%s\"?" #: js/messages.php:46 libraries/classes/MultSubmits.php:457 msgid "You are about to DESTROY a complete database!" -msgstr "คุณกำลังจะทำลายฐานข้อมูลทั้งหมด" +msgstr "คุณกำลังจะ ทํ า ล า ย ฐานข้อมูลหนึ่งโดยสมบูรณ์!" #: js/messages.php:48 msgid "Cannot rename database to the same name. Change the name and try again" -msgstr "" +msgstr "ไม่สามารถเปลี่ยนชื่อฐานข้อมูลให้เป็นชื่อเดิมได้ ให้แก้ไขชื่อแล้วลองใหม่" #: js/messages.php:50 msgid "You are about to DESTROY a complete table!" -msgstr "คุณกำลังจะทำลายตารางทั้งหมด!" +msgstr "คุณกำลังจะ ทํ า ล า ย ตารางหนึ่งโดยสมบูรณ์!" #: js/messages.php:52 msgid "You are about to TRUNCATE a complete table!" -msgstr "คุณกำลังจะลบข้อมูลในตารางทั้งหมด!" +msgstr "คุณกำลังจะ ล้ า ง ข้ อ มู ล ตารางหนึ่งโดยสมบูรณ์!" #: js/messages.php:53 -#, fuzzy -#| msgid "Delete tracking data for this table" msgid "Delete tracking data for this table?" -msgstr "ลบการติดตามตารางนี้" +msgstr "ลบข้อมูลการติดตามของตารางนี้?" #: js/messages.php:55 -#, fuzzy -#| msgid "Delete tracking data for this table" msgid "Delete tracking data for these tables?" -msgstr "ลบการติดตามตารางนี้" +msgstr "ลบข้อมูลการติดตามของตารางเหล่านี้?" #: js/messages.php:57 -#, fuzzy -#| msgid "Delete tracking data for this table" msgid "Delete tracking data for this version?" -msgstr "ลบการติดตามตารางนี้" +msgstr "ลบข้อมูลการติดตามของรุ่นนี้?" #: js/messages.php:59 -#, fuzzy -#| msgid "Delete tracking data for this table" msgid "Delete tracking data for these versions?" -msgstr "ลบการติดตามตารางนี้" +msgstr "ลบข้อมูลการติดตามของรุ่นเหล่านี้?" #: js/messages.php:60 -#, fuzzy -#| msgid "Delete tracking data for this table" msgid "Delete entry from tracking report?" -msgstr "ลบการติดตามตารางนี้" +msgstr "ลบแถวข้อมูลจากรายงานการติดตาม?" #: js/messages.php:61 msgid "Deleting tracking data" -msgstr "กำลังลบข้อมูลติดตามตาราง" +msgstr "กำลังลบข้อมูลการติดตาม" #: js/messages.php:62 msgid "Dropping Primary Key/Index" -msgstr "กำลังทิ้ง คีย์หลัก และดัชนี" +msgstr "กำลังทิ้งคีย์หลัก/ดัชนี" #: js/messages.php:63 -#, fuzzy -#| msgid "Select Foreign Key" msgid "Dropping Foreign key." -msgstr "เลือกคีย์นอก" +msgstr "กำลังทิ้งคีย์นอก" #: js/messages.php:65 msgid "This operation could take a long time. Proceed anyway?" -msgstr "การทำงานนี้อาจจะใช้เวลาในการประมวลผลนาน คุณแน่ใจที่จะทำมันหรือไม่?" +msgstr "การดำเนินการนี้อาจใช้ระยะเวลานาน ดำเนินการต่อไปหรือไม่?" #: js/messages.php:67 -#, fuzzy, php-format -#| msgid "Do you really want to execute \"%s\"?" +#, php-format msgid "Do you really want to delete user group \"%s\"?" -msgstr "คุณแน่ใจที่ต้องการจะ \"%s\"?" +msgstr "คุณแน่ใจหรือว่าต้องการลบกลุ่มผู้ใช้ \"%s\"?" #: js/messages.php:69 -#, fuzzy, php-format -#| msgid "Do you really want to execute \"%s\"?" +#, php-format msgid "Do you really want to delete the search \"%s\"?" -msgstr "คุณแน่ใจที่ต้องการจะ \"%s\"?" +msgstr "คุณแน่ใจหรือว่าต้องการลบการค้นหา \"%s\"?" #: js/messages.php:71 -#, fuzzy -#| msgid "" -#| "You have edited some data and they have not been saved. Are you sure you " -#| "want to leave this page before saving the data?" msgid "You have unsaved changes; are you sure you want to leave this page?" -msgstr "คุณได้ทำการแก้ไขข้อมูลบางอย่าง แต่ยังไม่ได้บันทึก คุณแน่ใจว่าจะออกจากหน้านี้โดยยังไม่บันทึก?" +msgstr "" +"คุณมีการเปลี่ยนแปลงข้อมูลที่ยังไม่ได้บันทึก " +"คุณแน่ใจหรือว่าต้องการออกจากหน้านี้?" #: js/messages.php:73 -#, fuzzy -#| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to revoke the selected user(s) ?" -msgstr "คุณแน่ใจที่ต้องการจะ \"%s\"?" +msgstr "คุณแน่ใจหรือว่าต้องการยกเลิกสิทธิ์ของผู้ใช้ที่เลือกไว้?" #: js/messages.php:75 -#, fuzzy -#| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to delete this central column?" -msgstr "คุณแน่ใจที่ต้องการจะ \"%s\"?" +msgstr "คุณแน่ใจหรือว่าต้องการลบสดมภ์ส่วนกลางนี้?" #: js/messages.php:77 -#, fuzzy -#| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to delete the selected items?" -msgstr "คุณแน่ใจที่ต้องการจะ \"%s\"?" +msgstr "คุณแน่ใจหรือว่าต้องการลบรายการที่เลือกไว้?" #: js/messages.php:79 msgid "" "Do you really want to DROP the selected partition(s)? This will also DELETE " "the data related to the selected partition(s)!" msgstr "" +"คุณแน่ใจหรือว่าต้องการ ทิ้ ง พาร์ติชั่นที่เลือกไว้? นี่จะเป็นการ ล บ " +"ข้อมูลที่เกี่ยวข้องกับพาร์ติชั่นที่เลือกไว้ออกไปด้วย!" #: js/messages.php:83 -#, fuzzy -#| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to TRUNCATE the selected partition(s)?" -msgstr "คุณแน่ใจที่ต้องการจะ \"%s\"?" +msgstr "คุณแน่ใจหรือว่าต้องการ ล้ า ง ข้ อ มู ล ในพาร์ติชั่นที่เลือกไว้?" #: js/messages.php:85 -#, fuzzy -#| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to remove partitioning?" -msgstr "คุณแน่ใจที่ต้องการจะ \"%s\"?" +msgstr "คุณแน่ใจหรือว่าต้องการนำการพาร์ติชั่นออก?" #: js/messages.php:86 -#, fuzzy -#| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to RESET SLAVE?" -msgstr "คุณแน่ใจที่ต้องการจะ \"%s\"?" +msgstr "คุณแน่ใจหรือว่าต้องการ RESET SLAVE?" #: js/messages.php:88 msgid "" @@ -1007,6 +1003,11 @@ msgid "" "collation; in this case we suggest you revert to the original collation and " "refer to the tips at " msgstr "" +"การดำเนินการนี้จะพยายามแปลงข้อมูลของคุณให้อยู่ในชุดอักขระใหม่ ในกรณีสุดวิสัย " +"หากมีอักขระใดที่ไม่มีอยู่ในชุดอักขระใหม่ " +"กระบวนการนี้อาจทำให้ข้อมูลนั้นแสดงผลไม่ถูกต้องเมื่ออยู่ในชุดอักขระใหม่ " +"ในกรณีนี้ " +"เราแนะนำให้คุณแปลงกลับไปเป็นชุดอักขระเดิมแล้วดำเนินการตามเคล็ดลับที่ " #: js/messages.php:94 msgid "Garbled Data" @@ -1014,7 +1015,7 @@ msgstr "" #: js/messages.php:96 msgid "Are you sure you wish to change the collation and convert the data?" -msgstr "" +msgstr "คุณแน่ใจหรือว่าต้องการเปลี่ยนชุดอักขระและแปลงข้อมูล?" #: js/messages.php:98 msgid "" @@ -1025,138 +1026,113 @@ msgid "" "column(s) editing feature (the \"Change\" Link) on the table structure page. " "" msgstr "" +"ในการดำเนินการนี้, MySQL จะพยายามเชื่อมค่าของข้อมูลในแต่ละชุดอักขระ " +"หากชุดอักขระไม่เข้ากันอาจทำให้เกิดการสูญเสียข้อมูล และข้อมูลในส่วนที่สูญเสียไ" +"ปนี้อาจไม่สามารถกู้คืนได้จากการเปลี่ยนชุดอักขระสดมภ์กลับคืน " +"หากต้องการแปลงข้อมูลที่มีอยู่เดิม, แนะนำให้ใช้คุณลักษณะการแก้ไขสดมภ์ " +"(ลิงก์ \"เปลี่ยน\") ที่อยู่ในหน้าโครงสร้างตาราง " #: js/messages.php:107 msgid "" "Are you sure you wish to change all the column collations and convert the " "data?" -msgstr "" +msgstr "คุณแน่ใจหรือว่าต้องการเปลี่ยนชุดอักขระสดมภ์ทั้งหมดและแปลงตัวข้อมูล?" #: js/messages.php:111 -#, fuzzy -#| msgid "Save as file" msgid "Save & close" -msgstr "บันทึกเป็นไฟล์" +msgstr "บันทึกและปิด" #: js/messages.php:112 libraries/classes/InsertEdit.php:1892 #: prefs_manage.php:355 prefs_manage.php:366 #: templates/config/form_display/fieldset_bottom.twig:9 msgid "Reset" -msgstr "ตั้งค่าใหม่" +msgstr "รีเซ็ต" #: js/messages.php:113 -#, fuzzy -#| msgid "Select All" msgid "Reset all" -msgstr "เลือกทั้งหมด" +msgstr "รีเซ็ตทั้งหมด" #: js/messages.php:116 msgid "Missing value in the form!" -msgstr "ค่าในแบบฟอร์มไม่มี !" +msgstr "ข้อมูลในแบบฟอร์มขาดหาย!" #: js/messages.php:117 -#, fuzzy -#| msgid "at least one of the words" msgid "Select at least one of the options!" -msgstr "อย่างน้อยหนึ่งคำ" +msgstr "เลือกอย่างน้อยหนึ่งตัวเลือก!" #: js/messages.php:118 -#, fuzzy -#| msgid "%d is not valid row number." msgid "Please enter a valid number!" -msgstr "%d ไม่ใช่หมายเลขแถวที่ถูกต้อง" +msgstr "โปรดกรอกตัวเลขที่ถูกต้อง!" #: js/messages.php:119 -#, fuzzy -#| msgid "%d is not valid row number." msgid "Please enter a valid length!" -msgstr "%d ไม่ใช่หมายเลขแถวที่ถูกต้อง" +msgstr "โปรดกรอกความยาวที่ถูกต้อง!" #: js/messages.php:120 -#, fuzzy -#| msgid "Add new field" msgid "Add index" -msgstr "เพิ่มฟิลด์ใหม่" +msgstr "เพิ่มดัชนี" #: js/messages.php:121 -#, fuzzy -#| msgid "Edit Index" msgid "Edit index" msgstr "แก้ไขดัชนี" #: js/messages.php:122 templates/table/index_form.twig:211 #, php-format msgid "Add %s column(s) to index" -msgstr "เพิ่มคอลัมน์ %s ไปยังดัชนี" +msgstr "เพิ่ม %s คอลัมน์ไปยังดัชนี" #: js/messages.php:123 -#, fuzzy -#| msgid "Create routine" msgid "Create single-column index" -msgstr "รุ่นของเซิร์ฟเวอร์" +msgstr "สร้างดัชนีชนิดหนึ่งคอลัมน์" #: js/messages.php:124 -#, fuzzy -#| msgid "Create routine" msgid "Create composite index" -msgstr "รุ่นของเซิร์ฟเวอร์" +msgstr "สร้างดัชนีผสม" #: js/messages.php:125 -#, fuzzy -#| msgid "Fields enclosed by" msgid "Composite with:" -msgstr "คร่อมฟิลด์ด้วย" +msgstr "ผสมกับ:" #: js/messages.php:126 -#, fuzzy -#| msgid "Add %s column(s) to index" msgid "Please select column(s) for the index." -msgstr "เพิ่มคอลัมน์ %s ไปยังดัชนี" +msgstr "โปรดเลือกคอลัมน์ให้กับดัชนี" #: js/messages.php:129 libraries/classes/InsertEdit.php:1890 #: templates/columns_definitions/column_definitions_form.twig:146 #: templates/table/relation/common_form.twig:188 #: templates/table/index_form.twig:216 msgid "Preview SQL" -msgstr "" +msgstr "ดูตัวอย่าง SQL" #: js/messages.php:132 -#, fuzzy -#| msgid "in query" msgid "Simulate query" -msgstr "ในคำค้น" +msgstr "จำลองการทำงาน" #: js/messages.php:133 -#, fuzzy -#| msgid "Affected rows:" msgid "Matched rows:" -msgstr "ระเบียนที่มีผล:" +msgstr "ระเบียนที่ตรงกัน:" #: js/messages.php:134 libraries/classes/Util.php:566 -#, fuzzy -#| msgid "SQL query" msgid "SQL query:" -msgstr "คำค้น SQL" +msgstr "คำค้น SQL:" #. l10n: Default label for the y-Axis of Charts #: js/messages.php:138 -#, fuzzy -#| msgid "Value" msgid "Y values" -msgstr "ค่า" +msgstr "ค่าแกน Y" #: js/messages.php:141 msgid "The host name is empty!" -msgstr "ชื่อโฮสต์ยังว่างอยู่!" +msgstr "ชื่อโฮสต์ยังว่างเปล่าอยู่!" #: js/messages.php:142 msgid "The user name is empty!" -msgstr "ชื่อผู้ใช้ยังว่างอยู่!" +msgstr "ชื่อผู้ใช้ยังว่างเปล่าอยู่!" #: js/messages.php:143 libraries/classes/Server/Privileges.php:1876 #: libraries/classes/UserPassword.php:66 msgid "The password is empty!" -msgstr "รหัสผ่านยังว่างอยู่!" +msgstr "รหัสผ่านยังว่างเปล่าอยู่!" #: js/messages.php:144 libraries/classes/Server/Privileges.php:1874 #: libraries/classes/UserPassword.php:70 @@ -1165,7 +1141,7 @@ msgstr "รหัสผ่านไม่ตรงกัน!" #: js/messages.php:145 msgid "Removing Selected Users" -msgstr "ถอนผู้ใช้ที่เลือก" +msgstr "กำลังลบผู้ใช้ที่เลือกออก" #: js/messages.php:146 js/messages.php:213 libraries/classes/Tracking.php:333 #: libraries/classes/Tracking.php:660 @@ -1173,25 +1149,20 @@ msgid "Close" msgstr "ปิด" #: js/messages.php:149 -#, fuzzy msgid "Template was created." -msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว" +msgstr "แม่แบบถูกสร้างขึ้นแล้ว" #: js/messages.php:150 msgid "Template was loaded." -msgstr "" +msgstr "โหลดแม่แบบแล้ว" #: js/messages.php:151 -#, fuzzy -#| msgid "The profile has been updated." msgid "Template was updated." -msgstr "ปรับปรุงโพรไฟล์เรียบร้อยแล้ว" +msgstr "อัปเดตแม่แบบแล้ว" #: js/messages.php:152 -#, fuzzy -#| msgid "The row has been deleted." msgid "Template was deleted." -msgstr "ลบเรียบร้อยแล้ว" +msgstr "แม่แบบถูกลบออกแล้ว" #. l10n: Other, small valued, queries #: js/messages.php:155 libraries/classes/Server/Status/Data.php:132 @@ -1213,13 +1184,11 @@ msgstr "." #: js/messages.php:161 msgid "Connections / Processes" -msgstr "การเชื่อมต่อ" +msgstr "การเชื่อมต่อ / กระบวนการ" #: js/messages.php:165 -#, fuzzy -#| msgid "Local monitor configuration incompatible" msgid "Local monitor configuration incompatible!" -msgstr "การตั้งค่าติดตามภายในเครื่องไม่เข้ากัน" +msgstr "การกำหนดค่าเครื่องภายในไม่สอดคล้องกัน!" #: js/messages.php:167 msgid "" From e7ee749650eac085d76d4fbe8c6d275731549ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sat, 19 May 2018 15:01:25 -0300 Subject: [PATCH 15/16] Add ChangeLog entry for #14309 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index f188893076..4562f0eeb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog - issue #14278 Fix central columns in-line edit bug - issue #14066 Fix AUTO_INCREMENT error when only exporting table structure in database-level exports - issue #13893 Simulating queries produces unexpected results +- issue #14309 Setup script icons missing 4.8.0.1 (2018-04-19) - issue [security] Multiple CSRF vulnerabilities, See PMASA-2018-02 From 54eb5ffff88f16a9417f88b4425a2d09b0fbcece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sat, 19 May 2018 16:29:17 -0300 Subject: [PATCH 16/16] Fix Config\FormDisplayTemplateTest failed test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Config/FormDisplayTemplate.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php index 0cb5b47ad0..039e8886d0 100644 --- a/libraries/classes/Config/FormDisplayTemplate.php +++ b/libraries/classes/Config/FormDisplayTemplate.php @@ -160,15 +160,21 @@ class FormDisplayTemplate // The first element contains the filename and the second // element is used for the "alt" and "title" attributes. $icon_init = array( - 'edit' => array('b_edit.png', ''), - 'help' => array('b_help.png', __('Documentation')), - 'reload' => array('s_reload.png', ''), - 'tblops' => array('b_tblops.png', '') + 'edit' => array('b_edit', ''), + 'help' => array('b_help', __('Documentation')), + 'reload' => array('s_reload', ''), + 'tblops' => array('b_tblops', '') ); if ($is_setup_script) { // When called from the setup script, we don't have access to the // sprite-aware getImage() function because the PMA_theme class // has not been loaded, so we generate the img tags manually. + $icon_init = array( + 'edit' => array('b_edit.png', ''), + 'help' => array('b_help.png', __('Documentation')), + 'reload' => array('s_reload.png', ''), + 'tblops' => array('b_tblops.png', '') + ); foreach ($icon_init as $k => $v) { $title = ''; if (! empty($v[1])) { @@ -177,7 +183,7 @@ class FormDisplayTemplate $icons[$k] = sprintf( '%s', $v[1], - "../themes/original/img/{$v[0]}", + "../themes/pmahomme/img/{$v[0]}", $title ); }