Download as
Browse Code »

Commit d25afd31b8cd8332a665162f7c09847e6c511639

Authored by Perry Werneck
2 parents 43c3b0fe f123a096
Exists in develop

Merge branch 'develop' into winpkg

Showing 7 changed files with 33 additions and 29 deletions   Show diff stats
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 .bin 2 .bin
3 .obj 3 .obj
4 .pot 4 .pot
  5 +.*
5 *~ 6 *~
6 *.log 7 *.log
7 *.status 8 *.status
@@ -72,3 +73,8 @@ m4 @@ -72,3 +73,8 @@ m4
72 po 73 po
73 app-manifest.xml 74 app-manifest.xml
74 libtool 75 libtool
  76 +<<<<<<< HEAD
  77 +=======
  78 +
  79 +
  80 +>>>>>>> develop
@@ -119,7 +119,9 @@ case &quot;$host&quot; in @@ -119,7 +119,9 @@ case &quot;$host&quot; in
119 119
120 esac 120 esac
121 121
122 -app_release_date=$(date +%Y-%m-%d) 122 +DATE_FMT="+%Y-%m-%d"
  123 +SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}"
  124 +app_release_date=$(date -u -d "@$SOURCE_DATE_EPOCH" "$DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "$DATE_FMT" 2>/dev/null || date -u "$DATE_FMT")
123 AC_SUBST(RELEASE_DATE,$app_release_date) 125 AC_SUBST(RELEASE_DATE,$app_release_date)
124 AC_SUBST(OSNAME,$app_cv_osname) 126 AC_SUBST(OSNAME,$app_cv_osname)
125 AC_SUBST(RLS_LDFLAGS,$app_rls_ldflags) 127 AC_SUBST(RLS_LDFLAGS,$app_rls_ldflags)
locale/Makefile.in
  Diff comments   View file @d25afd3
  1 +# SPDX-License-Identifier: LGPL-3.0-or-later
1 # 2 #
2 -# Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270  
3 -# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a  
4 -# aplicativos mainframe. Registro no INPI sob o nome G3270. 3 +# Copyright (C) 2008 Banco do Brasil S.A.
5 # 4 #
6 -# Copyright (C) <2008> <Banco do Brasil S.A.> 5 +# This program is free software: you can redistribute it and/or modify
  6 +# it under the terms of the GNU Lesser General Public License as published
  7 +# by the Free Software Foundation, either version 3 of the License, or
  8 +# (at your option) any later version.
7 # 9 #
8 -# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob  
9 -# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela  
10 -# Free Software Foundation. 10 +# This program is distributed in the hope that it will be useful,
  11 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  13 +# GNU General Public License for more details.
11 # 14 #
12 -# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER  
13 -# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO  
14 -# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para  
15 -# obter mais detalhes.  
16 -#  
17 -# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este  
18 -# programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin  
19 -# St, Fifth Floor, Boston, MA 02110-1301 USA  
20 -#  
21 -# Contatos:  
22 -#  
23 -# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)  
24 -# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) 15 +# You should have received a copy of the GNU Lesser General Public License
  16 +# along with this program. If not, see <https://www.gnu.org/licenses/>.
25 # 17 #
26 18
27 19
@@ -56,15 +48,15 @@ INSTALL_DATA=@INSTALL_DATA@ @@ -56,15 +48,15 @@ INSTALL_DATA=@INSTALL_DATA@
56 @$(MSGMERGE) --update --sort-output $@ $(PACKAGE_NAME).pot 48 @$(MSGMERGE) --update --sort-output $@ $(PACKAGE_NAME).pot
57 @touch $@ 49 @touch $@
58 50
59 -$(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ 51 +$(BINDIR)/%/LC_MESSAGES/$(PRODUCT_NAME).mo: \
60 %.po 52 %.po
61 53
62 @echo $< ... 54 @echo $< ...
63 @$(MKDIR) `dirname $@` 55 @$(MKDIR) `dirname $@`
64 @$(MSGFMT) -c -v -o $@ $^ 56 @$(MSGFMT) -c -v -o $@ $^
65 57
66 -$(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \  
67 - $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo 58 +$(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PRODUCT_NAME).mo: \
  59 + $(BINDIR)/%/LC_MESSAGES/$(PRODUCT_NAME).mo
68 60
69 @echo $< ... 61 @echo $< ...
70 @$(MKDIR) `dirname $@` 62 @$(MKDIR) `dirname $@`
@@ -73,7 +65,7 @@ $(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ @@ -73,7 +65,7 @@ $(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \
73 #---[ Targets ]-------------------------------------------------------------------------- 65 #---[ Targets ]--------------------------------------------------------------------------
74 66
75 all: \ 67 all: \
76 - $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) 68 + $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(PRODUCT_NAME).mo)
77 69
78 install: \ 70 install: \
79 $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) 71 $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo)
locale/pw3270.pot
  Diff comments   View file @d25afd3
@@ -8,7 +8,11 @@ msgid &quot;&quot; @@ -8,7 +8,11 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
  11 +<<<<<<< HEAD
11 "POT-Creation-Date: 2023-03-25 08:48-0300\n" 12 "POT-Creation-Date: 2023-03-25 08:48-0300\n"
  13 +=======
  14 +"POT-Creation-Date: 2023-03-24 08:43-0300\n"
  15 +>>>>>>> develop
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 16 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 17 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 18 "Language-Team: LANGUAGE <LL@li.org>\n"
schemas/linux/window.gschema.xml.in
  Diff comments   View file @d25afd3
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 </key> 111 </key>
112 112
113 <key name="header-action-names" type="s"> 113 <key name="header-action-names" type="s">
114 - <default>'app.tab.new:menu.open-menu,win.disconnect,win.reconnect'</default> 114 + <default>'menu.open-menu,win.disconnect,win.reconnect:'</default>
115 <summary>The title bar action list</summary> 115 <summary>The title bar action list</summary>
116 <description></description> 116 <description></description>
117 </key> 117 </key>
schemas/windows/window.gschema.xml.in
  Diff comments   View file @d25afd3
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 </key> 111 </key>
112 112
113 <key name="header-action-names" type="s"> 113 <key name="header-action-names" type="s">
114 - <default>'app.new.tab:menu.open-menu,win.disconnect,win.reconnect'</default> 114 + <default>'menu.open-menu,win.disconnect,win.reconnect:'</default>
115 <summary>The title bar action list</summary> 115 <summary>The title bar action list</summary>
116 <description></description> 116 <description></description>
117 </key> 117 </key>
src/main/main.c
  Diff comments   View file @d25afd3
@@ -79,8 +79,8 @@ int main (int argc, char **argv) { @@ -79,8 +79,8 @@ int main (int argc, char **argv) {
79 } 79 }
80 #endif // _WIN32 80 #endif // _WIN32
81 81
82 - bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");  
83 - textdomain(PACKAGE_NAME); 82 + bind_textdomain_codeset(G_STRINGIFY(PRODUCT_NAME), "UTF-8");
  83 + textdomain(G_STRINGIFY(PRODUCT_NAME));
84 84
85 // Setup and start application. 85 // Setup and start application.
86 g_set_application_name(G_STRINGIFY(PRODUCT_NAME)); 86 g_set_application_name(G_STRINGIFY(PRODUCT_NAME));