Download as
Browse Code »

Commit 6c41809d28bcd034b269d79f8e81d49d3c2b2b4c

Authored by Perry Werneck
Committed by GitHub
2 parents a8593537 943509ef
Exists in master and in 2 other branches develop, script-support

Merge pull request #15 from PerryWerneck/develop 

Bugfixes and enhancements
Showing 15 changed files with 575 additions and 71 deletions   Show diff stats
.gitignore
  Diff comments   View file @6c41809
... ... @@ -63,3 +63,6 @@ appdata.xml
63 63 *.3270
64 64 macos/**/*.app
65 65 mime.xml
  66 +*.patch
  67 +*.orig
  68 +*.rej
... ...
branding/Makefile.in
  Diff comments   View file @6c41809
... ... @@ -28,6 +28,7 @@ PACKAGE_NAME=@PACKAGE_NAME@
28 28 PACKAGE_VERSION=@PACKAGE_VERSION@
29 29 PACKAGE_TARNAME=@PACKAGE_TARNAME@
30 30 PRODUCT_NAME=@PRODUCT_NAME@
  31 +APPLICATION_ID=@APPLICATION_ID@
31 32  
32 33 prefix=@prefix@
33 34 exec_prefix=@exec_prefix@
... ... @@ -113,13 +114,13 @@ install-linux: \
113 114  
114 115 @$(INSTALL_DATA) \
115 116 launcher.desktop \
116   - $(PRODUCT_NAME).desktop
  117 + $(APPLICATION_ID).desktop
117 118  
118 119 @$(DESKTOP_INSTALL) \
119 120 --mode 644 \
120 121 --delete-original \
121 122 --dir $(DESTDIR)$(datarootdir)/applications \
122   - $(PRODUCT_NAME).desktop
  123 + $(APPLICATION_ID).desktop
123 124  
124 125 @$(MKDIR) $(DESTDIR)$(datarootdir)/mime/packages
125 126  
... ... @@ -131,7 +132,13 @@ install-linux: \
131 132  
132 133 @$(INSTALL_DATA) \
133 134 appdata.xml \
134   - $(DESTDIR)$(datarootdir)/appdata/$(PRODUCT_NAME).appdata.xml
  135 + $(DESTDIR)$(datarootdir)/appdata/$(APPLICATION_ID).appdata.xml
  136 +
  137 + @$(MKDIR) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps
  138 +
  139 + @$(INSTALL_DATA) \
  140 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/icons/$(PRODUCT_NAME).svg \
  141 + $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/$(APPLICATION_ID).svg
135 142  
136 143 install-windows: \
137 144 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).svg \
... ...
branding/appdata.xml.in
  Diff comments   View file @6c41809
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<application>
3 2  
4   - <id type="desktop">@PRODUCT_NAME@.desktop</id>
  3 +<!--
  4 +
  5 + References:
  6 +
  7 + https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#sect-Quickstart-DesktopApps
  8 + https://people.freedesktop.org/~hughsient/temp/AppData_WhitePaper.pdf
  9 + https://docs.fedoraproject.org/en-US/packaging-guidelines/AppData/
  10 +
  11 +-->
  12 +
  13 +<component type="desktop">
  14 +
  15 + <id>@APPLICATION_ID@.desktop</id>
5 16  
6 17 <metadata_license>CC0-1.0</metadata_license>
7 18 <project_license>LGPL-3.0</project_license>
8 19  
  20 + <name>@PRODUCT_NAME@</name>
  21 + <name xml:lang="pt_BR">@PRODUCT_NAME@</name>
  22 +
9 23 <summary>IBM 3270 Terminal emulator</summary>
10 24 <summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary>
11 25  
12   - <developer_name>perry.werneck@gmail.com</developer_name>
  26 + <developer_name>Perry Werneck</developer_name>
13 27  
14 28 <description>
15 29 <p>GTK Based 3270 terminal emulator</p>
... ... @@ -17,8 +31,8 @@
17 31 <p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p>
18 32 </description>
19 33  
20   - <url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url>
21 34 <url type="homepage">https://github.com/PerryWerneck/pw3270</url>
  35 + <url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url>
22 36  
23 37 <screenshots>
24 38 <screenshot type="default">
... ... @@ -29,9 +43,12 @@
29 43  
30 44 <update_contact>perry.werneck@gmail.com</update_contact>
31 45  
  46 + <project_group>GNOME</project_group>
  47 +
32 48 <provides>
33 49 <binary>@PRODUCT_NAME@</binary>
34 50 </provides>
35 51  
  52 + <translation type="gettext">@PRODUCT_NAME@</translation>
36 53  
37   -</application>
  54 +</component>
... ...
branding/launcher.desktop.in
  Diff comments   View file @6c41809
... ... @@ -7,7 +7,7 @@ Name[pt_BR]=Terminal 3270
7 7 Comment=IBM 3270 Terminal emulator
8 8 Comment[pt_BR]=Emulador de terminal IBM 3270
9 9 Exec=@PRODUCT_NAME@ %u
10   -Icon=/usr/share/@PRODUCT_NAME@/icons/@PRODUCT_NAME@.svg
  10 +Icon=@APPLICATION_ID@
11 11 Terminal=false
12 12 Type=Application
13 13 StartupNotify=true
... ...
configure.ac
  Diff comments   View file @6c41809
... ... @@ -178,6 +178,19 @@ AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
178 178 AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
179 179  
180 180 dnl ---------------------------------------------------------------------------
  181 +dnl Set application id & product name
  182 +dnl ---------------------------------------------------------------------------
  183 +
  184 +AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name lib3270` ])
  185 +AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
  186 +AC_SUBST(PRODUCT_NAME,$app_cv_product)
  187 +
  188 +AC_ARG_WITH([application-id], [AS_HELP_STRING([--application-id], [Set the application ID])], [ app_cv_application_id="$withval" ],[ app_cv_application_id="br.com.bb.$app_cv_product" ])
  189 +
  190 +AC_DEFINE_UNQUOTED(APPLICATION_ID, $app_cv_application_id)
  191 +AC_SUBST(APPLICATION_ID,$app_cv_application_id)
  192 +
  193 +dnl ---------------------------------------------------------------------------
181 194 dnl Check for LIBV3270
182 195 dnl ---------------------------------------------------------------------------
183 196  
... ... @@ -186,10 +199,6 @@ PKG_CHECK_MODULES( [LIBV3270], [libv3270], AC_DEFINE(HAVE_LIBV3270), AC_MSG_ERRO
186 199 AC_SUBST(LIBV3270_LIBS)
187 200 AC_SUBST(LIBV3270_CFLAGS)
188 201  
189   -AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name lib3270` ])
190   -AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
191   -AC_SUBST(PRODUCT_NAME,$app_cv_product)
192   -
193 202 AC_ARG_WITH([library-name], [AS_HELP_STRING([--with-library-name], [Set protocol library name])], [ app_cv_library="$withval" ],[ app_cv_library=`pkg-config --variable=library_name lib3270` ])
194 203 AC_DEFINE_UNQUOTED(LIBRARY_NAME, $app_cv_library)
195 204 AC_SUBST(LIBRARY_NAME,$app_cv_library)
... ...
locale/pt_BR.po
  Diff comments   View file @6c41809
