This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit e37c819e3619f61951342d4b99b4a72b6aca61d8 Author: Rene Engelhard <[email protected]> Date: Wed May 4 22:40:05 2016 +0200 chinese_{simplified,traditional} -> chinese_{china,taiwan} --- changelog | 5 +++++ control | 16 ++++++++-------- patches/series | 1 + patches/zh-l10n-names.diff | 15 +++++++++++++++ 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/changelog b/changelog index 4ef1312..db8fc2a 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,10 @@ libreoffice (1:5.1.3~rc1-2) UNRELEASED; urgency=medium + * debian/patches/zh-l10n-names.diff: update zh-* in lo-xlate-lang + zh-CN:chinese_simplified -> zh-CN:chinese_china + zh-TW:chinese_traditional -> zh-TW:chinese_taiwan + (closes: #823429) + * debian/rules: - print error in control without gcj-jdk installed - don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset diff --git a/control b/control index 3b75c7d..9288e74 100644 --- a/control +++ b/control @@ -3583,12 +3583,12 @@ Suggests: hunspell-dictionary-zh-cn | myspell-dictionary-zh-cn, libreoffice-grammarcheck-zh-cn, libreoffice-help-zh-cn, mythes-zh-cn -Description: office productivity suite -- Chinese_simplified language package +Description: office productivity suite -- Chinese_china language package LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. . This package contains the localization of LibreOffice in - Chinese_simplified. + Chinese_china. It contains the user interface, the templates and the autotext features. (please note that not all this is available for all possible languages). You can switch user interface language using the locales system. @@ -3613,12 +3613,12 @@ Suggests: hunspell-dictionary-zh-tw | myspell-dictionary-zh-tw, libreoffice-grammarcheck-zh-tw, libreoffice-help-zh-tw, mythes-zh-tw -Description: office productivity suite -- Chinese_traditional language package +Description: office productivity suite -- Chinese_taiwan language package LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. . This package contains the localization of LibreOffice in - Chinese_traditional. + Chinese_taiwan. It contains the user interface, the templates and the autotext features. (please note that not all this is available for all possible languages). You can switch user interface language using the locales system. @@ -4200,12 +4200,12 @@ Depends: libreoffice-l10n-zh-cn, libreoffice-writer | language-support-translations-zh, ${misc:Depends} Provides: libreoffice-help-${help-l10n-virtual-version} -Description: office productivity suite -- Chinese_simplified help +Description: office productivity suite -- Chinese_china help LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. . This package contains the help of LibreOffice in - Chinese_simplified. + Chinese_china. Package: libreoffice-help-zh-tw Architecture: all @@ -4217,12 +4217,12 @@ Depends: libreoffice-l10n-zh-tw, libreoffice-writer | language-support-translations-zh, ${misc:Depends} Provides: libreoffice-help-${help-l10n-virtual-version} -Description: office productivity suite -- Chinese_traditional help +Description: office productivity suite -- Chinese_taiwan help LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. . This package contains the help of LibreOffice in - Chinese_traditional. + Chinese_taiwan. Package: uno-libs3 Section: libs diff --git a/patches/series b/patches/series index dbaa342..3726b69 100644 --- a/patches/series +++ b/patches/series @@ -35,3 +35,4 @@ bash-completion-dir.diff OPENCL_DLL_NAME.diff no-packagekit-per-default.diff liborcus-0.11.diff +zh-l10n-names.diff diff --git a/patches/zh-l10n-names.diff b/patches/zh-l10n-names.diff new file mode 100644 index 0000000..0f51aa5 --- /dev/null +++ b/patches/zh-l10n-names.diff @@ -0,0 +1,15 @@ +diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang +index c54f379..cc05226 100755 +--- a/bin/lo-xlate-lang ++++ b/bin/lo-xlate-lang +@@ -202,8 +204,8 @@ __DATA__ + 79:nn:norwegian_nynorsk + 81:ja:japanese + 82:ko:korean +-86:zh-CN:chinese_simplified +-88:zh-TW:chinese_traditional ++86:zh-CN:chinese_china ++88:zh-TW:chinese_taiwan + 90:tr:turkish + 91:hi:hindi + 96:ar:arabic -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
