From 2bf74d053d0eebdd37546ad0be1233b23e45df2c Mon Sep 17 00:00:00 2001 From: Benny Date: Sun, 31 May 2015 18:32:48 +0200 Subject: [PATCH 1/3] Translated using Weblate (Indonesian) Currently translated at 73.4% (2228 of 3035 strings) [CI skip] --- po/id.po | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/po/id.po b/po/id.po index 4fabfd81df..7269593336 100644 --- a/po/id.po +++ b/po/id.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-05-05 15:46-0400\n" -"PO-Revision-Date: 2015-03-28 05:45+0200\n" -"Last-Translator: Deky Arifianto \n" -"Language-Team: Indonesian \n" +"PO-Revision-Date: 2015-05-31 18:32+0200\n" +"Last-Translator: Benny \n" +"Language-Team: Indonesian " +"\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 2.3-dev\n" "X-Poedit-Basepath: ../../..\n" @@ -679,7 +679,7 @@ msgid "Import has been successfully finished, %d queries executed." msgstr "Impor telah berhasil menyelesaikan,%d kueri dieksekusi." #: import.php:665 -#, fuzzy, php-format +#, php-format #| msgid "" #| "Script timeout passed, if you want to finish import, please resubmit same " #| "file and import will resume." @@ -687,8 +687,9 @@ msgid "" "Script timeout passed, if you want to finish import, please %sresubmit the " "same file%s and import will resume." msgstr "" -"Script sudah melewati timeout, jika Anda ingin menyelesaikan proses impor, " -"harap kirim ulang arsip yang sama dan proses impor akan berlanjut." +"Batas script sudah melewati batas, jika anda ingin menyelesaikan proses " +"import, silahkan %skirim ulang berkas yang %ssama agar proses import segera " +"dilanjutkan" #: import.php:675 msgid "" @@ -1013,10 +1014,9 @@ msgid "Do you really want to revoke the selected user(s) ?" msgstr "Anda yakin akan menghapus pengguna yang dipilih?" #: js/messages.php:60 -#, fuzzy #| msgid "Do you really want to delete user group \"%s\"?" msgid "Do you really want to delete this central column?" -msgstr "Anda yakin ingin menghapus kolom pusat ini?" +msgstr "Apakah anda yakin untuk menghapus kolom ini?" #: js/messages.php:63 msgid "Save & Close" @@ -1688,10 +1688,9 @@ msgid "Processing Request" msgstr "Memproses Permintaan" #: js/messages.php:268 -#, fuzzy #| msgid "Request Aborted!!" msgid "Request Failed!!" -msgstr "Permintaan Dibatalkan!" +msgstr "Permintaan gagal!!" #: js/messages.php:269 msgid "Error in Processing Request" @@ -1861,13 +1860,13 @@ msgid "Search this list" msgstr "Cari daftar ini" #: js/messages.php:322 -#, fuzzy, php-format +#, php-format msgid "" "No columns in the central list. Make sure the Central columns list for " "database %s has columns that are not present in the current table." msgstr "" -"Tidak ada kolom ditemukan dalam daftar pusat. Pastikan daftar untuk database " -"%s memiliki kolom yang tidak ada di dalam tabel saat ini." +"Tidak ditemukan kolom pada daftar. Pastikan daftar kolom untuk database %s " +"memiliki beberapa kolom yang tidak tertampilkan pada tabel saat ini." #: js/messages.php:323 msgid "See more" From cd25d321975342dddec19be81861455f488d8fdd Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 31 May 2015 16:13:23 +0200 Subject: [PATCH 2/3] Translated using Weblate (Turkish) Currently translated at 100.0% (3035 of 3035 strings) [CI skip] --- po/tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 25ee9b9069..daf4142c83 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-05-05 15:46-0400\n" -"PO-Revision-Date: 2015-05-27 18:54+0200\n" +"PO-Revision-Date: 2015-05-31 16:13+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish " "\n" @@ -6449,8 +6449,8 @@ msgid "" "Group items in the navigation tree (determined by the separator defined in " "the Databases and Tables tabs above)." msgstr "" -"Gezinti ağacındaki öğeleri gruplar (Veritabanları ve Tablolar sekmeleri ve " -"üzerinde tanımlanan ayıraç tarafından belirlenir)." +"Gezinti ağacındaki öğeleri gruplar (Veritabanları ve Tablolar sekmeleri " +"üzerini tanımlanan ayıraç tarafından belirlenir)." #: libraries/config/messages.inc.php:458 msgid "Group items in the tree" From d6d016aef9cb109f3d1fb545a96ccb759bd9c34e Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 2 Jun 2015 15:20:18 +0530 Subject: [PATCH 3/3] bug #4936 utf8mb4 fields show only ????s for 4-byte Unicode characters after import Signed-off-by: Madhura Jayaratne --- libraries/plugins/export/ExportSql.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 629949adb1..eb335f3d83 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -737,6 +737,9 @@ class ExportSql extends ExportPlugin // by default we use the connection charset $set_names = $mysql_charset_map['utf-8']; } + if ($set_names == 'utf8' && PMA_MYSQL_INT_VERSION > 50503) { + $set_names = 'utf8mb4'; + } $head .= $crlf . '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=' . '@@CHARACTER_SET_CLIENT */;' . $crlf