Download as
Browse Code »

Commit af7ebdcc358eb44fcb683dd2e0476f3a8caa5934

Authored by Perry Werneck
1 parent 89ce97fd
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustes no empacotamento windows.

Showing 5 changed files with 33 additions and 32 deletions   Show diff stats
@@ -192,6 +192,8 @@ all: \ @@ -192,6 +192,8 @@ all: \
192 $(BINDIR)/$(PACKAGE_NAME)-logo.png \ 192 $(BINDIR)/$(PACKAGE_NAME)-logo.png \
193 locale/$(PACKAGE_TARNAME).pot 193 locale/$(PACKAGE_TARNAME).pot
194 194
  195 + @$(MAKE) -C locale all
  196 +
195 Release: \ 197 Release: \
196 $(BINRLS)/lib3270@DLLEXT@ \ 198 $(BINRLS)/lib3270@DLLEXT@ \
197 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ 199 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
@@ -200,6 +202,8 @@ Release: \ @@ -200,6 +202,8 @@ Release: \
200 $(BINDIR)/$(PACKAGE_NAME)-logo.png \ 202 $(BINDIR)/$(PACKAGE_NAME)-logo.png \
201 locale/$(PACKAGE_TARNAME).pot 203 locale/$(PACKAGE_TARNAME).pot
202 204
  205 + @$(MAKE) -C locale all
  206 +
203 locale/$(PACKAGE_TARNAME).pot: \ 207 locale/$(PACKAGE_TARNAME).pot: \
204 $(POTDIR)/lib3270.pot \ 208 $(POTDIR)/lib3270.pot \
205 $(POTDIR)/pw3270.pot \ 209 $(POTDIR)/pw3270.pot \
locale/Makefile.in
  Diff comments   View file @af7ebdc
@@ -36,6 +36,9 @@ PACKAGE_NAME=@PACKAGE_NAME@ @@ -36,6 +36,9 @@ PACKAGE_NAME=@PACKAGE_NAME@
36 PACKAGE_VERSION=@PACKAGE_VERSION@ 36 PACKAGE_VERSION=@PACKAGE_VERSION@
37 PACKAGE_TARNAME=@PACKAGE_TARNAME@ 37 PACKAGE_TARNAME=@PACKAGE_TARNAME@
38 38
  39 +BASEDIR=@BASEDIR@
  40 +BINDIR=$(BASEDIR)/.bin/locale
  41 +
39 MKDIR=@MKDIR_P@ 42 MKDIR=@MKDIR_P@
40 MSGCAT=@MSGCAT@ 43 MSGCAT=@MSGCAT@
41 MSGFMT=@MSGFMT@ 44 MSGFMT=@MSGFMT@
@@ -52,18 +55,24 @@ INSTALL_DATA=@INSTALL_DATA@ @@ -52,18 +55,24 @@ INSTALL_DATA=@INSTALL_DATA@
52 @touch $@ 55 @touch $@
53 @$(MSGMERGE) --update --sort-output $@ $(PACKAGE_NAME).pot 56 @$(MSGMERGE) --update --sort-output $@ $(PACKAGE_NAME).pot
54 57
55 -$(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ 58 +$(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \
56 %.po 59 %.po
57 60
58 @echo $< ... 61 @echo $< ...
59 @$(MKDIR) `dirname $@` 62 @$(MKDIR) `dirname $@`
60 @$(MSGFMT) -c -v -o $@ $^ 63 @$(MSGFMT) -c -v -o $@ $^
61 64
  65 +$(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \
  66 + $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo
  67 +
  68 + @echo $< ...
  69 + @$(MKDIR) `dirname $@`
  70 + @echo $(INSTALL_DATA) $^ $@
62 71
63 #---[ Targets ]-------------------------------------------------------------------------- 72 #---[ Targets ]--------------------------------------------------------------------------
64 73
65 all: \ 74 all: \
66 - $(wildcard *.po) 75 + $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo)
67 76
68 install: \ 77 install: \
69 $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) 78 $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo)
locale/pt_BR.po
  Diff comments   View file @af7ebdc
