Download as
Browse Code »

Commit 5259d9fd2fd83681b6676f565172983059826415

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

Reincluindo processamento de plugins.

Showing 2 changed files with 62 additions and 7 deletions   Show diff stats
@@ -69,11 +69,13 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -69,11 +69,13 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
69 all: \ 69 all: \
70 $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ \ 70 $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ \
71 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ 71 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
  72 + $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \
72 locale/$(PACKAGE_TARNAME).pot 73 locale/$(PACKAGE_TARNAME).pot
73 74
74 Release: \ 75 Release: \
75 $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ \ 76 $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ \
76 - $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ 77 + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
  78 + $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@)
77 79
78 80
79 #---[ Debug Rules ]---------------------------------------------------------------------- 81 #---[ Debug Rules ]----------------------------------------------------------------------
@@ -91,11 +93,16 @@ $(BINDBG)/@DLLPREFIX@3270@DLLEXT@: \ @@ -91,11 +93,16 @@ $(BINDBG)/@DLLPREFIX@3270@DLLEXT@: \
91 93
92 $(BINDBG)/%@EXEEXT@: \ 94 $(BINDBG)/%@EXEEXT@: \
93 $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \ 95 $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \
94 - src/% \  
95 - src/%/* 96 + src/% \
  97 + src/%/*
96 98
97 @make -C src/$(notdir $(basename $@)) $@ 99 @make -C src/$(notdir $(basename $@)) $@
98 100
  101 +$(BINDBG)/plugins/%@DLLEXT@: \
  102 + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
  103 + src/plugins/%/*
  104 +
  105 + @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
99 106
100 #---[ Release Rules ]-------------------------------------------------------------------- 107 #---[ Release Rules ]--------------------------------------------------------------------
101 108
@@ -116,6 +123,12 @@ $(BINRLS)/%@EXEEXT@: \ @@ -116,6 +123,12 @@ $(BINRLS)/%@EXEEXT@: \
116 123
117 @$(MAKE) -C src/$(notdir $(basename $@)) $@ 124 @$(MAKE) -C src/$(notdir $(basename $@)) $@
118 125
  126 +$(BINRLS)/plugins/%@DLLEXT@: \
  127 + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
  128 + src/plugins/%/*
  129 +
  130 + @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
  131 +
119 #---[ Install Rules ]-------------------------------------------------------------------- 132 #---[ Install Rules ]--------------------------------------------------------------------
120 133
121 install: \ 134 install: \
@@ -145,6 +158,13 @@ install-%: \ @@ -145,6 +158,13 @@ install-%: \
145 158
146 #---[ Misc Rules ]----------------------------------------------------------------------- 159 #---[ Misc Rules ]-----------------------------------------------------------------------
147 160
  161 +$(POTDIR)/plugins/%.pot: \
  162 + ./src/plugins/%/*
  163 +
  164 + @echo $(notdir $@) ...
  165 + @mkdir -p `dirname $@`
  166 + @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
  167 +
148 $(POTDIR)/%.pot: \ 168 $(POTDIR)/%.pot: \
149 $(DEPENDS) \ 169 $(DEPENDS) \
150 ./src/%/* 170 ./src/%/*
@@ -174,7 +194,8 @@ $(POTDIR)/%.pot: \ @@ -174,7 +194,8 @@ $(POTDIR)/%.pot: \
174 194
175 Debug: \ 195 Debug: \
176 $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \ 196 $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \
177 - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ 197 + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
  198 + $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@)
178 199
179 run: \ 200 run: \
180 $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \ 201 $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \
@@ -190,7 +211,8 @@ locale: \ @@ -190,7 +211,8 @@ locale: \
190 locale/$(PACKAGE_TARNAME).pot: \ 211 locale/$(PACKAGE_TARNAME).pot: \
191 $(POTDIR)/pw3270.pot \ 212 $(POTDIR)/pw3270.pot \
192 $(POTDIR)/lib3270.pot \ 213 $(POTDIR)/lib3270.pot \
193 - $(POTDIR)/ui.pot 214 + $(POTDIR)/ui.pot \
  215 + $(foreach PLG, $(PLUGINS), $(POTDIR)/plugins/$(PLG).pot)
194 216
195 @rm -f $@ 217 @rm -f $@
196 @mkdir -p `dirname $@` 218 @mkdir -p `dirname $@`
locale/pw3270.pot
  Diff comments   View file @5259d9f
@@ -9,7 +9,7 @@ msgstr "" @@ -9,7 +9,7 @@ msgstr ""
9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# pw3270.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: 2018-11-09 16:34-0200\n" 12 +"POT-Creation-Date: 2018-11-09 17:20-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 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 20 "#-#-#-#-# lib3270.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: 2018-11-09 16:34-0200\n" 23 +"POT-Creation-Date: 2018-11-09 17:20-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"
@@ -39,6 +39,17 @@ msgstr &quot;&quot; @@ -39,6 +39,17 @@ msgstr &quot;&quot;
39 "MIME-Version: 1.0\n" 39 "MIME-Version: 1.0\n"
40 "Content-Type: text/plain; charset=CHARSET\n" 40 "Content-Type: text/plain; charset=CHARSET\n"
41 "Content-Transfer-Encoding: 8bit\n" 41 "Content-Transfer-Encoding: 8bit\n"
  42 +"#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
  43 +"Project-Id-Version: PACKAGE VERSION\n"
  44 +"Report-Msgid-Bugs-To: \n"
  45 +"POT-Creation-Date: 2018-11-09 17:20-0200\n"
  46 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  47 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  48 +"Language-Team: LANGUAGE <LL@li.org>\n"
  49 +"Language: \n"
  50 +"MIME-Version: 1.0\n"
  51 +"Content-Type: text/plain; charset=CHARSET\n"
  52 +"Content-Transfer-Encoding: 8bit\n"
42 53
43 #: window.c:329 54 #: window.c:329
44 #, c-format 55 #, c-format
@@ -428,6 +439,10 @@ msgstr &quot;&quot; @@ -428,6 +439,10 @@ msgstr &quot;&quot;
428 msgid "Can't connect to %s:%s" 439 msgid "Can't connect to %s:%s"
429 msgstr "" 440 msgstr ""
430 441
  442 +#: main.c:70
  443 +msgid "Can't connect to DBUS server"
  444 +msgstr ""
  445 +
431 #: selection.c:466 446 #: selection.c:466
432 #, c-format 447 #, c-format
433 msgid "Can't convert line %d from %s to %s" 448 msgid "Can't convert line %d from %s to %s"
@@ -442,6 +457,10 @@ msgstr &quot;&quot; @@ -442,6 +457,10 @@ msgstr &quot;&quot;
442 msgid "Can't determine value for environment variable \"%s\" " 457 msgid "Can't determine value for environment variable \"%s\" "
443 msgstr "" 458 msgstr ""
444 459
  460 +#: main.c:115
  461 +msgid "Can't get DBUS object name"
  462 +msgstr ""
  463 +
445 #: src/lib3270/ft.c:413 464 #: src/lib3270/ft.c:413
446 msgid "Can't get file size" 465 msgid "Can't get file size"
447 msgstr "" 466 msgstr ""
@@ -664,6 +683,10 @@ msgstr &quot;&quot; @@ -664,6 +683,10 @@ msgstr &quot;&quot;
664 msgid "Connect on startup" 683 msgid "Connect on startup"
665 msgstr "" 684 msgstr ""
666 685
  686 +#: gobject.c:205
  687 +msgid "Connecting to host"
  688 +msgstr ""
  689 +
667 #: src/lib3270/connect.c:215 src/lib3270/connect.c:311 690 #: src/lib3270/connect.c:215 src/lib3270/connect.c:311
668 #: src/lib3270/connect.c:320 src/lib3270/connect.c:382 691 #: src/lib3270/connect.c:320 src/lib3270/connect.c:382
669 #: src/lib3270/connect.c:397 src/lib3270/connect.c:413 692 #: src/lib3270/connect.c:397 src/lib3270/connect.c:413
@@ -1903,6 +1926,11 @@ msgstr &quot;&quot; @@ -1903,6 +1926,11 @@ msgstr &quot;&quot;
1903 msgid "Starting" 1926 msgid "Starting"
1904 msgstr "" 1927 msgstr ""
1905 1928
  1929 +#: gobject.c:193
  1930 +#, c-format
  1931 +msgid "State %04d can't accept requests"
  1932 +msgstr ""
  1933 +
1906 #: security.c:237 1934 #: security.c:237
1907 msgid "Subject issuer mismatch" 1935 msgid "Subject issuer mismatch"
1908 msgstr "" 1936 msgstr ""
@@ -2358,6 +2386,11 @@ msgstr &quot;&quot; @@ -2358,6 +2386,11 @@ msgstr &quot;&quot;
2358 msgid "Unexpected or unknown security status" 2386 msgid "Unexpected or unknown security status"
2359 msgstr "" 2387 msgstr ""
2360 2388
  2389 +#: gobject.c:208
  2390 +#, c-format
  2391 +msgid "Unexpected state %04d"
  2392 +msgstr ""
  2393 +
2361 #: actions.c:391 2394 #: actions.c:391
2362 #, c-format 2395 #, c-format
2363 msgid "Unexpected target \"%s\"" 2396 msgid "Unexpected target \"%s\""