From 94c19b1e0bd7dab481541e33864fbb49299fb6ce Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 19 Oct 2018 09:29:30 -0300 Subject: [PATCH] Ícone para windows passa a ser gerado automaticamente pelo imagemagick. --- locale/pt_BR.po | 39 ++++++++++++++++----------------------- locale/pw3270.pot | 37 ++----------------------------------- src/pw3270/Makefile.in | 5 ++++- win/pack.sh | 5 +++++ win/pw3270.ico | Bin 32236 -> 0 bytes 5 files changed, 27 insertions(+), 59 deletions(-) delete mode 100644 win/pw3270.ico diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 6656b05..92fe124 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: 2018-10-10 09:35-0300\n" +"POT-Creation-Date: 2018-10-18 15:11-0300\n" "PO-Revision-Date: 2018-10-10 09:38-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português <>\n" @@ -419,10 +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 -msgid "Can't connect to DBUS server" -msgstr "Não foi possível conectar ao servidor DBUS" - #: selection.c:466 #, c-format msgid "Can't convert line %d from %s to %s" @@ -437,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 "Não foi possível obter o nome do objeto DBUS" - #: ft.c:413 msgid "Can't get file size" msgstr "Não foi possível obter o tamanho do arquivo" @@ -675,10 +667,6 @@ msgstr "Configurar host" msgid "Connect on startup" msgstr "Conectar ao iniciar" -#: gobject.c:205 -msgid "Connecting to host" -msgstr "Conectando ao servidor" - #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477 #: connect.c:573 @@ -1954,11 +1942,6 @@ msgstr "Iniciar transferência de arquivo" msgid "Starting" msgstr "Iniciando" -#: gobject.c:193 -#, c-format -msgid "State %04d can't accept requests" -msgstr "Não é possível receber requisições no estado %04d" - #: security.c:237 msgid "Subject issuer mismatch" msgstr "Divergência na identidade do emissor" @@ -2460,11 +2443,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 -#, c-format -msgid "Unexpected state %04d" -msgstr "Estado inesperado %04d" - #: actions.c:391 #, c-format msgid "Unexpected target \"%s\"" @@ -2869,6 +2847,12 @@ msgstr "translator-credits" #~ "32768. Valores maiores trazem maior performance, porem, nem todos os " #~ "hosts podem suportá-los." +#~ msgid "Can't connect to DBUS server" +#~ msgstr "Não foi possível conectar ao servidor DBUS" + +#~ msgid "Can't get DBUS object name" +#~ msgstr "Não foi possível obter o nome do objeto DBUS" + #~ msgid "Can't start download." #~ msgstr "Não foi possível iniciar o download." @@ -2905,6 +2889,9 @@ msgstr "translator-credits" #~ msgid "Complete" #~ msgstr "Completo" +#~ msgid "Connecting to host" +#~ msgstr "Conectando ao servidor" + #~ msgid "Copiar tudo" #~ msgstr "Copiar tudo" @@ -3233,6 +3220,9 @@ msgstr "translator-credits" #~ msgid "Start upload." #~ msgstr "Iniciar envio." +#~ msgid "State %04d can't accept requests" +#~ msgstr "Não é possível receber requisições no estado %04d" + #~ msgid "Status" #~ msgstr "Situação" @@ -3267,6 +3257,9 @@ msgstr "translator-credits" #~ msgid "Unexpected element <%s>" #~ msgstr "Elemento <%s> inesperado" +#~ msgid "Unexpected state %04d" +#~ msgstr "Estado inesperado %04d" + #~ msgid "" #~ "Unknown host:\n" #~ "%s" diff --git a/locale/pw3270.pot b/locale/pw3270.pot index 612395a..e423c61 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: 2018-10-10 09:35-0300\n" +"POT-Creation-Date: 2018-10-18 15:19-0300\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: 2018-10-10 09:35-0300\n" +"POT-Creation-Date: 2018-10-18 15:19-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,17 +39,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-10 09:35-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" #: window.c:329 #, c-format @@ -435,10 +424,6 @@ msgstr "" msgid "Can't connect to %s:%s" msgstr "" -#: main.c:70 -msgid "Can't connect to DBUS server" -msgstr "" - #: selection.c:466 #, c-format msgid "Can't convert line %d from %s to %s" @@ -453,10 +438,6 @@ msgstr "" msgid "Can't determine value for environment variable \"%s\" " msgstr "" -#: main.c:115 -msgid "Can't get DBUS object name" -msgstr "" - #: ft.c:413 msgid "Can't get file size" msgstr "" @@ -679,10 +660,6 @@ msgstr "" msgid "Connect on startup" msgstr "" -#: gobject.c:205 -msgid "Connecting to host" -msgstr "" - #: connect.c:215 connect.c:311 connect.c:320 connect.c:382 connect.c:397 #: connect.c:413 connect.c:427 connect.c:447 connect.c:461 connect.c:477 #: connect.c:573 @@ -1913,11 +1890,6 @@ msgstr "" msgid "Starting" msgstr "" -#: gobject.c:193 -#, c-format -msgid "State %04d can't accept requests" -msgstr "" - #: security.c:237 msgid "Subject issuer mismatch" msgstr "" @@ -2363,11 +2335,6 @@ msgstr "" msgid "Unexpected or unknown security status" msgstr "" -#: gobject.c:208 -#, c-format -msgid "Unexpected state %04d" -msgstr "" - #: actions.c:391 #, c-format msgid "Unexpected target \"%s\"" diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 99b8ba5..04941ad 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -141,9 +141,12 @@ $(OBJRLS)/%.o: \ $(OBJRLS)/%.o: \ %.rc \ + @PACKAGE_TARNAME@.ico \ $(DEPENDS) - @$(WINDRES) --include-dir=$(BASEDIR)/win -i $< -o $@ + @echo $< ... + @$(MKDIR) `dirname $@` + @$(WINDRES) -i $< -o $@ $(BASEDIR)/.obj/Release/%.a: \ ./%/* \ diff --git a/win/pack.sh b/win/pack.sh index 80b3429..2467132 100755 --- a/win/pack.sh +++ b/win/pack.sh @@ -75,6 +75,11 @@ build() rm -f ./win/*.exe + if [ -e branding/${PACKAGE_TARNAME}.svg ]; then + rm -f win/${PACKAGE_TARNAME}.ico + convert -density 384 -background transparent branding/${PACKAGE_TARNAME}.svg -define icon:auto-resize -colors 256 win/${PACKAGE_TARNAME}.ico + fi + mkdir -p ${DESTDIR}/${PACKAGE_NAME}/${1} if [ "${RUNTIME}" == "1" ]; then diff --git a/win/pw3270.ico b/win/pw3270.ico deleted file mode 100644 index 6ec7e93..0000000 Binary files a/win/pw3270.ico and /dev/null differ -- libgit2 0.21.2