saving uncommitted changes in /etc prior to emerge run

diff --git a/dconf/db/ibus b/dconf/db/ibus
index 069e0c45642e7f5fe32b9956ca49068b88e33622..dde7a6218dd54c5631faa71d3610f56979343228 100644 (file)
Binary files a/dconf/db/ibus and b/dconf/db/ibus differ

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
index 7b76507d026f8bc3ce01a2dd06cdc7426a2239f1..98686a8570f82b1979b0fc5ce808fc138e259794 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -6777,6 +6777,25 @@ z.B. »Sans Italic 10«.</longdesc>
                <dir name="desktop">
                        <dir name="ibus">
                                <dir name="panel">
+                                       <entry name="property-icon-delay-time">
+                                               <local_schema short_desc="Millisekunden bis zum Anzeigen der Panel-Icons einer Eigenschaft">
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="xkb-icon-rgba">
+                                               <local_schema short_desc="RGBA Werte des XKB Icons">
+                                                       <longdesc>Das XKB Icon zeigt den Layout-String und der String wird mit dem RGBA Wert gerendert. Der RGBA Wert kann sein  1. eine X11-Farbe , 2. ein Hex-Wert in der Form &apos;#rrggbb&apos; wobei &apos;r&apos;, &apos;g&apos; und &apos;b&apos; HEX-Werte für Rot, Grün und Blau sind, 3. eine RGB-Farbe in der Form &apos;rgb(r,g,b)&apos; oder 4. eine RGBA-Farbe in der Form &apos;rgba(r,g,b,a)&apos; wobei &apos;r&apos;, &apos;g&apos;, und &apos;b&apos; entweder Integer im Bereich 0 bis 255 oder Prozentwerte von 0-100% sind und &apos;a&apos; ein Gleitkommawert im Bereich 0 bis 1 für das Alpha ist.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="follow-input-cursor-when-always-shown">
+                                               <local_schema short_desc="Den Input-Cursor verfolgen falls das Panel immer angezeigt wird">
+                                                       <longdesc>Wenn wahr folgt das Panel dem Input-Cursor wenn das Panel immer angezeigt wird. Wenn falsch wird das Panel an einer festen Position angezeigt.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="auto-hide-timeout">
+                                               <local_schema short_desc="Millisekunden bis die Einstellungsleiste angezeigt wird">
+                                                       <longdesc>Millisekunden bis zum Anzeigen der Eigenschaftenleiste nach Fokuswechsel oder Eigenschaftenwechsel.</longdesc>
+                                               </local_schema>
+                                       </entry>
                                        <entry name="custom_font">
                                                <local_schema short_desc="Benutzerdefinierte Schriftart">
                                                        <longdesc>Name der benutzerdefinierten Schriftart für Sprach-Panel</longdesc>
@@ -6812,10 +6831,43 @@ z.B. »Sans Italic 10«.</longdesc>
                                        </entry>
                                        <entry name="show">
                                                <local_schema short_desc="Automatisch verstecken">
+                                                       <longdesc>Verhalten des Eigenschaften-Panels. 0 = nicht anzeigen, 1 = automatisch verstecken, 2 = immer anzeigen</longdesc>
                                                </local_schema>
                                        </entry>
+                                       <dir name="emoji">
+                                               <entry name="favorites">
+                                                       <local_schema short_desc="Emoji-Favoriteneliste im Emoji-Dialog">
+                                                               <longdesc>Sie können die favorisierten Emoji in der Emoji-Liste anzeigen wenn die Liste Zeichen enthält.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="lang">
+                                                       <local_schema short_desc="Standard-Sprache für das Emoji-Wörterbuch">
+                                                               <longdesc>Auswahl einer Standard-Sprache der Emoji-Wörterbücher im Emoji-Dialog. Der Wert $lang wird auf /usr/share/ibus/dicts/emoji-$lang.dict angewendet.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="font">
+                                                       <local_schema short_desc="Benutzerdefinierte Schriftart">
+                                                               <longdesc>Benutzerdefinierter Font-Name für Emoji-Zeichen im Emoji-Dialog</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="hotkey">
+                                                       <local_schema short_desc="Emoji Tastenkombination für gtk_accelerator_parse">
+                                                               <longdesc>Tastenkombination zum Ein- und Ausschalten der Emoji-Eingabe</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                </dir>
                                <dir name="general">