@@ -5,7 +5,7 @@ msgid &quot;&quot; @@ -5,7 +5,7 @@ msgid &quot;&quot;
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2017-01-24 17:53-0200\n" 8 +"POT-Creation-Date: 2017-02-01 10:21-0200\n"
9 "PO-Revision-Date: 2016-10-25 10:47-0200\n" 9 "PO-Revision-Date: 2016-10-25 10:47-0200\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português <perry.werneck@gmail.com>\n" 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
@@ -419,11 +419,6 @@ msgstr &quot;Não foi possível conectar a %s&quot; @@ -419,11 +419,6 @@ msgstr &quot;Não foi possível conectar a %s&quot;
419 msgid "Can't connect to %s:%s" 419 msgid "Can't connect to %s:%s"
420 msgstr "Não foi possível conectar a %s:%s" 420 msgstr "Não foi possível conectar a %s:%s"
421 421
422 -#: main.c:70  
423 -#, fuzzy  
424 -msgid "Can't connect to DBUS server"  
425 -msgstr "Não foi possível conectar a %s"  
426 -  
427 #: selection.c:425 422 #: selection.c:425
428 #, c-format 423 #, c-format
429 msgid "Can't convert line %d from %s to %s" 424 msgid "Can't convert line %d from %s to %s"
@@ -438,10 +433,6 @@ msgstr &quot;Recortar não permitido em seleção retangular&quot; @@ -438,10 +433,6 @@ msgstr &quot;Recortar não permitido em seleção retangular&quot;
438 msgid "Can't determine value for environment variable \"%s\" " 433 msgid "Can't determine value for environment variable \"%s\" "
439 msgstr "Não consigo determinar o valor da variável de ambiente \"%s\" " 434 msgstr "Não consigo determinar o valor da variável de ambiente \"%s\" "
440 435
441 -#: main.c:115  
442 -msgid "Can't get DBUS object name"  
443 -msgstr ""  
444 -  
445 #: ft.c:413 436 #: ft.c:413
446 msgid "Can't get file size" 437 msgid "Can't get file size"
447 msgstr "Não foi possível obter o tamanho do arquivo" 438 msgstr "Não foi possível obter o tamanho do arquivo"
@@ -663,11 +654,6 @@ msgstr &quot;Configurar host&quot; @@ -663,11 +654,6 @@ msgstr &quot;Configurar host&quot;
663 msgid "Connect on startup" 654 msgid "Connect on startup"
664 msgstr "Conectar ao iniciar" 655 msgstr "Conectar ao iniciar"
665 656
666 -#: gobject.c:205  
667 -#, fuzzy  
668 -msgid "Connecting to host"  
669 -msgstr "Não foi possível conectar ao servidor"  
670 -  
671 #: connect.c:200 connect.c:296 connect.c:305 connect.c:367 connect.c:382 657 #: connect.c:200 connect.c:296 connect.c:305 connect.c:367 connect.c:382
672 #: connect.c:398 connect.c:412 connect.c:432 connect.c:446 connect.c:462 658 #: connect.c:398 connect.c:412 connect.c:432 connect.c:446 connect.c:462
673 #: connect.c:557 659 #: connect.c:557
@@ -1403,7 +1389,7 @@ msgstr &quot;Popup test&quot; @@ -1403,7 +1389,7 @@ msgstr &quot;Popup test&quot;
1403 msgid "Port or service name (empty for \"telnet\")." 1389 msgid "Port or service name (empty for \"telnet\")."
1404 msgstr "Nº da porta ou nome do serviço (em branco para \"telnet\")." 1390 msgstr "Nº da porta ou nome do serviço (em branco para \"telnet\")."
1405 1391
1406 -#: set.c:178 1392 +#: set.c:176
1407 msgid "Preparing" 1393 msgid "Preparing"
1408 msgstr "Preparando" 1394 msgstr "Preparando"
1409 1395
@@ -1927,11 +1913,6 @@ msgstr &quot;Iniciar transferência de arquivo&quot; @@ -1927,11 +1913,6 @@ msgstr &quot;Iniciar transferência de arquivo&quot;
1927 msgid "Starting" 1913 msgid "Starting"
1928 msgstr "Iniciando" 1914 msgstr "Iniciando"
1929 1915
1930 -#: gobject.c:193  
1931 -#, c-format  
1932 -msgid "State %04d can't accept requests"  
1933 -msgstr ""  
1934 -  
1935 #: security.c:237 1916 #: security.c:237
1936 msgid "Subject issuer mismatch" 1917 msgid "Subject issuer mismatch"
1937 msgstr "Divergência na identidade do emissor" 1918 msgstr "Divergência na identidade do emissor"
@@ -2417,11 +2398,6 @@ msgstr &quot;Valor de cor inválido ou inesperado: \&quot;%s\&quot;&quot; @@ -2417,11 +2398,6 @@ msgstr &quot;Valor de cor inválido ou inesperado: \&quot;%s\&quot;&quot;
2417 msgid "Unexpected or unknown security status" 2398 msgid "Unexpected or unknown security status"
2418 msgstr "Estado de segurança inesperado ou desconhecido." 2399 msgstr "Estado de segurança inesperado ou desconhecido."
2419 2400
2420 -#: gobject.c:208  
2421 -#, fuzzy, c-format  
2422 -msgid "Unexpected state %04d"  
2423 -msgstr "Alvo inesperado \"%s\""  
2424 -  
2425 #: actions.c:391 2401 #: actions.c:391
2426 #, c-format 2402 #, c-format
2427 msgid "Unexpected target \"%s\"" 2403 msgid "Unexpected target \"%s\""
@@ -2831,6 +2807,10 @@ msgstr &quot;translator-credits&quot; @@ -2831,6 +2807,10 @@ msgstr &quot;translator-credits&quot;
2831 #~ "32768. Valores maiores trazem maior performance, porem, nem todos os " 2807 #~ "32768. Valores maiores trazem maior performance, porem, nem todos os "
2832 #~ "hosts podem suportá-los." 2808 #~ "hosts podem suportá-los."
2833 2809
  2810 +#, fuzzy
  2811 +#~ msgid "Can't connect to DBUS server"
  2812 +#~ msgstr "Não foi possível conectar a %s"
  2813 +
