From 5f43a6dae66710bb6201d75175eb06f3185e43e3 Mon Sep 17 00:00:00 2001 From: Evgeniy Dushistov Date: Sat, 6 Jul 2013 20:04:22 +0000 Subject: [PATCH] - remove generated files *.gmo - remove not used Makefile.am - fix work with translated messages - make package and make install fixes --- CMakeLists.txt | 42 ++++-- README | 12 ++ config.h.cmake | 4 +- doc/Makefile.am | 5 - doc/uk/Makefile.am | 5 - po/Makefile.in.in | 366 --------------------------------------------- po/ru.gmo | Bin 1393 -> 0 bytes po/sk.gmo | Bin 1303 -> 0 bytes po/uk.gmo | Bin 1253 -> 0 bytes po/zh_CN.gmo | Bin 951 -> 0 bytes po/zh_TW.gmo | Bin 2726 -> 0 bytes src/sdcv.cpp | 6 +- 12 files changed, 46 insertions(+), 394 deletions(-) delete mode 100644 doc/Makefile.am delete mode 100644 doc/uk/Makefile.am delete mode 100644 po/Makefile.in.in delete mode 100644 po/ru.gmo delete mode 100644 po/sk.gmo delete mode 100644 po/uk.gmo delete mode 100644 po/zh_CN.gmo delete mode 100644 po/zh_TW.gmo diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c9873f..6368768 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,10 +31,7 @@ if (READLINE_INCLUDE_DIR AND READLINE_LIBRARY) set(WITH_READLINE TRUE) endif () -find_package(GettextTools REQUIRED) -set(gettext_stockDir "${CMAKE_CURRENT_SOURCE_DIR}/po") -set(gettext_langDir "${CMAKE_CURRENT_BINARY_DIR}/lang") -set(gettext_outDir "${CMAKE_CURRENT_BINARY_DIR}/locale") +option(ENABLE_NLS "Enable NLS support" True) set(sdcv_SRCS src/sdcv.cpp @@ -55,16 +52,23 @@ set(sdcv_SRCS src/lib/file.hpp ) -gettext_make_target("lang" - HIERARCHY "{1}/{2}/{3}/{4}.mo" - KEYWORDS "_" - DOMAIN "sdcv" - STOCK_DIR ${gettext_stockDir} - LANG_DIR ${gettext_langDir} - OUT_DIR ${gettext_outDir} - SOURCE ${sdcv_SRCS}) +if (ENABLE_NLS) + find_package(GettextTools REQUIRED) + set(gettext_stockDir "${CMAKE_CURRENT_SOURCE_DIR}/po") + set(gettext_langDir "${CMAKE_CURRENT_BINARY_DIR}/lang") + set(gettext_outDir "${CMAKE_CURRENT_BINARY_DIR}/locale") + set(GETTEXT_TRANSLATIONS_PATH "${CMAKE_INSTALL_PREFIX}/share/locale") + gettext_make_target("lang" + HIERARCHY "{1}/{2}/{3}/{4}.mo" + KEYWORDS "_" + DOMAIN "sdcv" + STOCK_DIR ${gettext_stockDir} + LANG_DIR ${gettext_langDir} + OUT_DIR ${gettext_outDir} + SOURCE ${sdcv_SRCS}) -list(APPEND makeCleanFiles ${gettext_outDir}) + list(APPEND makeCleanFiles ${gettext_outDir}) +endif () include(CheckFunctionExists) check_function_exists(mmap HAVE_MMAP) @@ -72,7 +76,7 @@ check_function_exists(mmap HAVE_MMAP) include(CheckIncludeFile) check_include_file(locale.h HAVE_LOCALE_H) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) @@ -105,10 +109,20 @@ target_link_libraries(sdcv ${ZLIB_LIBRARIES} ${READLINE_LIBRARY} ) +if (ENABLE_NLS) set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "locale") +endif () include(CPack) +INSTALL(TARGETS sdcv DESTINATION "bin") +INSTALL(FILES doc/sdcv.1 DESTINATION "share/man/man1") +INSTALL(FILES doc/uk/sdcv.1 DESTINATION "share/man/uk/man1") + +if (ENABLE_NLS) + INSTALL(DIRECTORY "${gettext_outDir}" DESTINATION "share") +endif () + option(BUILD_TESTS "Enable automatic testing" False) if (BUILD_TESTS) find_program(SHELL_CMD NAMES sh bash diff --git a/README b/README index 5d0d82d..aaeb1bf 100644 --- a/README +++ b/README @@ -1,3 +1,12 @@ +* How to compile and install +mkdir /tmp/build-sdcv +cd /tmp/build-sdcv +cmake path/to/source/code/of/sdcv +make +** to install type +make install +you can use "DESTDIR" variable to change installation path + * Documentation See sdcv man page for usage description. @@ -6,3 +15,6 @@ 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 +make package_source \ No newline at end of file diff --git a/config.h.cmake b/config.h.cmake index 36c2d37..e67be0c 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,3 +1,5 @@ #cmakedefine HAVE_MMAP 1 #cmakedefine HAVE_LOCALE_H 1 -#cmakedefine WITH_READLINE 1 \ No newline at end of file +#cmakedefine WITH_READLINE 1 +#cmakedefine ENABLE_NLS 1 +#cmakedefine GETTEXT_TRANSLATIONS_PATH "${GETTEXT_TRANSLATIONS_PATH}" \ No newline at end of file diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 879c2f1..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# subdirectories for translated manual pages -SUBDIRS = uk - -man_MANS = sdcv.1 -EXTRA_DIST = DICTFILE_FORMAT $(man_MANS) diff --git a/doc/uk/Makefile.am b/doc/uk/Makefile.am deleted file mode 100644 index 303183e..0000000 --- a/doc/uk/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -mandir = @mandir@/uk - -man_MANS = sdcv.1 - -EXTRA_DIST = $(man_MANS) diff --git a/po/Makefile.in.in b/po/Makefile.in.in deleted file mode 100644 index 53efc5e..0000000 --- a/po/Makefile.in.in +++ /dev/null @@ -1,366 +0,0 @@ -# Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License but which still want to provide support for the GNU gettext -# functionality. -# Please note that the actual code of GNU gettext is covered by the GNU -# General Public License and is *not* in the public domain. -# -# Origin: gettext-0.14 - -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = /bin/sh -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -localedir = $(datadir)/locale -gettextsrcdir = $(datadir)/gettext/po - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) - -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -MSGMERGE = msgmerge -MSGMERGE_UPDATE = @MSGMERGE@ --update -MSGINIT = msginit -MSGCONV = msgconv -MSGFILTER = msgfilter - -POFILES = @POFILES@ -GMOFILES = @GMOFILES@ -UPDATEPOFILES = @UPDATEPOFILES@ -DUMMYPOFILES = @DUMMYPOFILES@ -DISTFILES.common = Makefile.in.in remove-potcdate.sin \ -$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) -DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \ -$(POFILES) $(GMOFILES) \ -$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) - -POTFILES = \ - -CATALOGS = @CATALOGS@ - -# Makevars gets inserted here. (Don't remove this line!) - -.SUFFIXES: -.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update - -.po.mo: - @echo "$(MSGFMT) -c -o $@ $<"; \ - $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ - -.po.gmo: - @lang=`echo $* | sed -e 's,.*/,,'`; \ - test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo - -.sin.sed: - sed -e '/^#/d' $< > t-$@ - mv t-$@ $@ - - -all: all-@USE_NLS@ - -all-yes: stamp-po -all-no: - -# stamp-po is a timestamp denoting the last time at which the CATALOGS have -# been loosely updated. Its purpose is that when a developer or translator -# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, -# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent -# invocations of "make" will do nothing. This timestamp would not be necessary -# if updating the $(CATALOGS) would always touch them; however, the rule for -# $(POFILES) has been designed to not touch files that don't need to be -# changed. -stamp-po: $(srcdir)/$(DOMAIN).pot - test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) - @echo "touch stamp-po" - @echo timestamp > stamp-poT - @mv stamp-poT stamp-po - -# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', -# otherwise packages like GCC can not be built if only parts of the source -# have been downloaded. - -# This target rebuilds $(DOMAIN).pot; it is an expensive operation. -# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. -$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ - --files-from=$(srcdir)/POTFILES.in \ - --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' - test ! -f $(DOMAIN).po || { \ - if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ - if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ - rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ - else \ - rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ - mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ - fi; \ - else \ - mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ - fi; \ - } - -# This rule has no dependencies: we don't need to update $(DOMAIN).pot at -# every "make" invocation, only create it when it is missing. -# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. -$(srcdir)/$(DOMAIN).pot: - $(MAKE) $(DOMAIN).pot-update - -# This target rebuilds a PO file if $(DOMAIN).pot has changed. -# Note that a PO file is not touched if it doesn't need to be changed. -$(POFILES): $(srcdir)/$(DOMAIN).pot - @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ - if test -f "$(srcdir)/$${lang}.po"; then \ - test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ - else \ - $(MAKE) $${lang}.po-create; \ - fi - - -install: install-exec install-data -install-exec: -install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common) Makevars.template; do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - for file in Makevars; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi -install-data-no: all -install-data-yes: all - $(mkinstalldirs) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkinstalldirs) $(DESTDIR)$$dir; \ - if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ - $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ - echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ - for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ - if test -n "$$lc"; then \ - if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ - link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ - mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ - for file in *; do \ - if test -f $$file; then \ - ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ - fi; \ - done); \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ - else \ - if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ - :; \ - else \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - fi; \ - fi; \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ - ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ - ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ - cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ - echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ - fi; \ - done; \ - done - -install-strip: install - -installdirs: installdirs-exec installdirs-data -installdirs-exec: -installdirs-data: installdirs-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - else \ - : ; \ - fi -installdirs-data-no: -installdirs-data-yes: - $(mkinstalldirs) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkinstalldirs) $(DESTDIR)$$dir; \ - for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ - if test -n "$$lc"; then \ - if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ - link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ - mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ - for file in *; do \ - if test -f $$file; then \ - ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ - fi; \ - done); \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ - else \ - if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ - :; \ - else \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - fi; \ - fi; \ - fi; \ - done; \ - done - -# Define this as empty until I found a useful application. -installcheck: - -uninstall: uninstall-exec uninstall-data -uninstall-exec: -uninstall-data: uninstall-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ - for file in $(DISTFILES.common) Makevars.template; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi -uninstall-data-no: -uninstall-data-yes: - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ - done; \ - done - -check: all - -info dvi ps pdf html tags TAGS ctags CTAGS ID: - -mostlyclean: - rm -f remove-potcdate.sed - rm -f stamp-poT - rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po - rm -fr *.o - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f stamp-po $(GMOFILES) - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: - $(MAKE) update-po - @$(MAKE) dist2 -# This is a separate target because 'update-po' must be executed before. -dist2: $(DISTFILES) - dists="$(DISTFILES)"; \ - if test "$(PACKAGE)" = "gettext-tools"; then \ - dists="$$dists Makevars.template"; \ - fi; \ - if test -f $(srcdir)/ChangeLog; then \ - dists="$$dists ChangeLog"; \ - fi; \ - for i in 0 1 2 3 4 5 6 7 8 9; do \ - if test -f $(srcdir)/ChangeLog.$$i; then \ - dists="$$dists ChangeLog.$$i"; \ - fi; \ - done; \ - if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ - for file in $$dists; do \ - if test -f $$file; then \ - cp -p $$file $(distdir); \ - else \ - cp -p $(srcdir)/$$file $(distdir); \ - fi; \ - done - -update-po: Makefile - $(MAKE) $(DOMAIN).pot-update - test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) - $(MAKE) update-gmo - -# General rule for creating PO files. - -.nop.po-create: - @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ - echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ - exit 1 - -# General rule for updating PO files. - -.nop.po-update: - @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ - if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ - tmpdir=`pwd`; \ - echo "$$lang:"; \ - test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ - cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.po failed!" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi - -$(DUMMYPOFILES): - -update-gmo: Makefile $(GMOFILES) - @: - -Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@ - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ - $(SHELL) ./config.status - -force: - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/po/ru.gmo b/po/ru.gmo deleted file mode 100644 index 4f0bbdc259d7eb0b6f7d6563a1ef6191c65988bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1393 zcmaKr-)|d55XTQFzYZQKl|cNEmD?0=@@}u!o8_b_-j7`D6XC-B= zm#tfqN*$8rQj_fTlDWkih+}QYidVKi4Jy(qa)-)+ta?)M=CwMarbS?G-Y8nv1#|Ux zuvU?jLs{F-S@y?Pc9}A^b7gtnh6aY#7HfL?gPz-cWZBD!-4!Qm&)Z9|`@)sVDo#t} z!lAWhh56ntt)AUY`G2Kx6>feda4XCzGPmx~Rv@K^R>+IsTFpyyQ8_np2zhU;Z>*h{ zok`m!{<=bsSjF82icst)wb-b+p1*?c>k7$K;qx2oIcw|OP$#*=gtg|Eco{#`q1^b;k;FFzOF^$s}9mMyBbl7jjd;M@6kHVv4-Tou$#O<(i+#UW& z?RY=x$D{TTt@A$)(>Zt?cLy;X!yb)V{Xx`A#y~gy0(IkqR)3<7lGZv6$D^K=Dbm*N*Q`rsM9g+x`nxPNw9{E*u=68yf!r8&BPe diff --git a/po/sk.gmo b/po/sk.gmo deleted file mode 100644 index e98f463498736343e1a1311591ccbb2c6a5a665d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1303 zcmah|O>Z1E7@k7;=m;)=fI}r-kTxW0W;(Oos@qAnL~T$5sbXJ_^A0zZR)0`z@;0Jeb7fFA*W1AYK}0rclP_XcVK{dfz8vca1$Y&XO6 zIX9ob4Mcc=mO*fXDN@=|uGNGaM=eWEQ(haxl_RNhCV3qGM_BC!UB9W7)shnmSfLf^ z0o`}Z6e4%4e>+z8x1?CfiRhs=1-jSDg~6tB+|YO4qYYIf!z|AzxTD=j zs3BQV3dxK=V9TzO)y5o9wj2ii5jUI|Oz9@wUYsR2WSn8jO6EL|;kV_u5QYX!NM2;9 z69$#8xSD%{9i#Vn?xL+CdN8AtkuCBGCGn-W9p2-WHZIz>Ls3N6>!FSMI-{btBVnDM zY?P=Qn>yUN+mCJ-&OF`dCVFSoPLghvT#ectN|Wqz=RyJx0;79;BK*BA;;#6(G^HfT z+U*NTinyJ$; z^@NRS-Hs!XcGZT&fo&{>s`vjD4!YxTduw}h!9R_Y5O3^IJnA1*;NtkcyI4sk)Eea@ zW-NETulu*6?jp_~b-+!usd8Q5^)l-23Ku?#zT}D<<~)bn*V!(Yl*U)%G~AK3VKTa< zO=&YyRkO6cOKUWn_LfyEO?thQmX^p*lTUlNqc12SgkycJ*M7CN-s|{jlaZ{a2|a#1 zOF>Msf}9jN?Ul7KxFb02aVqucuWI@ujb}2zRh>TdT2PGG*wxcxsrW(->VK2w%DAo7 zp~l5ekG&2K1#5)iWzY!2JNyq+)8j)uA&W>g{b|e~3yeyi9C6op!{C9$2_0`%njp$u zO#_3x8Ui`_rFQimFIP#4lOwW>6#i+UchMINz{9I#PW9wSQ)RfXCr+RKLlcMcV8kT8 K^FkDJSMU-fBz3<4 diff --git a/po/uk.gmo b/po/uk.gmo deleted file mode 100644 index ba33a42e2de721ed0cd3653da4eca91fdf1aeb5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1253 zcmb7DO=}cM7;aa07uuT#PkVUxkdR<%(mlyy?4(^WMi7h!9lgj3Vg8u|3-~!CR zvqwDdBsc-jgI|IXa?mg=oAc$`cfj`m!o42=Z=PqANkes+b%ZiBqRB|A=SqppP%7&@ z6&3$0vfM1sxJ8+1nF>Mzoyd&jGF>%XHIllSIG7yKzPFGWq3E_$4U&r5EycBn$h#y> zE6JLqlhq{U${85Z6Qre5YZQ(7UacjRAP!`*4A+x`;L@y7Jku#R&gYVnzl*wI7aHvP zz)eKDQSVStnewlQwp4~K>SoelXY;0JH5pMO*R4bw**UYyleD68f9Z0K%`3qTiecxF zIHGD0%&_1Tt4>oGM88a*2rvU7yCOP?D|)D#W?_|u(48!GQ_x-H+OXQ5O{pTHxki3# zZRJd=(@NS&I+dKChAM03yeU{s@YRT}ttg&k3GU}x;)wDUfAPZN!m!@368N|hg9~J} zwKm)vamP%yQ>2@vdW$P9Onj|&p3Mw(&fKz4Y$2=51}-C_nOlkRm(pDEl%1DqRY#Py z%b|{^W@*rk$Fh+yh~tn(N6B@ApW`s3UnwBSF+Lqv_m}44Y1b_yg1IoDyLSg6&;;X% z2@z8rpY=Wa!fuiMWc&7A(Ixwr-74+@_w8%jM{gUwZTF|T#T}?V+MeAhHteno`-q9R zMHkv0CU%QW{1*Qs;od)O|3I4EVjbT><{lvYBE-6iAy$kSP=xByWZa#$W7?fMGp%wnMomd5 z1PPh|iGLE~1yZ6>iWdA3-i?Xfwl_Y2G4b6NAu(Z+U!K{S=bd?GXMP-STQIO4McR=# zatxV9f>uU4kPRf5|A}-We~=SM#{t6t)B)7fsCQ7WAqC_Vet$pMn*WX3h2QOm4C5r~ zRn%@&7d3=Bhl(Y;t!<|lDLf_83~&L(g$E)56PikwJGy&!Fr-Xl$kR;110h`y60#{t6|=#(E_8}} zNl-k)(^LilLaG~-ka802PSc2|m}Ec^Pc+L_Pph~YR!i!sG}S@QF)8jbN0VWf+-{|@ zLAg#Itne9goMna7WK<=&OD^S-io}HtZce4R(jq^Yp*$UyIdkkroWvxf8V^G*Iy^eGchX4M zGVwArULA=~W-+&B4|PvAO}Td-oD`Lc>497EDOb#P_e#xxqG^~Tn`|MZ<-TxgVvwZe<~tJOwnb-S`?_@#|%x!Cx$j#ae} tZ)(d^{_I?RX3c*-9Ym}zm8+Es?$LZQEkku{ss8P2qcn%Z|E<`J_7{PqN5%jE diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo deleted file mode 100644 index a08968c7a126ba1e58b10cd4bd524ba0906b23fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2726 zcmZ{kTW}Lq7{^z|3sJn_<-yBvymVTIZkp7>bi&1I0qqF10|CZis&2BIW+mAZch9EO zamLEDlLiV^pat5FQmk0fQf`j1l-4(2e03aOe9-JBc|u-z_J8&yY0>Gpywf399JEa7-S1h0Q?Ya0?&hO;O}5P_~Lz% z^ftH)+yah*JnkQ09e4*^1Fl&i)_e`*|M!7Bei|g;1#m6+3%CKi4L%Fj-7nY*K8gSD zf{%bEn1#kqK(1%ygOU^k_kcWZKiCNV0CHW$@_g+>lJqA2?+4d|UxEbu4O|D_0c*gQ zR!Y)y;9KA;pbBzbS@31>XRr>;gM6J;K9N@o$iKf2J_YuHT<=*Ba-}CQkec)u23(~F zFnC^kKUQP#XO)2G4>##)43trNygbi=w7rMN##VR_Qj{RydmhE_!~9K_RfQ?Cs+%OG zuy_Nb4g8%D+tLV&>lVRZEy}3bLln!iA&e4>DW_7Ymm^^N>O@hEh17O`>ClStZksq+jvb#H=jXwA&yw#S7;5g%P0^#SurW*4wEhMW7{R z;=`OCIF6D~3a+sodQs zrD#es$}>`jNk714liO5zpV;Y;xGw>JlfTioTT3C5ywmE^Rrw9O%aX%1L{!_tJ!LfA zl0;m;Y5O|b!*Z*sd1pZ0ibO-CF%Z}w2b$!@CK6m93O26`Gz9`Mly_@sogb;HUGP;I zrol!MYzhT~>jKTN+o9m*gv({4W{B+9ba{tukk+_D$)-rc)*=dPNovW6X8L1R%umg( zEpRisY!pfkYf3T%W8KiuR_d?;s_xyc#9FfHqqv+128@=3ZrF#oqn~we@$GEexoxos zL4Ux9Q_3_0I(kw_h-rsd11`L7Y(%vc)6&@Hz2WV0^P(Ns8`DgAn-Qfd&P#|iN6-yA z61J%%{0NjFugEq-8py*9f`cT+ZqLx^Q@w2>lh0|Mx_0nVEGK`b*~q+%q#( z`{i0Cd^jerM#; zQupP$APRuuHN(F#KCfRH$oBB`Ro`kr!#a>n2D-Z7cKQ(Elvz#U0A!H zjXRgQ?B$xEkX^_Q@MN!Lic?3Hs4etOxYvfA%Nc%Oi#N0G&{(zFfA=2tNtI?tuy{Uq z!#(~@F*7TI-I^N|FWiIQ*Q)ly)D>|W#BW*XaITaY@=3+-j*4w9PY;X~vYFz=FK*3^ zN^W-E8Mw^bVd-3d;d(C)mvdr}Yb%W9@^f>ZB(8aQ0D4NF=G>DRKDW5<0a6Z-|LJIH zb3w9f&MwYxY3eQd=V*k~9!6&(g`Kb~);RN#r hS)7>ShxF9E`&C~juTP~*I+Iu2;nQBMN}Ci@(!Um^u_*um diff --git a/src/sdcv.cpp b/src/sdcv.cpp index f86f9d7..ce2d0e9 100644 --- a/src/sdcv.cpp +++ b/src/sdcv.cpp @@ -91,9 +91,9 @@ int main(int argc, char *argv[]) { setlocale(LC_ALL, ""); #if ENABLE_NLS - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain (PACKAGE); -#endif + bindtextdomain("sdcv", GETTEXT_TRANSLATIONS_PATH); + textdomain("sdcv"); +#endif gboolean show_version = FALSE; gboolean show_list_dicts = FALSE;