Package list fcitx-table-extra / 087d6e5
Merge branch 'upstream' of ssh://git.debian.org/git/pkg-ime/fcitx-table-extra into upstream Conflicts: po/POTFILES.in.in po/fcitx-table-extra.pot po/zh_CN.po po/zh_TW.po tables/CMakeLists.txt tables/cantonese.conf.in tables/quick-classic.conf.in tables/scj6.txt YunQiang Su 9 years ago
1 changed file(s) with 7 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
77 msgstr ""
88 "Project-Id-Version: PACKAGE VERSION\n"
99 "Report-Msgid-Bugs-To: \n"
10 <<<<<<< HEAD
1011 "POT-Creation-Date: 2012-06-03 11:49+0800\n"
12 =======
13 "POT-Creation-Date: 2012-04-27 11:12+0800\n"
14 >>>>>>> 47a2b41744a11e4b5750d00dc2307d4a11922d5e
1115 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1216 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1317 "Language-Team: LANGUAGE <LL@li.org>\n"
8387 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/array30-big.conf.in.h:1
8488 msgid "Array30Big"
8589 msgstr ""
90 <<<<<<< HEAD
8691
8792 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/wubi-large.conf.in.h:1
8893 msgid "Wubi (Large)"
8994 msgstr ""
95 =======
96 >>>>>>> 47a2b41744a11e4b5750d00dc2307d4a11922d5e