2834 #~ msgid "Can't start download." 2814 #~ msgid "Can't start download."
2835 #~ msgstr "Não foi possível iniciar o download." 2815 #~ msgstr "Não foi possível iniciar o download."
2836 2816
@@ -2867,6 +2847,10 @@ msgstr &quot;translator-credits&quot; @@ -2867,6 +2847,10 @@ msgstr &quot;translator-credits&quot;
2867 #~ msgid "Complete" 2847 #~ msgid "Complete"
2868 #~ msgstr "Completo" 2848 #~ msgstr "Completo"
2869 2849
  2850 +#, fuzzy
  2851 +#~ msgid "Connecting to host"
  2852 +#~ msgstr "Não foi possível conectar ao servidor"
  2853 +
2870 #~ msgid "Copiar tudo" 2854 #~ msgid "Copiar tudo"
2871 #~ msgstr "Copiar tudo" 2855 #~ msgstr "Copiar tudo"
2872 2856
@@ -3229,6 +3213,10 @@ msgstr &quot;translator-credits&quot; @@ -3229,6 +3213,10 @@ msgstr &quot;translator-credits&quot;
3229 #~ msgid "Unexpected element <%s>" 3213 #~ msgid "Unexpected element <%s>"
3230 #~ msgstr "Elemento <%s> inesperado" 3214 #~ msgstr "Elemento <%s> inesperado"
3231 3215
  3216 +#, fuzzy
  3217 +#~ msgid "Unexpected state %04d"
  3218 +#~ msgstr "Alvo inesperado \"%s\""
  3219 +
3232 #~ msgid "" 3220 #~ msgid ""
3233 #~ "Unknown host:\n" 3221 #~ "Unknown host:\n"
3234 #~ "%s" 3222 #~ "%s"
locale/pw3270.pot
  Diff comments   View file @af7ebdc
@@ -9,7 +9,7 @@ msgstr &quot;&quot; @@ -9,7 +9,7 @@ msgstr &quot;&quot;
9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 "Project-Id-Version: PACKAGE VERSION\n" 10 "Project-Id-Version: PACKAGE VERSION\n"
11 "Report-Msgid-Bugs-To: \n" 11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2017-02-01 09:51-0200\n" 12 +"POT-Creation-Date: 2017-02-01 10:30-0200\n"
13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 "Language-Team: LANGUAGE <LL@li.org>\n" 15 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 "Project-Id-Version: PACKAGE VERSION\n" 21 "Project-Id-Version: PACKAGE VERSION\n"
22 "Report-Msgid-Bugs-To: \n" 22 "Report-Msgid-Bugs-To: \n"
23 -"POT-Creation-Date: 2017-02-01 09:51-0200\n" 23 +"POT-Creation-Date: 2017-02-01 10:30-0200\n"
24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 "Language-Team: LANGUAGE <LL@li.org>\n" 26 "Language-Team: LANGUAGE <LL@li.org>\n"
win/pw3270.nsi.in
  Diff comments   View file @af7ebdc
@@ -92,8 +92,8 @@ SubSection &quot;@PACKAGE@&quot; SecMain @@ -92,8 +92,8 @@ SubSection &quot;@PACKAGE@&quot; SecMain
92 file "/oname=$INSTDIR\ui\00default.xml" "..\ui\00default.xml" 92 file "/oname=$INSTDIR\ui\00default.xml" "..\ui\00default.xml"
93 93
94 # Locale files 94 # Locale files
95 - #CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"  
96 - #file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "..\.bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" 95 + CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES"
  96 + file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "..\.bin\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
97 97
98 # Save DataDir 98 # Save DataDir
99 SetRegView @WINARCH@ 99 SetRegView @WINARCH@