... ... @@ -5,8 +5,8 @@ msgid &quot;&quot;
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2020-11-03 15:48-0300\n"
9   -"PO-Revision-Date: 2020-10-15 13:45-0300\n"
  8 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  9 +"PO-Revision-Date: 2020-11-19 23:07-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,8 +16,7 @@ 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=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
20   -"11) ? 2 : 3;\n"
  19 +"Plural-Forms: nplurals=2; plural=(n != 1);\n"
21 20 "X-Generator: Gtranslator 2.91.7\n"
22 21  
23 22 #: src/objects/application/application.c:203
... ... @@ -50,6 +49,13 @@ msgstr &quot;Linux 64 bits&quot;
50 49 msgid "64 bits Windows"
51 50 msgstr "Windows 64 bits"
52 51  
  52 +#: src/objects/toolbar/settings.c:215
  53 +msgid ""
  54 +"<small><b>The toolbar position only takes effect after restart</b></small>"
  55 +msgstr ""
  56 +"<small><b>Alterações na posição da barra de ferramentas só tem efeito apos "
  57 +"reinício da aplicação</b></small>"
  58 +
53 59 #: src/objects/application/actions/about.c:231 ui/application.xml:39
54 60 #: ui/application.xml:537
55 61 msgid "About PW3270"
... ... @@ -83,7 +89,7 @@ msgstr &quot;Versão Apple&quot;
83 89 msgid "Application"
84 90 msgstr "Aplicação"
85 91  
86   -#: src/objects/window/header-settings.c:123
  92 +#: src/objects/window/header-settings.c:121
87 93 msgid "Application menu"
88 94 msgstr "Menu da aplicação"
89 95  
... ... @@ -99,7 +105,7 @@ msgstr &quot;Aplicar&quot;
99 105 msgid "Auto-Reconnect"
100 106 msgstr "Reconectar automaticamente"
101 107  
102   -#: src/objects/toolbar/settings.c:112 src/objects/settings/actionview.c:73
  108 +#: src/objects/toolbar/settings.c:119 src/objects/settings/actionview.c:73
103 109 msgid "Available"
104 110 msgstr "Disponível"
105 111  
... ... @@ -119,6 +125,10 @@ msgstr &quot;Cursor piscante&quot;
119 125 msgid "Bold"
120 126 msgstr "Negrito"
121 127  
  128 +#: src/objects/toolbar/models.c:139
  129 +msgid "Bottom"
  130 +msgstr "Em baixo"
  131 +
122 132 #: src/objects/window/terminal.c:165
123 133 msgid "Can't load session file"
124 134 msgstr "Não foi possível carregar arquivo de sessão"
... ... @@ -140,7 +150,7 @@ msgstr &quot;Mudar cores do terminal&quot;
140 150 msgid "Change the application preferences"
141 151 msgstr "Modificar preferências da aplicação"
142 152  
143   -#: src/objects/window/header-settings.c:98
  153 +#: src/objects/window/header-settings.c:96
144 154 msgid "Change the position of the title bar icons"
145 155 msgstr "Modificar posição dos ícones da barra de título"
146 156  
... ... @@ -347,7 +357,7 @@ msgstr &quot;Estilo do ícone&quot;
347 357 msgid "Icon _size"
348 358 msgstr "_Tamanho do ícone"
349 359  
350   -#: src/objects/toolbar/models.c:108
  360 +#: src/objects/toolbar/models.c:109
351 361 msgid "Icon type"
352 362 msgstr "Tipo do ícone"
353 363  
... ... @@ -379,7 +389,7 @@ msgstr &quot;Itens empacotados do final para o início&quot;
379 389 msgid "Items packed from the start to the end"
380 390 msgstr "Itens empacotados do início para o final"
381 391  
382   -#: src/objects/toolbar/settings.c:106
  392 +#: src/objects/toolbar/settings.c:113
383 393 msgid "Itens"
384 394 msgstr "Itens"
385 395  
... ... @@ -419,9 +429,9 @@ msgstr &quot;Etiqueta&quot;
419 429 msgid "Large"
420 430 msgstr "Grande"
421 431  
422   -#: src/objects/toolbar/settings.c:176
423   -msgid "Layout"
424   -msgstr "Formato"
  432 +#: src/objects/toolbar/models.c:135
  433 +msgid "Left"
  434 +msgstr "Esquerda"
425 435  
426 436 #: src/objects/settings/actionview.c:74
427 437 msgid "List of the available and unpacked actions"
... ... @@ -547,6 +557,10 @@ msgstr &quot;Colar com margem esquerda&quot;
547 557 msgid "Path for the new shortcut"
548 558 msgstr "Caminho para o novo atalho"
549 559  
  560 +#: src/objects/toolbar/models.c:128
  561 +msgid "Position"
  562 +msgstr "Posição"
  563 +
550 564 #: ui/window.xml:129
551 565 msgid "Preferences"
552 566 msgstr "Preferências"
... ... @@ -584,6 +598,10 @@ msgstr &quot;Reselecionar&quot;
584 598 msgid "Resize on alternate screen"
585 599 msgstr "Mudar tamanho do terminal em tela alternativa"
586 600  
  601 +#: src/objects/toolbar/models.c:143
  602 +msgid "Right"
  603 +msgstr "Direita"
  604 +
587 605 #: keypad/00-right.xml:34
588 606 msgid "Right keypad"
589 607 msgstr "Painel direito"
... ... @@ -636,11 +654,11 @@ msgstr &quot;Selecionar tudo&quot;
636 654 msgid "Select by rectangles"
637 655 msgstr "Seleção retangular"
638 656  
639   -#: src/objects/toolbar/settings.c:106
  657 +#: src/objects/toolbar/settings.c:113
