From 681d5fd37e469491268d40147c621187dc6f4b95 Mon Sep 17 00:00:00 2001 From: László Németh Date: Fri, 9 Sep 2016 15:52:23 +0200 Subject: tdf#97191 fix emoji correction conflict with time format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit by removing the bad patterns from DocumentList.xmls, and adding "h" to the end of the bad en-US emoji short names, (separated by a space according to the orthography): :1 h: instead of :1:, :10 h: instead of :10: etc. Also complete the fix for tdf#93233, removing the :1:30:-like (never working) patterns. Change-Id: Ia39e1f0d5fdbf686713c6deacf2a56e0beb8b42b Reviewed-on: https://gerrit.libreoffice.org/28756 Tested-by: Jenkins Reviewed-by: László Németh --- extras/source/autocorr/emoji/emoji.ulf | 24 +++++++++++----------- extras/source/autocorr/lang/bg/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/ca/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/cs/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/da/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/en-AU/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/en-GB/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/en-US/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/es/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/fi/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/fr/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/hr/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/hu/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/is/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/it/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/ja/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/ko/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/lt/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/nl-BE/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/nl/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/pt-BR/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/pt-PT/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/pt/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/ro/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/sk/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/sl/DocumentList.xml | 12 ----------- extras/source/autocorr/lang/sv/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/tr/DocumentList.xml | 24 ---------------------- extras/source/autocorr/lang/zh-CN/DocumentList.xml | 12 ----------- 29 files changed, 12 insertions(+), 480 deletions(-) (limited to 'extras') diff --git a/extras/source/autocorr/emoji/emoji.ulf b/extras/source/autocorr/emoji/emoji.ulf index 268ae34be2a4..f06b2e0a9fb1 100644 --- a/extras/source/autocorr/emoji/emoji.ulf +++ b/extras/source/autocorr/emoji/emoji.ulf @@ -3501,51 +3501,51 @@ en-US = "button" [CLOCK_FACE_ONE_OCLOCK] x-comment = "🕐 (U+1F550), see http://wiki.documentfoundation.org/Emoji" -en-US = "1" +en-US = "1 h" [CLOCK_FACE_TWO_OCLOCK] x-comment = "🕑 (U+1F551), see http://wiki.documentfoundation.org/Emoji" -en-US = "2" +en-US = "2 h" [CLOCK_FACE_THREE_OCLOCK] x-comment = "🕒 (U+1F552), see http://wiki.documentfoundation.org/Emoji" -en-US = "3" +en-US = "3 h" [CLOCK_FACE_FOUR_OCLOCK] x-comment = "🕓 (U+1F553), see http://wiki.documentfoundation.org/Emoji" -en-US = "4" +en-US = "4 h" [CLOCK_FACE_FIVE_OCLOCK] x-comment = "🕔 (U+1F554), see http://wiki.documentfoundation.org/Emoji" -en-US = "5" +en-US = "5 h" [CLOCK_FACE_SIX_OCLOCK] x-comment = "🕕 (U+1F555), see http://wiki.documentfoundation.org/Emoji" -en-US = "6" +en-US = "6 h" [CLOCK_FACE_SEVEN_OCLOCK] x-comment = "🕖 (U+1F556), see http://wiki.documentfoundation.org/Emoji" -en-US = "7" +en-US = "7 h" [CLOCK_FACE_EIGHT_OCLOCK] x-comment = "🕗 (U+1F557), see http://wiki.documentfoundation.org/Emoji" -en-US = "8" +en-US = "8 h" [CLOCK_FACE_NINE_OCLOCK] x-comment = "🕘 (U+1F558), see http://wiki.documentfoundation.org/Emoji" -en-US = "9" +en-US = "9 h" [CLOCK_FACE_TEN_OCLOCK] x-comment = "🕙 (U+1F559), see http://wiki.documentfoundation.org/Emoji" -en-US = "10" +en-US = "10 h" [CLOCK_FACE_ELEVEN_OCLOCK] x-comment = "🕚 (U+1F55A), see http://wiki.documentfoundation.org/Emoji" -en-US = "11" +en-US = "11 h" [CLOCK_FACE_TWELVE_OCLOCK] x-comment = "🕛 (U+1F55B), see http://wiki.documentfoundation.org/Emoji" -en-US = "12" +en-US = "12 h" [CLOCK_FACE_ONE-THIRTY] x-comment = "🕜 (U+1F55C), see http://wiki.documentfoundation.org/Emoji" diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml b/extras/source/autocorr/lang/bg/DocumentList.xml index eea1376deaa4..348a27a296cd 100644 --- a/extras/source/autocorr/lang/bg/DocumentList.xml +++ b/extras/source/autocorr/lang/bg/DocumentList.xml @@ -20,57 +20,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index 75a85c5146d8..2a9722db595d 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -361,57 +361,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml b/extras/source/autocorr/lang/cs/DocumentList.xml index 5c5c6e58b5ea..e168d0ed09f9 100644 --- a/extras/source/autocorr/lang/cs/DocumentList.xml +++ b/extras/source/autocorr/lang/cs/DocumentList.xml @@ -573,57 +573,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/da/DocumentList.xml b/extras/source/autocorr/lang/da/DocumentList.xml index ecfb8ae2e624..63463d8f7cc0 100644 --- a/extras/source/autocorr/lang/da/DocumentList.xml +++ b/extras/source/autocorr/lang/da/DocumentList.xml @@ -624,58 +624,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/en-AU/DocumentList.xml b/extras/source/autocorr/lang/en-AU/DocumentList.xml index b8568d6f233f..d0590bf1b7c5 100644 --- a/extras/source/autocorr/lang/en-AU/DocumentList.xml +++ b/extras/source/autocorr/lang/en-AU/DocumentList.xml @@ -828,57 +828,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/en-GB/DocumentList.xml b/extras/source/autocorr/lang/en-GB/DocumentList.xml index 1e561e971871..bc13c47aafd2 100644 --- a/extras/source/autocorr/lang/en-GB/DocumentList.xml +++ b/extras/source/autocorr/lang/en-GB/DocumentList.xml @@ -825,58 +825,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/en-US/DocumentList.xml b/extras/source/autocorr/lang/en-US/DocumentList.xml index 19e9f259f35e..0cac93d277a0 100644 --- a/extras/source/autocorr/lang/en-US/DocumentList.xml +++ b/extras/source/autocorr/lang/en-US/DocumentList.xml @@ -833,57 +833,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/es/DocumentList.xml b/extras/source/autocorr/lang/es/DocumentList.xml index 935362ffef56..a9852237ff6c 100644 --- a/extras/source/autocorr/lang/es/DocumentList.xml +++ b/extras/source/autocorr/lang/es/DocumentList.xml @@ -505,57 +505,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/fi/DocumentList.xml b/extras/source/autocorr/lang/fi/DocumentList.xml index 3ac3192f8fa5..bf87c3dd1cd7 100644 --- a/extras/source/autocorr/lang/fi/DocumentList.xml +++ b/extras/source/autocorr/lang/fi/DocumentList.xml @@ -19,57 +19,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/fr/DocumentList.xml b/extras/source/autocorr/lang/fr/DocumentList.xml index 9045d56d1a63..5a3945b63aa4 100644 --- a/extras/source/autocorr/lang/fr/DocumentList.xml +++ b/extras/source/autocorr/lang/fr/DocumentList.xml @@ -458,58 +458,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/hr/DocumentList.xml b/extras/source/autocorr/lang/hr/DocumentList.xml index 40e2cd32c70a..1924ed524514 100644 --- a/extras/source/autocorr/lang/hr/DocumentList.xml +++ b/extras/source/autocorr/lang/hr/DocumentList.xml @@ -4,57 +4,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/hu/DocumentList.xml b/extras/source/autocorr/lang/hu/DocumentList.xml index 63ddb7ec5aac..10d2497c61bc 100644 --- a/extras/source/autocorr/lang/hu/DocumentList.xml +++ b/extras/source/autocorr/lang/hu/DocumentList.xml @@ -652,57 +652,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/is/DocumentList.xml b/extras/source/autocorr/lang/is/DocumentList.xml index 42405669cbc2..956f05e5d977 100644 --- a/extras/source/autocorr/lang/is/DocumentList.xml +++ b/extras/source/autocorr/lang/is/DocumentList.xml @@ -4,57 +4,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/it/DocumentList.xml b/extras/source/autocorr/lang/it/DocumentList.xml index 58124dd7162e..2bad175bfd60 100644 --- a/extras/source/autocorr/lang/it/DocumentList.xml +++ b/extras/source/autocorr/lang/it/DocumentList.xml @@ -91,57 +91,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/ja/DocumentList.xml b/extras/source/autocorr/lang/ja/DocumentList.xml index 41ddf1c9c23a..befa97dbd7be 100644 --- a/extras/source/autocorr/lang/ja/DocumentList.xml +++ b/extras/source/autocorr/lang/ja/DocumentList.xml @@ -818,57 +818,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/ko/DocumentList.xml b/extras/source/autocorr/lang/ko/DocumentList.xml index 065a0f1acb15..a129f1288291 100644 --- a/extras/source/autocorr/lang/ko/DocumentList.xml +++ b/extras/source/autocorr/lang/ko/DocumentList.xml @@ -817,58 +817,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/lt/DocumentList.xml b/extras/source/autocorr/lang/lt/DocumentList.xml index 2d6bae13a78a..61b4459432e6 100644 --- a/extras/source/autocorr/lang/lt/DocumentList.xml +++ b/extras/source/autocorr/lang/lt/DocumentList.xml @@ -84,58 +84,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/nl-BE/DocumentList.xml b/extras/source/autocorr/lang/nl-BE/DocumentList.xml index b5452708b585..e527fccdfc6b 100644 --- a/extras/source/autocorr/lang/nl-BE/DocumentList.xml +++ b/extras/source/autocorr/lang/nl-BE/DocumentList.xml @@ -111,58 +111,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/nl/DocumentList.xml b/extras/source/autocorr/lang/nl/DocumentList.xml index d6489327c066..b2739bfd0b61 100644 --- a/extras/source/autocorr/lang/nl/DocumentList.xml +++ b/extras/source/autocorr/lang/nl/DocumentList.xml @@ -110,58 +110,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/pt-BR/DocumentList.xml b/extras/source/autocorr/lang/pt-BR/DocumentList.xml index df773ef33226..a1933f28c263 100644 --- a/extras/source/autocorr/lang/pt-BR/DocumentList.xml +++ b/extras/source/autocorr/lang/pt-BR/DocumentList.xml @@ -1834,57 +1834,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/pt-PT/DocumentList.xml b/extras/source/autocorr/lang/pt-PT/DocumentList.xml index 94e369855801..58b2988226c3 100644 --- a/extras/source/autocorr/lang/pt-PT/DocumentList.xml +++ b/extras/source/autocorr/lang/pt-PT/DocumentList.xml @@ -1987,57 +1987,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml b/extras/source/autocorr/lang/pt/DocumentList.xml index 43ec7306c03e..0fba5250e832 100644 --- a/extras/source/autocorr/lang/pt/DocumentList.xml +++ b/extras/source/autocorr/lang/pt/DocumentList.xml @@ -413,57 +413,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/ro/DocumentList.xml b/extras/source/autocorr/lang/ro/DocumentList.xml index 5d08e6482718..bbb543342bc0 100644 --- a/extras/source/autocorr/lang/ro/DocumentList.xml +++ b/extras/source/autocorr/lang/ro/DocumentList.xml @@ -88,57 +88,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/sk/DocumentList.xml b/extras/source/autocorr/lang/sk/DocumentList.xml index eb2d251d6e01..ab6de5397551 100644 --- a/extras/source/autocorr/lang/sk/DocumentList.xml +++ b/extras/source/autocorr/lang/sk/DocumentList.xml @@ -177,58 +177,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/sl/DocumentList.xml b/extras/source/autocorr/lang/sl/DocumentList.xml index 96cd8082b37f..7587c290d7d2 100644 --- a/extras/source/autocorr/lang/sl/DocumentList.xml +++ b/extras/source/autocorr/lang/sl/DocumentList.xml @@ -453,57 +453,45 @@ - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/sv/DocumentList.xml b/extras/source/autocorr/lang/sv/DocumentList.xml index 702394a24935..2a2e8577006e 100644 --- a/extras/source/autocorr/lang/sv/DocumentList.xml +++ b/extras/source/autocorr/lang/sv/DocumentList.xml @@ -113,58 +113,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml b/extras/source/autocorr/lang/tr/DocumentList.xml index 80c54a117be8..15208b6e877c 100644 --- a/extras/source/autocorr/lang/tr/DocumentList.xml +++ b/extras/source/autocorr/lang/tr/DocumentList.xml @@ -97,58 +97,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extras/source/autocorr/lang/zh-CN/DocumentList.xml b/extras/source/autocorr/lang/zh-CN/DocumentList.xml index 703d2a2c9864..511fea948681 100644 --- a/extras/source/autocorr/lang/zh-CN/DocumentList.xml +++ b/extras/source/autocorr/lang/zh-CN/DocumentList.xml @@ -815,57 +815,45 @@ - - - - - - - - - - - - -- cgit