ready for 0.5.2 release

This commit is contained in:
Evgeniy A. Dushistov
2017-08-16 10:14:23 +03:00
parent 8f16ceae59
commit 0cd29823cf
12 changed files with 94 additions and 83 deletions

View File

@@ -101,7 +101,7 @@ set(CPACK_PACKAGE_VENDOR "Evgeniy Dushistov <dushistov@mail.ru>")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.org")
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "5")
set(CPACK_PACKAGE_VERSION_PATCH "1")
set(CPACK_PACKAGE_VERSION_PATCH "2")
set(sdcv_VERSION
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")

7
NEWS
View File

@@ -1,6 +1,9 @@
Version X
Version 0.5.2
Synonyms index support (.syn files) by Peter <craven@gmx.net>
Add support of json output by Peter <craven@gmx.net>
Add support of json output by Peter <craven@gmx.net> (--json-output)
Add -e for exact searches (no fuzzy matches) by Peter <craven@gmx.net>
Fix build with clang 3.4.1
fix FSF address in license by Tomáš Čech <sleep_walker@suse.com>
Version 0.5.1
Fix usage of SDCV_PAGER by Anton Yuzhaninov

View File

@@ -25,9 +25,16 @@ See sdcv man page for usage description.
If you find bug reports it via email to dushistov at mail dot ru.
Be sure to include the word "sdcv" somewhere in the "Subject:" field.
* Notes to developer
** make source code release
#+BEGIN_SRC sh
make package_source
#+END_SRC
** update translation
#+BEGIN_SRC sh
cd po
xgettext -k_ ../src/*.cpp -o new.pot
msgmerge -U sdcv.pot new.pot
rm new.pot
for i in `ls *.po`; do msgmerge -U $i sdcv.pot; done
#+END_SRC

View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sdcv 0.4.2\n"
"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
"POT-Creation-Date: 2017-07-31 19:18+0200\n"
"POT-Creation-Date: 2017-08-16 09:52+0300\n"
"PO-Revision-Date: 2008-09-24 10:42+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -16,25 +16,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: ../src/libwrapper.cpp:297
#: ../src/libwrapper.cpp:300
msgid "popen failed"
msgstr "popen selhalo"
#: ../src/libwrapper.cpp:334
#: ../src/libwrapper.cpp:340
#, c-format
msgid "Can not convert %s to utf8.\n"
msgstr "Nepodařilo se převést %s do utf8.\n"
#: ../src/libwrapper.cpp:393 ../src/libwrapper.cpp:425
#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
#, fuzzy, c-format
msgid "Found %zu items, similar to %s.\n"
msgstr "Nalezeno %d záznamů podobných %s.\n"
#: ../src/libwrapper.cpp:410
#: ../src/libwrapper.cpp:416
msgid "Your choice[-1 to abort]: "
msgstr "Vaše volba [-1 pro ukončení]: "
#: ../src/libwrapper.cpp:419
#: ../src/libwrapper.cpp:426
#, fuzzy, c-format
msgid ""
"Invalid choice.\n"
@@ -43,7 +43,7 @@ msgstr ""
"Chybná volba.\n"
"Musí být mezi 0 a %d nebo -1.\n"
#: ../src/libwrapper.cpp:436
#: ../src/libwrapper.cpp:445
#, c-format
msgid "Nothing similar to %s, sorry :(\n"
msgstr "Nic podobného %s nenalezeno, promiň :(\n"
@@ -72,11 +72,11 @@ msgid "for use in scripts"
msgstr ""
#: ../src/sdcv.cpp:97
msgid "print the result formatted as JSON."
msgid "print the result formatted as JSON"
msgstr ""
#: ../src/sdcv.cpp:99
msgid "do not fuzzy-search for similar words, only return exact matches."
msgid "do not fuzzy-search for similar words, only return exact matches"
msgstr ""
#: ../src/sdcv.cpp:101

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sdcv 0.4.2\n"
"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
"POT-Creation-Date: 2017-07-31 19:18+0200\n"
"POT-Creation-Date: 2017-08-16 09:52+0300\n"
"PO-Revision-Date: 2009-06-15 23:20+0800\n"
"Language-Team: Vincent Petry <PVince81@yahoo.fr>\n"
"Language: \n"
@@ -18,25 +18,25 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../src/libwrapper.cpp:297
#: ../src/libwrapper.cpp:300
msgid "popen failed"
msgstr "Échec de popen"
#: ../src/libwrapper.cpp:334
#: ../src/libwrapper.cpp:340
#, c-format
msgid "Can not convert %s to utf8.\n"
msgstr "Ne peut convertir %s au format utf8.\n"
#: ../src/libwrapper.cpp:393 ../src/libwrapper.cpp:425
#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
#, fuzzy, c-format
msgid "Found %zu items, similar to %s.\n"
msgstr "Trouvé %d éléments similaires à %s.\n"
#: ../src/libwrapper.cpp:410
#: ../src/libwrapper.cpp:416
msgid "Your choice[-1 to abort]: "
msgstr "Votre choix[-1 pour abandonner] : "
#: ../src/libwrapper.cpp:419
#: ../src/libwrapper.cpp:426
#, fuzzy, c-format
msgid ""
"Invalid choice.\n"
@@ -45,7 +45,7 @@ msgstr ""
"Selection invalide.\n"
"Veuillez choisir un nombre entre 0 et %d, ou -1.\n"
#: ../src/libwrapper.cpp:436
#: ../src/libwrapper.cpp:445
#, c-format
msgid "Nothing similar to %s, sorry :(\n"
msgstr "Aucun mot/phrase similaire à %s, désolé :(\n"
@@ -79,11 +79,11 @@ msgid "for use in scripts"
msgstr ""
#: ../src/sdcv.cpp:97
msgid "print the result formatted as JSON."
msgid "print the result formatted as JSON"
msgstr ""
#: ../src/sdcv.cpp:99
msgid "do not fuzzy-search for similar words, only return exact matches."
msgid "do not fuzzy-search for similar words, only return exact matches"
msgstr ""
#: ../src/sdcv.cpp:101

View File

@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sdcv 0.5\n"
"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
"POT-Creation-Date: 2017-07-31 19:18+0200\n"
"PO-Revision-Date: 2013-07-07 18:49+0400\n"
"POT-Creation-Date: 2017-08-16 09:52+0300\n"
"PO-Revision-Date: 2017-08-16 10:05+0300\n"
"Last-Translator: Evgeniy Dushistov <dushistov@mail.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
"Language: ru\n"
@@ -19,25 +19,25 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../src/libwrapper.cpp:297
#: ../src/libwrapper.cpp:300
msgid "popen failed"
msgstr "функция popen завершилась с ошибкой"
#: ../src/libwrapper.cpp:334
#: ../src/libwrapper.cpp:340
#, c-format
msgid "Can not convert %s to utf8.\n"
msgstr "Не могу преобразовать %s в utf8.\n"
#: ../src/libwrapper.cpp:393 ../src/libwrapper.cpp:425
#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
#, c-format
msgid "Found %zu items, similar to %s.\n"
msgstr "Найдено %zu слов, похожих на %s.\n"
#: ../src/libwrapper.cpp:410
#: ../src/libwrapper.cpp:416
msgid "Your choice[-1 to abort]: "
msgstr "Ваш выбор[-1 - отмена]: "
#: ../src/libwrapper.cpp:419
#: ../src/libwrapper.cpp:426
#, c-format
msgid ""
"Invalid choice.\n"
@@ -46,7 +46,7 @@ msgstr ""
"Неправильный выбор.\n"
"Должно быть от 0 до %zu или -1.\n"
#: ../src/libwrapper.cpp:436
#: ../src/libwrapper.cpp:445
#, c-format
msgid "Nothing similar to %s, sorry :(\n"
msgstr "Ничего похожего на %s, извините :(\n"
@@ -72,12 +72,12 @@ msgid "for use in scripts"
msgstr "для использования в скриптах"
#: ../src/sdcv.cpp:97
msgid "print the result formatted as JSON."
msgstr ""
msgid "print the result formatted as JSON"
msgstr "выдать результат в JSON формате"
#: ../src/sdcv.cpp:99
msgid "do not fuzzy-search for similar words, only return exact matches."
msgstr ""
msgid "do not fuzzy-search for similar words, only return exact matches"
msgstr "не использовать нечеткий поиск похожих слов, вернуть только точные совпадения"
#: ../src/sdcv.cpp:101
msgid "output must be in utf8"
@@ -100,7 +100,7 @@ msgstr "путь/до/директории"
msgid ""
"only use the dictionaries in data-dir, do not search in user and system "
"directories"
msgstr ""
msgstr "использовать словари только из data-dir, не искать в пользовательских и системных каталогах"
#: ../src/sdcv.cpp:110
msgid "colorize the output"

View File

@@ -7,40 +7,41 @@ msgid ""
msgstr ""
"Project-Id-Version: sdcv 0.5\n"
"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
"POT-Creation-Date: 2017-07-31 19:22+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2017-08-16 09:52+0300\n"
"PO-Revision-Date: 2017-08-16 10:01+0300\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../src/libwrapper.cpp:297
#: ../src/libwrapper.cpp:300
msgid "popen failed"
msgstr ""
#: ../src/libwrapper.cpp:334
#: ../src/libwrapper.cpp:340
#, c-format
msgid "Can not convert %s to utf8.\n"
msgstr ""
#: ../src/libwrapper.cpp:393 ../src/libwrapper.cpp:425
#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
#, c-format
msgid "Found %zu items, similar to %s.\n"
msgstr ""
#: ../src/libwrapper.cpp:410
#: ../src/libwrapper.cpp:416
msgid "Your choice[-1 to abort]: "
msgstr ""
#: ../src/libwrapper.cpp:419
#: ../src/libwrapper.cpp:426
#, c-format
msgid ""
"Invalid choice.\n"
"It must be from 0 to %zu or -1.\n"
msgstr ""
#: ../src/libwrapper.cpp:436
#: ../src/libwrapper.cpp:445
#, c-format
msgid "Nothing similar to %s, sorry :(\n"
msgstr ""
@@ -66,11 +67,11 @@ msgid "for use in scripts"
msgstr ""
#: ../src/sdcv.cpp:97
msgid "print the result formatted as JSON."
msgid "print the result formatted as JSON"
msgstr ""
#: ../src/sdcv.cpp:99
msgid "do not fuzzy-search for similar words, only return exact matches."
msgid "do not fuzzy-search for similar words, only return exact matches"
msgstr ""
#: ../src/sdcv.cpp:101

View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sdcv 0.3.2\n"
"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
"POT-Creation-Date: 2017-07-31 19:18+0200\n"
"POT-Creation-Date: 2017-08-16 09:52+0300\n"
"PO-Revision-Date: 2007-09-11 00:22+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -18,26 +18,26 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../src/libwrapper.cpp:297
#: ../src/libwrapper.cpp:300
msgid "popen failed"
msgstr "popen zlyhalo"
#: ../src/libwrapper.cpp:334
#: ../src/libwrapper.cpp:340
#, c-format
msgid "Can not convert %s to utf8.\n"
msgstr "nie je možné konvertovať %s na utf8.\n"
#: ../src/libwrapper.cpp:393 ../src/libwrapper.cpp:425
#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
#, fuzzy, c-format
msgid "Found %zu items, similar to %s.\n"
msgstr "Nájdené %d položiek, podobných %s,\n"
#: ../src/libwrapper.cpp:410
#: ../src/libwrapper.cpp:416
#, fuzzy
msgid "Your choice[-1 to abort]: "
msgstr "Vaša voľba[-1 zruší]: "
#: ../src/libwrapper.cpp:419
#: ../src/libwrapper.cpp:426
#, fuzzy, c-format
msgid ""
"Invalid choice.\n"
@@ -46,7 +46,7 @@ msgstr ""
"Neplatná voľba.\n"
"Musí byť od 0 do %d alebo -1.\n"
#: ../src/libwrapper.cpp:436
#: ../src/libwrapper.cpp:445
#, c-format
msgid "Nothing similar to %s, sorry :(\n"
msgstr "Ľutujem, nič sa nepodobá na %s :(\n"
@@ -76,11 +76,11 @@ msgid "for use in scripts"
msgstr ""
#: ../src/sdcv.cpp:97
msgid "print the result formatted as JSON."
msgid "print the result formatted as JSON"
msgstr ""
#: ../src/sdcv.cpp:99
msgid "do not fuzzy-search for similar words, only return exact matches."
msgid "do not fuzzy-search for similar words, only return exact matches"
msgstr ""
#: ../src/sdcv.cpp:101

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sdcv 0.3\n"
"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
"POT-Creation-Date: 2017-07-31 19:18+0200\n"
"POT-Creation-Date: 2017-08-16 09:52+0300\n"
"PO-Revision-Date: 2004-12-14 17:54+0300\n"
"Last-Translator: <dubyk@lsl.lviv.ua>\n"
"Language-Team: Ukrainian <dubyk@lsl.lviv.ua>\n"
@@ -19,26 +19,26 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../src/libwrapper.cpp:297
#: ../src/libwrapper.cpp:300
msgid "popen failed"
msgstr ""
#: ../src/libwrapper.cpp:334
#: ../src/libwrapper.cpp:340
#, c-format
msgid "Can not convert %s to utf8.\n"
msgstr "Не можу перетворити %s у utf8.\n"
#: ../src/libwrapper.cpp:393 ../src/libwrapper.cpp:425
#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
#, fuzzy, c-format
msgid "Found %zu items, similar to %s.\n"
msgstr "Знайдено %d слів, схожих на %s.\n"
#: ../src/libwrapper.cpp:410
#: ../src/libwrapper.cpp:416
#, fuzzy
msgid "Your choice[-1 to abort]: "
msgstr "Ваш вибір: "
#: ../src/libwrapper.cpp:419
#: ../src/libwrapper.cpp:426
#, fuzzy, c-format
msgid ""
"Invalid choice.\n"
@@ -47,7 +47,7 @@ msgstr ""
"Неправильний вибір.\n"
"Повинно бути від 0 до %d.\n"
#: ../src/libwrapper.cpp:436
#: ../src/libwrapper.cpp:445
#, c-format
msgid "Nothing similar to %s, sorry :(\n"
msgstr "Нічого схожого на %s, даруйте :(\n"
@@ -79,11 +79,11 @@ msgid "for use in scripts"
msgstr ""
#: ../src/sdcv.cpp:97
msgid "print the result formatted as JSON."
msgid "print the result formatted as JSON"
msgstr ""
#: ../src/sdcv.cpp:99
msgid "do not fuzzy-search for similar words, only return exact matches."
msgid "do not fuzzy-search for similar words, only return exact matches"
msgstr ""
#: ../src/sdcv.cpp:101

View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sdcv 0.3\n"
"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
"POT-Creation-Date: 2017-07-31 19:18+0200\n"
"POT-Creation-Date: 2017-08-16 09:52+0300\n"
"PO-Revision-Date: 2005-1-17 00:58+0800\n"
"Last-Translator: Cai Qian <caiqian@gnome.org>\n"
"Language-Team: Simplified Chinese\n"
@@ -15,26 +15,26 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../src/libwrapper.cpp:297
#: ../src/libwrapper.cpp:300
msgid "popen failed"
msgstr ""
#: ../src/libwrapper.cpp:334
#: ../src/libwrapper.cpp:340
#, c-format
msgid "Can not convert %s to utf8.\n"
msgstr "无法将 %s 转换为 UTF-8。\n"
#: ../src/libwrapper.cpp:393 ../src/libwrapper.cpp:425
#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
#, fuzzy, c-format
msgid "Found %zu items, similar to %s.\n"
msgstr "发现 %d 条记录和 %s 相似。\n"
#: ../src/libwrapper.cpp:410
#: ../src/libwrapper.cpp:416
#, fuzzy
msgid "Your choice[-1 to abort]: "
msgstr "您的选择为:"
#: ../src/libwrapper.cpp:419
#: ../src/libwrapper.cpp:426
#, fuzzy, c-format
msgid ""
"Invalid choice.\n"
@@ -43,7 +43,7 @@ msgstr ""
"无效的选择。\n"
"必须是 0 到 %d。\n"
#: ../src/libwrapper.cpp:436
#: ../src/libwrapper.cpp:445
#, c-format
msgid "Nothing similar to %s, sorry :(\n"
msgstr "对不起,没有发现和 %s 相似的 :(\n"
@@ -72,11 +72,11 @@ msgid "for use in scripts"
msgstr ""
#: ../src/sdcv.cpp:97
msgid "print the result formatted as JSON."
msgid "print the result formatted as JSON"
msgstr ""
#: ../src/sdcv.cpp:99
msgid "do not fuzzy-search for similar words, only return exact matches."
msgid "do not fuzzy-search for similar words, only return exact matches"
msgstr ""
#: ../src/sdcv.cpp:101

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sdcv 0.4.2\n"
"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
"POT-Creation-Date: 2017-07-31 19:18+0200\n"
"POT-Creation-Date: 2017-08-16 09:52+0300\n"
"PO-Revision-Date: 2013-06-12 14:11+0800\n"
"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -18,25 +18,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../src/libwrapper.cpp:297
#: ../src/libwrapper.cpp:300
msgid "popen failed"
msgstr "popen 失敗"
#: ../src/libwrapper.cpp:334
#: ../src/libwrapper.cpp:340
#, c-format
msgid "Can not convert %s to utf8.\n"
msgstr "無法將 %s 轉換為 UTF-8。\n"
#: ../src/libwrapper.cpp:393 ../src/libwrapper.cpp:425
#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
#, fuzzy, c-format
msgid "Found %zu items, similar to %s.\n"
msgstr "找到 %d 項紀錄和 %s 相似。\n"
#: ../src/libwrapper.cpp:410
#: ../src/libwrapper.cpp:416
msgid "Your choice[-1 to abort]: "
msgstr "您的選擇是[-1 表示放棄]"
#: ../src/libwrapper.cpp:419
#: ../src/libwrapper.cpp:426
#, fuzzy, c-format
msgid ""
"Invalid choice.\n"
@@ -45,7 +45,7 @@ msgstr ""
"無效的選擇。\n"
"必須是 0 到 %d 之間或 -1。\n"
#: ../src/libwrapper.cpp:436
#: ../src/libwrapper.cpp:445
#, c-format
msgid "Nothing similar to %s, sorry :(\n"
msgstr "抱歉,沒有和 %s 相似者 :(\n"
@@ -74,11 +74,11 @@ msgid "for use in scripts"
msgstr ""
#: ../src/sdcv.cpp:97
msgid "print the result formatted as JSON."
msgid "print the result formatted as JSON"
msgstr ""
#: ../src/sdcv.cpp:99
msgid "do not fuzzy-search for similar words, only return exact matches."
msgid "do not fuzzy-search for similar words, only return exact matches"
msgstr ""
#: ../src/sdcv.cpp:101

View File

@@ -94,9 +94,9 @@ int main(int argc, char *argv[]) try {
{ "non-interactive", 'n', 0, G_OPTION_ARG_NONE, &non_interactive,
_("for use in scripts"), nullptr },
{ "json-output", 'j', 0, G_OPTION_ARG_NONE, &json_output,
_("print the result formatted as JSON."), nullptr },
_("print the result formatted as JSON"), nullptr },
{ "exact-search", 'e', 0, G_OPTION_ARG_NONE, &no_fuzzy,
_("do not fuzzy-search for similar words, only return exact matches."), nullptr },
_("do not fuzzy-search for similar words, only return exact matches"), nullptr },
{ "utf8-output", '0', 0, G_OPTION_ARG_NONE, &utf8_output,
_("output must be in utf8"), nullptr },
{ "utf8-input", '1', 0, G_OPTION_ARG_NONE, &utf8_input,