diff --git a/Makefile.in b/Makefile.in index c83eaca..e98f9cd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,7 +27,6 @@ #---[ Configuration ]-------------------------------------------------------------------- PACKAGE_NAME=@PACKAGE_NAME@ -PACKAGE_TARNAME=@PACKAGE_TARNAME@ PRODUCT_NAME=@PRODUCT_NAME@ SOURCES= \ @@ -134,7 +133,7 @@ $(OBJDBG)/%.o: \ $(OBJDBG)/%.o: \ %.rc \ - $(PACKAGE_TARNAME).ico + $(PRODUCT_NAME).ico @echo $< ... @$(MKDIR) $(@D) @@ -162,7 +161,7 @@ $(OBJRLS)/%.o: \ $(OBJRLS)/%.o: \ %.rc \ - $(PACKAGE_TARNAME).ico + $(PRODUCT_NAME).ico @echo $< ... @$(MKDIR) $(@D) @@ -363,7 +362,7 @@ clean: \ @rm -fr $(BASEDIR)/.tmp/$(PACKAGE_NAME) @rm -fr $(POTDIR)/$(PACKAGE_NAME) @rm -fr src/include/marshal - @rm -f $(PACKAGE_TARNAME).ico + @rm -f $(PRODUCT_NAME).ico cleanDebug: diff --git a/branding/Makefile.in b/branding/Makefile.in index 441099d..9bd0ae0 100644 --- a/branding/Makefile.in +++ b/branding/Makefile.in @@ -35,7 +35,6 @@ datarootdir=@datarootdir@ bindir=@bindir@ BASEDIR=@BASEDIR@ -SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/branding BINDIR=$(BASEDIR)/.bin MKDIR=@MKDIR_P@ @@ -53,7 +52,13 @@ $(BINDIR)/%.png: \ @echo $@ ... @$(MKDIR) `dirname $@` - @$(CONVERT) -strip -background transparent $< $@ + + @$(CONVERT) \ + -strip \ + -background transparent \ + $< \ + $@ + ifeq ($(OPTIPNG),no) @chmod 644 $@ else @@ -61,11 +66,16 @@ else endif $(BINDIR)/%.png: \ - $(PACKAGE_TARNAME).svg + $(PRODUCT_NAME).svg @echo $@ ... @$(MKDIR) `dirname $@` - @$(CONVERT) -strip -background transparent $< $@ + @$(CONVERT) \ + -strip \ + -background transparent \ + $< \ + $@ + ifeq ($(OPTIPNG),no) @chmod 644 $@ else @@ -73,16 +83,12 @@ else endif %.ico: \ - $(PACKAGE_TARNAME).svg + $(PRODUCT_NAME).svg @echo $@ ... @$(MKDIR) `dirname $@` @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@ -$(SRCDIR): - @$(MKDIR) $@ - @$(INSTALL_DATA) $(PACKAGE_NAME).svg $(PACKAGE_NAME)-logo.svg *.in $@ - $(BINDIR)/%.png: \ %.png diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 934b3ac..2577701 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: 2020-07-27 18:43-0300\n" +"POT-Creation-Date: 2020-08-05 16:03-0300\n" "PO-Revision-Date: 2020-06-06 11:11-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português <>\n" @@ -143,10 +143,6 @@ msgstr "Fechar janela" msgid "Colors" msgstr "Cores" -#: src/objects/linux/savedesktopicon.c:93 -msgid "Comment" -msgstr "Comentário" - #: src/objects/window/actions/connect.c:59 msgid "Connect" msgstr "Conectar" @@ -179,7 +175,7 @@ msgstr "Copiar como tabela" msgid "Copy as text" msgstr "Copiar como texto" -#: src/objects/linux/savedesktopicon.c:106 +#: src/objects/windows/savedesktopicon.c:79 msgid "Create a desktop icon for the current session" msgstr "Criar ícone da área de trabalho para a sessão atual." @@ -260,7 +256,7 @@ msgstr "Apagar até o final da linha" msgid "Field attributes" msgstr "Mostra atributos de campo" -#: src/objects/linux/savedesktopicon.c:72 +#: src/objects/windows/savedesktopicon.c:62 msgid "File name" msgstr "Nome do arquivo" @@ -276,10 +272,6 @@ msgstr "Tela cheia" msgid "Function bar" msgstr "Barra de funções" -#: src/objects/linux/savedesktopicon.c:86 -msgid "Generic name" -msgstr "Nome genérico" - #: ui/application.xml:36 ui/application.xml:534 msgid "Help" msgstr "Ajuda" @@ -364,7 +356,7 @@ msgstr "Etiqueta" msgid "Large" msgstr "Grande" -#: src/objects/linux/savedesktopicon.c:79 +#: src/objects/windows/savedesktopicon.c:67 msgid "Launcher name" msgstr "Nome do lançador" @@ -541,7 +533,7 @@ msgstr "Salvar" msgid "Save As" msgstr "Salvar Como" -#: src/objects/linux/savedesktopicon.c:105 +#: src/objects/windows/savedesktopicon.c:78 msgid "Save desktop icon" msgstr "Salvar ícone da área de trabalho" @@ -812,7 +804,7 @@ msgstr "Janela com sessão padrão" msgid "_Apply" msgstr "_Aplicar" -#: src/objects/settings/dialog.c:83 src/objects/linux/savedesktopicon.c:132 +#: src/objects/settings/dialog.c:83 src/objects/windows/savedesktopicon.c:104 msgid "_Cancel" msgstr "_Cancelar" @@ -856,7 +848,7 @@ msgstr "_Propriedades" msgid "_Rename session" msgstr "Renomear sessão" -#: src/objects/linux/savedesktopicon.c:133 +#: src/objects/windows/savedesktopicon.c:105 msgid "_Save" msgstr "_Salvar" @@ -1516,6 +1508,9 @@ msgstr "translator-credits" #~ msgid "Command to execute" #~ msgstr "Comando a executar" +#~ msgid "Comment" +#~ msgstr "Comentário" + #~ msgid "Complete" #~ msgstr "Completo" @@ -1841,6 +1836,9 @@ msgstr "translator-credits" #~ msgid "GTK Version mismatch" #~ msgstr "Divergência de versão GTK" +#~ msgid "Generic name" +#~ msgstr "Nome genérico" + #~ msgid "Get transfer queue from an external XML file" #~ msgstr "Obtém a fila de transferência de um arquivo XML externo" diff --git a/locale/pw3270.pot b/locale/pw3270.pot index b59ed5c..dd7c59b 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 18:43-0300\n" +"POT-Creation-Date: 2020-08-05 16:03-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -140,10 +140,6 @@ msgstr "" msgid "Colors" msgstr "" -#: src/objects/linux/savedesktopicon.c:93 -msgid "Comment" -msgstr "" - #: src/objects/window/actions/connect.c:59 msgid "Connect" msgstr "" @@ -176,7 +172,7 @@ msgstr "" msgid "Copy as text" msgstr "" -#: src/objects/linux/savedesktopicon.c:106 +#: src/objects/windows/savedesktopicon.c:79 msgid "Create a desktop icon for the current session" msgstr "" @@ -257,7 +253,7 @@ msgstr "" msgid "Field attributes" msgstr "" -#: src/objects/linux/savedesktopicon.c:72 +#: src/objects/windows/savedesktopicon.c:62 msgid "File name" msgstr "" @@ -273,10 +269,6 @@ msgstr "" msgid "Function bar" msgstr "" -#: src/objects/linux/savedesktopicon.c:86 -msgid "Generic name" -msgstr "" - #: ui/application.xml:36 ui/application.xml:534 msgid "Help" msgstr "" @@ -361,7 +353,7 @@ msgstr "" msgid "Large" msgstr "" -#: src/objects/linux/savedesktopicon.c:79 +#: src/objects/windows/savedesktopicon.c:67 msgid "Launcher name" msgstr "" @@ -538,7 +530,7 @@ msgstr "" msgid "Save As" msgstr "" -#: src/objects/linux/savedesktopicon.c:105 +#: src/objects/windows/savedesktopicon.c:78 msgid "Save desktop icon" msgstr "" @@ -809,7 +801,7 @@ msgstr "" msgid "_Apply" msgstr "" -#: src/objects/settings/dialog.c:83 src/objects/linux/savedesktopicon.c:132 +#: src/objects/settings/dialog.c:83 src/objects/windows/savedesktopicon.c:104 msgid "_Cancel" msgstr "" @@ -853,7 +845,7 @@ msgstr "" msgid "_Rename session" msgstr "" -#: src/objects/linux/savedesktopicon.c:133 +#: src/objects/windows/savedesktopicon.c:105 msgid "_Save" msgstr "" diff --git a/src/main/windows/resources.rc.in b/src/main/windows/resources.rc.in index 307d0d1..6f3e9bf 100644 --- a/src/main/windows/resources.rc.in +++ b/src/main/windows/resources.rc.in @@ -1,6 +1,6 @@ #include -1 ICON @PACKAGE_TARNAME@.ico +1 ICON @PRODUCT_NAME@.ico VS_VERSION_INFO VERSIONINFO FILEVERSION @WIN32_FILE_VERSION@ -- libgit2 0.21.2