+                                       <entry name="use-xmodmap">
+                                               <local_schema short_desc="Verwenden von xmodmap">
+                                                       <longdesc>xmodmap ausführen wenn .xmodmap oder .Xmodmap vorhanden ist wenn ibus Engines gewechselt werden.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="xkb-latin-layouts">
+                                               <local_schema short_desc="Latin Tastaturbelegungen ohne ASCII">
+                                                       <longdesc>US Tastaturbelegung wird den Latin Tastaturbelegungen angefügt. Varianten können vernachlässigt werden.</longdesc>
+                                               </local_schema>
+                                       </entry>
                                        <entry name="version">
                                                <local_schema short_desc="Gespeicherte Versions-Numnner">
                                                        <longdesc>Die gespeicherte Versions-Nummer wird verwendet, um den Unterschied zwischen der Version der zuvor installierten ibus und der aktuellen ibus zu überprüfen.</longdesc>

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 551ae6d31835b0960c475fb71709e34cadbe2d05..bbec8c6d572a6d695b9075b3e6dbab8c47585d72 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
@@ -6764,6 +6764,12 @@
                                                <local_schema short_desc="Auto hide">
                                                </local_schema>
                                        </entry>
+                                       <dir name="emoji">
+                                               <entry name="font">
+                                                       <local_schema short_desc="Custom font">
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                </dir>
                                <dir name="general">
                                        <entry name="enable_by_default">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index 62031b2c4361fdaefc21b45c3bb3b3e1fe96c991..0f264689470537606f12c74271e54728e6648f36 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -6719,6 +6719,20 @@
                <dir name="desktop">
                        <dir name="ibus">
                                <dir name="panel">
+                                       <entry name="xkb-icon-rgba">
+                                               <local_schema short_desc="RGBA-значение значка XKB">
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="follow-input-cursor-when-always-shown">
+                                               <local_schema short_desc="Следовать за курсором ввода, если панель всегда видна">
+                                                       <longdesc>Если «true», панель следует за курсором ввода в случае, если панель всегда видна. Если «false», панель отображается в фиксированном месте.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="auto-hide-timeout">
+                                               <local_schema short_desc="Миллисекунды для отображения панели свойств">
+                                                       <longdesc>Миллисекунды для отображения панели свойств после смены фокуса ввода или свойств.</longdesc>
+                                               </local_schema>
+                                       </entry>
                                        <entry name="custom_font">
                                                <local_schema short_desc="Свой шрифт">
                                                        <longdesc>Свой шрифт для языковой панели</longdesc>
@@ -6754,10 +6768,26 @@
                                        </entry>
                                        <entry name="show">
                                                <local_schema short_desc="Автоматически скрывать">
+                                                       <longdesc>Режим работы панели свойств. 0 = не показывать, 1 = автоматически скрывать, 2 = всегда показывать</longdesc>
                                                </local_schema>
                                        </entry>
+                                       <dir name="emoji">
+                                               <entry name="font">
+                                                       <local_schema short_desc="Свой шрифт">
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                </dir>
                                <dir name="general">
+                                       <entry name="use-xmodmap">
+                                               <local_schema short_desc="Использовать xmodmap">
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="xkb-latin-layouts">
+                                               <local_schema short_desc="Латинские раскладки, в которых нет ASCII">
+                                                       <longdesc>Раскладка США добавлена к латинским раскладкам. Вариант может быть опущен.</longdesc>
+                                               </local_schema>
+                                       </entry>
                                        <entry name="version">
                                                <local_schema short_desc="Сохраненный номер версии">
                                                        <longdesc>Сохраненный номер версии используется для сравнения предыдущей версии ibus с текущей.</longdesc>

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
index 55d6f667b39f5ac15091413b2efad7b6c2ae31bb..e28a23dcf68d2ed50bbe3ca536835f5b73514564 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
@@ -6024,6 +6024,12 @@ vào danh sách này. Phải khởi động lại bảng điều khiển để 
                                                <local_schema short_desc="Tự động ẩn">
                                                </local_schema>
                                        </entry>