640 658 msgid "Select the toolbar itens"
641 659 msgstr "Selecione itens da barra de ferramentas"
642 660  
643   -#: src/objects/toolbar/settings.c:111
  661 +#: src/objects/toolbar/settings.c:118
644 662 msgid "Selected"
645 663 msgstr "Selecionado"
646 664  
... ... @@ -658,7 +676,7 @@ msgstr &quot;Enviar/Receber&quot;
658 676 msgid "Send/Receive files"
659 677 msgstr "Enviar/Receber arquivos"
660 678  
661   -#: src/objects/toolbar/settings.c:234 src/objects/toolbar/settings.c:244
  679 +#: src/objects/toolbar/settings.c:248 src/objects/toolbar/settings.c:258
662 680 msgid "Separator"
663 681 msgstr "Separador"
664 682  
... ... @@ -699,15 +717,15 @@ msgstr &quot;Define o tipo de interface do usuário&quot;
699 717 msgid "Settings"
700 718 msgstr "Configurações"
701 719  
702   -#: src/objects/toolbar/settings.c:176
703   -msgid "Setup the toolbar layout"
704   -msgstr "Configura formato da barra de ferramentas"
  720 +#: src/objects/toolbar/settings.c:183
  721 +msgid "Setup the toolbar style and position"
  722 +msgstr "Configura estilo e posição da barra de ferramentas"
705 723  
706   -#: src/objects/window/header-settings.c:87
  724 +#: src/objects/window/header-settings.c:85
707 725 msgid "Setup title bar"
708 726 msgstr "Configurar barra de título"
709 727  
710   -#: src/objects/toolbar/toolbar.c:214 src/objects/toolbar/settings.c:88
  728 +#: src/objects/toolbar/toolbar.c:214 src/objects/toolbar/settings.c:95
711 729 msgid "Setup toolbar"
712 730 msgstr "Configurar barra de ferramentas"
713 731  
... ... @@ -759,12 +777,16 @@ msgstr &quot;Estado&quot;
759 777 msgid "State Type"
760 778 msgstr "Tipo do estado"
761 779  
762   -#: src/objects/toolbar/models.c:115
  780 +#: src/objects/toolbar/settings.c:183
  781 +msgid "Style & Position"
  782 +msgstr "Estilo & Posição"
  783 +
  784 +#: src/objects/toolbar/models.c:116
763 785 msgid "Symbolic"
764 786 msgstr "Simbólico"
765 787  
766 788 #: src/objects/toolbar/models.c:55 src/objects/toolbar/models.c:82
767   -#: src/objects/toolbar/models.c:111
  789 +#: src/objects/toolbar/models.c:112
768 790 msgid "System default"
769 791 msgstr "Padrão do sistema"
770 792  
... ... @@ -878,15 +900,15 @@ msgstr &quot;The type of GVariant passed to activate()&quot;
878 900 msgid "The type of the state kept by the action"
879 901 msgstr "O tipo do estado mantido pela ação"
880 902  
881   -#: src/objects/window/header-settings.c:86
  903 +#: src/objects/window/header-settings.c:84
882 904 msgid "Title bar"
883 905 msgstr "Barra de título"
884 906  
885   -#: src/objects/window/header-settings.c:98
  907 +#: src/objects/window/header-settings.c:96
886 908 msgid "Title bar actions"
887 909 msgstr "Ações da barra de título"
888 910  
889   -#: src/objects/toolbar/settings.c:87 ui/window.xml:435 ui/window.xml:555
  911 +#: src/objects/toolbar/settings.c:94 ui/window.xml:435 ui/window.xml:555
890 912 #: ui/application.xml:342
891 913 msgid "Toolbar"
892 914 msgstr "Barra de ferramentas"
... ... @@ -895,10 +917,18 @@ msgstr &quot;Barra de ferramentas&quot;
895 917 msgid "Toolbar Style"
896 918 msgstr "Estilo da barra de ferramentas"
897 919  
  920 +#: src/objects/toolbar/settings.c:75
  921 +msgid "Toolbar position"
  922 +msgstr "Posição da barra de ferramentas"
  923 +
898 924 #: src/objects/toolbar/models.c:79
899 925 msgid "Toolbar s_tyle"
900 926 msgstr "Est_ilo da barra de ferramentas"
901 927  
  928 +#: src/objects/toolbar/models.c:131
  929 +msgid "Top (system default)"
  930 +msgstr "Em cima (padrão do sistema)"
  931 +
902 932 #: ui/window.xml:440
903 933 msgid "Top menu"
904 934 msgstr "Menu principal"
... ... @@ -1767,9 +1797,6 @@ msgstr &quot;translator-credits&quot;
1767 1797 #~ msgid "Default host URL"
1768 1798 #~ msgstr "URL parão para acesso ao host"
1769 1799  
1770   -#~ msgid "Description"
1771   -#~ msgstr "Descrição"
1772   -
1773 1800 #~ msgid "Description of the current security state"
1774 1801 #~ msgstr "Descrição do estado de segurança atual"
1775 1802  
... ... @@ -2298,8 +2325,8 @@ msgstr &quot;translator-credits&quot;
2298 2325 #~ msgid "Launcher name"
2299 2326 #~ msgstr "Nome do lançador"
2300 2327  
2301   -#~ msgid "Left"
2302   -#~ msgstr "Esquerda"
  2328 +#~ msgid "Layout"
  2329 +#~ msgstr "Formato"
2303 2330  
2304 2331 #~ msgid "Load"
2305 2332 #~ msgstr "Load"
... ... @@ -2808,9 +2835,6 @@ msgstr &quot;translator-credits&quot;
2808 2835 #~ msgid "Revocation list"
2809 2836 #~ msgstr "Lista de revogados"
2810 2837  
2811   -#~ msgid "Right"
2812   -#~ msgstr "Direita"
2813   -
2814 2838 #~ msgid "SOCKS4 Proxy: client is not reachable"
2815 2839 #~ msgstr "SOCKS4 Proxy: client is not reachable"
2816 2840  
... ...
locale/pw3270.pot
  Diff comments   View file @6c41809
... ... @@ -6,9 +6,373 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
  9 +"#-#-#-#-# view.pot (PACKAGE VERSION) #-#-#-#-#\n"
