Repository :
http://git.fedorahosted.org/git/?p=ibus-typing-booster.git
On branch : master
---------------------------------------------------------------
commit 070bcb2ad31f58d4d8670e6911ffa1ebf98d9eb5
Author: Mike FABIAN <mfabian(a)redhat.com>
Date: Fri Jan 20 05:36:23 2017 +0100
Some updates for the emoji annotations in en.xml from CLDR
---------------------------------------------------------------
data/en.xml | 134 +++++++++++++++++++++--------------------------------------
1 files changed, 47 insertions(+), 87 deletions(-)
diff --git a/data/en.xml b/data/en.xml
index e3da179..683d3b3 100644
--- a/data/en.xml
+++ b/data/en.xml
@@ -9,7 +9,7 @@ DO NOT CHANGE MANUALLY! Generated by: GenerateOtherAnnotations
-->
<ldml>
<identity>
- <version number="$Revision: 12995 $"/>
+ <version number="$Revision: 13120 $"/>
<language type="en"/>
</identity>
<annotations>
@@ -392,10 +392,10 @@ DO NOT CHANGE MANUALLY! Generated by: GenerateOtherAnnotations
<annotation cp="����">demon | devil | imp | face | fairy tale |
fantasy</annotation>
<annotation cp="����" type="tts">angry face with
horns</annotation>
<!-- 1F479 -->
- <annotation cp="����">creature | face | fairy tale | fantasy | Japanese
| monster</annotation>
+ <annotation cp="����">creature | face | fairy tale | fantasy |
monster</annotation>
<annotation cp="����" type="tts">ogre</annotation>
<!-- 1F47A -->
- <annotation cp="����">creature | face | fairy tale | fantasy | Japanese
| monster</annotation>
+ <annotation cp="����">creature | face | fairy tale | fantasy |
monster</annotation>
<annotation cp="����" type="tts">goblin</annotation>
<!-- 1F480 -->
<annotation cp="����">death | face | fairy tale |
monster</annotation>
@@ -464,104 +464,72 @@ DO NOT CHANGE MANUALLY! Generated by: GenerateOtherAnnotations
<annotation cp="����">man</annotation>
<annotation cp="����" type="tts">man</annotation>
<annotation cp="����������">man | healthcare | doctor | nurse |
therapist</annotation>
- <annotation cp="����������" type="tts">health worker:
man</annotation>
- <annotation cp="����������" type="tts"
alt="variant">man health worker</annotation>
+ <annotation cp="����������" type="tts">man health
worker</annotation>
<annotation cp="�����������">man | student |
graduate</annotation>
- <annotation cp="�����������" type="tts">student:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man student</annotation>
+ <annotation cp="�����������" type="tts">man
student</annotation>
<annotation cp="�����������">man | farmer | rancher |
gardener</annotation>
- <annotation cp="�����������" type="tts">farmer:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man farmer</annotation>
+ <annotation cp="�����������" type="tts">man
farmer</annotation>
<annotation cp="�����������">man | cook | chef</annotation>
- <annotation cp="�����������" type="tts">cook:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man cook</annotation>
+ <annotation cp="�����������" type="tts">man
cook</annotation>
<annotation cp="�����������">man | professor | instructor |
teacher</annotation>
- <annotation cp="�����������" type="tts">teacher:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man teacher</annotation>
+ <annotation cp="�����������" type="tts">man
teacher</annotation>
<annotation cp="�����������">man | industrial | assembly | factory |
worker</annotation>
- <annotation cp="�����������" type="tts">factory worker:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man factory worker</annotation>
+ <annotation cp="�����������" type="tts">man factory
worker</annotation>
<annotation cp="�����������">artist | man | palette</annotation>
- <annotation cp="�����������" type="tts">artist:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man artist</annotation>
+ <annotation cp="�����������" type="tts">man
artist</annotation>
<annotation cp="�����������">firefighter | man |
firetruck</annotation>
- <annotation cp="�����������" type="tts">firefighter:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man firefighter</annotation>
+ <annotation cp="�����������" type="tts">man
firefighter</annotation>
<annotation cp="����������">man | pilot | plane</annotation>
- <annotation cp="����������" type="tts">pilot:
man</annotation>
- <annotation cp="����������" type="tts"
alt="variant">man pilot</annotation>
+ <annotation cp="����������" type="tts">man
pilot</annotation>
<annotation cp="�����������">astronaut | man |
rocket</annotation>
- <annotation cp="�����������" type="tts">astronaut:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man astronaut</annotation>
+ <annotation cp="�����������" type="tts">man
astronaut</annotation>
<annotation cp="�����������">man | singer | entertainer | rock | star |
actor</annotation>
- <annotation cp="�����������" type="tts">singer:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man singer</annotation>
+ <annotation cp="�����������" type="tts">man
singer</annotation>
<annotation cp="�����������">man | technologist | coder | software |
developer | inventor</annotation>
- <annotation cp="�����������" type="tts">technologist:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man technologist</annotation>
+ <annotation cp="�����������" type="tts">man
technologist</annotation>
<annotation cp="�����������">man | scientist | engineer | mathematician
| chemist | physicist | biologist</annotation>
- <annotation cp="�����������" type="tts">scientist:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man scientist</annotation>
+ <annotation cp="�����������" type="tts">man
scientist</annotation>
<annotation cp="�����������">man | office | business | manager |
architect | white-collar</annotation>
- <annotation cp="�����������" type="tts">office worker:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man office worker</annotation>
+ <annotation cp="�����������" type="tts">man office
worker</annotation>
<annotation cp="�����������">man | tradesperson | mechanic | plumber |
electrician</annotation>
- <annotation cp="�����������" type="tts">mechanic:
man</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">man mechanic</annotation>
+ <annotation cp="�����������" type="tts">man
mechanic</annotation>
<annotation cp="����������">justice | man | scales</annotation>
- <annotation cp="����������" type="tts">judge:
man</annotation>
- <annotation cp="����������" type="tts"
alt="variant">man judge</annotation>
+ <annotation cp="����������" type="tts">man
judge</annotation>
<!-- 1F469 -->
<annotation cp="����">woman</annotation>
<annotation cp="����" type="tts">woman</annotation>
<annotation cp="����������">woman | healthcare | doctor | nurse |
therapist</annotation>
- <annotation cp="����������" type="tts">health worker:
woman</annotation>
- <annotation cp="����������" type="tts"
alt="variant">woman health worker</annotation>
+ <annotation cp="����������" type="tts">woman health
worker</annotation>
<annotation cp="�����������">woman | student |
graduate</annotation>
- <annotation cp="�����������" type="tts">student:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman student</annotation>
+ <annotation cp="�����������" type="tts">woman
student</annotation>
<annotation cp="�����������">woman | farmer | rancher |
gardener</annotation>
- <annotation cp="�����������" type="tts">farmer:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman farmer</annotation>
+ <annotation cp="�����������" type="tts">woman
farmer</annotation>
<annotation cp="�����������">woman | cook | chef</annotation>
- <annotation cp="�����������" type="tts">cook:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman cook</annotation>
+ <annotation cp="�����������" type="tts">woman
cook</annotation>
<annotation cp="�����������">woman | professor | instructor |
teacher</annotation>
- <annotation cp="�����������" type="tts">teacher:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman teacher</annotation>
+ <annotation cp="�����������" type="tts">woman
teacher</annotation>
<annotation cp="�����������">woman | industrial | assembly | factory |
worker</annotation>
- <annotation cp="�����������" type="tts">factory worker:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman factory worker</annotation>
+ <annotation cp="�����������" type="tts">woman factory
worker</annotation>
<annotation cp="�����������">artist | palette |
woman</annotation>
- <annotation cp="�����������" type="tts">artist:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman artist</annotation>
+ <annotation cp="�����������" type="tts">woman
artist</annotation>
<annotation cp="�����������">firefighter | firetruck |
woman</annotation>
- <annotation cp="�����������" type="tts">firefighter:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman firefighter</annotation>
+ <annotation cp="�����������" type="tts">woman
firefighter</annotation>
<annotation cp="����������">pilot | plane | woman</annotation>
- <annotation cp="����������" type="tts">pilot:
woman</annotation>
- <annotation cp="����������" type="tts"
alt="variant">woman pilot</annotation>
+ <annotation cp="����������" type="tts">woman
pilot</annotation>
<annotation cp="�����������">astronaut | rocket |
woman</annotation>
- <annotation cp="�����������" type="tts">astronaut:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman astronaut</annotation>
+ <annotation cp="�����������" type="tts">woman
astronaut</annotation>
<annotation cp="�����������">woman | singer | entertainer | rock | star
| actor</annotation>
- <annotation cp="�����������" type="tts">singer:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman singer</annotation>
+ <annotation cp="�����������" type="tts">woman
singer</annotation>
<annotation cp="�����������">woman | technologist | coder | software |
developer | inventor</annotation>
- <annotation cp="�����������" type="tts">technologist:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman technologist</annotation>
+ <annotation cp="�����������" type="tts">woman
technologist</annotation>
<annotation cp="�����������">woman | scientist | engineer |
mathematician | chemist | physicist | biologist</annotation>
- <annotation cp="�����������" type="tts">scientist:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman scientist</annotation>
+ <annotation cp="�����������" type="tts">woman
scientist</annotation>
<annotation cp="�����������">woman | office | business | manager |
architect | white-collar</annotation>
- <annotation cp="�����������" type="tts">office worker:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman office worker</annotation>
+ <annotation cp="�����������" type="tts">woman office
worker</annotation>
<annotation cp="�����������">woman | tradesperson | mechanic | plumber
| electrician</annotation>
- <annotation cp="�����������" type="tts">mechanic:
woman</annotation>
- <annotation cp="�����������" type="tts"
alt="variant">woman mechanic</annotation>
+ <annotation cp="�����������" type="tts">woman
mechanic</annotation>
<annotation cp="����������">judge | woman | scales</annotation>
- <annotation cp="����������" type="tts">judge:
woman</annotation>
- <annotation cp="����������" type="tts"
alt="variant">woman judge</annotation>
+ <annotation cp="����������" type="tts">woman
judge</annotation>
<!-- 1F474 -->
<annotation cp="����">man | old</annotation>
<annotation cp="����" type="tts">old man</annotation>
@@ -582,11 +550,9 @@ DO NOT CHANGE MANUALLY! Generated by: GenerateOtherAnnotations
<annotation cp="����">cop | officer | police</annotation>
<annotation cp="����" type="tts">police
officer</annotation>
<annotation cp="����������">cop | officer | police |
woman</annotation>
- <annotation cp="����������" type="tts">police officer:
woman</annotation>
- <annotation cp="����������" type="tts"
alt="variant">woman police officer</annotation>
+ <annotation cp="����������" type="tts">woman police
officer</annotation>
<annotation cp="����������">cop | man | officer |
police</annotation>
- <annotation cp="����������" type="tts">police officer:
man</annotation>
- <annotation cp="����������" type="tts"
alt="variant">man police officer</annotation>
+ <annotation cp="����������" type="tts">man police
officer</annotation>
<!-- 1F472 -->
<annotation cp="����">gua pi mao | hat | man</annotation>
<annotation cp="����" type="tts">man with Chinese
cap</annotation>
@@ -601,11 +567,9 @@ DO NOT CHANGE MANUALLY! Generated by: GenerateOtherAnnotations
<annotation cp="����">construction | hat | worker</annotation>
<annotation cp="����" type="tts">construction
worker</annotation>
<annotation cp="����������">construction | woman |
worker</annotation>
- <annotation cp="����������" type="tts">construction worker:
woman</annotation>
- <annotation cp="����������" type="tts"
alt="variant">woman construction worker</annotation>
+ <annotation cp="����������" type="tts">woman construction
worker</annotation>
<annotation cp="����������">construction | man |
worker</annotation>
- <annotation cp="����������" type="tts">construction worker:
man</annotation>
- <annotation cp="����������" type="tts"
alt="variant">man construction worker</annotation>
+ <annotation cp="����������" type="tts">man construction
worker</annotation>
<!-- 26D1 -->
<annotation cp="���">aid | cross | face | hat |
helmet</annotation>
<annotation cp="���" type="tts">rescue worker���s
helmet</annotation>
@@ -616,20 +580,16 @@ DO NOT CHANGE MANUALLY! Generated by: GenerateOtherAnnotations
<annotation cp="����">guard</annotation>
<annotation cp="����" type="tts">guard</annotation>
<annotation cp="����������">guard | woman</annotation>
- <annotation cp="����������" type="tts">guard:
woman</annotation>
- <annotation cp="����������" type="tts"
alt="variant">woman guard</annotation>
+ <annotation cp="����������" type="tts">woman
guard</annotation>
<annotation cp="����������">guard | man</annotation>
- <annotation cp="����������" type="tts">guard:
man</annotation>
- <annotation cp="����������" type="tts"
alt="variant">man guard</annotation>
+ <annotation cp="����������" type="tts">man
guard</annotation>
<!-- 1F575 -->
<annotation cp="����">sleuth | spy | detective</annotation>
<annotation cp="����"
type="tts">detective</annotation>
<annotation cp="����������">sleuth | spy | woman |
detective</annotation>
- <annotation cp="����������" type="tts">detective:
woman</annotation>
- <annotation cp="����������" type="tts"
alt="variant">woman detective</annotation>
+ <annotation cp="����������" type="tts">woman
detective</annotation>
<annotation cp="����������">man | sleuth | spy |
detective</annotation>
- <annotation cp="����������" type="tts">detective:
man</annotation>
- <annotation cp="����������" type="tts"
alt="variant">man detective</annotation>
+ <annotation cp="����������" type="tts">man
detective</annotation>
<!-- 1F385 -->
<annotation cp="����">Christmas | celebration | father | santa |
claus</annotation>
<annotation cp="����" type="tts">Santa
Claus</annotation>
@@ -1104,11 +1064,11 @@ DO NOT CHANGE MANUALLY! Generated by: GenerateOtherAnnotations
<annotation cp="����">face | nose | pig</annotation>
<annotation cp="����" type="tts">pig nose</annotation>
<!-- 1F40F -->
- <annotation cp="����">Aries | sheep | zodiac</annotation>
+ <annotation cp="����">Aries | sheep | zodiac | male</annotation>
<annotation cp="����" type="tts">ram</annotation>
<!-- 1F411 -->
- <annotation cp="����">ewe</annotation>
- <annotation cp="����" type="tts">sheep</annotation>
+ <annotation cp="����">sheep | female</annotation>
+ <annotation cp="����" type="tts">ewe</annotation>
<!-- 1F410 -->
<annotation cp="����">Capricorn | zodiac</annotation>
<annotation cp="����" type="tts">goat</annotation>
@@ -2543,7 +2503,7 @@ DO NOT CHANGE MANUALLY! Generated by: GenerateOtherAnnotations
<annotation cp="����">electric | light | tool |
torch</annotation>
<annotation cp="����"
type="tts">flashlight</annotation>
<!-- 1F3EE -->
- <annotation cp="����">bar | Japanese | lantern | light |
red</annotation>
+ <annotation cp="����">bar | lantern | light | red</annotation>
<annotation cp="����" type="tts">red paper
lantern</annotation>
<!-- 1F4D4 -->
<annotation cp="����">book | cover | decorated |
notebook</annotation>