From c535e22d20e88325378d2eb13ae6cb0b64c01539 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 19 Jan 2017 10:14:34 -0200 Subject: [PATCH] Reativando suporte a plugins. --- Makefile.in | 10 +++++++++- locale/pw3270.pot | 37 +++++++++++++++++++++++++++++++++++-- src/plugins/dbus3270/Makefile.in | 12 ++++++------ 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index 73fe64f..8b36d5d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -108,6 +108,11 @@ $(POTDIR)/%.pot: \ @$(MAKE) -C $(basename $(notdir $@)) $@ +$(POTDIR)/plugins/%.pot: \ + $(DEPENDS) \ + ./src/plugins/%/* + + @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@ $(DESTDIR)$(libdir)/%@DLLEXT@: \ $(DEPENDS) \ @@ -165,7 +170,9 @@ Release: \ locale/$(PACKAGE_TARNAME).pot: \ $(POTDIR)/lib3270.pot \ $(POTDIR)/pw3270.pot \ - $(POTDIR)/ui.pot + $(POTDIR)/ui.pot \ + $(foreach PLG, $(PLUGINS), $(POTDIR)/plugins/$(PLG).pot) + @rm -f $@ @mkdir -p `dirname $@` @@ -302,6 +309,7 @@ clean: \ @rm -fr $(BINDIR) @rm -fr $(POTDIR) @rm -fr $(SRCDIR) + @rm -fr $(BASEDIR)/.obj diff --git a/locale/pw3270.pot b/locale/pw3270.pot index 4e3aaa0..f16fc86 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -9,7 +9,7 @@ msgstr "" "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 09:59-0200\n" +"POT-Creation-Date: 2017-01-19 10:13-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "" "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 09:59-0200\n" +"POT-Creation-Date: 2017-01-19 10:13-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,6 +39,17 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-19 10:13-0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" #: window.c:329 #, c-format @@ -424,6 +435,10 @@ msgstr "" msgid "Can't connect to %s:%s" msgstr "" +#: main.c:70 +msgid "Can't connect to DBUS server" +msgstr "" + #: selection.c:425 #, c-format msgid "Can't convert line %d from %s to %s" @@ -438,6 +453,10 @@ msgstr "" msgid "Can't determine value for environment variable \"%s\" " msgstr "" +#: main.c:115 +msgid "Can't get DBUS object name" +msgstr "" + #: ft.c:413 msgid "Can't get file size" msgstr "" @@ -647,6 +666,10 @@ msgstr "" msgid "Connect on startup" msgstr "" +#: gobject.c:205 +msgid "Connecting to host" +msgstr "" + #: connect.c:200 connect.c:296 connect.c:305 connect.c:367 connect.c:382 #: connect.c:398 connect.c:412 connect.c:432 connect.c:446 connect.c:462 #: connect.c:557 @@ -1861,6 +1884,11 @@ msgstr "" msgid "Starting" msgstr "" +#: gobject.c:193 +#, c-format +msgid "State %04d can't accept requests" +msgstr "" + #: security.c:237 msgid "Subject issuer mismatch" msgstr "" @@ -2292,6 +2320,11 @@ msgstr "" msgid "Unexpected or unknown security status" msgstr "" +#: gobject.c:208 +#, c-format +msgid "Unexpected state %04d" +msgstr "" + #: actions.c:391 #, c-format msgid "Unexpected target \"%s\"" diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in index eece52a..f9a2162 100644 --- a/src/plugins/dbus3270/Makefile.in +++ b/src/plugins/dbus3270/Makefile.in @@ -43,11 +43,11 @@ libdir=@libdir@ BASEDIR=@BASEDIR@ SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/plugins/$(MODULE_NAME) -POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/plugins/$(MODULE_NAME) +POTDIR=$(BASEDIR)/.pot/plugins/$(MODULE_NAME) -OBJDIR=$(BASEDIR)/src/pw3270/.obj -OBJDBG=$(OBJDIR)/Debug/plugins/$(MODULE_NAME) -OBJRLS=$(OBJDIR)/Release/plugins/$(MODULE_NAME) +OBJDIR=$(BASEDIR)/.obj/plugins/$(MODULE_NAME) +OBJDBG=$(OBJDIR)/Debug +OBJRLS=$(OBJDIR)/Release BINDIR=$(BASEDIR)/.bin BINDBG=$(BINDIR)/Debug/plugins @@ -135,9 +135,9 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \ pot: \ - $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot + $(BASEDIR)/.pot/plugins/$(MODULE_NAME).pot -$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \ +$(BASEDIR)/.pot/plugins/$(MODULE_NAME).pot: \ $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot) @rm -f $@ -- libgit2 0.21.2