9 10 "Project-Id-Version: PACKAGE VERSION\n"
10 11 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2020-11-03 15:50-0300\n"
  12 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  13 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  14 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  15 +"Language-Team: LANGUAGE <LL@li.org>\n"
  16 +"Language: \n"
  17 +"MIME-Version: 1.0\n"
  18 +"Content-Type: text/plain; charset=CHARSET\n"
  19 +"Content-Transfer-Encoding: 8bit\n"
  20 +"#-#-#-#-# save.pot (PACKAGE VERSION) #-#-#-#-#\n"
  21 +"Project-Id-Version: PACKAGE VERSION\n"
  22 +"Report-Msgid-Bugs-To: \n"
  23 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  24 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  25 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  26 +"Language-Team: LANGUAGE <LL@li.org>\n"
  27 +"Language: \n"
  28 +"MIME-Version: 1.0\n"
  29 +"Content-Type: text/plain; charset=CHARSET\n"
  30 +"Content-Transfer-Encoding: 8bit\n"
  31 +"#-#-#-#-# abstract.pot (PACKAGE VERSION) #-#-#-#-#\n"
  32 +"Project-Id-Version: PACKAGE VERSION\n"
  33 +"Report-Msgid-Bugs-To: \n"
  34 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  35 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  36 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  37 +"Language-Team: LANGUAGE <LL@li.org>\n"
  38 +"Language: \n"
  39 +"MIME-Version: 1.0\n"
  40 +"Content-Type: text/plain; charset=CHARSET\n"
  41 +"Content-Transfer-Encoding: 8bit\n"
  42 +"#-#-#-#-# application.pot (PACKAGE VERSION) #-#-#-#-#\n"
  43 +"Project-Id-Version: PACKAGE VERSION\n"
  44 +"Report-Msgid-Bugs-To: \n"
  45 +"POT-Creation-Date: 2020-11-19 23:06-0300\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"
  53 +"#-#-#-#-# window.pot (PACKAGE VERSION) #-#-#-#-#\n"
  54 +"Project-Id-Version: PACKAGE VERSION\n"
  55 +"Report-Msgid-Bugs-To: \n"
  56 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  57 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  58 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  59 +"Language-Team: LANGUAGE <LL@li.org>\n"
  60 +"Language: \n"
  61 +"MIME-Version: 1.0\n"
  62 +"Content-Type: text/plain; charset=CHARSET\n"
  63 +"Content-Transfer-Encoding: 8bit\n"
  64 +"#-#-#-#-# preferences.pot (PACKAGE VERSION) #-#-#-#-#\n"
  65 +"Project-Id-Version: PACKAGE VERSION\n"
  66 +"Report-Msgid-Bugs-To: \n"
  67 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  68 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  69 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  70 +"Language-Team: LANGUAGE <LL@li.org>\n"
  71 +"Language: \n"
  72 +"MIME-Version: 1.0\n"
  73 +"Content-Type: text/plain; charset=CHARSET\n"
  74 +"Content-Transfer-Encoding: 8bit\n"
  75 +"#-#-#-#-# open.pot (PACKAGE VERSION) #-#-#-#-#\n"
  76 +"Project-Id-Version: PACKAGE VERSION\n"
  77 +"Report-Msgid-Bugs-To: \n"
  78 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  79 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  80 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  81 +"Language-Team: LANGUAGE <LL@li.org>\n"
  82 +"Language: \n"
  83 +"MIME-Version: 1.0\n"
  84 +"Content-Type: text/plain; charset=CHARSET\n"
  85 +"Content-Transfer-Encoding: 8bit\n"
  86 +"#-#-#-#-# about.pot (PACKAGE VERSION) #-#-#-#-#\n"
  87 +"Project-Id-Version: PACKAGE VERSION\n"
  88 +"Report-Msgid-Bugs-To: \n"
  89 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  90 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  91 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  92 +"Language-Team: LANGUAGE <LL@li.org>\n"
  93 +"Language: \n"
  94 +"MIME-Version: 1.0\n"
  95 +"Content-Type: text/plain; charset=CHARSET\n"
  96 +"Content-Transfer-Encoding: 8bit\n"
  97 +"#-#-#-#-# window.pot (PACKAGE VERSION) #-#-#-#-#\n"
  98 +"Project-Id-Version: PACKAGE VERSION\n"
  99 +"Report-Msgid-Bugs-To: \n"
  100 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  101 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  102 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  103 +"Language-Team: LANGUAGE <LL@li.org>\n"
  104 +"Language: \n"
  105 +"MIME-Version: 1.0\n"
  106 +"Content-Type: text/plain; charset=CHARSET\n"
  107 +"Content-Transfer-Encoding: 8bit\n"
  108 +"#-#-#-#-# terminal.pot (PACKAGE VERSION) #-#-#-#-#\n"
  109 +"Project-Id-Version: PACKAGE VERSION\n"
  110 +"Report-Msgid-Bugs-To: \n"
  111 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  112 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  113 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  114 +"Language-Team: LANGUAGE <LL@li.org>\n"
  115 +"Language: \n"
  116 +"MIME-Version: 1.0\n"
  117 +"Content-Type: text/plain; charset=CHARSET\n"
  118 +"Content-Transfer-Encoding: 8bit\n"
  119 +"#-#-#-#-# page.pot (PACKAGE VERSION) #-#-#-#-#\n"
  120 +"Project-Id-Version: PACKAGE VERSION\n"
  121 +"Report-Msgid-Bugs-To: \n"
  122 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  123 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  124 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  125 +"Language-Team: LANGUAGE <LL@li.org>\n"
  126 +"Language: \n"
  127 +"MIME-Version: 1.0\n"
  128 +"Content-Type: text/plain; charset=CHARSET\n"
  129 +"Content-Transfer-Encoding: 8bit\n"
  130 +"#-#-#-#-# header-settings.pot (PACKAGE VERSION) #-#-#-#-#\n"
  131 +"Project-Id-Version: PACKAGE VERSION\n"
  132 +"Report-Msgid-Bugs-To: \n"
  133 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  134 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  135 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  136 +"Language-Team: LANGUAGE <LL@li.org>\n"
  137 +"Language: \n"
  138 +"MIME-Version: 1.0\n"
  139 +"Content-Type: text/plain; charset=CHARSET\n"
  140 +"Content-Transfer-Encoding: 8bit\n"
  141 +"#-#-#-#-# header.pot (PACKAGE VERSION) #-#-#-#-#\n"
  142 +"Project-Id-Version: PACKAGE VERSION\n"
  143 +"Report-Msgid-Bugs-To: \n"
  144 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  145 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  146 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  147 +"Language-Team: LANGUAGE <LL@li.org>\n"
  148 +"Language: \n"
  149 +"MIME-Version: 1.0\n"
  150 +"Content-Type: text/plain; charset=CHARSET\n"
  151 +"Content-Transfer-Encoding: 8bit\n"
  152 +"#-#-#-#-# setcolors.pot (PACKAGE VERSION) #-#-#-#-#\n"
  153 +"Project-Id-Version: PACKAGE VERSION\n"
  154 +"Report-Msgid-Bugs-To: \n"
  155 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  156 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  157 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  158 +"Language-Team: LANGUAGE <LL@li.org>\n"
  159 +"Language: \n"
  160 +"MIME-Version: 1.0\n"
  161 +"Content-Type: text/plain; charset=CHARSET\n"
  162 +"Content-Transfer-Encoding: 8bit\n"
  163 +"#-#-#-#-# sessionproperties.pot (PACKAGE VERSION) #-#-#-#-#\n"
  164 +"Project-Id-Version: PACKAGE VERSION\n"
  165 +"Report-Msgid-Bugs-To: \n"
  166 +"POT-Creation-Date: 2020-11-19 23:06-0300\n"
  167 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  168 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  169 +"Language-Team: LANGUAGE <LL@li.org>\n"
  170 +"Language: \n"
  171 +"MIME-Version: 1.0\n"
  172 +"Content-Type: text/plain; charset=CHARSET\n"
  173 +"Content-Transfer-Encoding: 8bit\n"
  174 +"#-#-#-#-# hostproperties.pot (PACKAGE VERSION) #-#-#-#-#\n"
  175 +"Project-Id-Version: PACKAGE VERSION\n"
  176 +"Report-Msgid-Bugs-To: \n"
  177 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  178 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  179 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  180 +"Language-Team: LANGUAGE <LL@li.org>\n"
  181 +"Language: \n"
  182 +"MIME-Version: 1.0\n"
  183 +"Content-Type: text/plain; charset=CHARSET\n"
  184 +"Content-Transfer-Encoding: 8bit\n"
  185 +"#-#-#-#-# filetransfer.pot (PACKAGE VERSION) #-#-#-#-#\n"
  186 +"Project-Id-Version: PACKAGE VERSION\n"
  187 +"Report-Msgid-Bugs-To: \n"
  188 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  189 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  190 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  191 +"Language-Team: LANGUAGE <LL@li.org>\n"
  192 +"Language: \n"
  193 +"MIME-Version: 1.0\n"
  194 +"Content-Type: text/plain; charset=CHARSET\n"
  195 +"Content-Transfer-Encoding: 8bit\n"
  196 +"#-#-#-#-# connect.pot (PACKAGE VERSION) #-#-#-#-#\n"
  197 +"Project-Id-Version: PACKAGE VERSION\n"
  198 +"Report-Msgid-Bugs-To: \n"
  199 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  200 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  201 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  202 +"Language-Team: LANGUAGE <LL@li.org>\n"
  203 +"Language: \n"
  204 +"MIME-Version: 1.0\n"
  205 +"Content-Type: text/plain; charset=CHARSET\n"
  206 +"Content-Transfer-Encoding: 8bit\n"
  207 +"#-#-#-#-# close.pot (PACKAGE VERSION) #-#-#-#-#\n"
  208 +"Project-Id-Version: PACKAGE VERSION\n"
  209 +"Report-Msgid-Bugs-To: \n"
  210 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  211 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  212 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  213 +"Language-Team: LANGUAGE <LL@li.org>\n"
  214 +"Language: \n"
  215 +"MIME-Version: 1.0\n"
  216 +"Content-Type: text/plain; charset=CHARSET\n"
  217 +"Content-Transfer-Encoding: 8bit\n"
  218 +"#-#-#-#-# toolbar.pot (PACKAGE VERSION) #-#-#-#-#\n"
  219 +"Project-Id-Version: PACKAGE VERSION\n"
  220 +"Report-Msgid-Bugs-To: \n"
  221 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  222 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  223 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  224 +"Language-Team: LANGUAGE <LL@li.org>\n"
  225 +"Language: \n"
  226 +"MIME-Version: 1.0\n"
  227 +"Content-Type: text/plain; charset=CHARSET\n"
  228 +"Content-Transfer-Encoding: 8bit\n"
  229 +"#-#-#-#-# settings.pot (PACKAGE VERSION) #-#-#-#-#\n"
  230 +"Project-Id-Version: PACKAGE VERSION\n"
  231 +"Report-Msgid-Bugs-To: \n"
  232 +"POT-Creation-Date: 2020-11-19 23:06-0300\n"
  233 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  234 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  235 +"Language-Team: LANGUAGE <LL@li.org>\n"
  236 +"Language: \n"
  237 +"MIME-Version: 1.0\n"
  238 +"Content-Type: text/plain; charset=CHARSET\n"
  239 +"Content-Transfer-Encoding: 8bit\n"
  240 +"#-#-#-#-# models.pot (PACKAGE VERSION) #-#-#-#-#\n"
  241 +"Project-Id-Version: PACKAGE VERSION\n"
  242 +"Report-Msgid-Bugs-To: \n"
  243 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  244 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  245 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  246 +"Language-Team: LANGUAGE <LL@li.org>\n"
  247 +"Language: \n"
  248 +"MIME-Version: 1.0\n"
  249 +"Content-Type: text/plain; charset=CHARSET\n"
  250 +"Content-Transfer-Encoding: 8bit\n"
  251 +"#-#-#-#-# dialog.pot (PACKAGE VERSION) #-#-#-#-#\n"
  252 +"Project-Id-Version: PACKAGE VERSION\n"
  253 +"Report-Msgid-Bugs-To: \n"
  254 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  255 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  256 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  257 +"Language-Team: LANGUAGE <LL@li.org>\n"
  258 +"Language: \n"
  259 +"MIME-Version: 1.0\n"
  260 +"Content-Type: text/plain; charset=CHARSET\n"
  261 +"Content-Transfer-Encoding: 8bit\n"
  262 +"#-#-#-#-# actionview.pot (PACKAGE VERSION) #-#-#-#-#\n"
  263 +"Project-Id-Version: PACKAGE VERSION\n"
  264 +"Report-Msgid-Bugs-To: \n"
  265 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  266 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  267 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  268 +"Language-Team: LANGUAGE <LL@li.org>\n"
  269 +"Language: \n"
  270 +"MIME-Version: 1.0\n"
  271 +"Content-Type: text/plain; charset=CHARSET\n"
  272 +"Content-Transfer-Encoding: 8bit\n"
  273 +"#-#-#-#-# savedesktopicon.pot (PACKAGE VERSION) #-#-#-#-#\n"
  274 +"Project-Id-Version: PACKAGE VERSION\n"
  275 +"Report-Msgid-Bugs-To: \n"
  276 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  277 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  278 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  279 +"Language-Team: LANGUAGE <LL@li.org>\n"
  280 +"Language: \n"
  281 +"MIME-Version: 1.0\n"
  282 +"Content-Type: text/plain; charset=CHARSET\n"
  283 +"Content-Transfer-Encoding: 8bit\n"
  284 +"#-#-#-#-# tools.pot (PACKAGE VERSION) #-#-#-#-#\n"
  285 +"Project-Id-Version: PACKAGE VERSION\n"
  286 +"Report-Msgid-Bugs-To: \n"
  287 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  288 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  289 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  290 +"Language-Team: LANGUAGE <LL@li.org>\n"
  291 +"Language: \n"
  292 +"MIME-Version: 1.0\n"
  293 +"Content-Type: text/plain; charset=CHARSET\n"
  294 +"Content-Transfer-Encoding: 8bit\n"
  295 +"#-#-#-#-# placeholders.pot (PACKAGE VERSION) #-#-#-#-#\n"
  296 +"Project-Id-Version: PACKAGE VERSION\n"
  297 +"Report-Msgid-Bugs-To: \n"
  298 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  299 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  300 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  301 +"Language-Team: LANGUAGE <LL@li.org>\n"
  302 +"Language: \n"
  303 +"MIME-Version: 1.0\n"
  304 +"Content-Type: text/plain; charset=CHARSET\n"
  305 +"Content-Transfer-Encoding: 8bit\n"
  306 +"#-#-#-#-# model.pot (PACKAGE VERSION) #-#-#-#-#\n"
  307 +"Project-Id-Version: PACKAGE VERSION\n"
  308 +"Report-Msgid-Bugs-To: \n"
  309 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  310 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  311 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  312 +"Language-Team: LANGUAGE <LL@li.org>\n"
  313 +"Language: \n"
  314 +"MIME-Version: 1.0\n"
  315 +"Content-Type: text/plain; charset=CHARSET\n"
  316 +"Content-Transfer-Encoding: 8bit\n"
  317 +"#-#-#-#-# element.pot (PACKAGE VERSION) #-#-#-#-#\n"
  318 +"Project-Id-Version: PACKAGE VERSION\n"
  319 +"Report-Msgid-Bugs-To: \n"
  320 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  321 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  322 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  323 +"Language-Team: LANGUAGE <LL@li.org>\n"
  324 +"Language: \n"
  325 +"MIME-Version: 1.0\n"
  326 +"Content-Type: text/plain; charset=CHARSET\n"
  327 +"Content-Transfer-Encoding: 8bit\n"
  328 +"#-#-#-#-# attribute.pot (PACKAGE VERSION) #-#-#-#-#\n"
  329 +"Project-Id-Version: PACKAGE VERSION\n"
  330 +"Report-Msgid-Bugs-To: \n"
  331 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  332 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  333 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  334 +"Language-Team: LANGUAGE <LL@li.org>\n"
  335 +"Language: \n"
  336 +"MIME-Version: 1.0\n"
  337 +"Content-Type: text/plain; charset=CHARSET\n"
  338 +"Content-Transfer-Encoding: 8bit\n"
  339 +"#-#-#-#-# window.pot (PACKAGE VERSION) #-#-#-#-#\n"
  340 +"Project-Id-Version: PACKAGE VERSION\n"
  341 +"Report-Msgid-Bugs-To: \n"
  342 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  343 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  344 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  345 +"Language-Team: LANGUAGE <LL@li.org>\n"
  346 +"Language: \n"
  347 +"MIME-Version: 1.0\n"
  348 +"Content-Type: text/plain; charset=CHARSET\n"
  349 +"Content-Transfer-Encoding: 8bit\n"
  350 +"#-#-#-#-# application.pot (PACKAGE VERSION) #-#-#-#-#\n"
  351 +"Project-Id-Version: PACKAGE VERSION\n"
  352 +"Report-Msgid-Bugs-To: \n"
  353 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  354 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  355 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  356 +"Language-Team: LANGUAGE <LL@li.org>\n"
  357 +"Language: \n"
  358 +"MIME-Version: 1.0\n"
  359 +"Content-Type: text/plain; charset=CHARSET\n"
  360 +"Content-Transfer-Encoding: 8bit\n"
  361 +"#-#-#-#-# 10-bottom.pot (PACKAGE VERSION) #-#-#-#-#\n"
  362 +"Project-Id-Version: PACKAGE VERSION\n"
  363 +"Report-Msgid-Bugs-To: \n"
  364 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
  365 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  366 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  367 +"Language-Team: LANGUAGE <LL@li.org>\n"
  368 +"Language: \n"
  369 +"MIME-Version: 1.0\n"
  370 +"Content-Type: text/plain; charset=CHARSET\n"
  371 +"Content-Transfer-Encoding: 8bit\n"
  372 +"#-#-#-#-# 00-right.pot (PACKAGE VERSION) #-#-#-#-#\n"
  373 +"Project-Id-Version: PACKAGE VERSION\n"
  374 +"Report-Msgid-Bugs-To: \n"
  375 +"POT-Creation-Date: 2020-11-19 12:35-0300\n"
