commit 5677a6f51d2d9786ac92b8938f4e7939b9796df7 Author: Tomás Touceda <chiiph@torproject.org> Date: Sat Feb 11 12:49:47 2012 -0300 Only enable translations that are 100% done --- CHANGELOG | 1 + src/vidalia/LanguageSupport.cpp | 55 ++++++++++++++++------------- src/vidalia/i18n/CMakeLists.txt | 70 ++++++++++++++++++++++--------------- src/vidalia/i18n/vidalia_i18n.qrc | 12 ++++++ 4 files changed, 86 insertions(+), 52 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0056019..1e17c67 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,6 +40,7 @@ (9050). Fixes bug 4598. o Sets __ReloadTorrcOnSIGHUP to 0 if SAVECONF failed, which means the user can't write the torrc file. Fixes bug 4833. + o Enable new translations that are 100% done. Resolves ticket 5051. 0.2.15 07-Oct-2011 o Draw the bandwidth graph curves based on the local maximum, not diff --git a/src/vidalia/LanguageSupport.cpp b/src/vidalia/LanguageSupport.cpp index 40f8400..710775a 100644 --- a/src/vidalia/LanguageSupport.cpp +++ b/src/vidalia/LanguageSupport.cpp @@ -29,49 +29,56 @@ LanguageSupport::languages() languages.insert("ar", QString::fromUtf8("\330\247\331\204\330\271\330\261\330" "\250\331\212\330\251")); - languages.insert("bg", - QString::fromUtf8("\320\221\321\212\320\273\320\263\320" + languages.insert("bg", + QString::fromUtf8("\320\221\321\212\320\273\320\263\320" "\260\321\200\321\201\320\272\320\270")); - languages.insert("my", "Burmese"); + // languages.insert("my", "Burmese"); languages.insert("cs", QString::fromUtf8("\304\215e\305\241tina")); + // languages.insert("ca", "Catalan"); languages.insert("da", "dansk"); languages.insert("de", "Deutsch"); languages.insert("es", QString::fromUtf8("espa\303\261ol")); + languages.insert("el", "Greek"); + // languages.insert("eo", "Esperanto"); languages.insert("fa", QString::fromUtf8("\331\201\330\247\330\261\330\263\333\214")); - languages.insert("fi", "suomi"); + // languages.insert("fi", "suomi"); languages.insert("fr", QString::fromUtf8("fran\303\247ais")); - languages.insert("he", - QString::fromUtf8("\327\242\327\221\327\250\327\231\327\252")); + // languages.insert("he", + // QString::fromUtf8("\327\242\327\221\327\250\327\231\327\252")); languages.insert("hu", "magyar nyelv"); languages.insert("it", "Italiano"); - languages.insert("ja", - QString::fromUtf8("\346\227\245\346\234\254\350\252\236")); - languages.insert("nb", - QString::fromUtf8("Bokm\303\245l")); + // languages.insert("id", "Indonesian"); + // languages.insert("ja", + // QString::fromUtf8("\346\227\245\346\234\254\350\252\236")); + languages.insert("ko", "Korean"); + // languages.insert("nb", + // QString::fromUtf8("Bokm\303\245l")); languages.insert("nl", "Nederlands"); - languages.insert("pl", "Polski"); + // languages.insert("pl", "Polski"); languages.insert("pt", QString::fromUtf8("Portugu\303\252s")); - languages.insert("pt", + languages.insert("pt_BR", QString::fromUtf8("Portugu\303\252s brasileiro")); - languages.insert("ro", - QString::fromUtf8("rom\303\242n\304\203")); + // languages.insert("ro", + // QString::fromUtf8("rom\303\242n\304\203")); languages.insert("ru", QString::fromUtf8("\320\240\321\203\321\201\321\201\320\272\320\270\320\271")); -// languages.insert("sq", "Shqip"); - languages.insert("sv", "svenska"); - languages.insert("th", "Thai"); - languages.insert("tr", QString::fromUtf8("T\303\274rk\303\247e")); - languages.insert("vi", - QString::fromUtf8("ti\341\272\277ng Vi\341\273\207t")); - languages.insert("zh_CN", - QString::fromUtf8("\347\256\200\344\275\223\345\255\227")); - languages.insert("zh_TW", - QString::fromUtf8("\347\260\241\351\253\224\345\255\227")); + // languages.insert("sq", "Shqip"); + // languages.insert("sv", "svenska"); + // languages.insert("sk", "Slovak"); + // languages.insert("sr", "Servian"); + // languages.insert("th", "Thai"); + // languages.insert("tr", QString::fromUtf8("T\303\274rk\303\247e")); + // languages.insert("vi", + // QString::fromUtf8("ti\341\272\277ng Vi\341\273\207t")); + // languages.insert("zh_CN", + // QString::fromUtf8("\347\256\200\344\275\223\345\255\227")); + // languages.insert("zh_TW", + // QString::fromUtf8("\347\260\241\351\253\224\345\255\227")); } return languages; } diff --git a/src/vidalia/i18n/CMakeLists.txt b/src/vidalia/i18n/CMakeLists.txt index 7ec3bda..5313460 100644 --- a/src/vidalia/i18n/CMakeLists.txt +++ b/src/vidalia/i18n/CMakeLists.txt @@ -15,32 +15,40 @@ set(vidalia_PO po/ar/vidalia_ar.po po/bg/vidalia_bg.po - po/my/vidalia_my.po + #po/my/vidalia_my.po + #po/ca/vidalia_ca.po po/cs/vidalia_cs.po po/da/vidalia_da.po po/de/vidalia_de.po + po/el/vidalia_el.po + #po/eo/vidalia_eo.po po/es/vidalia_es.po + #po/eu/vidalia_eu.po po/fa/vidalia_fa.po - po/fi/vidalia_fi.po + #po/fi/vidalia_fi.po po/fr/vidalia_fr.po - po/he/vidalia_he.po + #po/he/vidalia_he.po po/hu/vidalia_hu.po + #po/id/vidalia_id.po po/it/vidalia_it.po - po/ja/vidalia_ja.po - po/nb/vidalia_nb.po + #po/ja/vidalia_ja.po + po/ko/vidalia_ko.po + #po/nb/vidalia_nb.po po/nl/vidalia_nl.po - po/pl/vidalia_pl.po + #po/pl/vidalia_pl.po po/pt/vidalia_pt.po po/pt_BR/vidalia_pt_BR.po - po/ro/vidalia_ro.po + #po/ro/vidalia_ro.po po/ru/vidalia_ru.po - po/sq/vidalia_sq.po - po/sv/vidalia_sv.po - po/th/vidalia_th.po - po/tr/vidalia_tr.po - po/vi/vidalia_vi.po - po/zh_CN/vidalia_zh_CN.po - po/zh_TW/vidalia_zh_TW.po + #po/sk/vidalia_sk.po + #po/sr/vidalia_sr.po + #po/sq/vidalia_sq.po + #po/sv/vidalia_sv.po + #po/th/vidalia_th.po + #po/tr/vidalia_tr.po + #po/vi/vidalia_vi.po + #po/zh_CN/vidalia_zh_CN.po + #po/zh_TW/vidalia_zh_TW.po ) vidalia_add_po(vidalia_QMS ${vidalia_PO}) @@ -48,32 +56,38 @@ vidalia_add_po(vidalia_QMS ${vidalia_PO}) set(qt_PO po/ar/qt_ar.po po/bg/qt_bg.po - po/my/qt_my.po + #po/my/qt_my.po + #po/ca/qt_ca.po po/cs/qt_cs.po po/da/qt_da.po po/de/qt_de.po + po/el/qt_el.po po/es/qt_es.po po/fa/qt_fa.po - po/fi/qt_fi.po + #po/fi/qt_fi.po po/fr/qt_fr.po - po/he/qt_he.po + #po/he/qt_he.po po/hu/qt_hu.po + #po/id/qt_id.po po/it/qt_it.po - po/ja/qt_ja.po - po/nb/qt_nb.po + #po/ja/qt_ja.po + po/ko/qt_ko.po + #po/nb/qt_nb.po po/nl/qt_nl.po - po/pl/qt_pl.po + #po/pl/qt_pl.po po/pt/qt_pt.po po/pt_BR/qt_pt_BR.po - po/ro/qt_ro.po + #po/ro/qt_ro.po po/ru/qt_ru.po - po/sq/qt_sq.po - po/sv/qt_sv.po - po/th/qt_th.po - po/tr/qt_tr.po - po/vi/qt_vi.po - po/zh_CN/qt_zh_CN.po - po/zh_TW/qt_zh_TW.po + #po/sr/qt_sr.po + #po/sk/qt_sk.po + #po/sq/qt_sq.po + #po/sv/qt_sv.po + #po/th/qt_th.po + #po/tr/qt_tr.po + #po/vi/qt_vi.po + #po/zh_CN/qt_zh_CN.po + #po/zh_TW/qt_zh_TW.po ) vidalia_add_po(qt_QMS ${qt_PO}) diff --git a/src/vidalia/i18n/vidalia_i18n.qrc b/src/vidalia/i18n/vidalia_i18n.qrc index 1105cf7..e4a91de 100644 --- a/src/vidalia/i18n/vidalia_i18n.qrc +++ b/src/vidalia/i18n/vidalia_i18n.qrc @@ -4,16 +4,20 @@ <file>vidalia_bg.qm</file> <file>vidalia_my.qm</file> <file>vidalia_cs.qm</file> + <file>vidalia_ca.qm</file> <file>vidalia_da.qm</file> <file>vidalia_de.qm</file> <file>vidalia_es.qm</file> + <file>vidalia_el.qm</file> <file>vidalia_fa.qm</file> <file>vidalia_fi.qm</file> <file>vidalia_fr.qm</file> <file>vidalia_he.qm</file> <file>vidalia_hu.qm</file> + <file>vidalia_id.qm</file> <file>vidalia_it.qm</file> <file>vidalia_ja.qm</file> + <file>vidalia_ko.qm</file> <file>vidalia_nb.qm</file> <file>vidalia_nl.qm</file> <file>vidalia_pl.qm</file> @@ -22,6 +26,8 @@ <file>vidalia_ro.qm</file> <file>vidalia_ru.qm</file> <file>vidalia_sq.qm</file> + <file>vidalia_sk.qm</file> + <file>vidalia_sr.qm</file> <file>vidalia_sv.qm</file> <file>vidalia_th.qm</file> <file>vidalia_tr.qm</file> @@ -33,17 +39,21 @@ <file>qt_ar.qm</file> <file>qt_bg.qm</file> <file>qt_my.qm</file> + <file>qt_ca.qm</file> <file>qt_cs.qm</file> <file>qt_da.qm</file> <file>qt_de.qm</file> + <file>qt_el.qm</file> <file>qt_es.qm</file> <file>qt_fa.qm</file> <file>qt_fi.qm</file> <file>qt_fr.qm</file> <file>qt_he.qm</file> <file>qt_hu.qm</file> + <file>qt_id.qm</file> <file>qt_it.qm</file> <file>qt_ja.qm</file> + <file>qt_ko.qm</file> <file>qt_nb.qm</file> <file>qt_nl.qm</file> <file>qt_pl.qm</file> @@ -52,6 +62,8 @@ <file>qt_ro.qm</file> <file>qt_ru.qm</file> <file>qt_sq.qm</file> + <file>qt_sk.qm</file> + <file>qt_sr.qm</file> <file>qt_sv.qm</file> <file>qt_th.qm</file> <file>qt_tr.qm</file>