From 40053f86ff0830b3ac08df2639575c14c04f8adb Mon Sep 17 00:00:00 2001 From: "Eike Rathke [er]" Date: Thu, 24 Feb 2011 13:45:51 +0100 Subject: calc66: fixed out of bounds access in offset# Sequence of equals() --- i18npool/source/transliteration/transliterationImpl.cxx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'i18npool') diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 2109c310b233..7506ec5c15aa 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -43,6 +43,8 @@ #include #include +#include + #if OSL_DEBUG_LEVEL > 1 #include #endif @@ -474,24 +476,25 @@ TransliterationImpl::equals( OUString tmpStr1 = folding(str1, pos1, nCount1, offset1); OUString tmpStr2 = folding(str2, pos2, nCount2, offset2); + // Length of offset1 and offset2 may still be 0 if there was no folding + // necessary! const sal_Unicode *p1 = tmpStr1.getStr(); const sal_Unicode *p2 = tmpStr2.getStr(); - sal_Int32 i, nLen = (tmpStr1.getLength() < tmpStr1.getLength() ? - tmpStr1.getLength() : tmpStr2.getLength()); + sal_Int32 i, nLen = ::std::min( tmpStr1.getLength(), tmpStr2.getLength()); for (i = 0; i < nLen; ++i, ++p1, ++p2 ) { if (*p1 != *p2) { // return number of matched code points so far - nMatch1 = offset1[i]; - nMatch2 = offset2[i]; + nMatch1 = (i < offset1.getLength()) ? offset1[i] : i; + nMatch2 = (i < offset2.getLength()) ? offset2[i] : i; return sal_False; } } // i==nLen if ( tmpStr1.getLength() != tmpStr2.getLength() ) { // return number of matched code points so far - nMatch1 = offset1[i-1] + 1; - nMatch2 = offset2[i-1] + 1; + nMatch1 = (i <= offset1.getLength()) ? offset1[i-1] + 1 : i; + nMatch2 = (i <= offset2.getLength()) ? offset2[i-1] + 1 : i; return sal_False; } else { nMatch1 = nCount1; -- cgit v1.2.3 From 2d33246c1d6d3ad1991de927f397af837ac80d49 Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Thu, 7 Apr 2011 13:33:50 +0200 Subject: i#20348: made the ordinal suffixe autocorrection internationalized --- i18npool/inc/ordinalsuffix.hxx | 2 +- i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 85 +++++++++++++++---------- 2 files changed, 51 insertions(+), 36 deletions(-) (limited to 'i18npool') diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx index ef3328b0971d..6116047b0efd 100644 --- a/i18npool/inc/ordinalsuffix.hxx +++ b/i18npool/inc/ordinalsuffix.hxx @@ -45,7 +45,7 @@ class OrdinalSuffix : public cppu::WeakImplHelper2 virtual ~OrdinalSuffix(); // XOrdinalSuffix - virtual rtl::OUString SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale &rLocale) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale &rLocale ) throw(com::sun::star::uno::RuntimeException); // XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index f541553a9efa..3e8158cd8209 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -32,10 +32,14 @@ #include #include "ordinalsuffix.hxx" +#include +#include + +#define CSTR( ouStr ) rtl::OUStringToOString( ouStr, RTL_TEXTENCODING_UTF8 ).getStr( ) using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; +using namespace ::com::sun::star; using namespace ::rtl; namespace com { namespace sun { namespace star { namespace i18n { @@ -52,50 +56,61 @@ OrdinalSuffix::~OrdinalSuffix() } -static OUString getOrdinalSuffixEn( sal_Int32 nNumber ) +/* + * For this method to properly return the ordinal suffix for other locales + * than english ones, ICU 4.2+ has to be used. + */ +uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nNumber, + const lang::Locale &aLocale ) throw( RuntimeException ) { - OUString retValue; - - switch( labs( nNumber ) % 100 ) + uno::Sequence< OUString > retValue; + + // Get the value from ICU + UErrorCode nCode = U_ZERO_ERROR; + const icu::Locale rIcuLocale( + CSTR( aLocale.Language ), + CSTR( aLocale.Country ), + CSTR( aLocale.Variant ) ); + icu::RuleBasedNumberFormat formatter( + icu::URBNF_ORDINAL, rIcuLocale, nCode ); + + if ( U_SUCCESS( nCode ) ) { - case 11: case 12: case 13: - retValue = OUString(RTL_CONSTASCII_USTRINGPARAM("th")); - break; - default: - switch( nNumber % 10 ) + int32_t nRuleSets = formatter.getNumberOfRuleSetNames( ); + for ( int32_t i = 0; i < nRuleSets; i++ ) + { + icu::UnicodeString ruleSet = formatter.getRuleSetName( i ); + // format the string + icu::UnicodeString icuRet; + icu::FieldPosition icuPos; + formatter.format( (int32_t)nNumber, ruleSet, icuRet, icuPos, nCode ); + + if ( U_SUCCESS( nCode ) ) { - case 1: - retValue = OUString(RTL_CONSTASCII_USTRINGPARAM("st")); - break; - case 2: - retValue = OUString(RTL_CONSTASCII_USTRINGPARAM("nd")); - break; - case 3: - retValue = OUString(RTL_CONSTASCII_USTRINGPARAM("rd")); - break; - default: - retValue = OUString(RTL_CONSTASCII_USTRINGPARAM("th")); - break; + // Apply NFKC normalization to get normal letters + icu::UnicodeString normalized; + nCode = U_ZERO_ERROR; + icu::Normalizer::normalize( icuRet, UNORM_NFKC, 0, normalized, nCode ); + if ( U_SUCCESS( nCode ) && ( normalized != icuRet ) ) + { + // Convert the normalized UnicodeString to OUString + OUString sValue( reinterpret_cast( normalized.getBuffer( ) ), normalized.length() ); + + // Remove the number to get the prefix + sal_Int32 len = OUString::valueOf( nNumber ).getLength( ); + + sal_Int32 newLength = retValue.getLength() + 1; + retValue.realloc( newLength ); + retValue[ newLength - 1 ] = sValue.copy( len ); + } } - break; + } } return retValue; } -OUString SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nNumber, - const Locale &aLocale ) throw( RuntimeException ) -{ - OUString retValue; - - if (aLocale.Language.equalsAsciiL("en",2)) - retValue = getOrdinalSuffixEn( nNumber ); - - return retValue; -} - - const sal_Char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix"; OUString SAL_CALL OrdinalSuffix::getImplementationName(void) throw( RuntimeException ) -- cgit v1.2.3 From a7b8e4d7ba31de7f8b3a8e4020b802094bc5cec8 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Fri, 8 Apr 2011 13:13:09 +0200 Subject: add 8 languages spoken in Republic of Congo fdo#33779 --- i18npool/inc/i18npool/lang.h | 8 ++++++++ i18npool/source/isolang/isolang.cxx | 8 ++++++++ svtools/source/misc/langtab.src | 8 ++++++++ 3 files changed, 24 insertions(+) (limited to 'i18npool') diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index a29e78b547ec..f2947374123f 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -522,6 +522,14 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_LOJBAN 0x0658 /* no locale */ #define LANGUAGE_USER_KABYLE 0x0659 #define LANGUAGE_USER_HAITIAN 0x065A +#define LANGUAGE_USER_BEEMBE 0x065B +#define LANGUAGE_USER_BEKWEL 0x065C +#define LANGUAGE_USER_KITUBA 0x065D +#define LANGUAGE_USER_LARI 0x065E +#define LANGUAGE_USER_MBOCHI 0x065F +#define LANGUAGE_USER_TEKE_IBALI 0x0660 +#define LANGUAGE_USER_TEKE_TYEE 0x0661 +#define LANGUAGE_USER_VILI 0x0662 #endif /* INCLUDED_I18NPOOL_LANG_H */ diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx index fdb01a6d15f1..89ea341468a3 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18npool/source/isolang/isolang.cxx @@ -469,6 +469,14 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_KABYLE, "kab", "DZ" }, { LANGUAGE_USER_HAITIAN, "ht", "HT" }, { LANGUAGE_FRENCH_HAITI, "fr", "HT" }, + { LANGUAGE_USER_BEEMBE, "beq", "CG" }, + { LANGUAGE_USER_BEKWEL, "bkw", "CG" }, + { LANGUAGE_USER_KITUBA, "mkw", "CG" }, + { LANGUAGE_USER_LARI, "ldi", "CG" }, + { LANGUAGE_USER_MBOCHI, "mdw", "CG" }, + { LANGUAGE_USER_TEKE_IBALI, "tek", "CG" }, + { LANGUAGE_USER_TEKE_TYEE, "tyx", "CG" }, + { LANGUAGE_USER_VILI, "vif", "CG" }, { LANGUAGE_NONE, "zxx", "" }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information { LANGUAGE_DONTKNOW, "", "" } // marks end of table }; diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index 67d650b61c8e..5178d6b8f31f 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -330,6 +330,14 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Lojban" ; LANGUAGE_USER_LOJBAN ; > ; < "Kabyle" ; LANGUAGE_USER_KABYLE ; > ; < "Haitian" ; LANGUAGE_USER_HAITIAN ; > ; + < "Beembe" ; LANGUAGE_USER_BEEMBE ; > ; + < "Bekwel" ; LANGUAGE_USER_BEKWEL ; > ; + < "Kituba" ; LANGUAGE_USER_KITUBA ; > ; + < "Lari" ; LANGUAGE_USER_LARI ; > ; + < "Mbochi" ; LANGUAGE_USER_MBOCHI ; > ; + < "Teke-Ibali" ; LANGUAGE_USER_TEKE_IBALI ; > ; + < "Teke-Tyee" ; LANGUAGE_USER_TEKE_TYEE ; > ; + < "Vili" ; LANGUAGE_USER_VILI ; > ; }; }; -- cgit v1.2.3 From 5d833d37851597c1fb9076710d9eb03e4c94ca07 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Fri, 8 Apr 2011 16:09:14 +0200 Subject: add pt_AO locale data (edited version of Mandrake's patch) --- i18npool/inc/i18npool/lang.h | 2 +- i18npool/source/isolang/isolang.cxx | 1 + .../source/localedata/data/localedata_others.map | 18 +- i18npool/source/localedata/data/makefile.mk | 1 + i18npool/source/localedata/data/pt_AO.xml | 373 +++++++++++++++++++++ i18npool/source/localedata/localedata.cxx | 3 +- svtools/source/misc/langtab.src | 1 + 7 files changed, 396 insertions(+), 3 deletions(-) create mode 100644 i18npool/source/localedata/data/pt_AO.xml (limited to 'i18npool') diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h index f2947374123f..020cb72b3334 100644 --- a/i18npool/inc/i18npool/lang.h +++ b/i18npool/inc/i18npool/lang.h @@ -530,7 +530,7 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_TEKE_IBALI 0x0660 #define LANGUAGE_USER_TEKE_TYEE 0x0661 #define LANGUAGE_USER_VILI 0x0662 - +#define LANGUAGE_USER_PORTUGUESE_ANGOLA 0x8016 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_PORTUGUESE)) */ #endif /* INCLUDED_I18NPOOL_LANG_H */ diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx index 89ea341468a3..f324277b482f 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18npool/source/isolang/isolang.cxx @@ -477,6 +477,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_TEKE_IBALI, "tek", "CG" }, { LANGUAGE_USER_TEKE_TYEE, "tyx", "CG" }, { LANGUAGE_USER_VILI, "vif", "CG" }, + { LANGUAGE_USER_PORTUGUESE_ANGOLA, "pt", "AO" }, { LANGUAGE_NONE, "zxx", "" }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information { LANGUAGE_DONTKNOW, "", "" } // marks end of table }; diff --git a/i18npool/source/localedata/data/localedata_others.map b/i18npool/source/localedata/data/localedata_others.map index 5e9d81eaf31c..eab893b7e67f 100644 --- a/i18npool/source/localedata/data/localedata_others.map +++ b/i18npool/source/localedata/data/localedata_others.map @@ -57,6 +57,7 @@ getAllCalendars_om_ET; getAllCalendars_or_IN; getAllCalendars_pa_IN; getAllCalendars_plt_MG; +getAllCalendars_pt_AO; getAllCalendars_rw_RW; getAllCalendars_sg_CF; getAllCalendars_shs_CA; @@ -142,6 +143,7 @@ getAllCurrencies_om_ET; getAllCurrencies_or_IN; getAllCurrencies_pa_IN; getAllCurrencies_plt_MG; +getAllCurrencies_pt_AO; getAllCurrencies_rw_RW; getAllCurrencies_sg_CF; getAllCurrencies_shs_CA; @@ -227,6 +229,7 @@ getAllFormats0_om_ET; getAllFormats0_or_IN; getAllFormats0_pa_IN; getAllFormats0_plt_MG; +getAllFormats0_pt_AO; getAllFormats0_rw_RW; getAllFormats0_sg_CF; getAllFormats0_shs_CA; @@ -312,6 +315,7 @@ getBreakIteratorRules_om_ET; getBreakIteratorRules_or_IN; getBreakIteratorRules_pa_IN; getBreakIteratorRules_plt_MG; +getBreakIteratorRules_pt_AO; getBreakIteratorRules_rw_RW; getBreakIteratorRules_sg_CF; getBreakIteratorRules_shs_CA; @@ -397,6 +401,7 @@ getCollationOptions_om_ET; getCollationOptions_or_IN; getCollationOptions_pa_IN; getCollationOptions_plt_MG; +getCollationOptions_pt_AO; getCollationOptions_rw_RW; getCollationOptions_sg_CF; getCollationOptions_shs_CA; @@ -482,6 +487,7 @@ getCollatorImplementation_om_ET; getCollatorImplementation_or_IN; getCollatorImplementation_pa_IN; getCollatorImplementation_plt_MG; +getCollatorImplementation_pt_AO; getCollatorImplementation_rw_RW; getCollatorImplementation_sg_CF; getCollatorImplementation_shs_CA; @@ -567,6 +573,7 @@ getContinuousNumberingLevels_om_ET; getContinuousNumberingLevels_or_IN; getContinuousNumberingLevels_pa_IN; getContinuousNumberingLevels_plt_MG; +getContinuousNumberingLevels_pt_AO; getContinuousNumberingLevels_rw_RW; getContinuousNumberingLevels_sg_CF; getContinuousNumberingLevels_shs_CA; @@ -652,6 +659,7 @@ getFollowPageWords_om_ET; getFollowPageWords_or_IN; getFollowPageWords_pa_IN; getFollowPageWords_plt_MG; +getFollowPageWords_pt_AO; getFollowPageWords_rw_RW; getFollowPageWords_sg_CF; getFollowPageWords_shs_CA; @@ -736,7 +744,7 @@ getForbiddenCharacters_nso_ZA; getForbiddenCharacters_om_ET; getForbiddenCharacters_or_IN; getForbiddenCharacters_pa_IN; -getForbiddenCharacters_plt_MG; +getForbiddenCharacters_plt_MG;getForbiddenCharacters_pt_AO; getForbiddenCharacters_rw_RW; getForbiddenCharacters_sg_CF; getForbiddenCharacters_shs_CA; @@ -822,6 +830,7 @@ getIndexAlgorithm_om_ET; getIndexAlgorithm_or_IN; getIndexAlgorithm_pa_IN; getIndexAlgorithm_plt_MG; +getIndexAlgorithm_pt_AO; getIndexAlgorithm_rw_RW; getIndexAlgorithm_sg_CF; getIndexAlgorithm_shs_CA; @@ -907,6 +916,7 @@ getLCInfo_om_ET; getLCInfo_or_IN; getLCInfo_pa_IN; getLCInfo_plt_MG; +getLCInfo_pt_AO; getLCInfo_rw_RW; getLCInfo_sg_CF; getLCInfo_shs_CA; @@ -992,6 +1002,7 @@ getLocaleItem_om_ET; getLocaleItem_or_IN; getLocaleItem_pa_IN; getLocaleItem_plt_MG; +getLocaleItem_pt_AO; getLocaleItem_rw_RW; getLocaleItem_sg_CF; getLocaleItem_shs_CA; @@ -1077,6 +1088,7 @@ getOutlineNumberingLevels_om_ET; getOutlineNumberingLevels_or_IN; getOutlineNumberingLevels_pa_IN; getOutlineNumberingLevels_plt_MG; +getOutlineNumberingLevels_pt_AO; getOutlineNumberingLevels_rw_RW; getOutlineNumberingLevels_sg_CF; getOutlineNumberingLevels_shs_CA; @@ -1162,6 +1174,7 @@ getReservedWords_om_ET; getReservedWords_or_IN; getReservedWords_pa_IN; getReservedWords_plt_MG; +getReservedWords_pt_AO; getReservedWords_rw_RW; getReservedWords_sg_CF; getReservedWords_shs_CA; @@ -1247,6 +1260,7 @@ getSearchOptions_om_ET; getSearchOptions_or_IN; getSearchOptions_pa_IN; getSearchOptions_plt_MG; +getSearchOptions_pt_AO; getSearchOptions_rw_RW; getSearchOptions_sg_CF; getSearchOptions_shs_CA; @@ -1332,6 +1346,7 @@ getTransliterations_om_ET; getTransliterations_or_IN; getTransliterations_pa_IN; getTransliterations_plt_MG; +getTransliterations_pt_AO; getTransliterations_rw_RW; getTransliterations_sg_CF; getTransliterations_shs_CA; @@ -1417,6 +1432,7 @@ getUnicodeScripts_om_ET; getUnicodeScripts_or_IN; getUnicodeScripts_pa_IN; getUnicodeScripts_plt_MG; +getUnicodeScripts_pt_AO; getUnicodeScripts_rw_RW; getUnicodeScripts_sg_CF; getUnicodeScripts_shs_CA; diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk index ddf597d780d7..0e1e44ed8bb7 100644 --- a/i18npool/source/localedata/data/makefile.mk +++ b/i18npool/source/localedata/data/makefile.mk @@ -297,6 +297,7 @@ SHL4OBJS= \ $(SLO)$/localedata_or_IN.obj \ $(SLO)$/localedata_pa_IN.obj \ $(SLO)$/localedata_plt_MG.obj \ + $(SLO)$/localedata_pt_AO.obj \ $(SLO)$/localedata_rw_RW.obj \ $(SLO)$/localedata_sg_CF.obj \ $(SLO)$/localedata_shs_CA.obj \ diff --git a/i18npool/source/localedata/data/pt_AO.xml b/i18npool/source/localedata/data/pt_AO.xml new file mode 100644 index 000000000000..f1bb92becf05 --- /dev/null +++ b/i18npool/source/localedata/data/pt_AO.xml @@ -0,0 +1,373 @@ + + + + + +pt +Portuguese + + +AO +Angola + + + + +- +. +, +: +, +; +, + de + de + + + +‘ +’ +“ +” + +AM +PM +Metric + + + +DD-MM-AAAA + + + +NN DD-MMM AA + + + +MM-AA + + + +DD-MMM + + + +MMMM + + + +QQ AA + + + +DD-MM-AAAA + + + +DD-MM-AA + + + +NNNND "de" MMMM "de" AAAA + + + +D "de" MMM "de" AA + + + +D "de" MMM "de" AAAA + + + +D "de" MMMM "de" AAAA + + + +NN, D "de" MMM "de" AA + + + +NN, D "de" MMMM "de" AAAA + + + +NNNND "de" MMMM "de" AAAA + + + +D. MMM. AAAA + + + +D. MMMM AAAA + + + +MM-DD + + + +AA-MM-DD +ISO 8601 (EN 28601) + + +AAAA-MM-DD +ISO 8601 (EN 28601) + + +WW + + + +HH:MM + + + +HH:MM:SS + + + +HH:MM AM/PM + + + +HH:MM:SS AM/PM + + + +[HH]:MM:SS + + + +MM:SS,00 + + + +[HH]:MM:SS,00 + + + +DD-MM-AA HH:MM + + + +DD-MM-AAAA HH:MM:SS + + + +Estandar + + + +0 + + + +0,00 + + + +#.##0 + + + +#.##0,00 + + + +#.###,00 + + + +#.##0 [$Kz-816];-#.##0 [$Kz-816] + + + +#.##0,00 [$Kz-816];-#.##0,00 [$Kz-816] + + + +#.##0 [$Kz-816];[RED]-#.##0 [$Kz-816] + + + +#.##0,00 [$Kz-816];[RED]-#.##0,00 [$Kz-816] + + + +#.##0,00 CCC + + + +#.##0,-- [$Kz-816];[RED]-#.##0,-- [$Kz-816] + + + +0% + + + +0,00% + + + +0,00E+000 + + + +0,00E+00 + + + + + + + + + + +sun +Dom +Domingo + + +mon +Seg +Segunda-feira + + +tue +Ter +Terça-feira + + +wed +Qua +Quarta-feira + + +thu +Qui +Quinta-feira + + +fri +Sex +Sexta-feira + + +sat +Sáb +Sábado + + + + +jan +Jan +Janeiro + + +feb +Fev +Fevereiro + + +mar +Mar +Março + + +apr +Abr +Abril + + +may +Mai +Maio + + +jun +Jun +Junho + + +jul +Jul +Julho + + +aug +Ago +Agosto + + +sep +Set +Setembro + + +oct +Out +Outubro + + +nov +Nov +Novembro + + +dec +Dez +Dezembro + + + + +bc +BC +BC + + +ad +AD +AD + + + +mon + +1 + + + + +AOA +Kz +AOA +Kwanza +2 + + + + + +verdadeiro +falso +1º trimestre +2º trimestre +3º trimestre +4º trimestre +acima +abaixo +T1 +T2 +T3 +T4 + + + + + diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 64f5c975374b..adf74e25aef8 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -262,7 +262,8 @@ static const struct { { "ur_PK", lcl_DATA_OTHERS }, { "ht_HT", lcl_DATA_OTHERS }, { "jbo", lcl_DATA_OTHERS }, - { "kab_DZ", lcl_DATA_OTHERS } + { "kab_DZ", lcl_DATA_OTHERS }, + { "pt_AO", lcl_DATA_OTHERS } }; static const sal_Unicode under = sal_Unicode('_'); diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index 5178d6b8f31f..771afe609d83 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -148,6 +148,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Norwegian, Nynorsk" ; LANGUAGE_NORWEGIAN_NYNORSK ; > ; < "Oriya" ; LANGUAGE_ORIYA ; > ; < "Polish" ; LANGUAGE_POLISH ; > ; + < "Portuguese (Angola)" ; LANGUAGE_USER_PORTUGUESE_ANGOLA ; > ; < "Portuguese (Portugal)" ; LANGUAGE_PORTUGUESE ; > ; < "Portuguese (Brazil)" ; LANGUAGE_PORTUGUESE_BRAZILIAN ; > ; < "Punjabi" ; LANGUAGE_PUNJABI ; > ; -- cgit v1.2.3 From 1d95f5427ccba07b7c1af8caa67aeedb44294a1f Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Fri, 8 Apr 2011 20:52:25 +0200 Subject: typo fixes in help text --- i18npool/source/isolang/langid.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'i18npool') diff --git a/i18npool/source/isolang/langid.pl b/i18npool/source/isolang/langid.pl index 8035178b7bb5..9787309e20d9 100755 --- a/i18npool/source/isolang/langid.pl +++ b/i18npool/source/isolang/langid.pl @@ -53,13 +53,13 @@ sub Usage() "langtab.src, a generic string match of the listbox entries will be tried.\n\n", "Numeric values of LangID,primarylanguage,sublanguage can be given\n", - "decimal, hexagesimal (leading 0x), octal (leading 0) or binary (leading 0b).\n", + "decimal, hexadecimal (leading 0x), octal (leading 0) or binary (leading 0b).\n", "The exact language_define of an exact match will be used in remaining lookups.\n\n", "A language-country pair will lookup a xx-YY mapping from isolang.cxx,\n", "for example: 'en-US' or 'de-' or '-CH',\n", "xx and YY can be given case insensitive, will be lowered-uppered internally,\n", - "and xx and YY themselfs may be regular expressions.\n", + "and xx and YY themselves may be regular expressions.\n", "Also here a list of matches will be processed.\n\n", "If option --single is given, only the first match will be processed.\n\n"; -- cgit v1.2.3 From 371106716a8ea6f5cd93ac74516a432dee3946b3 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 9 Apr 2011 23:57:33 -0500 Subject: fix typo from commit a6eaaeceed90192ea61371c5ddfb0fe795eebfba --- i18npool/source/localedata/data/localedata_others.map | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'i18npool') diff --git a/i18npool/source/localedata/data/localedata_others.map b/i18npool/source/localedata/data/localedata_others.map index eab893b7e67f..de7a2312bfb9 100644 --- a/i18npool/source/localedata/data/localedata_others.map +++ b/i18npool/source/localedata/data/localedata_others.map @@ -744,7 +744,8 @@ getForbiddenCharacters_nso_ZA; getForbiddenCharacters_om_ET; getForbiddenCharacters_or_IN; getForbiddenCharacters_pa_IN; -getForbiddenCharacters_plt_MG;getForbiddenCharacters_pt_AO; +getForbiddenCharacters_plt_MG; +getForbiddenCharacters_pt_AO; getForbiddenCharacters_rw_RW; getForbiddenCharacters_sg_CF; getForbiddenCharacters_shs_CA; -- cgit v1.2.3