+                                       <dir name="emoji">
+                                               <entry name="font">
+                                                       <local_schema short_desc="Tùy biến phông">
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                </dir>
                                <dir name="general">
                                        <entry name="use_global_engine">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 75788f38173167d55548850174175d5b5dc527b9..0f853419dc3f27f1c83a23f85e21afc40234cc69 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -2114,40 +2114,50 @@
        <dir name="desktop">
                <dir name="ibus">
                        <dir name="panel">
-                               <entry name="property-icon-delay-time" mtime="1514432255" schema="/schemas/desktop/ibus/panel/property-icon-delay-time"/>
-                               <entry name="xkb-icon-rgba" mtime="1514432255" schema="/schemas/desktop/ibus/panel/xkb-icon-rgba"/>
-                               <entry name="follow-input-cursor-when-always-shown" mtime="1514432255" schema="/schemas/desktop/ibus/panel/follow-input-cursor-when-always-shown"/>
-                               <entry name="auto-hide-timeout" mtime="1514432255" schema="/schemas/desktop/ibus/panel/auto-hide-timeout"/>
-                               <entry name="custom_font" mtime="1514432255" schema="/schemas/desktop/ibus/panel/custom_font"/>
-                               <entry name="use_custom_font" mtime="1514432255" schema="/schemas/desktop/ibus/panel/use_custom_font"/>
-                               <entry name="show_im_name" mtime="1514432255" schema="/schemas/desktop/ibus/panel/show_im_name"/>
-                               <entry name="show_icon_on_systray" mtime="1514432255" schema="/schemas/desktop/ibus/panel/show_icon_on_systray"/>
-                               <entry name="lookup_table_orientation" mtime="1514432255" schema="/schemas/desktop/ibus/panel/lookup_table_orientation"/>
-                               <entry name="y" mtime="1514432255" schema="/schemas/desktop/ibus/panel/y"/>
-                               <entry name="x" mtime="1514432255" schema="/schemas/desktop/ibus/panel/x"/>
-                               <entry name="show" mtime="1514432255" schema="/schemas/desktop/ibus/panel/show"/>
+                               <entry name="property-icon-delay-time" mtime="1515360940" schema="/schemas/desktop/ibus/panel/property-icon-delay-time"/>
+                               <entry name="xkb-icon-rgba" mtime="1515360940" schema="/schemas/desktop/ibus/panel/xkb-icon-rgba"/>
+                               <entry name="follow-input-cursor-when-always-shown" mtime="1515360940" schema="/schemas/desktop/ibus/panel/follow-input-cursor-when-always-shown"/>
+                               <entry name="auto-hide-timeout" mtime="1515360940" schema="/schemas/desktop/ibus/panel/auto-hide-timeout"/>
+                               <entry name="custom_font" mtime="1515360940" schema="/schemas/desktop/ibus/panel/custom_font"/>
+                               <entry name="use_custom_font" mtime="1515360940" schema="/schemas/desktop/ibus/panel/use_custom_font"/>
+                               <entry name="show_im_name" mtime="1515360940" schema="/schemas/desktop/ibus/panel/show_im_name"/>
+                               <entry name="show_icon_on_systray" mtime="1515360940" schema="/schemas/desktop/ibus/panel/show_icon_on_systray"/>
+                               <entry name="lookup_table_orientation" mtime="1515360940" schema="/schemas/desktop/ibus/panel/lookup_table_orientation"/>
+                               <entry name="y" mtime="1515360940" schema="/schemas/desktop/ibus/panel/y"/>
+                               <entry name="x" mtime="1515360940" schema="/schemas/desktop/ibus/panel/x"/>
+                               <entry name="show" mtime="1515360940" schema="/schemas/desktop/ibus/panel/show"/>
+                               <dir name="emoji">
+                                       <entry name="partial-match-condition" mtime="1515360940" schema="/schemas/desktop/ibus/panel/emoji/partial-match-condition"/>
+                                       <entry name="partial-match-length" mtime="1515360940" schema="/schemas/desktop/ibus/panel/emoji/partial-match-length"/>
+                                       <entry name="has-partial-match" mtime="1515360940" schema="/schemas/desktop/ibus/panel/emoji/has-partial-match"/>
+                                       <entry name="favorite-annotations" mtime="1515360940" schema="/schemas/desktop/ibus/panel/emoji/favorite-annotations"/>
+                                       <entry name="favorites" mtime="1515360940" schema="/schemas/desktop/ibus/panel/emoji/favorites"/>
+                                       <entry name="lang" mtime="1515360940" schema="/schemas/desktop/ibus/panel/emoji/lang"/>
+                                       <entry name="font" mtime="1515360940" schema="/schemas/desktop/ibus/panel/emoji/font"/>
+                                       <entry name="hotkey" mtime="1515360940" schema="/schemas/desktop/ibus/panel/emoji/hotkey"/>
+                               </dir>
                        </dir>
                        <dir name="general">
