Merge branch 'master' into weblate-merge-tmp

4 files changed, 170 insertions, 377 deletions

diff --git a/po/et.po b/po/et.po
index 1f5e67a1ca..51351706e0 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-05-07 03:27-0300\n"
-"PO-Revision-Date: 2018-05-13 19:43+0000\n"
+"PO-Revision-Date: 2018-05-18 01:25+0000\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
 "Language-Team: Estonian <https://hosted.weblate.org/projects/phpmyadmin/"
 "master/et/>\n"
@@ -1955,6 +1955,8 @@ msgstr "Sirvi võõrvõtme väärtusi"
 #: js/messages.php:424
 msgid "No previously auto-saved query is available. Loading default query."
 msgstr ""
+"Puuduvad varasemad automaatselt salvestatud päringud. Laaditakse vaikimisi "
+"päring."
 
 #: js/messages.php:425
 msgid ""
diff --git a/po/he.po b/po/he.po
index eb06c76029..77b70995bd 100644
--- a/po/he.po
+++ b/po/he.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-05-07 03:27-0300\n"
-"PO-Revision-Date: 2018-05-16 17:52+0000\n"
+"PO-Revision-Date: 2018-05-18 01:25+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/phpmyadmin/master/"
 "he/>\n"
@@ -2208,7 +2208,7 @@ msgstr ""
 
 #: js/messages.php:554
 msgid "Select referenced key"
-msgstr ""
+msgstr "בחירת מפתח עם הפניה"
 
 #: js/messages.php:555
 msgid "Select Foreign Key"
@@ -2231,7 +2231,7 @@ msgstr "לא שמרת את השינויים לפריסה. הם יאבדו אלמ
 
 #: js/messages.php:563
 msgid "value/subQuery is empty"
-msgstr ""
+msgstr "הערך/תת־שאילתה ריקים"
 
 #: js/messages.php:564 templates/database/designer/side_menu.twig:34
 #: templates/database/designer/side_menu.twig:37
@@ -12427,22 +12427,16 @@ msgid "Group name:"
 msgstr "שמות עמודה"
 
 #: libraries/classes/Server/UserGroups.php:286
-#, fuzzy
-#| msgid "Server version"
 msgid "Server-level tabs"
-msgstr "גרסת שרת"
+msgstr "טאבים ברמת השרת"
 
 #: libraries/classes/Server/UserGroups.php:289
-#, fuzzy
-#| msgid "Database server"
 msgid "Database-level tabs"
-msgstr "שרת מסד נתונים"
+msgstr "לשוניות ברמת מסד הנתונים"
 
 #: libraries/classes/Server/UserGroups.php:292
-#, fuzzy
-#| msgid "Table comments"
 msgid "Table-level tabs"
-msgstr "הערות לטבלה"
+msgstr "טאבים ברמת הטבלה"
 
 #: libraries/classes/Sql.php:268 libraries/classes/Util.php:1145
 #: templates/console/display.twig:31 templates/console/display.twig:175
@@ -12450,13 +12444,10 @@ msgid "Profiling"
 msgstr ""
 
 #: libraries/classes/Sql.php:271
-#, fuzzy
-#| msgid "Data files"
 msgid "Detailed profile"
-msgstr "קבצי נתונים"
+msgstr "פרופיל מפורט"
 
 #: libraries/classes/Sql.php:276 libraries/classes/Sql.php:292
-#, fuzzy
 msgid "State"
 msgstr "מצב"
 
@@ -12465,48 +12456,36 @@ msgid "Summary by state"
 msgstr ""
 
 #: libraries/classes/Sql.php:295
-#, fuzzy
-#| msgid "Total"
 msgid "Total Time"
-msgstr "סה\"כ"
+msgstr "סך כל הזמן"
 
 #: libraries/classes/Sql.php:297
-#, fuzzy
-#| msgid "Time"
 msgid "% Time"
-msgstr "זמן"
+msgstr "% זמן"
 
 #: libraries/classes/Sql.php:299