12 376 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 377 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 378 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -47,6 +411,11 @@ msgstr &quot;&quot;
47 411 msgid "64 bits Windows"
48 412 msgstr ""
49 413  
  414 +#: src/objects/toolbar/settings.c:215
  415 +msgid ""
  416 +"<small><b>The toolbar position only takes effect after restart</b></small>"
  417 +msgstr ""
  418 +
50 419 #: src/objects/application/actions/about.c:231 ui/application.xml:39
51 420 #: ui/application.xml:537
52 421 msgid "About PW3270"
... ... @@ -80,7 +449,7 @@ msgstr &quot;&quot;
80 449 msgid "Application"
81 450 msgstr ""
82 451  
83   -#: src/objects/window/header-settings.c:123
  452 +#: src/objects/window/header-settings.c:121
84 453 msgid "Application menu"
85 454 msgstr ""
86 455  
... ... @@ -96,7 +465,7 @@ msgstr &quot;&quot;
96 465 msgid "Auto-Reconnect"
97 466 msgstr ""
98 467  
99   -#: src/objects/toolbar/settings.c:112 src/objects/settings/actionview.c:73
  468 +#: src/objects/toolbar/settings.c:119 src/objects/settings/actionview.c:73
100 469 msgid "Available"
101 470 msgstr ""
102 471  
... ... @@ -116,6 +485,10 @@ msgstr &quot;&quot;
116 485 msgid "Bold"
117 486 msgstr ""
118 487  
  488 +#: src/objects/toolbar/models.c:139
  489 +msgid "Bottom"
  490 +msgstr ""
  491 +
