Download as
Browse Code »

Commit f28b1b6343072923ce647921f6c949ea626a3be5

Authored by Perry Werneck
1 parent 482435e1
Exists in master and in 1 other branch develop

Fixing locale conflict, updating translation.

Showing 4 changed files with 42 additions and 24 deletions   Show diff stats
autogen.sh
  Diff comments   View file @f28b1b6
... ... @@ -6,19 +6,33 @@ test -n "$srcdir" || srcdir=.
6 6 olddir=`pwd`
7 7 cd "$srcdir"
8 8  
  9 +mkdir -p scripts
  10 +mkdir -p m4
  11 +
  12 +libtoolize --force
  13 +if test $? != 0 ; then
  14 + echo "libtoolize failed."
  15 + exit -1
  16 +fi
  17 +
9 18 aclocal
10 19 if test $? != 0 ; then
11 20 echo "aclocal failed."
12 21 exit -1
13 22 fi
14 23  
15   -autoconf
  24 +#autoheader --force
  25 +#if test $? != 0 ; then
  26 +# echo "autoheader failed."
  27 +# exit -1
  28 +#fi
  29 +
  30 +autoconf --force
16 31 if test $? != 0 ; then
17 32 echo "autoconf failed."
18 33 exit -1
19 34 fi
20 35  
21   -mkdir -p scripts
22 36 automake --add-missing 2> /dev/null | true
23 37  
24 38 cd "$olddir"
... ...
configure.ac
  Diff comments   View file @f28b1b6
... ... @@ -434,7 +434,7 @@ dnl ---------------------------------------------------------------------------
434 434 dnl Set translation domain.
435 435 dnl ---------------------------------------------------------------------------
436 436  
437   -app_cv_gettext_package="libipc3270"
  437 +app_cv_gettext_package="libipc3270-$app_vrs_major.$app_vrs_minor"
438 438  
439 439 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$app_cv_gettext_package")
440 440 AC_SUBST(GETTEXT_PACKAGE,"$app_cv_gettext_package")
... ...
locale/pt_BR.po
  Diff comments   View file @f28b1b6
1 1 #
2   -# Perry Werneck <perry.werneck@gmail.com>, 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2020.
  2 +# Perry Werneck <perry.werneck@gmail.com>, 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2020, 2021.
3 3 #
4 4 msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2020-01-10 15:55-0300\n"
9   -"PO-Revision-Date: 2020-01-10 15:59-0300\n"
  8 +"POT-Creation-Date: 2021-01-08 10:10-0300\n"
  9 +"PO-Revision-Date: 2021-01-08 10:11-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <>\n"
12 12 "Language: pt_BR\n"
... ... @@ -16,9 +16,17 @@ msgstr &quot;&quot;
16 16 "X-Poedit-Language: Portuguese\n"
17 17 "X-Poedit-Country: BRAZIL\n"
18 18 "X-Poedit-SourceCharset: utf-8\n"
19   -"Plural-Forms: nplurals=2; plural=(n > 1);\n"
  19 +"Plural-Forms: nplurals=2; plural=(n != 1);\n"
20 20 "X-Generator: Gtranslator 2.91.7\n"
21 21  
  22 +#: src/session/local/init.cc:90
  23 +msgid " is invalid."
  24 +msgstr "é inválido"
  25 +
  26 +#: src/session/local/init.cc:86
  27 +msgid " is not in the required revision "
  28 +msgstr "não está na versão necessária"
  29 +
22 30 #: src/session/local/get.cc:52 src/session/local/get.cc:65
23 31 #: src/session/local/get.cc:78
24 32 msgid "Can't get screen contents"
... ... @@ -28,24 +36,23 @@ msgstr &quot;Não foi possível obter o conteúdo da tela&quot;
28 36 msgid "Can't start IPC Module"
29 37 msgstr "Não foi possível iniciar o módulo IPC"
30 38  
31   -#: src/session/local/init.cc:79
32   -msgid "Invalid callback table, possible version mismatch in lib3270"
33   -msgstr ""
34   -"Tabela de callbacks inválida, possível divergência de versão na lib3270"
  39 +#: src/session/local/init.cc:81
  40 +msgid "Invalid callback table; "
  41 +msgstr "Tabela de chamadas inválida"
35 42  
36   -#: src/session/local/events.cc:87 src/session/local/events.cc:147
  43 +#: src/session/local/events.cc:88 src/session/local/events.cc:142
37 44 msgid "Invalid session handler"
38 45 msgstr "Identificador de sessão é inválido"
39 46  
40   -#: src/session/local/events.cc:70
  47 +#: src/session/local/events.cc:71
41 48 msgid "Out of memory in vasprintf"
42 49 msgstr "Memória insuficiente em vasprintf"
43 50  
44   -#: src/session/local/events.cc:169
  51 +#: src/session/local/events.cc:164
45 52 msgid "connected"
46 53 msgstr "Conectado"
47 54  
48   -#: src/session/local/events.cc:169
  55 +#: src/session/local/events.cc:164
49 56 msgid "disconnected"
50 57 msgstr "Desconectado"
51 58  
... ... @@ -1340,12 +1347,13 @@ msgstr &quot;Desconectado&quot;
1340 1347 #~ msgid "Invalid argument format"
1341 1348 #~ msgstr "O formato do argumento é inválido"
1342 1349  
  1350 +#~ msgid "Invalid callback table, possible version mismatch in lib3270"
  1351 +#~ msgstr ""
  1352 +#~ "Tabela de callbacks inválida, possível divergência de versão na lib3270"
  1353 +
1343 1354 #~ msgid "Invalid cgcsgid value"
1344 1355 #~ msgstr "Valor cgcsgid é inválido"
1345 1356  
1346   -#~ msgid "Invalid character value"
1347   -#~ msgstr "Valor de caractere inválido"
1348   -
1349 1357 #~ msgid "Invalid charset entry '%s' (#%d)"
1350 1358 #~ msgstr "Invalid charset entry '%s' (#%d)"
1351 1359  
... ... @@ -1572,9 +1580,6 @@ msgstr &quot;Desconectado&quot;
1572 1580 #~ msgid "OIA separator"
1573 1581 #~ msgstr "Separador da OIA"
1574 1582  
1575   -#~ msgid "OIA status invalid"
1576   -#~ msgstr "Estado inválido na OIA"
1577   -
1578 1583 #~ msgid "OIA status ok"
1579 1584 #~ msgstr "Estado normal na OIA"
1580 1585  
... ...
rpm/libipc3270.spec
  Diff comments   View file @f28b1b6
... ... @@ -20,14 +20,14 @@
20 20  
21 21 Summary: IPC client library for lib3270/%{product}
22 22 Name: libipc3270
23   -Version: 5.2
  23 +Version: 5.3
24 24 Release: 0
25 25 License: LGPL-3.0
26 26 Source: %{name}-%{version}.tar.xz
27 27  
28 28 URL: https://github.com/PerryWerneck/libipc3270
29 29  
30   -Group: System/Libraries
  30 +Group: Development/Libraries/C and C++
31 31 BuildRoot: /var/tmp/%{name}-%{version}
32 32  
33 33 BuildRequires: autoconf >= 2.61
... ... @@ -71,7 +71,6 @@ For more details, see https://github.com/PerryWerneck/libipc3270 .
71 71  
72 72 %package -n %{name}-%{_libvrs}
73 73 Summary: IPC Library for %{product}
74   -Group: Development/Libraries/C and C++
75 74  
76 75 %if 0%{?suse_version}
77 76 Recommends: lib3270-ipc-service
... ...