-#, fuzzy
-#| msgid "Close"
 msgid "Calls"
-msgstr "סגירה"
+msgstr "קריאות"
 
 #: libraries/classes/Sql.php:301
-#, fuzzy
-#| msgid "Time"
 msgid "ø Time"
-msgstr "זמן"
+msgstr "ø זמן"
 
 #: libraries/classes/Sql.php:606 libraries/classes/Sql.php:624
 msgid "Bookmark this SQL query"
 msgstr "הכנס שאילתת SQL זאת למועדפים"
 
 #: libraries/classes/Sql.php:610
-#, fuzzy
-#| msgid "Label"
 msgid "Label:"
-msgstr "תווית"
+msgstr "תווית:"
 
 #: libraries/classes/Sql.php:617 libraries/classes/SqlQueryForm.php:312
 msgid "Let every user access this bookmark"
 msgstr "אפשר לכל משתמש לגשת לכתובת מועדפת זאת"
 
 #: libraries/classes/Sql.php:833
-#, fuzzy
-#| msgid "Bookmark %s created"
 msgid "Bookmark not created!"
-msgstr "הסימנייה %s נוצרה"
+msgstr "לא נוצרה סימנייה!"
 
 #: libraries/classes/Sql.php:943
 #, php-format
@@ -12537,9 +12516,9 @@ msgid "Problems with indexes of table `%s`"
 msgstr "בעיות עם אינדקסים של טבלה `%s`"
 
 #: libraries/classes/SqlQueryForm.php:138
-#, fuzzy, php-format
+#, php-format
 msgid "Run SQL query/queries on server “%s”"
-msgstr "הרצת את שאילתה/שאילתות על מסד הנתונים %s"
+msgstr "הרצת את שאילתה/שאילתות על השרת „%s”"
 
 #: libraries/classes/SqlQueryForm.php:155
 #, php-format
@@ -12547,16 +12526,14 @@ msgid "Run SQL query/queries on database %s"
 msgstr "הרצת את שאילתה/שאילתות על מסד הנתונים %s"
 
 #: libraries/classes/SqlQueryForm.php:176
-#, 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:244 setup/frames/index.inc.php:254
 #: templates/console/display.twig:7
-#, fuzzy
 msgid "Clear"
-msgstr "לוח שנה"
+msgstr "פינוי"
 
 #: libraries/classes/SqlQueryForm.php:250
 msgid "Get auto-saved query"
@@ -12569,10 +12546,8 @@ msgid "Bind parameters"
 msgstr "פרמטרים שגויים!"
 
 #: libraries/classes/SqlQueryForm.php:304
-#, fuzzy
-#| msgid "Bookmark this SQL query"
 msgid "Bookmark this SQL query:"
-msgstr "הכנס שאילתת SQL זאת למועדפים"
+msgstr "הוספת שאילתת SQL זאת לסימניות:"
 
 #: libraries/classes/SqlQueryForm.php:318
 msgid "Replace existing bookmark of same name"
@@ -12625,42 +12600,36 @@ msgid "This MySQL server does not support the %s storage engine."
 msgstr "שרת MySQL לא תומך במנוע אחסון %s."
 
 #: libraries/classes/Table.php:338
-#, fuzzy
-#| msgid "Show tables"
 msgid "Unknown table status:"
-msgstr "ראיית טבלאות"
+msgstr "מצב הטבלה אינו ידוע:"
 
 #: libraries/classes/Table.php:892
-#, fuzzy, php-format
+#, php-format
 msgid "Source database `%s` was not found!"
-msgstr "חפש במסד הנתונים"
+msgstr "מסד נתוני המקור ‚%s’ לא נמצא!"
 
 #: libraries/classes/Table.php:900
-#, fuzzy, php-format
+#, php-format
 msgid "Target database `%s` was not found!"
-msgstr "חפש במסד הנתונים"
+msgstr "מסד נתוני היעד ‚%s’ לא נמצא!"
 
 #: libraries/classes/Table.php:1443
-#, fuzzy
 msgid "Invalid database:"
