Hello community, here is the log from the commit of package fcitx-anthy for openSUSE:Factory checked in at 2014-06-10 14:38:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-anthy (Old) and /work/SRC/openSUSE:Factory/.fcitx-anthy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-anthy" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-anthy/fcitx-anthy.changes 2013-07-08 13:34:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-anthy.new/fcitx-anthy.changes 2014-06-10 14:38:55.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 9 04:56:42 UTC 2014 - i...@marguerite.su + +- update version 0.2.1 + * Fix Google Code Issue 729 + +------------------------------------------------------------------- Old: ---- fcitx-anthy-0.2.0.tar.xz New: ---- fcitx-anthy-0.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-anthy.spec ++++++ --- /var/tmp/diff_new_pack.iQhiBA/_old 2014-06-10 14:38:56.000000000 +0200 +++ /var/tmp/diff_new_pack.iQhiBA/_new 2014-06-10 14:38:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx-anthy # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: fcitx-anthy -Version: 0.2.0 +Version: 0.2.1 Release: 0 Summary: Japanese Anthy IME Wrapper for Fcitx License: GPL-2.0+ ++++++ fcitx-anthy-0.2.0.tar.xz -> fcitx-anthy-0.2.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-anthy-0.2.0/po/de.po new/fcitx-anthy-0.2.1/po/de.po --- old/fcitx-anthy-0.2.0/po/de.po 2013-06-03 20:02:35.000000000 +0200 +++ new/fcitx-anthy-0.2.1/po/de.po 2014-05-15 21:57:28.000000000 +0200 @@ -3,14 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# mar well <marwell.1...@freenet.de>, 2013 +# Seneca, 2013 +# mar well <m.wellend...@gmx.de>, 2013 +# yuwash <yuw...@yandex.com>, 2014 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n" -"POT-Creation-Date: 2013-06-03 14:02-0400\n" -"PO-Revision-Date: 2013-05-22 06:30+0000\n" -"Last-Translator: mar well <marwell.1...@freenet.de>\n" +"POT-Creation-Date: 2014-03-01 18:01+0000\n" +"PO-Revision-Date: 2014-03-01 16:10+0000\n" +"Last-Translator: yuwash <yuw...@yandex.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/fcitx/language/"; "de/)\n" "Language: de\n" @@ -22,123 +24,123 @@ #: src/imengine.cpp:515 #, c-format msgid "(%d / %d)" -msgstr "" +msgstr "(%d / %d)" #: src/fcitx-anthy.desc:155 msgid "101kana" -msgstr "" +msgstr "101kana" #: src/fcitx-anthy.desc:462 msgid "Add Word" -msgstr "" +msgstr "Wort hinzufügen" #: src/fcitx-anthy.desc:487 msgid "Add word" -msgstr "" +msgstr "Wort hinzufügen" #: src/fcitx-anthy.desc:84 msgid "Allow split" -msgstr "" +msgstr "Aufteilen erlauben" #: src/fcitx-anthy.desc:387 msgid "Alternative Select next candidate" -msgstr "" +msgstr "Alternative Auswahl nächster Kandidat" #: src/fcitx-anthy.desc:397 msgid "Alternative Select prev candidate" -msgstr "" +msgstr "Alternative Auswahl vorheriger Kandidat" -#: src/factory.cpp:91 src/anthy.conf.in:3 src/fcitx-anthy.conf.in:3 +#: src/factory.cpp:92 src/anthy.conf.in:3 src/fcitx-anthy.conf.in:3 msgid "Anthy" -msgstr "" +msgstr "Anthy" #: src/fcitx-anthy.conf.in:4 msgid "Anthy Wrapper For Fcitx" -msgstr "" +msgstr "Anthy Wrapper für Fcitx" #: src/fcitx-anthy.desc:128 src/fcitx-anthy.desc:141 msgid "Atok" -msgstr "" +msgstr "Atok" #: src/fcitx-anthy.desc:142 msgid "Azik" -msgstr "" +msgstr "Azik" #: src/fcitx-anthy.desc:262 msgid "BackSpace" -msgstr "" +msgstr "Backspace" #: src/fcitx-anthy.desc:292 msgid "Cancel" -msgstr "" +msgstr "Abbrechen" #: src/fcitx-anthy.desc:297 msgid "Cancel all" -msgstr "" +msgstr "Alle abbrechen" #: src/fcitx-anthy.desc:236 msgid "Cancel pseudo ascii mode" -msgstr "" +msgstr "Pseudo-ASCII-Modus beenden" #: src/fcitx-anthy.desc:8 msgid "Candidate List Layout" -msgstr "" +msgstr "Layout der Kandidatenliste" #: src/fcitx-anthy.desc:407 msgid "Candidates Page Down" -msgstr "" +msgstr "Nächste Kandidaten" #: src/fcitx-anthy.desc:402 msgid "Candidates Page Up" -msgstr "" +msgstr "Vorherige Kandidaten" #: src/fcitx-anthy.desc:129 src/fcitx-anthy.desc:143 msgid "Canna" -msgstr "" +msgstr "Canna" #: src/fcitx-anthy.desc:196 msgid "Circle input mode" -msgstr "" +msgstr "Zwischen Eingabemodi wechseln" #: src/fcitx-anthy.desc:201 msgid "Circle kana mode" -msgstr "" +msgstr "Zwischen Kana-Modi wechseln" #: src/fcitx-anthy.desc:206 msgid "Circle typing method" -msgstr "" +msgstr "Zwischen Eingabemethoden wechseln" #: src/fcitx-anthy.desc:485 src/fcitx-anthy.desc:490 msgid "Command" -msgstr "" +msgstr "Befehl" #: src/fcitx-anthy.desc:272 msgid "Commit" -msgstr "" +msgstr "Übernehmen" #: src/fcitx-anthy.desc:277 msgid "Commit Reverse Learn" -msgstr "" +msgstr "Übernehmen und aus dem Wörterbuch löschen" #: src/fcitx-anthy.desc:352 msgid "Commit first segment" -msgstr "" +msgstr "Erstes Segment übernehmen" #: src/fcitx-anthy.desc:362 msgid "Commit first segment reverse learn" -msgstr "" +msgstr "Erstes Segment übernehmen und aus dem Wörterbuch löschen" #: src/fcitx-anthy.desc:357 msgid "Commit selected segment" -msgstr "" +msgstr "Ausgewähltes Segment übernehmen" #: src/fcitx-anthy.desc:367 msgid "Commit selected segment reverse learn" -msgstr "" +msgstr "Ausgewähltes Segment übernehmen und aus dem Wörterbuch löschen" #: src/imengine.cpp:804 msgid "Conversion Mode" -msgstr "" +msgstr "Umwandlungsmodus" #: src/fcitx-anthy.desc:44 msgid "Conversion mode" @@ -146,93 +148,93 @@ #: src/fcitx-anthy.desc:282 msgid "Convert" -msgstr "" +msgstr "Transkribieren" #: src/fcitx-anthy.desc:432 msgid "Convert To Half" -msgstr "" +msgstr "Umwandeln in Halbbreit" #: src/fcitx-anthy.desc:437 msgid "Convert To Half Katakana" -msgstr "" +msgstr "Umwandeln in Halbbreite Katakana" #: src/fcitx-anthy.desc:422 msgid "Convert To Hiragana" -msgstr "" +msgstr "In Hiragana umwandeln" #: src/fcitx-anthy.desc:427 msgid "Convert To Katakana" -msgstr "" +msgstr "In Katakana umwandeln" #: src/fcitx-anthy.desc:447 msgid "Convert To Latin" -msgstr "" +msgstr "Umwandeln in Latin" #: src/fcitx-anthy.desc:442 msgid "Convert To Wide Latin" -msgstr "" +msgstr "Umwandeln in Wide-Latin" #: src/imengine.cpp:599 msgid "Convert as you type (Multi segment)" -msgstr "" +msgstr "Beim Schreiben unwandeln (Multi Segment)" #: src/imengine.cpp:600 msgid "Convert as you type (Single segment)" -msgstr "" +msgstr "Beim Schreiben umwandeln (Einfach Segment)" #: src/fcitx-anthy.desc:417 msgid "Convert char type backward" -msgstr "" +msgstr "Zeichentyp rückwärts umwandeln" #: src/fcitx-anthy.desc:412 msgid "Convert char type forward" -msgstr "" +msgstr "Zeichentyp vorwärts umwandeln" #: src/fcitx-anthy.desc:69 msgid "Corner bracket and wide slash" -msgstr "" +msgstr "Eckige Klammern und breiter Schrägstrich" #: src/fcitx-anthy.desc:133 src/fcitx-anthy.desc:147 src/fcitx-anthy.desc:158 #: src/fcitx-anthy.desc:172 msgid "Custom" -msgstr "" +msgstr "Anwendungsspezifisch" #: src/fcitx-anthy.desc:187 msgid "Custom Kana Table" -msgstr "" +msgstr "Benutzerdefinierte Kana-Tabelle" #: src/fcitx-anthy.desc:177 msgid "Custom Key Binding" -msgstr "" +msgstr "Benutzerdefinierte Tastenbindung" #: src/fcitx-anthy.desc:192 msgid "Custom Nicola Table" -msgstr "" +msgstr "Benutzerdefinierte Nicola-Tabelle" #: src/fcitx-anthy.desc:182 msgid "Custom Romaji Table" -msgstr "" +msgstr "Benutzerdefinierte Romaji-Tabelle" #: src/fcitx-anthy.desc:127 src/fcitx-anthy.desc:140 src/fcitx-anthy.desc:154 #: src/fcitx-anthy.desc:165 msgid "Default" -msgstr "" +msgstr "Standard" #: src/fcitx-anthy.desc:267 msgid "Delete" -msgstr "" +msgstr "Löschen" #: src/fcitx-anthy.desc:457 src/fcitx-anthy.desc:492 msgid "Dict admin" -msgstr "" +msgstr "Wörterbuch Admin" #: src/imengine.cpp:586 msgid "Direct input" -msgstr "" +msgstr "Direkte Eingabe" #: src/fcitx-anthy.desc:347 msgid "Expand segment" -msgstr "" +msgstr "Segment vergrößern" #: src/fcitx-anthy.desc:1 src/fcitx-anthy.desc:6 src/fcitx-anthy.desc:15 #: src/fcitx-anthy.desc:22 src/fcitx-anthy.desc:33 src/fcitx-anthy.desc:42 @@ -240,39 +242,39 @@ #: src/fcitx-anthy.desc:77 src/fcitx-anthy.desc:82 src/fcitx-anthy.desc:87 #: src/fcitx-anthy.desc:92 msgid "General" -msgstr "" +msgstr "Allgemein" #: src/fcitx-anthy.desc:10 msgid "Global" -msgstr "" +msgstr "Global" #: src/fcitx-anthy.desc:29 msgid "Half Katakana" -msgstr "" +msgstr "Halbbreite Katakana" #: src/fcitx-anthy.desc:231 msgid "Half Katakana mode" -msgstr "" +msgstr "Katakana-Modus (halbläufig)" #: src/imengine.cpp:585 msgid "Half width katakana" -msgstr "" +msgstr "Halbbreite Katakana" #: src/imengine.cpp:583 src/fcitx-anthy.desc:27 msgid "Hiragana" -msgstr "" +msgstr "Hiragana" #: src/fcitx-anthy.desc:221 msgid "Hiragana mode" -msgstr "" +msgstr "Hiragana-Modus" #: src/fcitx-anthy.desc:12 msgid "Horizontal" -msgstr "" +msgstr "Horizontal" #: src/imengine.cpp:802 msgid "Input Mode" -msgstr "" +msgstr "Eingabemodus" #: src/fcitx-anthy.desc:24 msgid "Input mode" @@ -280,44 +282,44 @@ #: src/fcitx-anthy.desc:247 msgid "Insert Alternative space" -msgstr "" +msgstr "Alternatives Leerzeichen einfügen" #: src/fcitx-anthy.desc:252 msgid "Insert Half Space" -msgstr "" +msgstr "Halbes Leerzeichen einfügen" #: src/fcitx-anthy.desc:242 msgid "Insert space" -msgstr "" +msgstr "Leerzeichen einfügen" #: src/fcitx-anthy.desc:257 msgid "Insert wide space" -msgstr "" +msgstr "Weites Leerzeichen einfügen" #: src/fcitx-anthy.desc:97 src/fcitx-anthy.desc:102 src/fcitx-anthy.desc:107 #: src/fcitx-anthy.desc:112 src/fcitx-anthy.desc:117 msgid "Interface" -msgstr "" +msgstr "Oberfläche" #: src/fcitx-anthy.desc:59 src/fcitx-anthy.desc:67 msgid "Japanese" -msgstr "" +msgstr "Japanisch" #: src/imengine.cpp:592 src/fcitx-anthy.desc:39 msgid "Kana" -msgstr "" +msgstr "Kana" #: src/fcitx-anthy.desc:152 msgid "Kana Table" -msgstr "" +msgstr "Kana-Tabelle" #: src/imengine.cpp:584 src/fcitx-anthy.desc:28 msgid "Katakana" -msgstr "" +msgstr "Katakana" #: src/fcitx-anthy.desc:226 msgid "Katakana mode" -msgstr "" +msgstr "Katakana-Modus" #: src/fcitx-anthy.desc:194 src/fcitx-anthy.desc:199 src/fcitx-anthy.desc:204 #: src/fcitx-anthy.desc:209 src/fcitx-anthy.desc:214 src/fcitx-anthy.desc:219 @@ -340,225 +342,225 @@ #: src/fcitx-anthy.desc:465 src/fcitx-anthy.desc:470 src/fcitx-anthy.desc:475 #: src/fcitx-anthy.desc:480 msgid "Key" -msgstr "" +msgstr "Taste" #: src/fcitx-anthy.desc:125 msgid "Key binding profile" -msgstr "" +msgstr "Tastenbindungsprofil" #: src/fcitx-anthy.desc:122 src/fcitx-anthy.desc:135 src/fcitx-anthy.desc:149 #: src/fcitx-anthy.desc:160 src/fcitx-anthy.desc:174 src/fcitx-anthy.desc:179 #: src/fcitx-anthy.desc:184 src/fcitx-anthy.desc:189 msgid "KeyProfile" -msgstr "" +msgstr "TastenProfil" #: src/fcitx-anthy.desc:30 src/fcitx-anthy.desc:58 msgid "Latin" -msgstr "" +msgstr "Latin" #: src/fcitx-anthy.desc:211 msgid "Latin mode" -msgstr "" +msgstr "Lateinisches Alphabet" #: src/fcitx-anthy.desc:79 msgid "Learn on auto commit" -msgstr "" +msgstr "Lernen per automatischer Übergabe" #: src/fcitx-anthy.desc:74 msgid "Learn on manual commit" -msgstr "" +msgstr "Lernen per manueller Übergabe" #: src/fcitx-anthy.desc:467 msgid "Left thumb key" -msgstr "" +msgstr "Linke Daumentaste" #: src/fcitx-anthy.desc:130 src/fcitx-anthy.desc:144 msgid "MS IME" -msgstr "" +msgstr "MS IME" #: src/fcitx-anthy.desc:302 msgid "Move Caret First" -msgstr "" +msgstr "Eingabemarke ganz vorne" #: src/fcitx-anthy.desc:317 msgid "Move caret backward" -msgstr "" +msgstr "Eingabemarke nach hinten" #: src/fcitx-anthy.desc:312 msgid "Move caret forward" -msgstr "" +msgstr "Eingabemarke nach vorn" #: src/fcitx-anthy.desc:307 msgid "Move caret last" -msgstr "" +msgstr "Eingabemarke ganz hinten" #: src/imengine.cpp:597 src/fcitx-anthy.desc:47 msgid "Multi segment" -msgstr "" +msgstr "Multi Segment" #: src/fcitx-anthy.desc:49 msgid "Multi segment immediate" -msgstr "" +msgstr "Mehrere Satzteile sofort" #: src/imengine.cpp:593 src/fcitx-anthy.desc:40 msgid "Nicola" -msgstr "" +msgstr "Nicola" #: src/fcitx-anthy.desc:163 msgid "Nicola Table" -msgstr "" +msgstr "Nicola-Tabelle" #: src/fcitx-anthy.desc:482 msgid "Nicola time" -msgstr "" +msgstr "Nicola-Zeit" #: src/fcitx-anthy.desc:166 msgid "Nicola-A" -msgstr "" +msgstr "Nicola-A" #: src/fcitx-anthy.desc:167 msgid "Nicola-F" -msgstr "" +msgstr "Nicola-F" #: src/fcitx-anthy.desc:168 msgid "Nicola-J" -msgstr "" +msgstr "Nicola-J" #: src/fcitx-anthy.desc:17 msgid "Number candidate of Triggers To Show Candidate Window" -msgstr "" +msgstr "Anzahl der Kanditaten, bei der das Kandidatenfenster angezeigt wird" #: src/fcitx-anthy.desc:169 msgid "Oasys100J" -msgstr "" +msgstr "Oasys100J" #: src/fcitx-anthy.desc:3 msgid "Page size" -msgstr "" +msgstr "Größe des Kandidatenfensters" #: src/imengine.cpp:805 msgid "Period Style" -msgstr "" +msgstr "Interpunktionsstil" #: src/fcitx-anthy.desc:54 msgid "Period style" -msgstr "" +msgstr "Interpunktionsstil" #: src/fcitx-anthy.desc:287 msgid "Predict" -msgstr "" +msgstr "Transkription vorschlagen" #: src/fcitx-anthy.desc:452 msgid "Reconvert" -msgstr "" +msgstr "Umwandeln zurücknehmen" #: src/fcitx-anthy.desc:472 msgid "Right thumb key" -msgstr "" +msgstr "Rechte Daumentaste" #: src/fcitx-anthy.desc:477 msgid "Ro key for kana layout" -msgstr "" +msgstr "Ro-Taste für Kana-Belegung" #: src/imengine.cpp:591 src/fcitx-anthy.desc:38 msgid "Romaji" -msgstr "" +msgstr "Romaji" #: src/fcitx-anthy.desc:138 msgid "Romaji Table" -msgstr "" +msgstr "Romaji-Tabelle" #: src/fcitx-anthy.desc:372 msgid "Select first candidate" -msgstr "" +msgstr "Ersten Kandidaten auswählen" #: src/fcitx-anthy.desc:322 msgid "Select first segment" -msgstr "" +msgstr "Erstes Segment auswählen" #: src/fcitx-anthy.desc:377 msgid "Select last candidate" -msgstr "" +msgstr "Letzten Kanditaten auswählen" #: src/fcitx-anthy.desc:327 msgid "Select last segment" -msgstr "" +msgstr "Letztes Segment auswählen" #: src/fcitx-anthy.desc:382 msgid "Select next candidate" -msgstr "" +msgstr "Nächsten Kanditaten auswählen" #: src/fcitx-anthy.desc:332 msgid "Select next segment" -msgstr "" +msgstr "Nächstes Segment auswählen" #: src/fcitx-anthy.desc:392 msgid "Select prev candidate" -msgstr "" +msgstr "Vorherigen Kanditaten auswählen" #: src/fcitx-anthy.desc:337 msgid "Select previous segment" -msgstr "" +msgstr "Vorheriges Segment auswählen" #: src/fcitx-anthy.desc:94 msgid "Show candidates label" -msgstr "" +msgstr "Kandidatenbeschriftung anzeigen" #: src/fcitx-anthy.desc:109 msgid "Show conversion mode" -msgstr "" +msgstr "Umwandlungsmodus anzeigen" #: src/fcitx-anthy.desc:99 msgid "Show input mode" -msgstr "" +msgstr "Eingabemodus zeigen" #: src/fcitx-anthy.desc:114 msgid "Show period style" -msgstr "" +msgstr "Interpunktionsstil anzeigen" #: src/fcitx-anthy.desc:119 msgid "Show symbol style" -msgstr "" +msgstr "Symbolstil anzeigen" #: src/fcitx-anthy.desc:104 msgid "Show typing method" -msgstr "" +msgstr "Schreibmethode anzeigen" #: src/fcitx-anthy.desc:342 msgid "Shrink segment" -msgstr "" +msgstr "Segment verkleinern" #: src/imengine.cpp:598 src/fcitx-anthy.desc:48 msgid "Single segment" -msgstr "" +msgstr "Einfach Segment" #: src/fcitx-anthy.desc:50 msgid "Single segment immediate" -msgstr "" +msgstr "Einzelne Satzteile sofort" #: src/imengine.cpp:806 msgid "Symbol Style" -msgstr "" +msgstr "Symbolstil" #: src/fcitx-anthy.desc:64 msgid "Symbol style" -msgstr "Stil Symbol" +msgstr "Symbolstil" #: src/imengine.cpp:593 msgid "Thumb shift" -msgstr "" +msgstr "Daumen-Umschaltetaste" #: src/fcitx-anthy.desc:170 msgid "Tron Dvorak" -msgstr "" +msgstr "Tron Dvorak" #: src/fcitx-anthy.desc:171 msgid "Tron Qwerty JP" -msgstr "" +msgstr "Tron Qwerty JP" #: src/imengine.cpp:803 msgid "Typing Method" -msgstr "" +msgstr "Schreibmethode" #: src/fcitx-anthy.desc:35 msgid "Typing method" @@ -566,48 +568,48 @@ #: src/fcitx-anthy.desc:89 msgid "Use direct key on predict" -msgstr "" +msgstr "Bei Worthinweis Richtungstaste benutzen" #: src/fcitx-anthy.desc:11 msgid "Vertical" -msgstr "" +msgstr "Vertikal" #: src/fcitx-anthy.desc:131 src/fcitx-anthy.desc:145 msgid "Vje Delta" -msgstr "" +msgstr "Vje Delta" #: src/fcitx-anthy.desc:132 src/fcitx-anthy.desc:146 msgid "WNN" -msgstr "" +msgstr "WNN" #: src/fcitx-anthy.desc:31 msgid "Wide Latin" -msgstr "" +msgstr "Breites Lateinisch" #: src/fcitx-anthy.desc:70 msgid "Wide bracket and Middle Dot" -msgstr "" +msgstr "Breite Klammern und Mittelpunkt" #: src/fcitx-anthy.desc:68 msgid "Wide bracket and wide slash" -msgstr "" +msgstr "Breite Klammern und breiter Schrägstrich" #: src/imengine.cpp:587 src/fcitx-anthy.desc:57 msgid "Wide latin" -msgstr "" +msgstr "Breites Lateinisch" #: src/fcitx-anthy.desc:60 msgid "Wide latin Japanese" -msgstr "" +msgstr "Japanisch mit breitem Lateinisch" #: src/fcitx-anthy.desc:216 msgid "Wide latin mode" -msgstr "" +msgstr "Weitläufiges lateinisches Alphabet" #: src/fcitx-anthy.desc:156 msgid "tsuki-2-203-101" -msgstr "" +msgstr "tsuki-2-203-101" #: src/fcitx-anthy.desc:157 msgid "tsuki-2-203-106" -msgstr "" +msgstr "tsuki-2-203-106" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-anthy-0.2.0/po/ja.po new/fcitx-anthy-0.2.1/po/ja.po --- old/fcitx-anthy-0.2.0/po/ja.po 2013-06-03 20:02:35.000000000 +0200 +++ new/fcitx-anthy-0.2.1/po/ja.po 2014-05-15 21:57:28.000000000 +0200 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n" -"POT-Creation-Date: 2013-04-26 00:44-0400\n" -"PO-Revision-Date: 2013-04-25 14:33+0000\n" +"POT-Creation-Date: 2013-10-26 14:42-0400\n" +"PO-Revision-Date: 2013-10-26 16:21+0000\n" "Last-Translator: いくや あわしろ <iku...@gmail.com>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/"; "ja/)\n" @@ -51,7 +51,7 @@ msgid "Alternative Select prev candidate" msgstr "前の候補に移動する別のキー" -#: src/factory.cpp:91 src/anthy.conf.in:3 src/fcitx-anthy.conf.in:3 +#: src/factory.cpp:92 src/anthy.conf.in:3 src/fcitx-anthy.conf.in:3 msgid "Anthy" msgstr "Anthy" @@ -271,7 +271,7 @@ #: src/fcitx-anthy.desc:12 msgid "Horizontal" -msgstr "水平" +msgstr "横" #: src/imengine.cpp:802 msgid "Input Mode" @@ -573,7 +573,7 @@ #: src/fcitx-anthy.desc:11 msgid "Vertical" -msgstr "垂直" +msgstr "縦" #: src/fcitx-anthy.desc:131 src/fcitx-anthy.desc:145 msgid "Vje Delta" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-anthy-0.2.0/po/zh_CN.po new/fcitx-anthy-0.2.1/po/zh_CN.po --- old/fcitx-anthy-0.2.0/po/zh_CN.po 2013-06-03 20:02:35.000000000 +0200 +++ new/fcitx-anthy-0.2.1/po/zh_CN.po 2014-05-15 21:57:28.000000000 +0200 @@ -11,10 +11,11 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n" -"POT-Creation-Date: 2013-04-25 00:01-0400\n" -"PO-Revision-Date: 2013-04-20 17:29+0000\n" +"POT-Creation-Date: 2013-10-26 14:42-0400\n" +"PO-Revision-Date: 2013-04-29 10:03+0000\n" "Last-Translator: Xuetian Weng <wen...@gmail.com>\n" -"Language-Team: Chinese (China) <fcitx-...@googlegroups.com>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/fcitx/"; +"language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +51,7 @@ msgid "Alternative Select prev candidate" msgstr "备选选择上一个候选词" -#: src/factory.cpp:91 src/anthy.conf.in:3 src/fcitx-anthy.conf.in:3 +#: src/factory.cpp:92 src/anthy.conf.in:3 src/fcitx-anthy.conf.in:3 msgid "Anthy" msgstr "Anthy" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-anthy-0.2.0/src/common.h new/fcitx-anthy-0.2.1/src/common.h --- old/fcitx-anthy-0.2.0/src/common.h 2013-06-03 20:02:35.000000000 +0200 +++ new/fcitx-anthy-0.2.1/src/common.h 2014-05-15 21:57:28.000000000 +0200 @@ -31,6 +31,7 @@ public: FcitxKeySym sym; unsigned int state; + unsigned int keycode; bool is_release; KeyEvent() { @@ -74,4 +75,4 @@ typedef std::vector<KeyEvent> KeyEventList; -#endif \ No newline at end of file +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-anthy-0.2.0/src/factory.cpp new/fcitx-anthy-0.2.1/src/factory.cpp --- old/fcitx-anthy-0.2.0/src/factory.cpp 2013-06-03 20:02:35.000000000 +0200 +++ new/fcitx-anthy-0.2.1/src/factory.cpp 2014-05-15 21:57:28.000000000 +0200 @@ -73,6 +73,7 @@ } bindtextdomain("fcitx-anthy", LOCALEDIR); + bind_textdomain_codeset("fcitx-anthy", "UTF-8"); FcitxIMIFace iface; memset(&iface, 0, sizeof(FcitxIMIFace)); @@ -144,6 +145,7 @@ FcitxInputState* input = FcitxInstanceGetInputState(anthy->get_owner()); event.sym = (FcitxKeySym) FcitxInputStateGetKeySym(input); event.is_release = false; + event.keycode = FcitxInputStateGetKeyCode(input); event.state = FcitxInputStateGetKeyState(input) & FcitxKeyState_SimpleMask; bool result = anthy->process_key_event(event); anthy->update_ui(); @@ -159,6 +161,7 @@ KeyEvent event; FcitxInputState* input = FcitxInstanceGetInputState(anthy->get_owner()); event.sym = (FcitxKeySym) FcitxInputStateGetKeySym(input); + event.keycode = FcitxInputStateGetKeyCode(input); event.is_release = true; event.state = FcitxInputStateGetKeyState(input) & FcitxKeyState_SimpleMask; bool result = anthy->process_key_event(event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-anthy-0.2.0/src/key2kana.cpp new/fcitx-anthy-0.2.1/src/key2kana.cpp --- old/fcitx-anthy-0.2.0/src/key2kana.cpp 2013-06-03 20:02:35.000000000 +0200 +++ new/fcitx-anthy-0.2.1/src/key2kana.cpp 2014-05-15 21:57:28.000000000 +0200 @@ -19,6 +19,7 @@ * Foundation, 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <fcitx/module/xkb/fcitx-xkb.h> #include "key2kana.h" #include "factory.h" #include "imengine.h" @@ -121,9 +122,45 @@ } static -void split_string_list(std::vector<std::string>& str, const std::string& s) +int split_string_list(std::vector<std::string>& vec, const std::string& str) { + int count = 0; + std::string temp; + std::string::const_iterator bg, ed; + + vec.clear (); + + bg = str.begin (); + ed = str.begin (); + + while (bg != str.end () && ed != str.end ()) { + for (; ed != str.end (); ++ed) { + if (*ed == ',') + break; + } + temp.assign (bg, ed); + vec.push_back (temp); + ++count; + + if (ed != str.end ()) + bg = ++ ed; + } + return count; +} + +static inline bool CheckLayout(FcitxInstance* instance) +{ + char *layout = NULL, *variant = NULL; + bool layout_is_jp = false; + FcitxXkbGetCurrentLayout(instance, &layout, &variant); + if (layout && strcmp(layout, "jp") == 0) + layout_is_jp = true; + + fcitx_utils_free(layout); + fcitx_utils_free(variant); + + return layout_is_jp; } bool @@ -150,7 +187,9 @@ /* find matched table */ if ((m_anthy.get_typing_method () == FCITX_ANTHY_TYPING_METHOD_KANA) && - (m_last_key.state & /*SCIM_KEY_QuirkKanaRoMask*/ (1<<14)) && + (CheckLayout(m_anthy.get_owner())) && + (m_last_key.sym == FcitxKey_backslash) && + (!(m_last_key.keycode == 132 || m_last_key.keycode == 133)) && (m_anthy.get_config()->m_kana_layout_ro_key[0])) { // Special treatment for Kana "Ro" key. -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
