This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit d1c08657aeddf1548aebb42c3dc9a487e4814e04 Author: Rene Engelhard <[email protected]> Date: Wed May 4 23:18:52 2016 +0200 Revert "chinese_{simplified,traditional} -> chinese_{china,taiwan}" This reverts commit e37c819e3619f61951342d4b99b4a72b6aca61d8. --- changelog | 5 ----- control | 16 ++++++++-------- patches/series | 1 - patches/zh-l10n-names.diff | 15 --------------- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/changelog b/changelog index db8fc2a..4ef1312 100644 --- a/changelog +++ b/changelog @@ -1,10 +1,5 @@ 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 9288e74..3b75c7d 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_china language package +Description: office productivity suite -- Chinese_simplified 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_china. + Chinese_simplified. 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_taiwan language package +Description: office productivity suite -- Chinese_traditional 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_taiwan. + Chinese_traditional. 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_china help +Description: office productivity suite -- Chinese_simplified 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_china. + Chinese_simplified. 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_taiwan help +Description: office productivity suite -- Chinese_traditional 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_taiwan. + Chinese_traditional. Package: uno-libs3 Section: libs diff --git a/patches/series b/patches/series index 3726b69..dbaa342 100644 --- a/patches/series +++ b/patches/series @@ -35,4 +35,3 @@ 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 deleted file mode 100644 index 0f51aa5..0000000 --- a/patches/zh-l10n-names.diff +++ /dev/null @@ -1,15 +0,0 @@ -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