-                               <entry name="use-xmodmap" mtime="1514432255" schema="/schemas/desktop/ibus/general/use-xmodmap"/>
-                               <entry name="xkb-latin-layouts" mtime="1514432255" schema="/schemas/desktop/ibus/general/xkb-latin-layouts"/>
-                               <entry name="version" mtime="1514432255" schema="/schemas/desktop/ibus/general/version"/>
-                               <entry name="dconf_preserve_name_prefixes" mtime="1514432255" schema="/schemas/desktop/ibus/general/dconf_preserve_name_prefixes"/>
-                               <entry name="enable_by_default" mtime="1514432255" schema="/schemas/desktop/ibus/general/enable_by_default"/>
-                               <entry name="use_global_engine" mtime="1514432255" schema="/schemas/desktop/ibus/general/use_global_engine"/>
-                               <entry name="embed_preedit_text" mtime="1514432255" schema="/schemas/desktop/ibus/general/embed_preedit_text"/>
-                               <entry name="use_system_keyboard_layout" mtime="1514432255" schema="/schemas/desktop/ibus/general/use_system_keyboard_layout"/>
-                               <entry name="switcher-delay-time" mtime="1514432255" schema="/schemas/desktop/ibus/general/switcher-delay-time"/>
-                               <entry name="engines_order" mtime="1514432255" schema="/schemas/desktop/ibus/general/engines_order"/>
-                               <entry name="preload_engines" mtime="1514432255" schema="/schemas/desktop/ibus/general/preload_engines"/>
+                               <entry name="use-xmodmap" mtime="1515360940" schema="/schemas/desktop/ibus/general/use-xmodmap"/>
+                               <entry name="xkb-latin-layouts" mtime="1515360940" schema="/schemas/desktop/ibus/general/xkb-latin-layouts"/>
+                               <entry name="version" mtime="1515360940" schema="/schemas/desktop/ibus/general/version"/>
+                               <entry name="dconf_preserve_name_prefixes" mtime="1515360940" schema="/schemas/desktop/ibus/general/dconf_preserve_name_prefixes"/>
+                               <entry name="enable_by_default" mtime="1515360940" schema="/schemas/desktop/ibus/general/enable_by_default"/>
+                               <entry name="use_global_engine" mtime="1515360940" schema="/schemas/desktop/ibus/general/use_global_engine"/>
+                               <entry name="embed_preedit_text" mtime="1515360940" schema="/schemas/desktop/ibus/general/embed_preedit_text"/>
+                               <entry name="use_system_keyboard_layout" mtime="1515360940" schema="/schemas/desktop/ibus/general/use_system_keyboard_layout"/>
+                               <entry name="switcher-delay-time" mtime="1515360940" schema="/schemas/desktop/ibus/general/switcher-delay-time"/>
+                               <entry name="engines_order" mtime="1515360940" schema="/schemas/desktop/ibus/general/engines_order"/>
+                               <entry name="preload_engines" mtime="1515360940" schema="/schemas/desktop/ibus/general/preload_engines"/>
                                <dir name="hotkey">
