Download as
Browse Code »

Commit c535e22d20e88325378d2eb13ae6cb0b64c01539

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

Reativando suporte a plugins.

Showing 3 changed files with 50 additions and 9 deletions   Show diff stats
@@ -108,6 +108,11 @@ $(POTDIR)/%.pot: \ @@ -108,6 +108,11 @@ $(POTDIR)/%.pot: \
108 108
109 @$(MAKE) -C $(basename $(notdir $@)) $@ 109 @$(MAKE) -C $(basename $(notdir $@)) $@
110 110
  111 +$(POTDIR)/plugins/%.pot: \
  112 + $(DEPENDS) \
  113 + ./src/plugins/%/*
  114 +
  115 + @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
111 116
112 $(DESTDIR)$(libdir)/%@DLLEXT@: \ 117 $(DESTDIR)$(libdir)/%@DLLEXT@: \
113 $(DEPENDS) \ 118 $(DEPENDS) \
@@ -165,7 +170,9 @@ Release: \ @@ -165,7 +170,9 @@ Release: \
165 locale/$(PACKAGE_TARNAME).pot: \ 170 locale/$(PACKAGE_TARNAME).pot: \
166 $(POTDIR)/lib3270.pot \ 171 $(POTDIR)/lib3270.pot \
167 $(POTDIR)/pw3270.pot \ 172 $(POTDIR)/pw3270.pot \
168 - $(POTDIR)/ui.pot 173 + $(POTDIR)/ui.pot \
  174 + $(foreach PLG, $(PLUGINS), $(POTDIR)/plugins/$(PLG).pot)
  175 +
169 176
170 @rm -f $@ 177 @rm -f $@
171 @mkdir -p `dirname $@` 178 @mkdir -p `dirname $@`
@@ -302,6 +309,7 @@ clean: \ @@ -302,6 +309,7 @@ clean: \
302 @rm -fr $(BINDIR) 309 @rm -fr $(BINDIR)
303 @rm -fr $(POTDIR) 310 @rm -fr $(POTDIR)
304 @rm -fr $(SRCDIR) 311 @rm -fr $(SRCDIR)
  312 + @rm -fr $(BASEDIR)/.obj
305 313
306 314
307 315
locale/pw3270.pot
  Diff comments   View file @c535e22
@@ -9,7 +9,7 @@ msgstr "" @@ -9,7 +9,7 @@ msgstr ""
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-01-19 09:59-0200\n" 12 +"POT-Creation-Date: 2017-01-19 10:13-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-01-19 09:59-0200\n" 23 +"POT-Creation-Date: 2017-01-19 10:13-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: 2017-01-19 10:13-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
@@ -424,6 +435,10 @@ msgstr &quot;&quot; @@ -424,6 +435,10 @@ msgstr &quot;&quot;
424 msgid "Can't connect to %s:%s" 435 msgid "Can't connect to %s:%s"
425 msgstr "" 436 msgstr ""
426 437
  438 +#: main.c:70
  439 +msgid "Can't connect to DBUS server"
  440 +msgstr ""
  441 +
427 #: selection.c:425 442 #: selection.c:425
428 #, c-format 443 #, c-format
429 msgid "Can't convert line %d from %s to %s" 444 msgid "Can't convert line %d from %s to %s"
@@ -438,6 +453,10 @@ msgstr &quot;&quot; @@ -438,6 +453,10 @@ msgstr &quot;&quot;
438 msgid "Can't determine value for environment variable \"%s\" " 453 msgid "Can't determine value for environment variable \"%s\" "
439 msgstr "" 454 msgstr ""
440 455
  456 +#: main.c:115
  457 +msgid "Can't get DBUS object name"
  458 +msgstr ""
  459 +
441 #: ft.c:413 460 #: ft.c:413
442 msgid "Can't get file size" 461 msgid "Can't get file size"
443 msgstr "" 462 msgstr ""
@@ -647,6 +666,10 @@ msgstr &quot;&quot; @@ -647,6 +666,10 @@ msgstr &quot;&quot;
647 msgid "Connect on startup" 666 msgid "Connect on startup"
648 msgstr "" 667 msgstr ""
649 668
  669 +#: gobject.c:205
  670 +msgid "Connecting to host"
  671 +msgstr ""
  672 +
650 #: connect.c:200 connect.c:296 connect.c:305 connect.c:367 connect.c:382 673 #: connect.c:200 connect.c:296 connect.c:305 connect.c:367 connect.c:382
651 #: connect.c:398 connect.c:412 connect.c:432 connect.c:446 connect.c:462 674 #: connect.c:398 connect.c:412 connect.c:432 connect.c:446 connect.c:462
652 #: connect.c:557 675 #: connect.c:557
@@ -1861,6 +1884,11 @@ msgstr &quot;&quot; @@ -1861,6 +1884,11 @@ msgstr &quot;&quot;
1861 msgid "Starting" 1884 msgid "Starting"
1862 msgstr "" 1885 msgstr ""
1863 1886
  1887 +#: gobject.c:193
  1888 +#, c-format
  1889 +msgid "State %04d can't accept requests"
  1890 +msgstr ""
  1891 +
1864 #: security.c:237 1892 #: security.c:237
1865 msgid "Subject issuer mismatch" 1893 msgid "Subject issuer mismatch"
1866 msgstr "" 1894 msgstr ""
@@ -2292,6 +2320,11 @@ msgstr &quot;&quot; @@ -2292,6 +2320,11 @@ msgstr &quot;&quot;
2292 msgid "Unexpected or unknown security status" 2320 msgid "Unexpected or unknown security status"
2293 msgstr "" 2321 msgstr ""
2294 2322
  2323 +#: gobject.c:208
  2324 +#, c-format
  2325 +msgid "Unexpected state %04d"
  2326 +msgstr ""
  2327 +
2295 #: actions.c:391 2328 #: actions.c:391
2296 #, c-format 2329 #, c-format
2297 msgid "Unexpected target \"%s\"" 2330 msgid "Unexpected target \"%s\""
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @c535e22
@@ -43,11 +43,11 @@ libdir=@libdir@ @@ -43,11 +43,11 @@ libdir=@libdir@
43 43
44 BASEDIR=@BASEDIR@ 44 BASEDIR=@BASEDIR@
45 SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/plugins/$(MODULE_NAME) 45 SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/plugins/$(MODULE_NAME)
46 -POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/plugins/$(MODULE_NAME) 46 +POTDIR=$(BASEDIR)/.pot/plugins/$(MODULE_NAME)
47 47
48 -OBJDIR=$(BASEDIR)/src/pw3270/.obj  
49 -OBJDBG=$(OBJDIR)/Debug/plugins/$(MODULE_NAME)  
50 -OBJRLS=$(OBJDIR)/Release/plugins/$(MODULE_NAME) 48 +OBJDIR=$(BASEDIR)/.obj/plugins/$(MODULE_NAME)
  49 +OBJDBG=$(OBJDIR)/Debug
  50 +OBJRLS=$(OBJDIR)/Release
51 51
52 BINDIR=$(BASEDIR)/.bin 52 BINDIR=$(BASEDIR)/.bin
53 BINDBG=$(BINDIR)/Debug/plugins 53 BINDBG=$(BINDIR)/Debug/plugins
@@ -135,9 +135,9 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \ @@ -135,9 +135,9 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
135 135
136 136
137 pot: \ 137 pot: \
138 - $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot 138 + $(BASEDIR)/.pot/plugins/$(MODULE_NAME).pot
139 139
140 -$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \ 140 +$(BASEDIR)/.pot/plugins/$(MODULE_NAME).pot: \
141 $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot) 141 $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot)
142 142
143 @rm -f $@ 143 @rm -f $@