-msgstr "אין מאגרי נתונים"
+msgstr "מסד נתונים שגוי:"
 
 #: libraries/classes/Table.php:1460
-#, fuzzy
-#| msgid "Inside tables:"
 msgid "Invalid table name:"
-msgstr "בתוך הטבלאות:"
+msgstr "שם הטבלה שגוי:"
 
 #: libraries/classes/Table.php:1495
-#, 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:1514
-#, 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:1745
 msgid "Could not save table UI preferences!"
@@ -12699,9 +12668,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
@@ -12728,9 +12697,8 @@ msgid "Theme:"
 msgstr ""
 
 #: libraries/classes/Tracking.php:172 templates/server/plugins/section.twig:11
-#, fuzzy
 msgid "Version"
-msgstr "Persian"
+msgstr "גרסה"
 
 #: libraries/classes/Tracking.php:173
 #: templates/database/tracking/tracked_tables.twig:13
@@ -12743,9 +12711,8 @@ msgid "Updated"
 msgstr "עודכנה"
 
 #: libraries/classes/Tracking.php:183 libraries/classes/Tracking.php:247
-#, fuzzy
 msgid "Delete version"
-msgstr "גרסת שרת"
+msgstr "מחיקת גרסה"
 
 #: libraries/classes/Tracking.php:184 libraries/classes/Tracking.php:347
 #: templates/database/tracking/tracked_tables.twig:60
@@ -12766,10 +12733,8 @@ msgid "Delete tracking data row from report"
 msgstr ""
 
 #: libraries/classes/Tracking.php:374
-#, fuzzy
-#| msgid "No databases"
 msgid "No data"
-msgstr "אין מאגרי נתונים"
+msgstr "אין נתונים"
 
 #: libraries/classes/Tracking.php:464 libraries/classes/Tracking.php:514
 #, php-format
@@ -12848,9 +12813,9 @@ msgid "Tracking for %1$s was deactivated at version %2$s."
 msgstr ""
 
 #: libraries/classes/Tracking.php:1010
-#, fuzzy, php-format
+#, php-format
 msgid "Version %1$s of %2$s was deleted."
-msgstr "גרסת שרת"
+msgstr "גרסה %1$s מתוך %2$s נמחקה."
 
 #: libraries/classes/Tracking.php:1041
 #, php-format
@@ -12938,9 +12903,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
@@ -12954,9 +12919,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 ""
@@ -13061,10 +13026,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"
@@ -13094,28 +13057,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:75
 msgid "The profile has been updated."
 msgstr "הפרופיל עודכן בהצלחה."
 
 #: libraries/classes/UserPassword.php:87
-#, fuzzy
-#| msgid "Password:"
 msgid "Password is too long!"
-msgstr "סיסמא:"
+msgstr "הססמה ארוכה מדי!"
 
 #: libraries/classes/UserPreferences.php:157
 msgid "Could not save configuration"
@@ -13145,24 +13102,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
@@ -13186,16 +13137,13 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s ימים, %s שעות, %s דקות ו- %s שניות"
 
 #: libraries/classes/Util.php:1878
-#, fuzzy
-#| msgid "Add new field"
 msgid "Missing parameter:"
-msgstr "הוספת שדה חדש"
+msgstr "חסר משתנה:"
 
 #: libraries/classes/Util.php:2422
-#, fuzzy, php-format
-#| msgid "Jump to database \"%s\"."
+#, php-format
 msgid "Jump to database “%s”."
-msgstr "קפיצה אל מאגר נתונים \"%s\"."
+msgstr "קפיצה אל מסד הנתונים „%s”."
 
 #: libraries/classes/Util.php:2447
 #, php-format
@@ -13207,9 +13155,9 @@ msgid "Browse your computer:"
 msgstr ""
 
 #: libraries/classes/Util.php:3260
-#, fuzzy, php-format
+#, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
-msgstr "שמירת שרת בתוך תיקיית %s"
+msgstr "נא לבחור מתיקיית ההעלאה של השרת <b>%s</b>:"
 
 #: libraries/classes/Util.php:3300
 msgid "There are no files to upload!"