-                                       <entry name="previous_engine" mtime="1514432255" schema="/schemas/desktop/ibus/general/hotkey/previous_engine"/>
-                                       <entry name="prev_engine" mtime="1514432255" schema="/schemas/desktop/ibus/general/hotkey/prev_engine"/>
-                                       <entry name="next_engine_in_menu" mtime="1514432255" schema="/schemas/desktop/ibus/general/hotkey/next_engine_in_menu"/>
-                                       <entry name="next_engine" mtime="1514432255" schema="/schemas/desktop/ibus/general/hotkey/next_engine"/>
-                                       <entry name="disable_unconditional" mtime="1514432255" schema="/schemas/desktop/ibus/general/hotkey/disable_unconditional"/>
-                                       <entry name="enable_unconditional" mtime="1514432255" schema="/schemas/desktop/ibus/general/hotkey/enable_unconditional"/>
-                                       <entry name="triggers" mtime="1514432255" schema="/schemas/desktop/ibus/general/hotkey/triggers"/>
-                                       <entry name="trigger" mtime="1514432255" schema="/schemas/desktop/ibus/general/hotkey/trigger"/>
+                                       <entry name="previous_engine" mtime="1515360940" schema="/schemas/desktop/ibus/general/hotkey/previous_engine"/>
+                                       <entry name="prev_engine" mtime="1515360940" schema="/schemas/desktop/ibus/general/hotkey/prev_engine"/>
+                                       <entry name="next_engine_in_menu" mtime="1515360940" schema="/schemas/desktop/ibus/general/hotkey/next_engine_in_menu"/>
+                                       <entry name="next_engine" mtime="1515360940" schema="/schemas/desktop/ibus/general/hotkey/next_engine"/>
+                                       <entry name="disable_unconditional" mtime="1515360940" schema="/schemas/desktop/ibus/general/hotkey/disable_unconditional"/>
+                                       <entry name="enable_unconditional" mtime="1515360940" schema="/schemas/desktop/ibus/general/hotkey/enable_unconditional"/>
+                                       <entry name="triggers" mtime="1515360940" schema="/schemas/desktop/ibus/general/hotkey/triggers"/>
+                                       <entry name="trigger" mtime="1515360940" schema="/schemas/desktop/ibus/general/hotkey/trigger"/>
                                </dir>
                        </dir>
                </dir>
@@ -16530,7 +16540,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                <dir name="desktop">
                        <dir name="ibus">
                                <dir name="panel">
-                                       <entry name="property-icon-delay-time" mtime="1514432255" type="schema" stype="int" owner="ibus">
+                                       <entry name="property-icon-delay-time" mtime="1515360940" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="The milliseconds to show the panel icon for a property">
                                                        <default type="int" value="500"/>
                                                        <longdesc>The milliseconds to show the panel icon from the
@@ -16541,7 +16551,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                 is shown immediately.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="xkb-icon-rgba" mtime="1514432255" type="schema" stype="string" owner="ibus">
+                                       <entry name="xkb-icon-rgba" mtime="1515360940" type="schema" stype="string" owner="ibus">
                                                <local_schema locale="C" short_desc="RGBA value of XKB icon">
                                                        <default type="string">
                                                                <stringvalue>#415099</stringvalue>
@@ -16558,7 +16568,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                   of the alpha.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="follow-input-cursor-when-always-shown" mtime="1514432255" type="schema" stype="bool" owner="ibus">
+                                       <entry name="follow-input-cursor-when-always-shown" mtime="1515360940" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Follow the input cursor in case the panel is always shown">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>If true, the panel follows the input cursor in case the
@@ -16566,14 +16576,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                 a fixed location.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="auto-hide-timeout" mtime="1514432255" type="schema" stype="int" owner="ibus">
+                                       <entry name="auto-hide-timeout" mtime="1515360940" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="The milliseconds to show property panel">
                                                        <default type="int" value="10000"/>
                                                        <longdesc>The milliseconds to show property panel after focus-in or
                 properties are changed.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="custom_font" mtime="1514432255" type="schema" stype="string" owner="ibus">
+                                       <entry name="custom_font" mtime="1515360940" type="schema" stype="string" owner="ibus">
                                                <local_schema locale="C" short_desc="Custom font">
                                                        <default type="string">
                                                                <stringvalue>Sans 10</stringvalue>
@@ -16581,56 +16591,127 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Custom font name for language panel</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_custom_font" mtime="1514432255" type="schema" stype="bool" owner="ibus">
+                                       <entry name="use_custom_font" mtime="1515360940" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Use custom font">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Use custom font name for language panel</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="show_im_name" mtime="1514432255" type="schema" stype="bool" owner="ibus">
+                                       <entry name="show_im_name" mtime="1515360940" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Show input method name">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Show input method name on language bar</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="show_icon_on_systray" mtime="1514432255" type="schema" stype="bool" owner="ibus">
+                                       <entry name="show_icon_on_systray" mtime="1515360940" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Show icon on system tray">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Show icon on system tray</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="lookup_table_orientation" mtime="1514432255" type="schema" stype="int" owner="ibus">
+                                       <entry name="lookup_table_orientation" mtime="1515360940" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Orientation of lookup table">
                                                        <default type="int" value="1"/>
                                                        <longdesc>Orientation of lookup table. 0 = Horizontal, 1 = Vertical</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="y" mtime="1514432255" type="schema" stype="int" owner="ibus">