119 492 #: src/objects/window/terminal.c:165
120 493 msgid "Can't load session file"
121 494 msgstr ""
... ... @@ -137,7 +510,7 @@ msgstr &quot;&quot;
137 510 msgid "Change the application preferences"
138 511 msgstr ""
139 512  
140   -#: src/objects/window/header-settings.c:98
  513 +#: src/objects/window/header-settings.c:96
141 514 msgid "Change the position of the title bar icons"
142 515 msgstr ""
143 516  
... ... @@ -344,7 +717,7 @@ msgstr &quot;&quot;
344 717 msgid "Icon _size"
345 718 msgstr ""
346 719  
347   -#: src/objects/toolbar/models.c:108
  720 +#: src/objects/toolbar/models.c:109
348 721 msgid "Icon type"
349 722 msgstr ""
350 723  
... ... @@ -376,7 +749,7 @@ msgstr &quot;&quot;
376 749 msgid "Items packed from the start to the end"
377 750 msgstr ""
378 751  
379   -#: src/objects/toolbar/settings.c:106
  752 +#: src/objects/toolbar/settings.c:113
380 753 msgid "Itens"
381 754 msgstr ""
382 755  
... ... @@ -416,8 +789,8 @@ msgstr &quot;&quot;
416 789 msgid "Large"
417 790 msgstr ""
418 791  
419   -#: src/objects/toolbar/settings.c:176
420   -msgid "Layout"
  792 +#: src/objects/toolbar/models.c:135
  793 +msgid "Left"