@@ -13241,10 +13189,8 @@ msgid "SSL is used"
 msgstr ""
 
 #: libraries/classes/Util.php:3966
-#, fuzzy
-#| msgid "User"
 msgid "Users"
-msgstr "משתמש"
+msgstr "משתמשים"
 
 #: libraries/classes/Util.php:4658
 #: templates/database/multi_table_query/form.twig:46
@@ -13280,18 +13226,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
@@ -13329,10 +13271,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"
@@ -13355,21 +13295,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"
@@ -13408,22 +13343,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:298
-#, fuzzy
-#| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
-msgstr "שינויים נשמרו"
+msgstr "התצוגה נשמרה."
 
 #: libraries/user_preferences.inc.php:71
 #, php-format
@@ -13471,10 +13400,8 @@ msgid "Saved on: @DATE@"
 msgstr ""
 
 #: prefs_manage.php:236
-#, fuzzy
-#| msgid "Import files"
 msgid "Import from file"
-msgstr "קבצי ייבוא"
+msgstr "ייבוא מקובץ"
 
 #: prefs_manage.php:244
 msgid "Import from browser's storage"
@@ -13504,10 +13431,8 @@ msgid ""
 msgstr ""
 
 #: prefs_manage.php:314
-#, fuzzy
-#| msgid "Save as file"
 msgid "Save as PHP file"
-msgstr "שמירה כקובץ"
+msgstr "שמירה כקובץ PHP"
 
 #: prefs_manage.php:319
 msgid "Save to browser's storage"
@@ -13526,9 +13451,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."
@@ -13544,10 +13468,8 @@ msgid "No Privileges"
 msgstr "ללא הרשאות"
 
 #: server_privileges.php:153
-#, 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:167
 msgid ""
@@ -13607,10 +13529,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 ""
@@ -13619,10 +13539,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 ""
@@ -13672,9 +13590,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"
@@ -13689,9 +13606,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!"
@@ -13718,9 +13634,8 @@ msgid "Ignore errors"
 msgstr ""
 
 #: setup/lib/FormProcessing.php:73
-#, fuzzy
 msgid "Show form"
-msgstr "ראיית צבע"
+msgstr "הצגת טופס"
 
 #: setup/lib/Index.php:124
 msgid ""
@@ -13748,10 +13663,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
@@ -13764,9 +13677,9 @@ msgid "'%s' database does not exist."
 msgstr ""
 
 #: tbl_create.php:48
-#, fuzzy, php-format
+#, php-format
 msgid "Table %s already exists!"
-msgstr "שם המשתמש %s כבר קיים!"
+msgstr "הטבלה %s כבר קיימת!"
 
 #: tbl_export.php:45
 msgid "View dump (schema) of table"
@@ -13782,10 +13695,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:36
 #, php-format
@@ -13793,15 +13704,12 @@ msgid "Tracking of %s is activated."
 msgstr ""
 
 #: tbl_tracking.php:105
-#, fuzzy
 msgid "Tracking versions deleted successfully."
-msgstr "%s מסדי נתונים נמחקו בהצלחה."
+msgstr "גרסאות המעקב נמחקו בהצלחה."
 
 #: tbl_tracking.php:110
-#, fuzzy
-#| msgid "No rows selected"
 msgid "No versions selected."
-msgstr "לא נבחרו שורות"
+msgstr "לא נבחרו גרסאות."
 
 #: tbl_tracking.php:141
 msgid "SQL statements executed."
@@ -13844,8 +13752,6 @@ msgid "Input transformation"
 msgstr "שינויי צורה זמינים"
 
 #: transformation_overview.php:57
-#, fuzzy
-#| msgid "Description"
 msgctxt "for MIME transformation"
 msgid "Description"
 msgstr "תיאור"
@@ -13860,39 +13766,30 @@ msgstr "תצוגת יחסים"
 #: templates/database/designer/options_panel.twig:228
 #: templates/database/designer/where_query_panel.twig:59
 #: templates/database/designer/having_query_panel.twig:90
