From ba6315c7bd61c76946a81dab291730d89c465d3d Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 16 Sep 2012 13:15:07 +0000 Subject: [PATCH] [ENHANCE] Enhance the translation system (for tab context menu). git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@958 f5eea248-9336-0410-98b8-ebc06183d4e3 --- .../installer/nativeLang/afrikaans.xml | 32 +- PowerEditor/installer/nativeLang/albanian.xml | 14 +- PowerEditor/installer/nativeLang/arabic.xml | 14 +- PowerEditor/installer/nativeLang/aranese.xml | 14 +- .../installer/nativeLang/azerbaijani.xml | 32 +- PowerEditor/installer/nativeLang/basque.xml | 143 ++-- .../installer/nativeLang/belarusian.xml | 14 +- PowerEditor/installer/nativeLang/bosnian.xml | 32 +- .../nativeLang/brazilian_portuguese.xml | 32 +- .../installer/nativeLang/bulgarian.xml | 32 +- PowerEditor/installer/nativeLang/catalan.xml | 84 ++- PowerEditor/installer/nativeLang/chinese.xml | 32 +- .../nativeLang/chineseSimplified.xml | 32 +- PowerEditor/installer/nativeLang/croatian.xml | 42 +- PowerEditor/installer/nativeLang/czech.xml | 32 +- PowerEditor/installer/nativeLang/danish.xml | 57 +- PowerEditor/installer/nativeLang/dutch.xml | 32 +- PowerEditor/installer/nativeLang/english.xml | 271 ++++--- .../nativeLang/english_customizable.xml | 32 +- .../installer/nativeLang/esperanto.xml | 32 +- .../installer/nativeLang/extremaduran.xml | 14 +- PowerEditor/installer/nativeLang/farsi.xml | 32 +- PowerEditor/installer/nativeLang/finnish.xml | 42 +- PowerEditor/installer/nativeLang/french.xml | 32 +- PowerEditor/installer/nativeLang/friulian.xml | 32 +- PowerEditor/installer/nativeLang/galician.xml | 14 +- PowerEditor/installer/nativeLang/georgian.xml | 34 +- PowerEditor/installer/nativeLang/german.xml | 48 +- PowerEditor/installer/nativeLang/greek.xml | 32 +- PowerEditor/installer/nativeLang/hebrew.xml | 32 +- PowerEditor/installer/nativeLang/hindi.xml | 32 +- .../installer/nativeLang/hungarian.xml | 34 +- .../installer/nativeLang/hungarianA.xml | 34 +- .../installer/nativeLang/indonesian.xml | 32 +- PowerEditor/installer/nativeLang/italian.xml | 32 +- PowerEditor/installer/nativeLang/japanese.xml | 32 +- PowerEditor/installer/nativeLang/kazakh.xml | 32 +- PowerEditor/installer/nativeLang/korean.xml | 34 +- PowerEditor/installer/nativeLang/kyrgyz.xml | 32 +- PowerEditor/installer/nativeLang/latvian.xml | 32 +- PowerEditor/installer/nativeLang/ligurian.xml | 32 +- .../installer/nativeLang/lithuanian.xml | 14 +- .../installer/nativeLang/luxembourgish.xml | 32 +- .../installer/nativeLang/macedonian.xml | 32 +- PowerEditor/installer/nativeLang/malay.xml | 14 +- .../installer/nativeLang/norwegian.xml | 32 +- PowerEditor/installer/nativeLang/nynorsk.xml | 14 +- PowerEditor/installer/nativeLang/occitan.xml | 14 +- PowerEditor/installer/nativeLang/polish.xml | 32 +- .../installer/nativeLang/portuguese.xml | 682 +++++++++--------- PowerEditor/installer/nativeLang/romanian.xml | 32 +- PowerEditor/installer/nativeLang/russian.xml | 41 +- .../installer/nativeLang/samogitian.xml | 14 +- .../installer/nativeLang/sardinian.xml | 32 +- PowerEditor/installer/nativeLang/serbian.xml | 14 +- .../installer/nativeLang/serbianCyrillic.xml | 32 +- PowerEditor/installer/nativeLang/slovak.xml | 32 +- PowerEditor/installer/nativeLang/slovakA.xml | 32 +- .../installer/nativeLang/slovenian.xml | 32 +- PowerEditor/installer/nativeLang/spanish.xml | 34 +- .../installer/nativeLang/spanish_ar.xml | 34 +- PowerEditor/installer/nativeLang/swedish.xml | 32 +- PowerEditor/installer/nativeLang/tagalog.xml | 32 +- PowerEditor/installer/nativeLang/tamil.xml | 34 +- PowerEditor/installer/nativeLang/telugu.xml | 32 +- PowerEditor/installer/nativeLang/thai.xml | 32 +- PowerEditor/installer/nativeLang/turkish.xml | 32 +- .../installer/nativeLang/ukrainian.xml | 32 +- PowerEditor/installer/nativeLang/uyghur.xml | 32 +- PowerEditor/installer/nativeLang/uzbek.xml | 32 +- .../installer/nativeLang/uzbekCyrillic.xml | 32 +- PowerEditor/src/Notepad_plus.cpp | 3 +- PowerEditor/src/localization.cpp | 309 +------- 73 files changed, 1663 insertions(+), 1841 deletions(-) diff --git a/PowerEditor/installer/nativeLang/afrikaans.xml b/PowerEditor/installer/nativeLang/afrikaans.xml index e911c77f..69a689e1 100644 --- a/PowerEditor/installer/nativeLang/afrikaans.xml +++ b/PowerEditor/installer/nativeLang/afrikaans.xml @@ -187,22 +187,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/albanian.xml b/PowerEditor/installer/nativeLang/albanian.xml index a4577e55..be5e7072 100644 --- a/PowerEditor/installer/nativeLang/albanian.xml +++ b/PowerEditor/installer/nativeLang/albanian.xml @@ -139,13 +139,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/arabic.xml b/PowerEditor/installer/nativeLang/arabic.xml index 6de8ce49..f4e3d5a1 100644 --- a/PowerEditor/installer/nativeLang/arabic.xml +++ b/PowerEditor/installer/nativeLang/arabic.xml @@ -142,13 +142,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/aranese.xml b/PowerEditor/installer/nativeLang/aranese.xml index 63503c7f..12095bbf 100644 --- a/PowerEditor/installer/nativeLang/aranese.xml +++ b/PowerEditor/installer/nativeLang/aranese.xml @@ -125,13 +125,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/azerbaijani.xml b/PowerEditor/installer/nativeLang/azerbaijani.xml index 8d82b872..360f5628 100644 --- a/PowerEditor/installer/nativeLang/azerbaijani.xml +++ b/PowerEditor/installer/nativeLang/azerbaijani.xml @@ -237,22 +237,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/basque.xml b/PowerEditor/installer/nativeLang/basque.xml index c1ce002c..a12a86a6 100644 --- a/PowerEditor/installer/nativeLang/basque.xml +++ b/PowerEditor/installer/nativeLang/basque.xml @@ -9,7 +9,7 @@ - + @@ -37,8 +37,8 @@ - - + + @@ -58,7 +58,7 @@ - + @@ -71,7 +71,6 @@ - @@ -80,7 +79,6 @@ - @@ -90,9 +88,9 @@ - - - + + + @@ -101,8 +99,8 @@ - - + + @@ -112,8 +110,8 @@ - - + + @@ -123,13 +121,11 @@ - - @@ -183,14 +179,17 @@ - - + + + + + - - + + @@ -218,14 +217,11 @@ - - - @@ -240,15 +236,12 @@ - - - - - + + @@ -258,22 +251,23 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -289,21 +283,21 @@ - + - + - + - - + + @@ -315,7 +309,7 @@ - + @@ -387,8 +381,8 @@ - - + + @@ -414,10 +408,10 @@ - - - - + + + + @@ -440,28 +434,25 @@ - - - - + + + - - + - - - + + @@ -477,17 +468,14 @@ - - - @@ -509,12 +497,11 @@ - - - - - + + + + @@ -580,7 +567,6 @@ - @@ -635,7 +621,7 @@ - + @@ -643,7 +629,12 @@ \rGordetako aldaketa guztiak ezin dira desegin.\r\rJarraitu?"/> + + + + + @@ -671,6 +662,8 @@ + + @@ -682,7 +675,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/belarusian.xml b/PowerEditor/installer/nativeLang/belarusian.xml index 77bbc273..4d25243f 100644 --- a/PowerEditor/installer/nativeLang/belarusian.xml +++ b/PowerEditor/installer/nativeLang/belarusian.xml @@ -125,13 +125,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/bosnian.xml b/PowerEditor/installer/nativeLang/bosnian.xml index d7c1e0c2..a64254bb 100644 --- a/PowerEditor/installer/nativeLang/bosnian.xml +++ b/PowerEditor/installer/nativeLang/bosnian.xml @@ -249,22 +249,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml index ad50d8ba..db1ea7a4 100644 --- a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml +++ b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml @@ -257,22 +257,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/bulgarian.xml b/PowerEditor/installer/nativeLang/bulgarian.xml index cd57e249..cd1b8775 100644 --- a/PowerEditor/installer/nativeLang/bulgarian.xml +++ b/PowerEditor/installer/nativeLang/bulgarian.xml @@ -189,22 +189,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml index 0ae562c9..b422155e 100644 --- a/PowerEditor/installer/nativeLang/catalan.xml +++ b/PowerEditor/installer/nativeLang/catalan.xml @@ -1,8 +1,8 @@ - + @@ -92,7 +92,7 @@ By Hiro5 [groccat at gmail] - + @@ -118,7 +118,8 @@ By Hiro5 [groccat at gmail] - + + @@ -183,7 +184,7 @@ By Hiro5 [groccat at gmail] - + @@ -205,7 +206,7 @@ By Hiro5 [groccat at gmail] - + @@ -213,6 +214,9 @@ By Hiro5 [groccat at gmail] + + + @@ -244,7 +248,7 @@ By Hiro5 [groccat at gmail] - + @@ -262,22 +266,23 @@ By Hiro5 [groccat at gmail] - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -293,7 +298,7 @@ By Hiro5 [groccat at gmail] - + @@ -336,14 +341,14 @@ By Hiro5 [groccat at gmail] - - - + + + - + @@ -562,10 +567,12 @@ By Hiro5 [groccat at gmail] + + + - @@ -614,7 +621,7 @@ By Hiro5 [groccat at gmail] - + @@ -629,15 +636,16 @@ By Hiro5 [groccat at gmail] - - - - - - - + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml index 87098d09..a21cc643 100644 --- a/PowerEditor/installer/nativeLang/chinese.xml +++ b/PowerEditor/installer/nativeLang/chinese.xml @@ -235,22 +235,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/chineseSimplified.xml b/PowerEditor/installer/nativeLang/chineseSimplified.xml index 34a1d253..9dce5763 100644 --- a/PowerEditor/installer/nativeLang/chineseSimplified.xml +++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml @@ -240,22 +240,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/croatian.xml b/PowerEditor/installer/nativeLang/croatian.xml index 102486c0..190a77f5 100644 --- a/PowerEditor/installer/nativeLang/croatian.xml +++ b/PowerEditor/installer/nativeLang/croatian.xml @@ -1,7 +1,7 @@ @@ -248,22 +248,23 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -501,7 +502,7 @@ - + @@ -614,6 +615,9 @@ + + + diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml index 7cac9dfb..ac1b6643 100644 --- a/PowerEditor/installer/nativeLang/czech.xml +++ b/PowerEditor/installer/nativeLang/czech.xml @@ -264,22 +264,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index afb020c0..0a1061ac 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -1,7 +1,7 @@ - +
@@ -26,7 +26,7 @@ - + @@ -101,8 +101,8 @@ - - + + @@ -113,8 +113,8 @@ - - + + @@ -123,12 +123,14 @@ - + + + @@ -210,9 +212,9 @@ - - - + + + @@ -268,22 +270,23 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
@@ -601,6 +604,8 @@ + + diff --git a/PowerEditor/installer/nativeLang/dutch.xml b/PowerEditor/installer/nativeLang/dutch.xml index d1ac800e..f415d2ab 100644 --- a/PowerEditor/installer/nativeLang/dutch.xml +++ b/PowerEditor/installer/nativeLang/dutch.xml @@ -265,22 +265,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index d21b616e..536f23ea 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -1,8 +1,8 @@ - - -
+ + +
@@ -27,8 +27,8 @@ - - + + @@ -101,12 +101,12 @@ - - - - - - + + + + + + @@ -175,8 +175,8 @@ - - + + @@ -185,14 +185,14 @@ - + - - - + + + @@ -212,7 +212,6 @@ - @@ -236,31 +235,31 @@ - - - + + +
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -284,26 +283,26 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + @@ -325,10 +324,10 @@ - + - + @@ -362,8 +361,8 @@ - - + + @@ -410,13 +409,13 @@ - + - + @@ -447,10 +446,10 @@ - + - + @@ -470,7 +469,7 @@ - + @@ -503,7 +502,7 @@ - + @@ -514,21 +513,21 @@ - + - + - + - + @@ -562,7 +561,7 @@ - + @@ -571,7 +570,7 @@ - + @@ -579,14 +578,14 @@ - + - + @@ -600,66 +599,66 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index dcacf5db..c9e584e6 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -240,22 +240,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/esperanto.xml b/PowerEditor/installer/nativeLang/esperanto.xml index f1687c99..2bda446c 100644 --- a/PowerEditor/installer/nativeLang/esperanto.xml +++ b/PowerEditor/installer/nativeLang/esperanto.xml @@ -283,22 +283,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/extremaduran.xml b/PowerEditor/installer/nativeLang/extremaduran.xml index 49bc62d2..accc3bb9 100644 --- a/PowerEditor/installer/nativeLang/extremaduran.xml +++ b/PowerEditor/installer/nativeLang/extremaduran.xml @@ -152,13 +152,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/farsi.xml b/PowerEditor/installer/nativeLang/farsi.xml index e97cef61..25d4a948 100644 --- a/PowerEditor/installer/nativeLang/farsi.xml +++ b/PowerEditor/installer/nativeLang/farsi.xml @@ -244,22 +244,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml index 03631ea2..eff52eab 100644 --- a/PowerEditor/installer/nativeLang/finnish.xml +++ b/PowerEditor/installer/nativeLang/finnish.xml @@ -1,7 +1,7 @@ @@ -276,22 +276,22 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -603,7 +603,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 - + @@ -618,12 +618,14 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 - + + + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 92bcbc09..52f7223d 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -309,22 +309,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/friulian.xml b/PowerEditor/installer/nativeLang/friulian.xml index 188a2c87..93f9e947 100644 --- a/PowerEditor/installer/nativeLang/friulian.xml +++ b/PowerEditor/installer/nativeLang/friulian.xml @@ -240,22 +240,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/galician.xml b/PowerEditor/installer/nativeLang/galician.xml index 832153b3..9cc1dc77 100644 --- a/PowerEditor/installer/nativeLang/galician.xml +++ b/PowerEditor/installer/nativeLang/galician.xml @@ -160,13 +160,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/georgian.xml b/PowerEditor/installer/nativeLang/georgian.xml index 446181df..16df321c 100644 --- a/PowerEditor/installer/nativeLang/georgian.xml +++ b/PowerEditor/installer/nativeLang/georgian.xml @@ -262,23 +262,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml index ba3d928a..543e4e83 100644 --- a/PowerEditor/installer/nativeLang/german.xml +++ b/PowerEditor/installer/nativeLang/german.xml @@ -1,7 +1,7 @@ @@ -137,6 +137,8 @@ + + @@ -189,6 +191,9 @@ + + + @@ -231,6 +236,7 @@ + @@ -255,22 +261,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -566,16 +572,18 @@ - + - + + + diff --git a/PowerEditor/installer/nativeLang/greek.xml b/PowerEditor/installer/nativeLang/greek.xml index 9028bfbe..8c0cac88 100644 --- a/PowerEditor/installer/nativeLang/greek.xml +++ b/PowerEditor/installer/nativeLang/greek.xml @@ -238,22 +238,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/hebrew.xml b/PowerEditor/installer/nativeLang/hebrew.xml index 54602a2b..c7cfe1ff 100644 --- a/PowerEditor/installer/nativeLang/hebrew.xml +++ b/PowerEditor/installer/nativeLang/hebrew.xml @@ -244,22 +244,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/hindi.xml b/PowerEditor/installer/nativeLang/hindi.xml index 698bb98b..077f20c8 100644 --- a/PowerEditor/installer/nativeLang/hindi.xml +++ b/PowerEditor/installer/nativeLang/hindi.xml @@ -247,22 +247,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/hungarian.xml b/PowerEditor/installer/nativeLang/hungarian.xml index e76261e6..47f8cca3 100644 --- a/PowerEditor/installer/nativeLang/hungarian.xml +++ b/PowerEditor/installer/nativeLang/hungarian.xml @@ -266,23 +266,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/hungarianA.xml b/PowerEditor/installer/nativeLang/hungarianA.xml index 820248b6..3da73f5c 100644 --- a/PowerEditor/installer/nativeLang/hungarianA.xml +++ b/PowerEditor/installer/nativeLang/hungarianA.xml @@ -266,23 +266,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/indonesian.xml b/PowerEditor/installer/nativeLang/indonesian.xml index 3794c84e..6de4be24 100644 --- a/PowerEditor/installer/nativeLang/indonesian.xml +++ b/PowerEditor/installer/nativeLang/indonesian.xml @@ -242,22 +242,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml index 59ac781e..616cec22 100644 --- a/PowerEditor/installer/nativeLang/italian.xml +++ b/PowerEditor/installer/nativeLang/italian.xml @@ -257,22 +257,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/japanese.xml b/PowerEditor/installer/nativeLang/japanese.xml index 2875db25..e430661d 100644 --- a/PowerEditor/installer/nativeLang/japanese.xml +++ b/PowerEditor/installer/nativeLang/japanese.xml @@ -187,22 +187,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/kazakh.xml b/PowerEditor/installer/nativeLang/kazakh.xml index ab71cb6a..1cd6490b 100644 --- a/PowerEditor/installer/nativeLang/kazakh.xml +++ b/PowerEditor/installer/nativeLang/kazakh.xml @@ -187,22 +187,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/korean.xml b/PowerEditor/installer/nativeLang/korean.xml index dd29b649..ef925281 100644 --- a/PowerEditor/installer/nativeLang/korean.xml +++ b/PowerEditor/installer/nativeLang/korean.xml @@ -282,23 +282,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/kyrgyz.xml b/PowerEditor/installer/nativeLang/kyrgyz.xml index 7164f5b6..733bf645 100644 --- a/PowerEditor/installer/nativeLang/kyrgyz.xml +++ b/PowerEditor/installer/nativeLang/kyrgyz.xml @@ -230,22 +230,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/latvian.xml b/PowerEditor/installer/nativeLang/latvian.xml index 223a2e70..5414358c 100644 --- a/PowerEditor/installer/nativeLang/latvian.xml +++ b/PowerEditor/installer/nativeLang/latvian.xml @@ -227,22 +227,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/ligurian.xml b/PowerEditor/installer/nativeLang/ligurian.xml index 7a61cd71..f89d645b 100644 --- a/PowerEditor/installer/nativeLang/ligurian.xml +++ b/PowerEditor/installer/nativeLang/ligurian.xml @@ -240,22 +240,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/lithuanian.xml b/PowerEditor/installer/nativeLang/lithuanian.xml index 232eb7bf..595db4ae 100644 --- a/PowerEditor/installer/nativeLang/lithuanian.xml +++ b/PowerEditor/installer/nativeLang/lithuanian.xml @@ -108,13 +108,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/luxembourgish.xml b/PowerEditor/installer/nativeLang/luxembourgish.xml index 04404b23..b255b6ba 100644 --- a/PowerEditor/installer/nativeLang/luxembourgish.xml +++ b/PowerEditor/installer/nativeLang/luxembourgish.xml @@ -157,22 +157,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/macedonian.xml b/PowerEditor/installer/nativeLang/macedonian.xml index 5f0fb745..c2accd42 100644 --- a/PowerEditor/installer/nativeLang/macedonian.xml +++ b/PowerEditor/installer/nativeLang/macedonian.xml @@ -192,22 +192,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/malay.xml b/PowerEditor/installer/nativeLang/malay.xml index fad51378..49245ff9 100644 --- a/PowerEditor/installer/nativeLang/malay.xml +++ b/PowerEditor/installer/nativeLang/malay.xml @@ -161,13 +161,13 @@ Desc: Malay translation for Notepad++ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/norwegian.xml b/PowerEditor/installer/nativeLang/norwegian.xml index 3e9e3158..b630c7d4 100644 --- a/PowerEditor/installer/nativeLang/norwegian.xml +++ b/PowerEditor/installer/nativeLang/norwegian.xml @@ -187,22 +187,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/nynorsk.xml b/PowerEditor/installer/nativeLang/nynorsk.xml index 9b1a79bf..5fbda646 100644 --- a/PowerEditor/installer/nativeLang/nynorsk.xml +++ b/PowerEditor/installer/nativeLang/nynorsk.xml @@ -162,13 +162,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/occitan.xml b/PowerEditor/installer/nativeLang/occitan.xml index 5fdf9de0..81d12416 100644 --- a/PowerEditor/installer/nativeLang/occitan.xml +++ b/PowerEditor/installer/nativeLang/occitan.xml @@ -161,13 +161,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/polish.xml b/PowerEditor/installer/nativeLang/polish.xml index a09b6d8a..6099e3ff 100644 --- a/PowerEditor/installer/nativeLang/polish.xml +++ b/PowerEditor/installer/nativeLang/polish.xml @@ -272,22 +272,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/portuguese.xml b/PowerEditor/installer/nativeLang/portuguese.xml index 21bf74c2..3f1809d7 100644 --- a/PowerEditor/installer/nativeLang/portuguese.xml +++ b/PowerEditor/installer/nativeLang/portuguese.xml @@ -6,6 +6,9 @@ Andr New update by: David Cunha 05/01/2012 +New update (V 6.1.6) by: (Portuguese (Portugal) not according the orthographic agreement with Brazil +10/09/2012 +Luis Neves --> @@ -19,124 +22,126 @@ David Cunha - - - + + + - - + - - + + - - + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + + + + + - + - + - - + - - + - - - - - - + + + + + + - - + + - + - - - - - - - - + + - - + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -145,7 +150,7 @@ David Cunha - + @@ -167,183 +172,195 @@ David Cunha - + - + - + - - + + - - + + - - - - - - - + + + + + + + - - - - - + + + + + - + + + + + - - - - - - - - - - + + + + + + + + - - - + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + - + - - + + + + - - - - - - - - + + + + + + - - - - - - - - - - - - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + - - + - + @@ -351,37 +368,26 @@ David Cunha - - + + - - - - - - - - - - + + + + + + + + + + - - + - - - - - - - - - - - + @@ -390,12 +396,23 @@ David Cunha + + + + + + + + + + + - - - + + + - + @@ -406,84 +423,85 @@ David Cunha - - - - - - + + + + + + - + + - + - - + - + - - - + + - - + - + - - + + + - - - - - - - - + - - - - - - - - + - - - + + - + + + + + + + + + + + + + + + + + + @@ -492,39 +510,41 @@ David Cunha - - + + - + - - + + + + + - - - - - + + + + - - - + + + - + - + - + @@ -543,48 +563,52 @@ David Cunha + - - + + + + + - + - - - - - + + + + + + + + - - + + - - - + + + + - - - - - + - - - - - - - + + + + + + + - + - + @@ -592,48 +616,54 @@ David Cunha + + + - - - - + + + + + + - - - - - - + - - + + + + + + - - + + - - + + + + - + - + @@ -641,36 +671,36 @@ David Cunha + - - + - - - + + + - - - + + + - + diff --git a/PowerEditor/installer/nativeLang/romanian.xml b/PowerEditor/installer/nativeLang/romanian.xml index 4229c019..23d3880a 100644 --- a/PowerEditor/installer/nativeLang/romanian.xml +++ b/PowerEditor/installer/nativeLang/romanian.xml @@ -264,22 +264,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml index 6db3e88d..a32e9753 100644 --- a/PowerEditor/installer/nativeLang/russian.xml +++ b/PowerEditor/installer/nativeLang/russian.xml @@ -126,7 +126,9 @@ - + + + @@ -253,22 +255,23 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -555,7 +558,7 @@ - + @@ -564,6 +567,8 @@ + + diff --git a/PowerEditor/installer/nativeLang/samogitian.xml b/PowerEditor/installer/nativeLang/samogitian.xml index 40a41331..69b37282 100644 --- a/PowerEditor/installer/nativeLang/samogitian.xml +++ b/PowerEditor/installer/nativeLang/samogitian.xml @@ -110,13 +110,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/sardinian.xml b/PowerEditor/installer/nativeLang/sardinian.xml index 2aad5bb5..aea40e96 100644 --- a/PowerEditor/installer/nativeLang/sardinian.xml +++ b/PowerEditor/installer/nativeLang/sardinian.xml @@ -274,22 +274,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/serbian.xml b/PowerEditor/installer/nativeLang/serbian.xml index ca728364..74be1999 100644 --- a/PowerEditor/installer/nativeLang/serbian.xml +++ b/PowerEditor/installer/nativeLang/serbian.xml @@ -144,13 +144,13 @@ - - - - - - - + + + + + + + diff --git a/PowerEditor/installer/nativeLang/serbianCyrillic.xml b/PowerEditor/installer/nativeLang/serbianCyrillic.xml index b28bbccb..9537ca3e 100644 --- a/PowerEditor/installer/nativeLang/serbianCyrillic.xml +++ b/PowerEditor/installer/nativeLang/serbianCyrillic.xml @@ -250,22 +250,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/slovak.xml b/PowerEditor/installer/nativeLang/slovak.xml index 100ea9e9..97b623e8 100644 --- a/PowerEditor/installer/nativeLang/slovak.xml +++ b/PowerEditor/installer/nativeLang/slovak.xml @@ -259,22 +259,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/slovakA.xml b/PowerEditor/installer/nativeLang/slovakA.xml index 06cc8e58..eb5b8246 100644 --- a/PowerEditor/installer/nativeLang/slovakA.xml +++ b/PowerEditor/installer/nativeLang/slovakA.xml @@ -163,22 +163,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/slovenian.xml b/PowerEditor/installer/nativeLang/slovenian.xml index be38382c..c06db360 100644 --- a/PowerEditor/installer/nativeLang/slovenian.xml +++ b/PowerEditor/installer/nativeLang/slovenian.xml @@ -224,22 +224,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/spanish.xml b/PowerEditor/installer/nativeLang/spanish.xml index 515fb775..55382206 100644 --- a/PowerEditor/installer/nativeLang/spanish.xml +++ b/PowerEditor/installer/nativeLang/spanish.xml @@ -236,23 +236,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/spanish_ar.xml b/PowerEditor/installer/nativeLang/spanish_ar.xml index e4b9264a..d9e190cf 100644 --- a/PowerEditor/installer/nativeLang/spanish_ar.xml +++ b/PowerEditor/installer/nativeLang/spanish_ar.xml @@ -244,23 +244,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/swedish.xml b/PowerEditor/installer/nativeLang/swedish.xml index ed8c1c1b..9267d210 100644 --- a/PowerEditor/installer/nativeLang/swedish.xml +++ b/PowerEditor/installer/nativeLang/swedish.xml @@ -279,22 +279,22 @@ Comments: Added some missing translations. - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/tagalog.xml b/PowerEditor/installer/nativeLang/tagalog.xml index 74955c95..92573b46 100644 --- a/PowerEditor/installer/nativeLang/tagalog.xml +++ b/PowerEditor/installer/nativeLang/tagalog.xml @@ -187,22 +187,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/tamil.xml b/PowerEditor/installer/nativeLang/tamil.xml index 8c00e328..930582fc 100644 --- a/PowerEditor/installer/nativeLang/tamil.xml +++ b/PowerEditor/installer/nativeLang/tamil.xml @@ -244,23 +244,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/telugu.xml b/PowerEditor/installer/nativeLang/telugu.xml index 31c1e973..654d05b3 100644 --- a/PowerEditor/installer/nativeLang/telugu.xml +++ b/PowerEditor/installer/nativeLang/telugu.xml @@ -238,22 +238,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/thai.xml b/PowerEditor/installer/nativeLang/thai.xml index ac7816c4..89f5b219 100644 --- a/PowerEditor/installer/nativeLang/thai.xml +++ b/PowerEditor/installer/nativeLang/thai.xml @@ -247,22 +247,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/turkish.xml b/PowerEditor/installer/nativeLang/turkish.xml index 9fee0f7a..7c4ebe82 100644 --- a/PowerEditor/installer/nativeLang/turkish.xml +++ b/PowerEditor/installer/nativeLang/turkish.xml @@ -237,22 +237,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/ukrainian.xml b/PowerEditor/installer/nativeLang/ukrainian.xml index 9496b1e1..afac4f29 100644 --- a/PowerEditor/installer/nativeLang/ukrainian.xml +++ b/PowerEditor/installer/nativeLang/ukrainian.xml @@ -231,22 +231,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/uyghur.xml b/PowerEditor/installer/nativeLang/uyghur.xml index f49cb39e..caf5cc68 100644 --- a/PowerEditor/installer/nativeLang/uyghur.xml +++ b/PowerEditor/installer/nativeLang/uyghur.xml @@ -248,22 +248,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/uzbek.xml b/PowerEditor/installer/nativeLang/uzbek.xml index 52645a9d..385ad4a0 100644 --- a/PowerEditor/installer/nativeLang/uzbek.xml +++ b/PowerEditor/installer/nativeLang/uzbek.xml @@ -199,22 +199,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/uzbekCyrillic.xml b/PowerEditor/installer/nativeLang/uzbekCyrillic.xml index bea656bc..e9b4673d 100644 --- a/PowerEditor/installer/nativeLang/uzbekCyrillic.xml +++ b/PowerEditor/installer/nativeLang/uzbekCyrillic.xml @@ -199,22 +199,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index c1ddff69..403dc60a 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -5036,7 +5036,7 @@ struct Quote{ const char *_quote; }; -const int nbQuote = 84; +const int nbQuote = 85; Quote quotes[nbQuote] = { {"Notepad++", "Notepad++ is written in C++ and uses pure Win32 API and STL which ensures a higher execution speed and smaller program size.\nBy optimizing as many routines as possible without losing user friendliness, Notepad++ is trying to reduce the world carbon dioxide emissions. When using less CPU power, the PC can throttle down and reduce power consumption, resulting in a greener environment."}, {"Martin Golding", "Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live."}, @@ -5117,6 +5117,7 @@ Quote quotes[nbQuote] = { {"Anonymous #49", "There are 2 types of people in this world:\nPeople who say they pee in the swimming pool, and the dirty fucking liars."}, {"Anonymous #50", "London 2012 Olympic Games - A bunch of countries coming across the ocean to put their flags in britain and try to get a bunch of gold... it's like history but opposite."}, {"Anonymous #51", "I don't need a stable relationship,\nI just need a stable Internet connection."}, +{"Anonymous #52", "What's the difference between religion and bullshit?\nThe bull."}, {"Hustle Man", "Politicians are like sperm.\nOne in a million turn out to be an actual human being."}, {"Confucius", "It's good to meet girl in park.\nBut better to park meat in girl."}, {"Mark Twain", "Censorship is telling a man he can't have a steak just because a baby can't chew it."}, diff --git a/PowerEditor/src/localization.cpp b/PowerEditor/src/localization.cpp index afd24c43..f08ae3a3 100644 --- a/PowerEditor/src/localization.cpp +++ b/PowerEditor/src/localization.cpp @@ -366,47 +366,30 @@ void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & plugin } } +int tabContextMenuItemPos[] = { +0, // 0 : Close +1, // 1 : Close ALL BUT This +2, // 2 : Save +3, // 3 : Save As +7, // 4 : Print +16,// 5 : Move to Other View +17,// 6 : Clone to Other View +12,// 7 : Full File Path to Clipboard +13,// 8 : Filename to Clipboard +14,// 9 : Current Dir. Path to Clipboard +4, // 10: Rename +5, // 11: Delete +9, // 12: Read-Only +10,// 13: Clear Read-Only Flag +18,// 14: Move to New Instance +19,// 15: Open to New Instance +6, // 16: Reload + +-1 //-------End +}; + void NativeLangSpeaker::changeLangTabContextMenu(HMENU hCM) { - const int POS_CLOSE = 0; - const int POS_CLOSEBUT = 1; - const int POS_SAVE = 2; - const int POS_SAVEAS = 3; - const int POS_RENAME = 4; - const int POS_REMOVE = 5; - const int POS_RELOAOD = 6; - const int POS_PRINT = 7; - //------8 - const int POS_READONLY = 9; - const int POS_CLEARREADONLY = 10; - //------11 - const int POS_CLIPFULLPATH = 12; - const int POS_CLIPFILENAME = 13; - const int POS_CLIPCURRENTDIR = 14; - //------15 - const int POS_GO2VIEW = 16; - const int POS_CLONE2VIEW = 17; - const int POS_GO2NEWINST = 18; - const int POS_OPENINNEWINST = 19; - - const char *pClose = NULL; - const char *pCloseBut = NULL; - const char *pSave = NULL; - const char *pSaveAs = NULL; - const char *pPrint = NULL; - const char *pReadOnly = NULL; - const char *pClearReadOnly = NULL; - const char *pGoToView = NULL; - const char *pCloneToView = NULL; - const char *pGoToNewInst = NULL; - const char *pOpenInNewInst = NULL; - const char *pCilpFullPath = NULL; - const char *pCilpFileName = NULL; - const char *pCilpCurrentDir = NULL; - const char *pRename = NULL; - const char *pRemove = NULL; - const char *pReload = NULL; - if (_nativeLangA) { TiXmlNodeA *tabBarMenu = _nativeLangA->FirstChild("Menu"); @@ -415,247 +398,31 @@ void NativeLangSpeaker::changeLangTabContextMenu(HMENU hCM) tabBarMenu = tabBarMenu->FirstChild("TabBar"); if (tabBarMenu) { + WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); + int nbCMItems = sizeof(tabContextMenuItemPos)/sizeof(int); + for (TiXmlNodeA *childNode = tabBarMenu->FirstChildElement("Item"); childNode ; childNode = childNode->NextSibling("Item") ) { TiXmlElementA *element = childNode->ToElement(); - int ordre; - element->Attribute("order", &ordre); - switch (ordre) + int index; + const char *indexStr = element->Attribute("CMID", &index); + if (!indexStr || (index < 0 || index >= nbCMItems-1)) + continue; + + int pos = tabContextMenuItemPos[index]; + const char *pName = element->Attribute("name"); + if (pName) { - case 0 : - pClose = element->Attribute("name"); break; - case 1 : - pCloseBut = element->Attribute("name"); break; - case 2 : - pSave = element->Attribute("name"); break; - case 3 : - pSaveAs = element->Attribute("name"); break; - case 4 : - pPrint = element->Attribute("name"); break; - case 5 : - pGoToView = element->Attribute("name"); break; - case 6 : - pCloneToView = element->Attribute("name"); break; - case 7 : - pCilpFullPath = element->Attribute("name"); break; - case 8 : - pCilpFileName = element->Attribute("name"); break; - case 9 : - pCilpCurrentDir = element->Attribute("name"); break; - case 10 : - pRename = element->Attribute("name"); break; - case 11 : - pRemove = element->Attribute("name"); break; - case 12 : - pReadOnly = element->Attribute("name"); break; - case 13 : - pClearReadOnly = element->Attribute("name"); break; - case 14 : - pGoToNewInst = element->Attribute("name"); break; - case 15 : - pOpenInNewInst = element->Attribute("name"); break; - case 16 : - pReload = element->Attribute("name"); break; + const wchar_t *pNameW = wmc->char2wchar(pName, _nativeLangEncoding); + int cmdID = ::GetMenuItemID(hCM, pos); + ::ModifyMenu(hCM, pos, MF_BYPOSITION, cmdID, pNameW); } } - } + } } } - //HMENU hCM = _tabPopupMenu.getMenuHandle(); - -#ifdef UNICODE - WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); - if (pGoToView && pGoToView[0]) - { - const wchar_t *goToViewG = wmc->char2wchar(pGoToView, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_GO2VIEW); - ::ModifyMenu(hCM, POS_GO2VIEW, MF_BYPOSITION, cmdID, goToViewG); - } - if (pCloneToView && pCloneToView[0]) - { - const wchar_t *cloneToViewG = wmc->char2wchar(pCloneToView, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_CLONE2VIEW); - ::ModifyMenu(hCM, POS_CLONE2VIEW, MF_BYPOSITION, cmdID, cloneToViewG); - } - if (pGoToNewInst && pGoToNewInst[0]) - { - const wchar_t *goToNewInstG = wmc->char2wchar(pGoToNewInst, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_GO2NEWINST); - ::ModifyMenu(hCM, POS_GO2NEWINST, MF_BYPOSITION, cmdID, goToNewInstG); - } - if (pOpenInNewInst && pOpenInNewInst[0]) - { - const wchar_t *openInNewInstG = wmc->char2wchar(pOpenInNewInst, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_OPENINNEWINST); - ::ModifyMenu(hCM, POS_OPENINNEWINST, MF_BYPOSITION, cmdID, openInNewInstG); - } - if (pClose && pClose[0]) - { - const wchar_t *closeG = wmc->char2wchar(pClose, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_CLOSE); - ::ModifyMenu(hCM, POS_CLOSE, MF_BYPOSITION, cmdID, closeG); - } - if (pCloseBut && pCloseBut[0]) - { - const wchar_t *closeButG = wmc->char2wchar(pCloseBut, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_CLOSEBUT); - ::ModifyMenu(hCM, POS_CLOSEBUT, MF_BYPOSITION, cmdID, closeButG); - } - if (pSave && pSave[0]) - { - const wchar_t *saveG = wmc->char2wchar(pSave, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_SAVE); - ::ModifyMenu(hCM, POS_SAVE, MF_BYPOSITION, cmdID, saveG); - } - if (pSaveAs && pSaveAs[0]) - { - const wchar_t *saveAsG = wmc->char2wchar(pSaveAs, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_SAVEAS); - ::ModifyMenu(hCM, POS_SAVEAS, MF_BYPOSITION, cmdID, saveAsG); - } - if (pPrint && pPrint[0]) - { - const wchar_t *printG = wmc->char2wchar(pPrint, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_PRINT); - ::ModifyMenu(hCM, POS_PRINT, MF_BYPOSITION, cmdID, printG); - } - if (pReadOnly && pReadOnly[0]) - { - const wchar_t *readOnlyG = wmc->char2wchar(pReadOnly, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_READONLY); - ::ModifyMenu(hCM, POS_READONLY, MF_BYPOSITION, cmdID, readOnlyG); - } - if (pClearReadOnly && pClearReadOnly[0]) - { - const wchar_t *clearReadOnlyG = wmc->char2wchar(pClearReadOnly, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_CLEARREADONLY); - ::ModifyMenu(hCM, POS_CLEARREADONLY, MF_BYPOSITION, cmdID, clearReadOnlyG); - } - if (pCilpFullPath && pCilpFullPath[0]) - { - const wchar_t *cilpFullPathG = wmc->char2wchar(pCilpFullPath, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_CLIPFULLPATH); - ::ModifyMenu(hCM, POS_CLIPFULLPATH, MF_BYPOSITION, cmdID, cilpFullPathG); - } - if (pCilpFileName && pCilpFileName[0]) - { - const wchar_t *cilpFileNameG = wmc->char2wchar(pCilpFileName, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_CLIPFILENAME); - ::ModifyMenu(hCM, POS_CLIPFILENAME, MF_BYPOSITION, cmdID, cilpFileNameG); - } - if (pCilpCurrentDir && pCilpCurrentDir[0]) - { - const wchar_t * cilpCurrentDirG= wmc->char2wchar(pCilpCurrentDir, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_CLIPCURRENTDIR); - ::ModifyMenu(hCM, POS_CLIPCURRENTDIR, MF_BYPOSITION, cmdID, cilpCurrentDirG); - } - if (pRename && pRename[0]) - { - const wchar_t *renameG = wmc->char2wchar(pRename, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_RENAME); - ::ModifyMenu(hCM, POS_RENAME, MF_BYPOSITION, cmdID, renameG); - } - if (pRemove && pRemove[0]) - { - const wchar_t *removeG = wmc->char2wchar(pRemove, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_REMOVE); - ::ModifyMenu(hCM, POS_REMOVE, MF_BYPOSITION, cmdID, removeG); - } - if (pReload && pReload[0]) - { - const wchar_t *reloadG = wmc->char2wchar(pReload, _nativeLangEncoding); - int cmdID = ::GetMenuItemID(hCM, POS_RELOAOD); - ::ModifyMenu(hCM, POS_REMOVE, MF_BYPOSITION, cmdID, reloadG); - } -#else - if (pGoToView && pGoToView[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_GO2VIEW); - ::ModifyMenu(hCM, POS_GO2VIEW, MF_BYPOSITION, cmdID, pGoToView); - } - if (pCloneToView && pCloneToView[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_CLONE2VIEW); - ::ModifyMenu(hCM, POS_CLONE2VIEW, MF_BYPOSITION, cmdID, pCloneToView); - } - if (pGoToNewInst && pGoToNewInst[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_GO2NEWINST); - ::ModifyMenu(hCM, POS_GO2NEWINST, MF_BYPOSITION, cmdID, pGoToNewInst); - } - if (pOpenInNewInst && pOpenInNewInst[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_OPENINNEWINST); - ::ModifyMenu(hCM, POS_OPENINNEWINST, MF_BYPOSITION, cmdID, pOpenInNewInst); - } - if (pClose && pClose[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_CLOSE); - ::ModifyMenu(hCM, POS_CLOSE, MF_BYPOSITION, cmdID, pClose); - } - if (pCloseBut && pCloseBut[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_CLOSEBUT); - ::ModifyMenu(hCM, POS_CLOSEBUT, MF_BYPOSITION, cmdID, pCloseBut); - } - if (pSave && pSave[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_SAVE); - ::ModifyMenu(hCM, POS_SAVE, MF_BYPOSITION, cmdID, pSave); - } - if (pSaveAs && pSaveAs[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_SAVEAS); - ::ModifyMenu(hCM, POS_SAVEAS, MF_BYPOSITION, cmdID, pSaveAs); - } - if (pPrint && pPrint[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_PRINT); - ::ModifyMenu(hCM, POS_PRINT, MF_BYPOSITION, cmdID, pPrint); - } - if (pClearReadOnly && pClearReadOnly[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_CLEARREADONLY); - ::ModifyMenu(hCM, POS_CLEARREADONLY, MF_BYPOSITION, cmdID, pClearReadOnly); - } - if (pReadOnly && pReadOnly[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_READONLY); - ::ModifyMenu(hCM, POS_READONLY, MF_BYPOSITION, cmdID, pReadOnly); - } - if (pCilpFullPath && pCilpFullPath[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_CLIPFULLPATH); - ::ModifyMenu(hCM, POS_CLIPFULLPATH, MF_BYPOSITION, cmdID, pCilpFullPath); - } - if (pCilpFileName && pCilpFileName[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_CLIPFILENAME); - ::ModifyMenu(hCM, POS_CLIPFILENAME, MF_BYPOSITION, cmdID, pCilpFileName); - } - if (pCilpCurrentDir && pCilpCurrentDir[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_CLIPCURRENTDIR); - ::ModifyMenu(hCM, POS_CLIPCURRENTDIR, MF_BYPOSITION, cmdID, pCilpCurrentDir); - } - if (pRename && pRename[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_RENAME); - ::ModifyMenu(hCM, POS_RENAME, MF_BYPOSITION, cmdID, pRename); - } - if (pRemove && pRemove[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_REMOVE); - ::ModifyMenu(hCM, POS_REMOVE, MF_BYPOSITION, cmdID, pRemove); - } - if (pReload && pReload[0]) - { - int cmdID = ::GetMenuItemID(hCM, POS_RELOAD); - ::ModifyMenu(hCM, POS_REMOVE, MF_BYPOSITION, cmdID, pReload); - } -#endif } void NativeLangSpeaker::changeLangTabDrapContextMenu(HMENU hCM) @@ -678,7 +445,7 @@ void NativeLangSpeaker::changeLangTabDrapContextMenu(HMENU hCM) { TiXmlElementA *element = childNode->ToElement(); int ordre; - element->Attribute("order", &ordre); + element->Attribute("CMID", &ordre); if (ordre == 5) goToViewA = element->Attribute("name"); else if (ordre == 6)