421 794 msgstr ""
422 795  
423 796 #: src/objects/settings/actionview.c:74
... ... @@ -544,6 +917,10 @@ msgstr &quot;&quot;
544 917 msgid "Path for the new shortcut"
545 918 msgstr ""
546 919  
  920 +#: src/objects/toolbar/models.c:128
  921 +msgid "Position"
  922 +msgstr ""
  923 +
547 924 #: ui/window.xml:129
548 925 msgid "Preferences"
549 926 msgstr ""
... ... @@ -581,6 +958,10 @@ msgstr &quot;&quot;
581 958 msgid "Resize on alternate screen"
582 959 msgstr ""
583 960  
  961 +#: src/objects/toolbar/models.c:143
  962 +msgid "Right"
  963 +msgstr ""
  964 +
584 965 #: keypad/00-right.xml:34
585 966 msgid "Right keypad"
586 967 msgstr ""
... ... @@ -633,11 +1014,11 @@ msgstr &quot;&quot;
633 1014 msgid "Select by rectangles"
634 1015 msgstr ""
635 1016  
636   -#: src/objects/toolbar/settings.c:106
  1017 +#: src/objects/toolbar/settings.c:113
637 1018 msgid "Select the toolbar itens"
638 1019 msgstr ""
639 1020  
640   -#: src/objects/toolbar/settings.c:111
  1021 +#: src/objects/toolbar/settings.c:118
641 1022 msgid "Selected"
642 1023 msgstr ""
643 1024  
... ... @@ -655,7 +1036,7 @@ msgstr &quot;&quot;
655 1036 msgid "Send/Receive files"
656 1037 msgstr ""
657 1038  
658   -#: src/objects/toolbar/settings.c:234 src/objects/toolbar/settings.c:244
  1039 +#: src/objects/toolbar/settings.c:248 src/objects/toolbar/settings.c:258
659 1040 msgid "Separator"
660 1041 msgstr ""
661 1042  
... ... @@ -696,15 +1077,15 @@ msgstr &quot;&quot;
696 1077 msgid "Settings"
697 1078 msgstr ""
698 1079  
699   -#: src/objects/toolbar/settings.c:176
700   -msgid "Setup the toolbar layout"
  1080 +#: src/objects/toolbar/settings.c:183
  1081 +msgid "Setup the toolbar style and position"
701 1082 msgstr ""
702 1083  
703   -#: src/objects/window/header-settings.c:87
  1084 +#: src/objects/window/header-settings.c:85
704 1085 msgid "Setup title bar"
705 1086 msgstr ""
706 1087  
707   -#: src/objects/toolbar/toolbar.c:214 src/objects/toolbar/settings.c:88
  1088 +#: src/objects/toolbar/toolbar.c:214 src/objects/toolbar/settings.c:95
708 1089 msgid "Setup toolbar"
709 1090 msgstr ""
710 1091  
... ... @@ -756,12 +1137,16 @@ msgstr &quot;&quot;
756 1137 msgid "State Type"
757 1138 msgstr ""
758 1139  
759   -#: src/objects/toolbar/models.c:115
  1140 +#: src/objects/toolbar/settings.c:183
  1141 +msgid "Style & Position"
  1142 +msgstr ""
  1143 +
  1144 +#: src/objects/toolbar/models.c:116
760 1145 msgid "Symbolic"
761 1146 msgstr ""
762 1147  
763 1148 #: src/objects/toolbar/models.c:55 src/objects/toolbar/models.c:82
764   -#: src/objects/toolbar/models.c:111
  1149 +#: src/objects/toolbar/models.c:112
765 1150 msgid "System default"
766 1151 msgstr ""
767 1152  
... ... @@ -873,15 +1258,15 @@ msgstr &quot;&quot;
873 1258 msgid "The type of the state kept by the action"
874 1259 msgstr ""
875 1260  
876   -#: src/objects/window/header-settings.c:86
  1261 +#: src/objects/window/header-settings.c:84
877 1262 msgid "Title bar"
878 1263 msgstr ""
879 1264  
880   -#: src/objects/window/header-settings.c:98
  1265 +#: src/objects/window/header-settings.c:96
881 1266 msgid "Title bar actions"
882 1267 msgstr ""
883 1268  
884   -#: src/objects/toolbar/settings.c:87 ui/window.xml:435 ui/window.xml:555
  1269 +#: src/objects/toolbar/settings.c:94 ui/window.xml:435 ui/window.xml:555