-#, fuzzy
-#| msgid "Export"
 msgid "Except"
-msgstr "ייצוא"
+msgstr "למעט"
 
 #: templates/database/designer/options_panel.twig:75
 #: templates/database/designer/options_panel.twig:240
 #: templates/database/designer/where_query_panel.twig:71
 #: templates/database/designer/having_query_panel.twig:102
-#, fuzzy
-#| msgid "in query"
 msgid "subquery"
-msgstr "בשאילתה"
+msgstr "תת־שאילתה"
 
 #: templates/database/designer/options_panel.twig:84
 #: templates/database/designer/rename_to_panel.twig:22
-#, fuzzy
 msgid "Rename to"
-msgstr "שינוי שם טבלה אל"
+msgstr "שינוי שם טבלה לשם"
 
 #: templates/database/designer/options_panel.twig:90
 #: templates/database/designer/rename_to_panel.twig:30
-#, fuzzy
-#| msgid "User name"
 msgid "New name"
-msgstr "שם משתמש"
+msgstr "שם חדש"
 
 #: templates/database/designer/options_panel.twig:99
 #: templates/database/designer/aggregate_query_panel.twig:22
-#, fuzzy
-#| msgid "Create"
 msgid "Aggregate"
-msgstr "יצירה"
+msgstr "צבירה"
 
 #: templates/database/designer/options_panel.twig:105
 #: templates/database/designer/options_panel.twig:169
@@ -13912,10 +13809,8 @@ 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."
@@ -13926,26 +13821,20 @@ 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/database/designer/delete_relation_panel.twig:21
-#, fuzzy
-#| msgid "Deleting tracking data"
 msgid "Delete relationship"
-msgstr "נתוני המעקב נמחקים"
+msgstr "מחיקת יחס"
 
 #: templates/table/tracking/report_table.twig:4
 #: templates/table/tracking/structure_snapshot_columns.twig:5
@@ -13954,25 +13843,20 @@ 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/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"
@@ -14003,17 +13887,13 @@ 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/login/twofactor/application_configure.twig:3
 msgid ""
@@ -14027,10 +13907,8 @@ msgstr ""
 
 #: templates/login/twofactor/application_configure.twig:12
 #: templates/login/twofactor/application.twig:2
-#, fuzzy
-#| msgid "Documentation"
 msgid "Authentication code:"
-msgstr "תיעוד"
+msgstr "קוד אימות:"
 
 #: templates/table/index_form.twig:15
 msgid "Index name:"
@@ -14048,10 +13926,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:"
@@ -14062,15 +13938,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:118
 #: templates/database/structure/table_header.twig:38
@@ -14091,10 +13964,8 @@ 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"
@@ -14106,10 +13977,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"
@@ -14125,80 +13994,58 @@ 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:90
-#, 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 "עדכון שאילתה"
 
 #: 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."
@@ -14211,8 +14058,6 @@ msgid "Drop the databases that have the same names as the users."
 msgstr "הסרת מאגרי נתונים שיש להם שמות דומים כמו למשתמשים."
 
 #: templates/table/structure/row_stats_table.twig:2
-#, fuzzy
-#| msgid "Row Statistics"
 msgid "Row statistics"
 msgstr "סטטיסטיקת שורה"
 
@@ -14256,10 +14101,8 @@ msgid "Last check"
 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/table/search/search_and_replace.twig:1
 #: templates/database/search/selection_form.twig:15
@@ -14267,16 +14110,12 @@ msgid "Find:"
 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/database/qbe/footer_options.twig:3
 msgid "Add/Delete criteria rows"
@@ -14287,10 +14126,8 @@ msgid "Add/Delete columns"
 msgstr "הוספת/מחיקת עמודות"
 
 #: templates/display/export/selection.twig:3
-#, fuzzy
-#| msgid "Databases"
 msgid "Databases:"