+                                       <entry name="y" mtime="1515360940" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Language panel position">
                                                        <default type="int" value="-1"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="x" mtime="1514432255" type="schema" stype="int" owner="ibus">
+                                       <entry name="x" mtime="1515360940" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Language panel position">
                                                        <default type="int" value="-1"/>
                                                </local_schema>
                                        </entry>
-                                       <entry name="show" mtime="1514432255" type="schema" stype="int" owner="ibus">
+                                       <entry name="show" mtime="1515360940" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Auto hide">
                                                        <default type="int" value="0"/>
                                                        <longdesc>The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show</longdesc>
                                                </local_schema>
                                        </entry>
+                                       <dir name="emoji">
+                                               <entry name="partial-match-condition" mtime="1515360940" type="schema" stype="int" owner="ibus">
+                                                       <local_schema locale="C" short_desc="Choose a condition to match emoji annotations partially">
+                                                               <default type="int" value="0"/>
+                                                               <longdesc>Choose one of the following conditions to match emoji
+                 annotations partially:
+                  0 == Prefix match, 1 == Suffix match, 2 == Containing match
+                  </longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="partial-match-length" mtime="1515360940" type="schema" stype="int" owner="ibus">
+                                                       <local_schema locale="C" short_desc="Match emoji annotaions with the specified length">
+                                                               <default type="int" value="3"/>
+                                                               <longdesc>Match emoji annotations partially with more than
+                  the specified number of characters instead of
+                  the exact match.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="has-partial-match" mtime="1515360940" type="schema" stype="bool" owner="ibus">
+                                                       <local_schema locale="C" short_desc="Whether emoji annotaions can be match partially or not">
+                                                               <default type="bool" value="false"/>
+                                                               <longdesc>Whether emoji annotations can be matched with a partial
+                  string instead of the exact match or not.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="favorite-annotations" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
+                                                       <local_schema locale="C" short_desc="favorite emoji annotation list on emoji dialog">
+                                                               <default type="list" ltype="string">
+                                                               </default>
+                                                               <longdesc>You can assign an annotation for a favorite emoji
+                  in this list.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="favorites" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
+                                                       <local_schema locale="C" short_desc="favorite emoji list on emoji dialog">
+                                                               <default type="list" ltype="string">
+                                                               </default>
+                                                               <longdesc>You can show the favorite emojis on emoji list
+                  if this list has any characters.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="lang" mtime="1515360940" type="schema" stype="string" owner="ibus">
+                                                       <local_schema locale="C" short_desc="Default language for emoji dictionary">
+                                                               <default type="string">
+                                                                       <stringvalue>en</stringvalue>
+                                                               </default>
+                                                               <longdesc>Choose a default language of emoji dictionaries on
+                 the emoji dialog. The value $lang is applied to
+                  /usr/share/ibus/dicts/emoji-$lang.dict
+            </longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="font" mtime="1515360940" type="schema" stype="string" owner="ibus">
+                                                       <local_schema locale="C" short_desc="Custom font">
+                                                               <default type="string">
+                                                                       <stringvalue>Monospace 16</stringvalue>
+                                                               </default>
+                                                               <longdesc>Custom font name for emoji chracters on emoji dialog</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="hotkey" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
+                                                       <local_schema locale="C" short_desc="Emoji shortcut keys for gtk_accelerator_parse">
+                                                               <default type="list" ltype="string">
+                                                                       <li type="string">
+                                                                               <stringvalue>&lt;Control&gt;&lt;Shift&gt;e</stringvalue>
+                                                                       </li>
+                                                               </default>
+                                                               <longdesc>The shortcut keys for turning emoji typing on or off</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                </dir>
                                <dir name="general">
