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
11 years ago
| 7 | 7 | msgstr "" |
| 8 | 8 | "Project-Id-Version: PACKAGE VERSION\n" |
| 9 | 9 | "Report-Msgid-Bugs-To: \n" |
| 10 | <<<<<<< HEAD | |
| 10 | 11 | "POT-Creation-Date: 2012-06-03 11:49+0800\n" |
| 12 | ======= | |
| 13 | "POT-Creation-Date: 2012-04-27 11:12+0800\n" | |
| 14 | >>>>>>> 47a2b41744a11e4b5750d00dc2307d4a11922d5e | |
| 11 | 15 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
| 12 | 16 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 13 | 17 | "Language-Team: LANGUAGE <LL@li.org>\n" |
| 83 | 87 | #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/array30-big.conf.in.h:1 |
| 84 | 88 | msgid "Array30Big" |
| 85 | 89 | msgstr "" |
| 90 | <<<<<<< HEAD | |
| 86 | 91 | |
| 87 | 92 | #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/wubi-large.conf.in.h:1 |
| 88 | 93 | msgid "Wubi (Large)" |
| 89 | 94 | msgstr "" |
| 95 | ======= | |
| 96 | >>>>>>> 47a2b41744a11e4b5750d00dc2307d4a11922d5e | |