-msgstr "מאגרי נתונים"
+msgstr "מסדי נתונים:"
 
 #: templates/error/report_form.twig:6
 msgid ""
@@ -14312,65 +14149,49 @@ msgstr ""
 #: templates/display/results/additional_fields.twig:6
 #: templates/start_and_number_of_rows_panel.twig:10
 #: templates/display/export/options_rows.twig:10
-#, fuzzy
-#| msgid "Number of fields"
 msgid "Number of rows:"
-msgstr "מספר שדות"
+msgstr "מספר שורות:"
 
 #: templates/export/alias_add.twig:4
 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/columns_definitions/column_definitions_form.twig:32
 #: templates/database/central_columns/add_column.twig:15
 #: templates/console/display.twig:99
-#, 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/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
@@ -14378,8 +14199,6 @@ msgid "Check privileges for database \"%s\"."
 msgstr "בדיקת הראשות עבור מאגר נתונים \"%s\"."
 
 #: templates/server/databases/table_row.twig:62
-#, fuzzy
-#| msgid "Check Privileges"
 msgid "Check privileges"
 msgstr "בדיקת הרשאות"
 
@@ -14389,26 +14208,22 @@ msgid "Character set of the file:"
 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/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:"
@@ -14419,28 +14234,21 @@ msgid "Track these data manipulation statements:"
 msgstr ""
 
 #: templates/table/tracking/create_version.twig:76
-#, fuzzy
 msgid "Create version"
-msgstr "גרסת שרת"
+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/columns_definitions/column_virtuality.twig:29
 #: templates/table/structure/display_partitions.twig:26
-#, fuzzy
-#| msgid "Compression"
 msgid "Expression"
-msgstr "דחיסה"
+msgstr "ביטוי"
 
 #: templates/display/export/template_options.twig:1
-#, fuzzy
-#| msgid "Select Tables"
 msgid "Select a template"
-msgstr "בחירת טבלאות"
+msgstr "בחירת טבלה"
 
 #: templates/table/search/options_zoom.twig:6
 msgid "Use this column to label each point"
@@ -14452,10 +14260,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/databases/create.twig:30
 #: templates/display/export/template_loading.twig:10
@@ -14482,16 +14288,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"
@@ -14527,35 +14329,24 @@ 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: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/display/export/options_quick_export.twig:2
 #: templates/display/export/options_output.twig:2
@@ -14564,10 +14355,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 <strong>%s</strong>"
-msgstr "שמירת שרת בתוך תיקיית %s"
+msgstr "שמירה בשרת בתיקיית <strong>%s</strong>"
 
 #: templates/table/relation/foreign_key_row.twig:15
 #, fuzzy, php-format
@@ -14576,21 +14366,17 @@ msgid "Foreign key constraint %s has been dropped"
 msgstr "הוספת הגבלות"
 
 #: templates/table/relation/foreign_key_row.twig:38
-#, fuzzy
-#| msgid "Constraints for table"
 msgid "Constraint name"
-msgstr "הגבלות לטבלה"
+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
diff --git a/po/it.po b/po/it.po
index a01eeaa702..a9fdb6226a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-05-07 03:27-0300\n"
-"PO-Revision-Date: 2018-03-30 20:15+0000\n"
-"Last-Translator: Stefano Martinelli <stefano.ste.martinelli@gmail.com>\n"
+"PO-Revision-Date: 2018-05-18 01:25+0000\n"
+"Last-Translator: Nicola Lombardi <nicolaandroid23@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/phpmyadmin/"
 "master/it/>\n"
 "Language: it\n"
@@ -13,7 +13,7 @@ msgstr ""
 "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.20-dev\n"
+"X-Generator: Weblate 3.0-dev\n"
 
 #: ajax.php:21 ajax.php:50 export.php:205 libraries/classes/Export.php:1144
 msgid "Bad type!"
@@ -949,6 +949,8 @@ msgid ""
 "You are trying to reduce the number of rows, but have already entered data "
 "in those rows which will be lost. Do you wish to continue?"
 msgstr ""