-                                       <entry name="use-xmodmap" mtime="1514432255" type="schema" stype="bool" owner="ibus">
+                                       <entry name="use-xmodmap" mtime="1515360940" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Use xmodmap">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Run xmodmap if .xmodmap or .Xmodmap exists when
                 ibus engines are switched.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="xkb-latin-layouts" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                       <entry name="xkb-latin-layouts" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                <local_schema locale="C" short_desc="Latin layouts which have no ASCII">
                                                        <default type="list" ltype="string">
                                                                <li type="string">
@@ -16675,7 +16756,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
            </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="version" mtime="1514432255" type="schema" stype="string" owner="ibus">
+                                       <entry name="version" mtime="1515360940" type="schema" stype="string" owner="ibus">
                                                <local_schema locale="C" short_desc="Saved version number">
                                                        <default type="string">
                                                                <stringvalue></stringvalue>
@@ -16686,7 +16767,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
             </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="dconf_preserve_name_prefixes" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                       <entry name="dconf_preserve_name_prefixes" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                <local_schema locale="C" short_desc="DConf preserve name prefixes">
                                                        <default type="list" ltype="string">
                                                                <li type="string">
@@ -16702,32 +16783,32 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Prefixes of DConf keys to stop name conversion</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="enable_by_default" mtime="1514432255" type="schema" stype="bool" owner="ibus">
+                                       <entry name="enable_by_default" mtime="1515360940" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Enable input method by default">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Enable input method by default when the application gets input
             focus</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_global_engine" mtime="1514432255" type="schema" stype="bool" owner="ibus">
+                                       <entry name="use_global_engine" mtime="1515360940" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Use global input method">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Share the same input method among all applications</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="embed_preedit_text" mtime="1514432255" type="schema" stype="bool" owner="ibus">
+                                       <entry name="embed_preedit_text" mtime="1515360940" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Embed Preedit Text">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Embed Preedit Text in Application Window</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_system_keyboard_layout" mtime="1514432255" type="schema" stype="bool" owner="ibus">
+                                       <entry name="use_system_keyboard_layout" mtime="1515360940" type="schema" stype="bool" owner="ibus">
                                                <local_schema locale="C" short_desc="Use system keyboard layout">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Use system keyboard (XKB) layout</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="switcher-delay-time" mtime="1514432255" type="schema" stype="int" owner="ibus">
+                                       <entry name="switcher-delay-time" mtime="1515360940" type="schema" stype="int" owner="ibus">
                                                <local_schema locale="C" short_desc="Popup delay milliseconds for IME switcher window">
                                                        <default type="int" value="400"/>
                                                        <longdesc>Set popup delay milliseconds to show IME switcher window.
@@ -16738,14 +16819,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
             </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="engines_order" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                       <entry name="engines_order" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                <local_schema locale="C" short_desc="Engines order">
                                                        <default type="list" ltype="string">
                                                        </default>
                                                        <longdesc>Saved engines order in input method list</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="preload_engines" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                       <entry name="preload_engines" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                <local_schema locale="C" short_desc="Preload engines">
                                                        <default type="list" ltype="string">
                                                        </default>
@@ -16753,21 +16834,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </local_schema>
                                        </entry>
                                        <dir name="hotkey">
-                                               <entry name="previous_engine" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="previous_engine" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Prev engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for switching to the previous input method</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="prev_engine" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="prev_engine" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Prev engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for switching to the previous input method</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="next_engine_in_menu" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="next_engine_in_menu" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Next engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">
@@ -16777,7 +16858,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The shortcut keys for switching to the next input method in the list</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="next_engine" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="next_engine" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Next engine shortcut keys">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">
@@ -16787,21 +16868,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The shortcut keys for switching to the next input method in the list</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="disable_unconditional" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="disable_unconditional" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Disable shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for turning input method off</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable_unconditional" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="enable_unconditional" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Enable shortcut keys">
                                                                <default type="list" ltype="string">
                                                                </default>
                                                                <longdesc>The shortcut keys for turning input method on</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="triggers" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="triggers" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Trigger shortcut keys for gtk_accelerator_parse">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">
@@ -16811,7 +16892,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The shortcut keys for turning input method on or off</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="trigger" mtime="1514432255" type="schema" stype="list" owner="ibus" list_type="string">
+                                               <entry name="trigger" mtime="1515360940" type="schema" stype="list" owner="ibus" list_type="string">
                                                        <local_schema locale="C" short_desc="Trigger shortcut keys">
                                                                <default type="list" ltype="string">
                                                                        <li type="string">