885 1270 #: ui/application.xml:342
886 1271 msgid "Toolbar"
887 1272 msgstr ""
... ... @@ -890,10 +1275,18 @@ msgstr &quot;&quot;
890 1275 msgid "Toolbar Style"
891 1276 msgstr ""
892 1277  
  1278 +#: src/objects/toolbar/settings.c:75
  1279 +msgid "Toolbar position"
  1280 +msgstr ""
  1281 +
893 1282 #: src/objects/toolbar/models.c:79
894 1283 msgid "Toolbar s_tyle"
895 1284 msgstr ""
896 1285  
  1286 +#: src/objects/toolbar/models.c:131
  1287 +msgid "Top (system default)"
  1288 +msgstr ""
  1289 +
897 1290 #: ui/window.xml:440
898 1291 msgid "Top menu"
899 1292 msgstr ""
... ...
src/include/config.h.in
  Diff comments   View file @6c41809
... ... @@ -35,6 +35,7 @@
35 35 #undef PACKAGE_VERSION
36 36 #undef PACKAGE_RELEASE
37 37 #undef PRODUCT_NAME
  38 + #undef APPLICATION_ID
38 39  
39 40 #endif /* PW3270_CONFIG_H_INCLUDED */
40 41  
... ...
src/include/pw3270/application.h
  Diff comments   View file @6c41809
... ... @@ -65,6 +65,9 @@
65 65 GType pw3270Application_get_type();
66 66 GtkApplication * pw3270_application_new(const gchar *application_id, GApplicationFlags flags);
67 67  
  68 + /// @brief Get application settings.
  69 + /// @param app The pw3270 application object.
  70 + /// @return The internal settings object (Do not unref it).
68 71 GSettings * pw3270_application_get_settings(GApplication *app);
69 72 GList * pw3270_application_get_keypad_models(GApplication *app);
70 73  
... ...
src/main/main.c
  Diff comments   View file @6c41809
... ... @@ -106,7 +106,7 @@ int main (int argc, char **argv) {
106 106  
107 107 // Setup and start application.
108 108 g_set_application_name(G_STRINGIFY(PRODUCT_NAME));
109   - app = pw3270_application_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME),G_APPLICATION_HANDLES_OPEN);
  109 + app = pw3270_application_new(G_STRINGIFY(APPLICATION_ID),G_APPLICATION_HANDLES_OPEN);
110 110  
111 111 #ifdef G_OS_UNIX
112 112 g_unix_signal_add(SIGTERM, (GSourceFunc) quit_signal, app);
... ...
src/objects/application/application.c
  Diff comments   View file @6c41809
... ... @@ -352,7 +352,7 @@
352 352  
353 353 G_APPLICATION_CLASS(pw3270Application_parent_class)->startup(application);
354 354  
355   - g_autoptr(GSettings) settings = pw3270_application_get_settings(application);
  355 + GSettings *settings = pw3270_application_get_settings(application);
356 356  
357 357 //
358 358 // Common actions
... ...
src/objects/toolbar/models.c
  Diff comments   View file @6c41809
... ... @@ -102,6 +102,7 @@
102 102 }
103 103 }
104 104 },
  105 +
105 106 {
106 107 "toolbar-icon-type",
107 108 "icon-type",
... ... @@ -119,8 +120,34 @@
119 120 .label = NULL
120 121 }
121 122 }
122   - }
  123 + },
123 124  
  125 + {
  126 + "toolbar-position",
  127 + "position",
  128 + N_("Position"),
  129 + (const struct _contents[]) {
  130 + {
  131 + .label = N_( "Top (system default)" ),
  132 + .value = 0
  133 + },
  134 + {
  135 + .label = N_( "Left" ),
  136 + .value = 3
  137 + },
  138 + {
  139 + .label = N_( "Bottom" ),
  140 + .value = 1
  141 + },
  142 + {
  143 + .label = N_( "Right" ),
  144 + .value = 2
  145 + },
  146 + {
  147 + .label = NULL
  148 + }
  149 + }
  150 + }
124 151 };
125 152  
126 153 GtkTreeModel * pw3270_model_from_name(const gchar *name) {
... ...
src/objects/toolbar/settings.c
  Diff comments   View file @6c41809
... ... @@ -66,6 +66,13 @@
66 66 .top = 1,
67 67 .name = "toolbar-style",
68 68 .label = N_("Toolbar Style")
  69 + },
  70 +
  71 + {
  72 + .left = 3,
  73 + .top = 1,
  74 + .name = "toolbar-position",
  75 + .label = N_("Toolbar position")
69 76 }
70 77  
71 78 };
... ... @@ -173,7 +180,7 @@
173 180  
174 181 gtk_grid_attach(
175 182 GTK_GRID(settings),
176   - v3270_dialog_section_new(_("Layout"), _("Setup the toolbar layout"), GTK_WIDGET(grid)),
  183 + v3270_dialog_section_new(_("Style & Position"), _("Setup the toolbar style and position"), GTK_WIDGET(grid)),
177 184 0,5,4,1
178 185 );
179 186  
... ... @@ -203,6 +210,13 @@
203 210  
204 211 }
205 212  
  213 + {
  214 + GtkWidget * label = gtk_label_new("");
  215 + gtk_label_set_markup(GTK_LABEL(label),_("<small><b>The toolbar position only takes effect after restart</b></small>"));
  216 + g_object_set(G_OBJECT(label),"margin-top",12,NULL);
  217 + gtk_grid_attach(grid,label,0,3,6,1);
  218 + }
  219 +
206 220 }
207 221  
208 222 return GTK_WIDGET(settings);
... ...
src/objects/window/actions/sessionproperties.c
  Diff comments   View file @6c41809
... ... @@ -53,7 +53,7 @@
53 53  
54 54 size_t ix;
55 55  
56   - g_autoptr(GSettings) settings = pw3270_application_get_settings(g_application_get_default());
  56 + GSettings *settings = pw3270_application_get_settings(g_application_get_default());
57 57  
58 58 GtkWidget * dialog = v3270_settings_dialog_new();
59 59 gtk_window_set_title(GTK_WINDOW(dialog), action->label);
... ...
validate-appdata.sh 0 → 100755
  Diff comments   View file @6c41809
... ... @@ -0,0 +1,6 @@
  1 +#!/bin/bash
  2 +./configure
  3 +
  4 +cp branding/appdata.xml /tmp/pw3270.appdata.xml
  5 +appstream-util validate /tmp/pw3270.appdata.xml
  6 +
... ...