+"Stai cercando di ridurre il numero di righe, ma hai già inserito dei dati "
+"all'interno di quelle righe che verranno persi. Desideri procedere?"
 
 #: js/messages.php:75
 msgid "Do you really want to revoke the selected user(s) ?"
@@ -1978,12 +1980,16 @@ msgstr "Naviga tra i valori esterni"
 #: js/messages.php:424
 msgid "No previously auto-saved query is available. Loading default query."
 msgstr ""
+"Nessuna query automaticamente salvata presente. Caricamento query "
+"predefinita in corso."
 
 #: js/messages.php:425
 msgid ""
 "You have a previously saved query. Click Get auto-saved query to load the "
 "query."
 msgstr ""
+"Hai una query precedentemente salvata. Clicca \"Ottieni query\" per caricare "
+"la query."
 
 #: js/messages.php:426
 #, php-format
@@ -14683,7 +14689,7 @@ msgstr ""
 
 #: templates/login/twofactor/application_configure.twig:9
 msgid "Secret/key:"
-msgstr ""
+msgstr "Segreto/chiave:"
 
 #: templates/login/twofactor/application_configure.twig:12
 #: templates/login/twofactor/application.twig:2
@@ -16383,10 +16389,8 @@ msgid "Edit partitioning"
 msgstr "Modifica partizionamento"
 
 #: templates/database/central_columns/table_header.twig:17
-#, fuzzy
-#| msgid "Length/Values"
 msgid "Lenght/Value"
-msgstr "Lunghezza/Valori"
+msgstr "Lunghezza/Valore"
 
 #: templates/database/central_columns/table_header.twig:29
 msgid "Attribute"
diff --git a/po/vi.po b/po/vi.po
index 1ba3cffa0c..492a472eff 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-05-07 03:27-0300\n"
-"PO-Revision-Date: 2018-01-13 02:26+0000\n"
-"Last-Translator: Dao Nguyen <quynh.d.nguyen@student.fh-kiel.de>\n"
+"PO-Revision-Date: 2018-05-18 01:25+0000\n"
+"Last-Translator: Xuan Hung <mr.hungdx@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/phpmyadmin/"
 "master/vi/>\n"
 "Language: vi\n"
@@ -18,7 +18,7 @@ msgstr ""
 "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:205 libraries/classes/Export.php:1144
 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"
@@ -943,6 +945,8 @@ msgid ""
 "You are trying to reduce the number of rows, but have already entered data "
 "in those rows which will be lost. Do you wish to continue?"
 msgstr ""
+"Bạn đang muốn giảm số lượng các hàng, Những dữ liệu đã nhập trong các hàng "
+"này sẽ bị mất. Bạn có muốn tiếp tục không?"
 
 #: js/messages.php:75
 msgid "Do you really want to revoke the selected user(s) ?"
@@ -977,7 +981,6 @@ msgid "Do you really want to RESET SLAVE?"
 msgstr "Bạn có thực sự muốn RESET SLAVE?"
 
 #: js/messages.php:90
-#, 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, "
@@ -986,10 +989,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:96
 msgid "Garbled Data"
@@ -1580,15 +1583,11 @@ msgid "Database"
 msgstr "Cơ sở dữ liệu"
 
 #: js/messages.php:298 libraries/classes/Display/Export.php:591
-#, fuzzy
-#| msgid "Table"
 msgctxt "Alias"
 msgid "Table"
 msgstr "Bảng"
 
 #: js/messages.php:299 libraries/classes/Display/Export.php:602
-#, fuzzy
-#| msgid "Column"
 msgctxt "Alias"
 msgid "Column"
 msgstr "Cột"
@@ -1965,6 +1964,8 @@ msgstr "Duyệt giá trị khóa ngoại"
 #: js/messages.php:424
 msgid "No previously auto-saved query is available. Loading default query."
 msgstr ""
+"Không có câu truy vấn nào được tự động lưu lại trước đó. Đang tải câu truy "
+"vấn mặc định."
 
 #: js/messages.php:425
 msgid ""