Commit e25614703af402ba9073c8457548e26e0557c7b2
1 parent
4deb0403
Exists in
master
and in
3 other branches
Adjustments for customized windows package.
Showing
5 changed files
with
39 additions
and
44 deletions
Show diff stats
Makefile.in
| ... | ... | @@ -27,7 +27,6 @@ |
| 27 | 27 | #---[ Configuration ]-------------------------------------------------------------------- |
| 28 | 28 | |
| 29 | 29 | PACKAGE_NAME=@PACKAGE_NAME@ |
| 30 | -PACKAGE_TARNAME=@PACKAGE_TARNAME@ | |
| 31 | 30 | PRODUCT_NAME=@PRODUCT_NAME@ |
| 32 | 31 | |
| 33 | 32 | SOURCES= \ |
| ... | ... | @@ -134,7 +133,7 @@ $(OBJDBG)/%.o: \ |
| 134 | 133 | |
| 135 | 134 | $(OBJDBG)/%.o: \ |
| 136 | 135 | %.rc \ |
| 137 | - $(PACKAGE_TARNAME).ico | |
| 136 | + $(PRODUCT_NAME).ico | |
| 138 | 137 | |
| 139 | 138 | @echo $< ... |
| 140 | 139 | @$(MKDIR) $(@D) |
| ... | ... | @@ -162,7 +161,7 @@ $(OBJRLS)/%.o: \ |
| 162 | 161 | |
| 163 | 162 | $(OBJRLS)/%.o: \ |
| 164 | 163 | %.rc \ |
| 165 | - $(PACKAGE_TARNAME).ico | |
| 164 | + $(PRODUCT_NAME).ico | |
| 166 | 165 | |
| 167 | 166 | @echo $< ... |
| 168 | 167 | @$(MKDIR) $(@D) |
| ... | ... | @@ -363,7 +362,7 @@ clean: \ |
| 363 | 362 | @rm -fr $(BASEDIR)/.tmp/$(PACKAGE_NAME) |
| 364 | 363 | @rm -fr $(POTDIR)/$(PACKAGE_NAME) |
| 365 | 364 | @rm -fr src/include/marshal |
| 366 | - @rm -f $(PACKAGE_TARNAME).ico | |
| 365 | + @rm -f $(PRODUCT_NAME).ico | |
| 367 | 366 | |
| 368 | 367 | cleanDebug: |
| 369 | 368 | ... | ... |
branding/Makefile.in
| ... | ... | @@ -35,7 +35,6 @@ datarootdir=@datarootdir@ |
| 35 | 35 | bindir=@bindir@ |
| 36 | 36 | |
| 37 | 37 | BASEDIR=@BASEDIR@ |
| 38 | -SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/branding | |
| 39 | 38 | BINDIR=$(BASEDIR)/.bin |
| 40 | 39 | |
| 41 | 40 | MKDIR=@MKDIR_P@ |
| ... | ... | @@ -53,7 +52,13 @@ $(BINDIR)/%.png: \ |
| 53 | 52 | |
| 54 | 53 | @echo $@ ... |
| 55 | 54 | @$(MKDIR) `dirname $@` |
| 56 | - @$(CONVERT) -strip -background transparent $< $@ | |
| 55 | + | |
| 56 | + @$(CONVERT) \ | |
| 57 | + -strip \ | |
| 58 | + -background transparent \ | |
| 59 | + $< \ | |
| 60 | + $@ | |
| 61 | + | |
| 57 | 62 | ifeq ($(OPTIPNG),no) |
| 58 | 63 | @chmod 644 $@ |
| 59 | 64 | else |
| ... | ... | @@ -61,11 +66,16 @@ else |
| 61 | 66 | endif |
| 62 | 67 | |
| 63 | 68 | $(BINDIR)/%.png: \ |
| 64 | - $(PACKAGE_TARNAME).svg | |
| 69 | + $(PRODUCT_NAME).svg | |
| 65 | 70 | |
| 66 | 71 | @echo $@ ... |
| 67 | 72 | @$(MKDIR) `dirname $@` |
| 68 | - @$(CONVERT) -strip -background transparent $< $@ | |
| 73 | + @$(CONVERT) \ | |
| 74 | + -strip \ | |
| 75 | + -background transparent \ | |
| 76 | + $< \ | |
| 77 | + $@ | |
| 78 | + | |
| 69 | 79 | ifeq ($(OPTIPNG),no) |
| 70 | 80 | @chmod 644 $@ |
| 71 | 81 | else |
| ... | ... | @@ -73,16 +83,12 @@ else |
| 73 | 83 | endif |
| 74 | 84 | |
| 75 | 85 | %.ico: \ |
| 76 | - $(PACKAGE_TARNAME).svg | |
| 86 | + $(PRODUCT_NAME).svg | |
| 77 | 87 | |
| 78 | 88 | @echo $@ ... |
| 79 | 89 | @$(MKDIR) `dirname $@` |
| 80 | 90 | @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@ |
| 81 | 91 | |
| 82 | -$(SRCDIR): | |
| 83 | - @$(MKDIR) $@ | |
| 84 | - @$(INSTALL_DATA) $(PACKAGE_NAME).svg $(PACKAGE_NAME)-logo.svg *.in $@ | |
| 85 | - | |
| 86 | 92 | $(BINDIR)/%.png: \ |
| 87 | 93 | %.png |
| 88 | 94 | ... | ... |
locale/pt_BR.po
| ... | ... | @@ -5,7 +5,7 @@ msgid "" |
| 5 | 5 | msgstr "" |
| 6 | 6 | "Project-Id-Version: pw3270 5.0\n" |
| 7 | 7 | "Report-Msgid-Bugs-To: \n" |
| 8 | -"POT-Creation-Date: 2020-07-27 18:43-0300\n" | |
| 8 | +"POT-Creation-Date: 2020-08-05 16:03-0300\n" | |
| 9 | 9 | "PO-Revision-Date: 2020-06-06 11:11-0300\n" |
| 10 | 10 | "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" |
| 11 | 11 | "Language-Team: Português <>\n" |
| ... | ... | @@ -143,10 +143,6 @@ msgstr "Fechar janela" |
| 143 | 143 | msgid "Colors" |
| 144 | 144 | msgstr "Cores" |
| 145 | 145 | |
| 146 | -#: src/objects/linux/savedesktopicon.c:93 | |
| 147 | -msgid "Comment" | |
| 148 | -msgstr "Comentário" | |
| 149 | - | |
| 150 | 146 | #: src/objects/window/actions/connect.c:59 |
| 151 | 147 | msgid "Connect" |
| 152 | 148 | msgstr "Conectar" |
| ... | ... | @@ -179,7 +175,7 @@ msgstr "Copiar como tabela" |
| 179 | 175 | msgid "Copy as text" |
| 180 | 176 | msgstr "Copiar como texto" |
| 181 | 177 | |
| 182 | -#: src/objects/linux/savedesktopicon.c:106 | |
| 178 | +#: src/objects/windows/savedesktopicon.c:79 | |
| 183 | 179 | msgid "Create a desktop icon for the current session" |
| 184 | 180 | msgstr "Criar ícone da área de trabalho para a sessão atual." |
| 185 | 181 | |
| ... | ... | @@ -260,7 +256,7 @@ msgstr "Apagar até o final da linha" |
| 260 | 256 | msgid "Field attributes" |
| 261 | 257 | msgstr "Mostra atributos de campo" |
| 262 | 258 | |
| 263 | -#: src/objects/linux/savedesktopicon.c:72 | |
| 259 | +#: src/objects/windows/savedesktopicon.c:62 | |
| 264 | 260 | msgid "File name" |
| 265 | 261 | msgstr "Nome do arquivo" |
| 266 | 262 | |
| ... | ... | @@ -276,10 +272,6 @@ msgstr "Tela cheia" |
| 276 | 272 | msgid "Function bar" |
| 277 | 273 | msgstr "Barra de funções" |
| 278 | 274 | |
| 279 | -#: src/objects/linux/savedesktopicon.c:86 | |
| 280 | -msgid "Generic name" | |
| 281 | -msgstr "Nome genérico" | |
| 282 | - | |
| 283 | 275 | #: ui/application.xml:36 ui/application.xml:534 |
| 284 | 276 | msgid "Help" |
| 285 | 277 | msgstr "Ajuda" |
| ... | ... | @@ -364,7 +356,7 @@ msgstr "Etiqueta" |
| 364 | 356 | msgid "Large" |
| 365 | 357 | msgstr "Grande" |
| 366 | 358 | |
| 367 | -#: src/objects/linux/savedesktopicon.c:79 | |
| 359 | +#: src/objects/windows/savedesktopicon.c:67 | |
| 368 | 360 | msgid "Launcher name" |
| 369 | 361 | msgstr "Nome do lançador" |
| 370 | 362 | |
| ... | ... | @@ -541,7 +533,7 @@ msgstr "Salvar" |
| 541 | 533 | msgid "Save As" |
| 542 | 534 | msgstr "Salvar Como" |
| 543 | 535 | |
| 544 | -#: src/objects/linux/savedesktopicon.c:105 | |
| 536 | +#: src/objects/windows/savedesktopicon.c:78 | |
| 545 | 537 | msgid "Save desktop icon" |
| 546 | 538 | msgstr "Salvar ícone da área de trabalho" |
| 547 | 539 | |
| ... | ... | @@ -812,7 +804,7 @@ msgstr "Janela com sessão padrão" |
| 812 | 804 | msgid "_Apply" |
| 813 | 805 | msgstr "_Aplicar" |
| 814 | 806 | |
| 815 | -#: src/objects/settings/dialog.c:83 src/objects/linux/savedesktopicon.c:132 | |
| 807 | +#: src/objects/settings/dialog.c:83 src/objects/windows/savedesktopicon.c:104 | |
| 816 | 808 | msgid "_Cancel" |
| 817 | 809 | msgstr "_Cancelar" |
| 818 | 810 | |
| ... | ... | @@ -856,7 +848,7 @@ msgstr "_Propriedades" |
| 856 | 848 | msgid "_Rename session" |
| 857 | 849 | msgstr "Renomear sessão" |
| 858 | 850 | |
| 859 | -#: src/objects/linux/savedesktopicon.c:133 | |
| 851 | +#: src/objects/windows/savedesktopicon.c:105 | |
| 860 | 852 | msgid "_Save" |
| 861 | 853 | msgstr "_Salvar" |
| 862 | 854 | |
| ... | ... | @@ -1516,6 +1508,9 @@ msgstr "translator-credits" |
| 1516 | 1508 | #~ msgid "Command to execute" |
| 1517 | 1509 | #~ msgstr "Comando a executar" |
| 1518 | 1510 | |
| 1511 | +#~ msgid "Comment" | |
| 1512 | +#~ msgstr "Comentário" | |
| 1513 | + | |
| 1519 | 1514 | #~ msgid "Complete" |
| 1520 | 1515 | #~ msgstr "Completo" |
| 1521 | 1516 | |
| ... | ... | @@ -1841,6 +1836,9 @@ msgstr "translator-credits" |
| 1841 | 1836 | #~ msgid "GTK Version mismatch" |
| 1842 | 1837 | #~ msgstr "Divergência de versão GTK" |
| 1843 | 1838 | |
| 1839 | +#~ msgid "Generic name" | |
| 1840 | +#~ msgstr "Nome genérico" | |
| 1841 | + | |
| 1844 | 1842 | #~ msgid "Get transfer queue from an external XML file" |
| 1845 | 1843 | #~ msgstr "Obtém a fila de transferência de um arquivo XML externo" |
| 1846 | 1844 | ... | ... |
locale/pw3270.pot
| ... | ... | @@ -8,7 +8,7 @@ msgid "" |
| 8 | 8 | msgstr "" |
| 9 | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
| 10 | 10 | "Report-Msgid-Bugs-To: \n" |
| 11 | -"POT-Creation-Date: 2020-07-27 18:43-0300\n" | |
| 11 | +"POT-Creation-Date: 2020-08-05 16:03-0300\n" | |
| 12 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
| 13 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 14 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
| ... | ... | @@ -140,10 +140,6 @@ msgstr "" |
| 140 | 140 | msgid "Colors" |
| 141 | 141 | msgstr "" |
| 142 | 142 | |
| 143 | -#: src/objects/linux/savedesktopicon.c:93 | |
| 144 | -msgid "Comment" | |
| 145 | -msgstr "" | |
| 146 | - | |
| 147 | 143 | #: src/objects/window/actions/connect.c:59 |
| 148 | 144 | msgid "Connect" |
| 149 | 145 | msgstr "" |
| ... | ... | @@ -176,7 +172,7 @@ msgstr "" |
| 176 | 172 | msgid "Copy as text" |
| 177 | 173 | msgstr "" |
| 178 | 174 | |
| 179 | -#: src/objects/linux/savedesktopicon.c:106 | |
| 175 | +#: src/objects/windows/savedesktopicon.c:79 | |
| 180 | 176 | msgid "Create a desktop icon for the current session" |
| 181 | 177 | msgstr "" |
| 182 | 178 | |
| ... | ... | @@ -257,7 +253,7 @@ msgstr "" |
| 257 | 253 | msgid "Field attributes" |
| 258 | 254 | msgstr "" |
| 259 | 255 | |
| 260 | -#: src/objects/linux/savedesktopicon.c:72 | |
| 256 | +#: src/objects/windows/savedesktopicon.c:62 | |
| 261 | 257 | msgid "File name" |
| 262 | 258 | msgstr "" |
| 263 | 259 | |
| ... | ... | @@ -273,10 +269,6 @@ msgstr "" |
| 273 | 269 | msgid "Function bar" |
| 274 | 270 | msgstr "" |
| 275 | 271 | |
| 276 | -#: src/objects/linux/savedesktopicon.c:86 | |
| 277 | -msgid "Generic name" | |
| 278 | -msgstr "" | |
| 279 | - | |
| 280 | 272 | #: ui/application.xml:36 ui/application.xml:534 |
| 281 | 273 | msgid "Help" |
| 282 | 274 | msgstr "" |
| ... | ... | @@ -361,7 +353,7 @@ msgstr "" |
| 361 | 353 | msgid "Large" |
| 362 | 354 | msgstr "" |
| 363 | 355 | |
| 364 | -#: src/objects/linux/savedesktopicon.c:79 | |
| 356 | +#: src/objects/windows/savedesktopicon.c:67 | |
| 365 | 357 | msgid "Launcher name" |
| 366 | 358 | msgstr "" |
| 367 | 359 | |
| ... | ... | @@ -538,7 +530,7 @@ msgstr "" |
| 538 | 530 | msgid "Save As" |
| 539 | 531 | msgstr "" |
| 540 | 532 | |
| 541 | -#: src/objects/linux/savedesktopicon.c:105 | |
| 533 | +#: src/objects/windows/savedesktopicon.c:78 | |
| 542 | 534 | msgid "Save desktop icon" |
| 543 | 535 | msgstr "" |
| 544 | 536 | |
| ... | ... | @@ -809,7 +801,7 @@ msgstr "" |
| 809 | 801 | msgid "_Apply" |
| 810 | 802 | msgstr "" |
| 811 | 803 | |
| 812 | -#: src/objects/settings/dialog.c:83 src/objects/linux/savedesktopicon.c:132 | |
| 804 | +#: src/objects/settings/dialog.c:83 src/objects/windows/savedesktopicon.c:104 | |
| 813 | 805 | msgid "_Cancel" |
| 814 | 806 | msgstr "" |
| 815 | 807 | |
| ... | ... | @@ -853,7 +845,7 @@ msgstr "" |
| 853 | 845 | msgid "_Rename session" |
| 854 | 846 | msgstr "" |
| 855 | 847 | |
| 856 | -#: src/objects/linux/savedesktopicon.c:133 | |
| 848 | +#: src/objects/windows/savedesktopicon.c:105 | |
| 857 | 849 | msgid "_Save" |
| 858 | 850 | msgstr "" |
| 859 | 851 | ... | ... |