From ec29cc70d703689ba78f2841edf924da8760aa9b Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sun, 7 Jan 2018 22:36:40 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- dconf/db/ibus | Bin 2227 -> 2730 bytes gconf/gconf.xml.defaults/%gconf-tree-de.xml | 52 +++++ .../gconf.xml.defaults/%gconf-tree-en_GB.xml | 6 + gconf/gconf.xml.defaults/%gconf-tree-ru.xml | 30 +++ gconf/gconf.xml.defaults/%gconf-tree-vi.xml | 6 + gconf/gconf.xml.defaults/%gconf-tree.xml | 205 ++++++++++++------ 6 files changed, 237 insertions(+), 62 deletions(-) diff --git a/dconf/db/ibus b/dconf/db/ibus index 069e0c45642e7f5fe32b9956ca49068b88e33622..dde7a6218dd54c5631faa71d3610f56979343228 100644 GIT binary patch literal 2730 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 diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 7b76507d..98686a85 100644 --- 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«. + + + + + + + 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 '#rrggbb' wobei 'r', 'g' und 'b' HEX-Werte für Rot, Grün und Blau sind, 3. eine RGB-Farbe in der Form 'rgb(r,g,b)' oder 4. eine RGBA-Farbe in der Form 'rgba(r,g,b,a)' wobei 'r', 'g', und 'b' entweder Integer im Bereich 0 bis 255 oder Prozentwerte von 0-100% sind und 'a' ein Gleitkommawert im Bereich 0 bis 1 für das Alpha ist. + + + + + Wenn wahr folgt das Panel dem Input-Cursor wenn das Panel immer angezeigt wird. Wenn falsch wird das Panel an einer festen Position angezeigt. + + + + + Millisekunden bis zum Anzeigen der Eigenschaftenleiste nach Fokuswechsel oder Eigenschaftenwechsel. + + Name der benutzerdefinierten Schriftart für Sprach-Panel @@ -6812,10 +6831,43 @@ z.B. »Sans Italic 10«. + Verhalten des Eigenschaften-Panels. 0 = nicht anzeigen, 1 = automatisch verstecken, 2 = immer anzeigen + + + + Sie können die favorisierten Emoji in der Emoji-Liste anzeigen wenn die Liste Zeichen enthält. + + + + + 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. + + + + + Benutzerdefinierter Font-Name für Emoji-Zeichen im Emoji-Dialog + + + + + Tastenkombination zum Ein- und Ausschalten der Emoji-Eingabe + + + + + + xmodmap ausführen wenn .xmodmap oder .Xmodmap vorhanden ist wenn ibus Engines gewechselt werden. + + + + + US Tastaturbelegung wird den Latin Tastaturbelegungen angefügt. Varianten können vernachlässigt werden. + + Die gespeicherte Versions-Nummer wird verwendet, um den Unterschied zwischen der Version der zuvor installierten ibus und der aktuellen ibus zu überprüfen. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index 551ae6d3..bbec8c6d 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -6764,6 +6764,12 @@ + + + + + + diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index 62031b2c..0f264689 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -6719,6 +6719,20 @@ + + + + + + + Если «true», панель следует за курсором ввода в случае, если панель всегда видна. Если «false», панель отображается в фиксированном месте. + + + + + Миллисекунды для отображения панели свойств после смены фокуса ввода или свойств. + + Свой шрифт для языковой панели @@ -6754,10 +6768,26 @@ + Режим работы панели свойств. 0 = не показывать, 1 = автоматически скрывать, 2 = всегда показывать + + + + + + + + + + + + + Раскладка США добавлена к латинским раскладкам. Вариант может быть опущен. + + Сохраненный номер версии используется для сравнения предыдущей версии ibus с текущей. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml index 55d6f667..e28a23dc 100644 --- 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 để + + + + + + diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 75788f38..0f853419 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2114,40 +2114,50 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -16530,7 +16540,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + 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. - + #415099 @@ -16558,7 +16568,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati of the alpha. - + 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. - + The milliseconds to show property panel after focus-in or properties are changed. - + Sans 10 @@ -16581,56 +16591,127 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Custom font name for language panel - + Use custom font name for language panel - + Show input method name on language bar - + Show icon on system tray - + Orientation of lookup table. 0 = Horizontal, 1 = Vertical - + - + - + The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show + + + + + Choose one of the following conditions to match emoji + annotations partially: + 0 == Prefix match, 1 == Suffix match, 2 == Containing match + + + + + + + Match emoji annotations partially with more than + the specified number of characters instead of + the exact match. + + + + + + Whether emoji annotations can be matched with a partial + string instead of the exact match or not. + + + + + + + You can assign an annotation for a favorite emoji + in this list. + + + + + + + You can show the favorite emojis on emoji list + if this list has any characters. + + + + + + en + + Choose a default language of emoji dictionaries on + the emoji dialog. The value $lang is applied to + /usr/share/ibus/dicts/emoji-$lang.dict + + + + + + + Monospace 16 + + Custom font name for emoji chracters on emoji dialog + + + + + +
  • + <Control><Shift>e +
    • +     + The shortcut keys for turning emoji typing on or off +     +     +     - + Run xmodmap if .xmodmap or .Xmodmap exists when ibus engines are switched. - +
  • @@ -16675,7 +16756,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16686,7 +16767,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -16702,32 +16783,32 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Prefixes of DConf keys to stop name conversion - + Enable input method by default when the application gets input focus - + Share the same input method among all applications - + Embed Preedit Text in Application Window - + Use system keyboard (XKB) layout - + 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 - + Saved engines order in input method list - + @@ -16753,21 +16834,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + The shortcut keys for switching to the previous input method - + The shortcut keys for switching to the previous input method - +
  • @@ -16777,7 +16858,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The shortcut keys for switching to the next input method in the list - +
  • @@ -16787,21 +16868,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The shortcut keys for switching to the next input method in the list - + The shortcut keys for turning input method off - + The shortcut keys for turning input method on - +
  • @@ -16811,7 +16892,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The shortcut keys for turning input method on or off - +
  • -- 2.39.5