From 71e1f0e2c16e8073e07613c0ac2cc71f22bedc0f Mon Sep 17 00:00:00 2001 From: Stian Berg Date: Tue, 26 Mar 2013 11:59:25 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 77.3% (1981 of 2562) --- po/nb.po | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/nb.po b/po/nb.po index d5eddcc88c..52abd2f04d 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2013-03-06 13:15+0200\n" -"Last-Translator: Axel Sjøstedt \n" +"PO-Revision-Date: 2013-03-26 11:59+0200\n" +"Last-Translator: Stian Berg \n" "Language-Team: Norwegian Bokmål " "\n" "Language: nb\n" @@ -8534,7 +8534,7 @@ msgstr "Kollasjon for SQL-oppkobling" #: main.php:124 #| msgid "Other core settings" msgid "Appearance Settings" -msgstr "Visningsinnstillinger" +msgstr "Innstillinger for visning" #: main.php:153 prefs_manage.php:272 msgid "More settings" @@ -8543,7 +8543,7 @@ msgstr "Flere innstillinger" #: main.php:169 #| msgid "Database for user" msgid "Database server" -msgstr "Database-server" +msgstr "Databaseserver" #: main.php:172 msgid "Software" @@ -8576,7 +8576,7 @@ msgstr "Webserver" #: main.php:209 #| msgid "Use light version" msgid "Database client version" -msgstr "Database-versjon" +msgstr "Databaseklientversjon" #: main.php:213 msgid "PHP extension" @@ -8676,8 +8676,8 @@ msgid "" "exists in your phpMyAdmin directory. You should remove it once phpMyAdmin " "has been configured." msgstr "" -"Mappe [code]config[/code], som blir brukt av setupskriptet eksisterer " -"fortsatt i din phpMyAdmin mappe. Du bør fjerne den så fort phpMyAdming har " +"Mappen [code]config[/code], som blir brukt av setupskriptet eksisterer " +"fortsatt i din phpMyAdmin mappe. Du bør fjerne den så fort phpMyAdmin har " "blitt konfigurert." #: main.php:321 @@ -9837,10 +9837,9 @@ msgid "Runtime Information" msgstr "Kjøringsinformasjon" #: server_status.php:791 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Se slavestatustabell" +msgstr "Alle statusvariabler" #: server_status.php:792 msgid "Monitor" From 9ce300ef7b271a60a02da535ea423807ef7b84bd Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Wed, 27 Mar 2013 14:44:51 +0100 Subject: [PATCH 2/4] Translated using Weblate (Catalan) Currently translated at 100.0% (2562 of 2562) --- po/ca.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/ca.po b/po/ca.po index d13b2818a1..388fd8371d 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2013-01-10 13:40+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2013-03-27 14:44+0200\n" +"Last-Translator: Xavier Navarro \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.4-dev\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 1.5-dev\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -8574,7 +8574,6 @@ msgstr "" "de dividir cadenes de text correctament i pot generar resultats inesperats." #: main.php:292 -#, fuzzy #| msgid "" #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration." #| "php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower " @@ -8586,10 +8585,11 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" -"El paràmetre de PHP [a@http://php.net/manual/en/session.configuration." -"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] és menor " -"que la caducitat de galetes -cookies- configurat a phpMyAdmin, degut a aixó, " -"la vostra conenexió caducarà abans del establert a phpMyAdmin." +"El paràmetre de PHP " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] és menor que la caducitat de " +"galetes -cookies- configurat a phpMyAdmin, degut a aixó, la vostra conenexió " +"caducarà abans de l'establert a phpMyAdmin." #: main.php:299 msgid "" @@ -9734,10 +9734,9 @@ msgid "Advisor" msgstr "Assessorament" #: server_status.php:803 server_status.php:829 -#, fuzzy #| msgid "Number of rows:" msgid "Number of data points: " -msgstr "Nombre de files:" +msgstr "Nombre de punts de dades:" #: server_status.php:807 server_status.php:833 msgid "Refresh rate: " From a776aa57438d9ff5174cc1acad9131216a280ca6 Mon Sep 17 00:00:00 2001 From: Ahmad Zulhilmi Idris Date: Wed, 27 Mar 2013 09:12:03 +0100 Subject: [PATCH 3/4] Translated using Weblate (Malay) Currently translated at 14.5% (371 of 2562) --- po/ms.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/ms.po b/po/ms.po index 06b5fcd3c6..e9393345d7 100644 --- a/po/ms.po +++ b/po/ms.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2013-03-25 09:37+0200\n" +"PO-Revision-Date: 2013-03-27 09:12+0200\n" "Last-Translator: Ahmad Zulhilmi Idris \n" "Language-Team: Malay \n" "Language: ms\n" @@ -34,6 +34,9 @@ msgid "" "parent window, or your browser's security settings are configured to block " "cross-window updates." msgstr "" +"Tetingkap pelayan induk tidak boleh dikemaskini. Mungkin anda telah menutup " +"tetingkap utama atau tetapan keselamatan tetingkap anda telah menghalang " +"pengemaskinian merentas tetingkap." #: browse_foreigners.php:160 libraries/common.lib.php:3125 #: libraries/common.lib.php:3132 libraries/common.lib.php:3341 @@ -102,7 +105,7 @@ msgstr "" #: bs_disp_as_mime_type.php:35 msgid "Failed to fetch headers" -msgstr "" +msgstr "Gagal untuk mencapai pengepala" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" @@ -404,12 +407,11 @@ msgid "Last check" msgstr "Semakan Terakhir" #: db_printview.php:219 db_structure.php:524 -#, fuzzy, php-format +#, php-format #| msgid "%s table(s)" msgid "%s table" msgid_plural "%s tables" msgstr[0] "%s jadual" -msgstr[1] "%s jadual" #: db_qbe.php:41 msgid "You have to choose at least one column to display" @@ -473,10 +475,9 @@ msgid "Modify" msgstr "Ubahsuai" #: db_qbe.php:606 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" -msgstr "Tambah/Padam Baris Kriteria" +msgstr "Tambah/Padam baris kriteria" #: db_qbe.php:618 #| msgid "Add/Delete Field Columns" @@ -529,7 +530,7 @@ msgid "Search results for \"%s\" %s:" msgstr "Hasil carian bagi \"%s\" %s:" #: db_search.php:227 -#, fuzzy, php-format +#, php-format #| msgid "%s match(es) inside table %s" msgid "%s match inside table %s" msgid_plural "%s matches inside table %s" @@ -571,10 +572,9 @@ msgid "Search in database" msgstr "Cari di pangkalan data" #: db_search.php:277 -#, fuzzy #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgid "Words or values to search for (wildcard: \"%\"):" -msgstr "Perkataan atau nilai untuk dicari (wildcard: \"%\"):" +msgstr "Perkataan atau nilai yang dicari untuk (wildcard: \"%\"):" #: db_search.php:282 msgid "Find:" @@ -585,7 +585,6 @@ msgid "Words are separated by a space character (\" \")." msgstr "Perkataan dipisahkan oleh aksara ruang (\" \")." #: db_search.php:300 -#, fuzzy #| msgid "Inside table(s):" msgid "Inside tables:" msgstr "Di dalam jadual:" @@ -611,7 +610,7 @@ msgid "Table %s has been emptied" msgstr "Jadual %s telah dikosongkan" #: db_structure.php:328 tbl_operations.php:728 -#, fuzzy, php-format +#, php-format msgid "View %s has been dropped" msgstr "Medan %s telah digugurkan" From 45af9e186995d3c9404818231b21dd7d9015c720 Mon Sep 17 00:00:00 2001 From: Nikolay Ermolovich Date: Fri, 29 Mar 2013 16:29:14 +0600 Subject: [PATCH 4/4] Update rte_triggers.lib.php Editing a trigger with special characters --- libraries/rte/rte_triggers.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index cc76685f04..ed874474c0 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -296,7 +296,7 @@ function PMA_TRI_getEditorForm($mode, $item) 'item_definer' ); foreach ($need_escape as $key => $index) { - $item[$index] = htmlentities($item[$index], ENT_QUOTES); + $item[$index] = htmlentities($item[$index], ENT_QUOTES, 'UTF-8'); } $original_data = ''; if ($mode == 'edit') {