From af7ebdcc358eb44fcb683dd2e0476f3a8caa5934 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 1 Feb 2017 10:32:19 -0200 Subject: [PATCH] Ajustes no empacotamento windows. --- Makefile.in | 4 ++++ locale/Makefile.in | 13 +++++++++++-- locale/pt_BR.po | 40 ++++++++++++++-------------------------- locale/pw3270.pot | 4 ++-- win/pw3270.nsi.in | 4 ++-- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/Makefile.in b/Makefile.in index 266c7ee..94ee68b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -192,6 +192,8 @@ all: \ $(BINDIR)/$(PACKAGE_NAME)-logo.png \ locale/$(PACKAGE_TARNAME).pot + @$(MAKE) -C locale all + Release: \ $(BINRLS)/lib3270@DLLEXT@ \ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ @@ -200,6 +202,8 @@ Release: \ $(BINDIR)/$(PACKAGE_NAME)-logo.png \ locale/$(PACKAGE_TARNAME).pot + @$(MAKE) -C locale all + locale/$(PACKAGE_TARNAME).pot: \ $(POTDIR)/lib3270.pot \ $(POTDIR)/pw3270.pot \ diff --git a/locale/Makefile.in b/locale/Makefile.in index 3a82a14..3341ce1 100644 --- a/locale/Makefile.in +++ b/locale/Makefile.in @@ -36,6 +36,9 @@ PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ +BASEDIR=@BASEDIR@ +BINDIR=$(BASEDIR)/.bin/locale + MKDIR=@MKDIR_P@ MSGCAT=@MSGCAT@ MSGFMT=@MSGFMT@ @@ -52,18 +55,24 @@ INSTALL_DATA=@INSTALL_DATA@ @touch $@ @$(MSGMERGE) --update --sort-output $@ $(PACKAGE_NAME).pot -$(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ +$(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ %.po @echo $< ... @$(MKDIR) `dirname $@` @$(MSGFMT) -c -v -o $@ $^ +$(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ + $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo + + @echo $< ... + @$(MKDIR) `dirname $@` + @echo $(INSTALL_DATA) $^ $@ #---[ Targets ]-------------------------------------------------------------------------- all: \ - $(wildcard *.po) + $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) install: \ $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) diff --git a/locale/pt_BR.po b/locale/pt_BR.po index a4d671e..d9fcdd2 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-24 17:53-0200\n" +"POT-Creation-Date: 2017-02-01 10:21-0200\n" "PO-Revision-Date: 2016-10-25 10:47-0200\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português \n" @@ -419,11 +419,6 @@ msgstr "Não foi possível conectar a %s" msgid "Can't connect to %s:%s" msgstr "Não foi possível conectar a %s:%s" -#: main.c:70 -#, fuzzy -msgid "Can't connect to DBUS server" -msgstr "Não foi possível conectar a %s" - #: selection.c:425 #, c-format msgid "Can't convert line %d from %s to %s" @@ -438,10 +433,6 @@ msgstr "Recortar não permitido em seleção retangular" msgid "Can't determine value for environment variable \"%s\" " msgstr "Não consigo determinar o valor da variável de ambiente \"%s\" " -#: main.c:115 -msgid "Can't get DBUS object name" -msgstr "" - #: ft.c:413 msgid "Can't get file size" msgstr "Não foi possível obter o tamanho do arquivo" @@ -663,11 +654,6 @@ msgstr "Configurar host" msgid "Connect on startup" msgstr "Conectar ao iniciar" -#: gobject.c:205 -#, fuzzy -msgid "Connecting to host" -msgstr "Não foi possível conectar ao servidor" - #: connect.c:200 connect.c:296 connect.c:305 connect.c:367 connect.c:382 #: connect.c:398 connect.c:412 connect.c:432 connect.c:446 connect.c:462 #: connect.c:557 @@ -1403,7 +1389,7 @@ msgstr "Popup test" msgid "Port or service name (empty for \"telnet\")." msgstr "Nº da porta ou nome do serviço (em branco para \"telnet\")." -#: set.c:178 +#: set.c:176 msgid "Preparing" msgstr "Preparando" @@ -1927,11 +1913,6 @@ msgstr "Iniciar transferência de arquivo" msgid "Starting" msgstr "Iniciando" -#: gobject.c:193 -#, c-format -msgid "State %04d can't accept requests" -msgstr "" - #: security.c:237 msgid "Subject issuer mismatch" msgstr "Divergência na identidade do emissor" @@ -2417,11 +2398,6 @@ msgstr "Valor de cor inválido ou inesperado: \"%s\"" msgid "Unexpected or unknown security status" msgstr "Estado de segurança inesperado ou desconhecido." -#: gobject.c:208 -#, fuzzy, c-format -msgid "Unexpected state %04d" -msgstr "Alvo inesperado \"%s\"" - #: actions.c:391 #, c-format msgid "Unexpected target \"%s\"" @@ -2831,6 +2807,10 @@ msgstr "translator-credits" #~ "32768. Valores maiores trazem maior performance, porem, nem todos os " #~ "hosts podem suportá-los." +#, fuzzy +#~ msgid "Can't connect to DBUS server" +#~ msgstr "Não foi possível conectar a %s" + #~ msgid "Can't start download." #~ msgstr "Não foi possível iniciar o download." @@ -2867,6 +2847,10 @@ msgstr "translator-credits" #~ msgid "Complete" #~ msgstr "Completo" +#, fuzzy +#~ msgid "Connecting to host" +#~ msgstr "Não foi possível conectar ao servidor" + #~ msgid "Copiar tudo" #~ msgstr "Copiar tudo" @@ -3229,6 +3213,10 @@ msgstr "translator-credits" #~ msgid "Unexpected element <%s>" #~ msgstr "Elemento <%s> inesperado" +#, fuzzy +#~ msgid "Unexpected state %04d" +#~ msgstr "Alvo inesperado \"%s\"" + #~ msgid "" #~ "Unknown host:\n" #~ "%s" diff --git a/locale/pw3270.pot b/locale/pw3270.pot index 0c9b64e..160b327 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -9,7 +9,7 @@ msgstr "" "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-01 09:51-0200\n" +"POT-Creation-Date: 2017-02-01 10:30-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "" "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-01 09:51-0200\n" +"POT-Creation-Date: 2017-02-01 10:30-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in index 8a2eb1e..b3ebbee 100644 --- a/win/pw3270.nsi.in +++ b/win/pw3270.nsi.in @@ -92,8 +92,8 @@ SubSection "@PACKAGE@" SecMain file "/oname=$INSTDIR\ui\00default.xml" "..\ui\00default.xml" # Locale files - #CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES" - #file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "..\.bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" + CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES" + file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "..\.bin\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo" # Save DataDir SetRegView @WINARCH@ -- libgit2 0.21.2