diff --git a/Makefile.in b/Makefile.in
index 0121e6c..304cbde 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -240,6 +240,16 @@ install-%: \
 		-colors 256 \
 		$@
 
+%.png: \
+	$(srcdir)/branding/%.svg
+
+	@echo $@ ...
+	@$(MKDIR) $(@D)
+	@$(CONVERT) \
+		+antialias \
+		-background transparent \
+		$< \
+		$@
 
 #---[ Release Targets ]------------------------------------------------------------------
 
@@ -314,6 +324,7 @@ install-macos-application: \
 		$(DESTDIR)$(bindir)/$(PRODUCT_NAME)@EXEEXT@
 
 install-windows-application: \
+	$(PRODUCT_NAME).png \
 	strip
 
 	@$(MKDIR) \
@@ -323,6 +334,13 @@ install-windows-application: \
 		$(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \
 		$(DESTDIR)$(bindir)/$(PRODUCT_NAME)@EXEEXT@
 
+	@$(MKDIR) \
+		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)
+
+	@$(INSTALL_DATA) \
+		$(PRODUCT_NAME).png \
+		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png
+
 install-icons:
 
 	@$(MKDIR) \
diff --git a/configure.ac b/configure.ac
index edd6154..1467c90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,7 @@ dnl ---------------------------------------------------------------------------
 
 AC_PATH_TOOL([AR], [ar], [ar])
 AC_PATH_TOOL([CONVERT], [convert], [no])
-dnl AC_PATH_TOOL([OPTIPNG],[optipng],[no])
+AC_PATH_TOOL([OPTIPNG],[optipng],[no])
 AC_PATH_TOOL([ZIP],[zip],[no])
 AC_PATH_TOOL([DLLTOOL],[dlltool],[no])
 AC_PATH_TOOL([WINDRES], [windres], [no])
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 1b1a943..47f0340 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
+"POT-Creation-Date: 2022-05-18 15:30-0300\n"
 "PO-Revision-Date: 2021-12-23 01:36-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <perry.werneck@gmail.com>\n"
@@ -19,34 +19,34 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 3.38.0\n"
 
-#: src/objects/application/application.c:225
+#: src/objects/application/application.c:211
 #, c-format
 msgid "\"%s\" is not a valid user interface name"
 msgstr "\"%s\" não é um nome válido para interface de usuário"
 
-#: src/objects/application/actions/about.c:110
+#: src/objects/application/actions/about.c:133
 #, c-format
 msgid "%s for %s."
 msgstr "%s para %s"
 
-#: src/objects/application/actions/about.c:117
+#: src/objects/application/actions/about.c:140
 msgid "32 bits Linux"
 msgstr "Linux 32 bits"
 
-#: src/objects/application/actions/about.c:115
+#: src/objects/application/actions/about.c:138
 msgid "32 bits Windows"
 msgstr "Windows 32 bits"
 
-#: src/objects/actions/save.c:166 src/objects/os/linux/savedesktopicon.c:267
+#: src/objects/actions/save.c:166 src/objects/os/linux/savedesktopicon.c:233
 #: src/objects/os/windows/savedesktopicon.c:222
 msgid "3270 session files"
 msgstr "Arquivos de sessão TN3270"
 
-#: src/objects/application/actions/about.c:119
+#: src/objects/application/actions/about.c:142
 msgid "64 bits Linux"
 msgstr "Linux 64 bits"
 
-#: src/objects/application/actions/about.c:113
+#: src/objects/application/actions/about.c:136
 msgid "64 bits Windows"
 msgstr "Windows 64 bits"
 
@@ -57,8 +57,9 @@ msgstr ""
 "<small><b>Alterações na posição da barra de ferramentas só tem efeito apos "
 "reinício da aplicação</b></small>"
 
-#: src/objects/application/actions/about.c:209 ui/windows.ui.xml:40
-#: ui/windows.ui.xml:553 ui/linux.ui.xml:40 ui/linux.ui.xml:553
+#: src/objects/application/actions/about.c:232 ui/windows.ui.xml:40
+#: ui/windows.ui.xml:553 ui/macos.ui.xml:40 ui/macos.ui.xml:553
+#: ui/linux.ui.xml:40 ui/linux.ui.xml:553
 msgid "About PW3270"
 msgstr "Sobre o PW3270"
 
@@ -71,6 +72,7 @@ msgid "Action Names"
 msgstr "Nome das ações"
 
 #: ui/windows.ui.xml:525 ui/windows.ui.xml:917 ui/windows.ui.xml:1032
+#: ui/macos.ui.xml:525 ui/macos.ui.xml:917 ui/macos.ui.xml:1032
 #: ui/linux.ui.xml:525 ui/linux.ui.xml:917 ui/linux.ui.xml:1032
 msgid "Alert sound"
 msgstr "Aviso sonoro"
@@ -79,17 +81,17 @@ msgstr "Aviso sonoro"
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ui/windows.ui.xml:252 ui/windows.ui.xml:691 ui/linux.ui.xml:252
-#: ui/linux.ui.xml:691
+#: ui/windows.ui.xml:252 ui/windows.ui.xml:691 ui/macos.ui.xml:252
+#: ui/macos.ui.xml:691 ui/linux.ui.xml:252 ui/linux.ui.xml:691
 msgid "Append to copy"
 msgstr "Adicionar à cópia"
 
-#: src/objects/application/actions/about.c:152
+#: src/objects/application/actions/about.c:175
 msgid "Apple version"
 msgstr "Versão Apple"
 
-#: ui/windows.ui.xml:385 ui/windows.ui.xml:665 ui/linux.ui.xml:385
-#: ui/linux.ui.xml:665
+#: ui/windows.ui.xml:385 ui/windows.ui.xml:665 ui/macos.ui.xml:385
+#: ui/macos.ui.xml:665 ui/linux.ui.xml:385 ui/linux.ui.xml:665
 msgid "Application"
 msgstr "Aplicação"
 
@@ -98,7 +100,7 @@ msgid "Application menu"
 msgstr "Menu da aplicação"
 
 #: src/objects/application/actions/preferences.c:76 ui/windows.ui.xml:84
-#: ui/linux.ui.xml:84
+#: ui/macos.ui.xml:84 ui/linux.ui.xml:84
 msgid "Application preferences"
 msgstr "Preferências da aplicação"
 
@@ -106,7 +108,7 @@ msgstr "Preferências da aplicação"
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ui/windows.ui.xml:500 ui/linux.ui.xml:500
+#: ui/windows.ui.xml:500 ui/macos.ui.xml:500 ui/linux.ui.xml:500
 msgid "Auto-Reconnect"
 msgstr "Reconectar automaticamente"
 
@@ -114,20 +116,20 @@ msgstr "Reconectar automaticamente"
 msgid "Available"
 msgstr "Disponível"
 
-#: src/objects/application/actions/about.c:155
+#: src/objects/application/actions/about.c:178
 msgid "Based on X3270 from"
 msgstr "Baseado no X3270 por"
 
-#: ui/windows.ui.xml:490 ui/windows.ui.xml:946 ui/linux.ui.xml:490
-#: ui/linux.ui.xml:946
+#: ui/windows.ui.xml:490 ui/windows.ui.xml:946 ui/macos.ui.xml:490
+#: ui/macos.ui.xml:946 ui/linux.ui.xml:490 ui/linux.ui.xml:946
 msgid "Blank Fill"
 msgstr "Completar com espaços"
 
-#: ui/windows.ui.xml:455 ui/linux.ui.xml:455
+#: ui/windows.ui.xml:455 ui/macos.ui.xml:455 ui/linux.ui.xml:455
 msgid "Blinking Cursor"
 msgstr "Cursor piscante"
 
-#: ui/windows.ui.xml:505 ui/linux.ui.xml:505
+#: ui/windows.ui.xml:505 ui/macos.ui.xml:505 ui/linux.ui.xml:505
 msgid "Bold"
 msgstr "Negrito"
 
@@ -174,17 +176,19 @@ msgid "Change the preferences for the active session"
 msgstr "Modificar preferências da sessão ativa"
 
 #: ui/windows.ui.xml:305 ui/windows.ui.xml:725 ui/windows.ui.xml:867
+#: ui/macos.ui.xml:305 ui/macos.ui.xml:725 ui/macos.ui.xml:867
 #: ui/linux.ui.xml:305 ui/linux.ui.xml:725 ui/linux.ui.xml:867
 msgid "Clear"
 msgstr "Limpar"
 
-#: ui/windows.ui.xml:400 ui/linux.ui.xml:400
+#: ui/windows.ui.xml:400 ui/macos.ui.xml:400 ui/linux.ui.xml:400
 msgid "Clipboard"
 msgstr "Área de transferência"
 
 #: ui/windows.ui.xml:150 ui/windows.ui.xml:187 ui/windows.ui.xml:617
-#: ui/windows.ui.xml:654 ui/linux.ui.xml:150 ui/linux.ui.xml:187
-#: ui/linux.ui.xml:617 ui/linux.ui.xml:654
+#: ui/windows.ui.xml:654 ui/macos.ui.xml:150 ui/macos.ui.xml:187
+#: ui/macos.ui.xml:617 ui/macos.ui.xml:654 ui/linux.ui.xml:150
+#: ui/linux.ui.xml:187 ui/linux.ui.xml:617 ui/linux.ui.xml:654
 msgid "Clipboard contents"
 msgstr "Conteúdo da área de transferência"
 
@@ -198,8 +202,9 @@ msgstr "Fechar a janela"
 
 #: src/objects/window/actions/close.c:60 ui/windows.ui.xml:217
 #: ui/windows.ui.xml:813 ui/windows.ui.xml:1011 ui/windows.ui.xml:1118
-#: ui/linux.ui.xml:217 ui/linux.ui.xml:813 ui/linux.ui.xml:1011
-#: ui/linux.ui.xml:1118
+#: ui/macos.ui.xml:217 ui/macos.ui.xml:813 ui/macos.ui.xml:1011
+#: ui/macos.ui.xml:1118 ui/linux.ui.xml:217 ui/linux.ui.xml:813
+#: ui/linux.ui.xml:1011 ui/linux.ui.xml:1118
 msgid "Close window"
 msgstr "Fechar janela"
 
@@ -211,7 +216,7 @@ msgstr "Comentário"
 msgid "Connect"
 msgstr "Conectar"
 
-#: ui/windows.ui.xml:450 ui/linux.ui.xml:450
+#: ui/windows.ui.xml:450 ui/macos.ui.xml:450 ui/linux.ui.xml:450
 msgid "Connect on startup"
 msgstr "Conectar ao iniciar"
 
@@ -219,71 +224,73 @@ msgstr "Conectar ao iniciar"
 msgid "Connect to host"
 msgstr "Conectar ao servidor"
 
-#: src/objects/window/window.c:802 src/objects/window/page.c:218
+#: src/objects/window/window.c:808 src/objects/window/page.c:218
 msgid "Connected to host"
 msgstr "Conectado no servidor"
 
-#: src/objects/application/actions/about.c:153
+#: src/objects/application/actions/about.c:176
 msgid "Contributors"
 msgstr "Contribuidores"
 
-#: ui/windows.ui.xml:237 ui/windows.ui.xml:686 ui/linux.ui.xml:237
-#: ui/linux.ui.xml:686
+#: ui/windows.ui.xml:237 ui/windows.ui.xml:686 ui/macos.ui.xml:237
+#: ui/macos.ui.xml:686 ui/linux.ui.xml:237 ui/linux.ui.xml:686
 msgid "Copy"
 msgstr "Copiar"
 
-#: ui/windows.ui.xml:706 ui/linux.ui.xml:706
+#: ui/windows.ui.xml:706 ui/macos.ui.xml:706 ui/linux.ui.xml:706
 msgid "Copy as HTML"
 msgstr "Copiar como HTML"
 
-#: ui/windows.ui.xml:711 ui/linux.ui.xml:711
+#: ui/windows.ui.xml:711 ui/macos.ui.xml:711 ui/linux.ui.xml:711
 msgid "Copy as image"
 msgstr "Copiar como imagem"
 
-#: ui/windows.ui.xml:247 ui/windows.ui.xml:701 ui/linux.ui.xml:247
-#: ui/linux.ui.xml:701
+#: ui/windows.ui.xml:247 ui/windows.ui.xml:701 ui/macos.ui.xml:247
+#: ui/macos.ui.xml:701 ui/linux.ui.xml:247 ui/linux.ui.xml:701
 msgid "Copy as table"
 msgstr "Copiar como tabela"
 
-#: ui/windows.ui.xml:242 ui/windows.ui.xml:696 ui/linux.ui.xml:242
-#: ui/linux.ui.xml:696
+#: ui/windows.ui.xml:242 ui/windows.ui.xml:696 ui/macos.ui.xml:242
+#: ui/macos.ui.xml:696 ui/linux.ui.xml:242 ui/linux.ui.xml:696
 msgid "Copy as text"
 msgstr "Copiar como texto"
 
-#: src/objects/application/actions/about.c:159
+#: src/objects/application/actions/about.c:182
 msgid "Copyright © 2008 Banco do Brasil S.A."
 msgstr "Copyright © 2008 Banco do Brasil S.A."
 
 #: src/objects/os/linux/savedesktopicon.c:114
 #: src/objects/os/windows/savedesktopicon.c:107
+#: src/objects/os/macos/savedesktopicon.c:54
 msgid "Create shortcut for the current session"
 msgstr "Criar atalho para a sessão atual."
 
-#: ui/windows.ui.xml:475 ui/windows.ui.xml:902 ui/linux.ui.xml:475
-#: ui/linux.ui.xml:902
+#: ui/windows.ui.xml:475 ui/windows.ui.xml:902 ui/macos.ui.xml:475
+#: ui/macos.ui.xml:902 ui/linux.ui.xml:475 ui/linux.ui.xml:902
 msgid "Cross hair cursor"
 msgstr "Cursor mira"
 
-#: ui/windows.ui.xml:177 ui/windows.ui.xml:644 ui/linux.ui.xml:177
-#: ui/linux.ui.xml:644
+#: ui/windows.ui.xml:177 ui/windows.ui.xml:644 ui/macos.ui.xml:177
+#: ui/macos.ui.xml:644 ui/linux.ui.xml:177 ui/linux.ui.xml:644
 msgid "Current Screen"
 msgstr "Tela atual"
 
-#: ui/windows.ui.xml:140 ui/windows.ui.xml:607 ui/linux.ui.xml:140
-#: ui/linux.ui.xml:607
+#: ui/windows.ui.xml:140 ui/windows.ui.xml:607 ui/macos.ui.xml:140
+#: ui/macos.ui.xml:607 ui/linux.ui.xml:140 ui/linux.ui.xml:607
 msgid "Current screen"
 msgstr "Tela atual"
 
-#: ui/windows.ui.xml:670 ui/linux.ui.xml:670
+#: ui/windows.ui.xml:670 ui/macos.ui.xml:670 ui/linux.ui.xml:670
 msgid "Current session"
 msgstr "Sessão atual"
 
-#: ui/windows.ui.xml:257 ui/windows.ui.xml:716 ui/linux.ui.xml:257
-#: ui/linux.ui.xml:716
+#: ui/windows.ui.xml:257 ui/windows.ui.xml:716 ui/macos.ui.xml:257
+#: ui/macos.ui.xml:716 ui/linux.ui.xml:257 ui/linux.ui.xml:716
 msgid "Cut"
 msgstr "Recortar"
 
 #: ui/windows.ui.xml:315 ui/windows.ui.xml:735 ui/windows.ui.xml:877
+#: ui/macos.ui.xml:315 ui/macos.ui.xml:735 ui/macos.ui.xml:877
 #: ui/linux.ui.xml:315 ui/linux.ui.xml:735 ui/linux.ui.xml:877
 msgid "Delete Field"
 msgstr "Apagar campo"
@@ -292,17 +299,18 @@ msgstr "Apagar campo"
 msgid "Description"
 msgstr "Descrição"
 
-#: ui/windows.ui.xml:808 ui/windows.ui.xml:1006 ui/linux.ui.xml:808
-#: ui/linux.ui.xml:1006
+#: ui/windows.ui.xml:808 ui/windows.ui.xml:1006 ui/macos.ui.xml:808
+#: ui/macos.ui.xml:1006 ui/linux.ui.xml:808 ui/linux.ui.xml:1006
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: src/objects/window/window.c:802 src/objects/window/window.c:829
+#: src/objects/window/window.c:808 src/objects/window/window.c:835
 #: src/objects/window/page.c:207
 msgid "Disconnected from host"
 msgstr "Desconectado do servidor"
 
 #: ui/windows.ui.xml:540 ui/windows.ui.xml:929 ui/windows.ui.xml:1045
+#: ui/macos.ui.xml:540 ui/macos.ui.xml:929 ui/macos.ui.xml:1045
 #: ui/linux.ui.xml:540 ui/linux.ui.xml:929 ui/linux.ui.xml:1045
 msgid "Dynamic font spacing"
 msgstr "Espaçamento dinâmico"
@@ -332,16 +340,19 @@ msgid "End"
 msgstr "Final"
 
 #: ui/windows.ui.xml:310 ui/windows.ui.xml:730 ui/windows.ui.xml:872
+#: ui/macos.ui.xml:310 ui/macos.ui.xml:730 ui/macos.ui.xml:872
 #: ui/linux.ui.xml:310 ui/linux.ui.xml:730 ui/linux.ui.xml:872
 msgid "Erase input"
 msgstr "Apagar campos"
 
 #: ui/windows.ui.xml:320 ui/windows.ui.xml:740 ui/windows.ui.xml:882
+#: ui/macos.ui.xml:320 ui/macos.ui.xml:740 ui/macos.ui.xml:882
 #: ui/linux.ui.xml:320 ui/linux.ui.xml:740 ui/linux.ui.xml:882
 msgid "Erase to end of field"
 msgstr "Apagar até o final do campo"
 
 #: ui/windows.ui.xml:325 ui/windows.ui.xml:745 ui/windows.ui.xml:887
+#: ui/macos.ui.xml:325 ui/macos.ui.xml:745 ui/macos.ui.xml:887
 #: ui/linux.ui.xml:325 ui/linux.ui.xml:745 ui/linux.ui.xml:887
 msgid "Erase to end of line"
 msgstr "Apagar até o final da linha"
@@ -350,7 +361,7 @@ msgstr "Apagar até o final da linha"
 msgid "Error starting session"
 msgstr "Erro iniciando sessão"
 
-#: ui/windows.ui.xml:353 ui/linux.ui.xml:353
+#: ui/windows.ui.xml:353 ui/macos.ui.xml:353 ui/linux.ui.xml:353
 msgid "Field attributes"
 msgstr "Atributos de campo"
 
@@ -358,11 +369,12 @@ msgstr "Atributos de campo"
 msgid "File for session preferences"
 msgstr "Arquivo para preferências da sessão"
 
-#: ui/windows.ui.xml:470 ui/linux.ui.xml:470
+#: ui/windows.ui.xml:470 ui/macos.ui.xml:470 ui/linux.ui.xml:470
 msgid "Full Screen"
 msgstr "Tela cheia"
 
 #: ui/windows.ui.xml:779 ui/windows.ui.xml:955 ui/windows.ui.xml:1050
+#: ui/macos.ui.xml:779 ui/macos.ui.xml:955 ui/macos.ui.xml:1050
 #: ui/linux.ui.xml:779 ui/linux.ui.xml:955 ui/linux.ui.xml:1050
 msgid "Full screen"
 msgstr "Tela cheia"
@@ -371,16 +383,16 @@ msgstr "Tela cheia"
 msgid "Generic name"
 msgstr "Nome genérico"
 
-#: ui/windows.ui.xml:37 ui/windows.ui.xml:550 ui/linux.ui.xml:37
-#: ui/linux.ui.xml:550
+#: ui/windows.ui.xml:37 ui/windows.ui.xml:550 ui/macos.ui.xml:37
+#: ui/macos.ui.xml:550 ui/linux.ui.xml:37 ui/linux.ui.xml:550
 msgid "Help"
 msgstr "Ajuda"
 
-#: ui/windows.ui.xml:390 ui/linux.ui.xml:390
+#: ui/windows.ui.xml:390 ui/macos.ui.xml:390 ui/linux.ui.xml:390
 msgid "Host and Emulation settings"
 msgstr "Configuração de servidor e emulação"
 
-#: src/objects/application/actions/about.c:111 src/objects/window/window.c:592
+#: src/objects/application/actions/about.c:134 src/objects/window/window.c:592
 #: src/objects/os/linux/savedesktopicon.c:102
 #: src/objects/os/windows/savedesktopicon.c:269
 msgid "IBM 3270 Terminal emulator"
@@ -422,7 +434,7 @@ msgstr "Apenas ícones"
 msgid "If the action can be activated"
 msgstr "Se a ação pode ser ativada"
 
-#: ui/windows.ui.xml:1022 ui/linux.ui.xml:1022
+#: ui/windows.ui.xml:1022 ui/macos.ui.xml:1022 ui/linux.ui.xml:1022
 msgid "Insert"
 msgstr "Inserção"
 
@@ -442,11 +454,11 @@ msgstr "Itens empacotados do início para o final"
 msgid "Itens"
 msgstr "Itens"
 
-#: ui/windows.ui.xml:515 ui/linux.ui.xml:515
+#: ui/windows.ui.xml:515 ui/macos.ui.xml:515 ui/linux.ui.xml:515
 msgid "Keep selected"
 msgstr "Manter selecionado"
 
-#: ui/windows.ui.xml:395 ui/linux.ui.xml:395
+#: ui/windows.ui.xml:395 ui/macos.ui.xml:395 ui/linux.ui.xml:395
 msgid "Keyboard accelerators"
 msgstr "Atalhos de teclado"
 
@@ -470,7 +482,7 @@ msgstr "Largura do painel em colunas"
 msgid "Keypads"
 msgstr "Painéis"
 
-#: src/objects/application/actions/about.c:163
+#: src/objects/application/actions/about.c:186
 msgid "LICENSE"
 msgstr "LICENCA"
 
@@ -490,56 +502,56 @@ msgstr "Esquerda"
 msgid "List of the available and unpacked actions"
 msgstr "Lista de ações disponíveis ainda não empacotadas"
 
-#: src/objects/application/application.c:179
+#: src/objects/application/application.c:164
 msgid "Log name"
 msgstr "Nome do arquivo de log"
 
-#: ui/windows.ui.xml:72 ui/linux.ui.xml:72
+#: ui/windows.ui.xml:72 ui/macos.ui.xml:72 ui/linux.ui.xml:72
 msgid "Main Menu"
 msgstr "Menu principal"
 
-#: ui/windows.ui.xml:67 ui/linux.ui.xml:67
+#: ui/windows.ui.xml:67 ui/macos.ui.xml:67 ui/linux.ui.xml:67
 msgid "Main Toolbar"
 msgstr "Barra de ferramentas"
 
-#: ui/windows.ui.xml:1093 ui/linux.ui.xml:1093
+#: ui/windows.ui.xml:1093 ui/macos.ui.xml:1093 ui/linux.ui.xml:1093
 msgid "Main menu"
 msgstr "Menu principal"
 
-#: src/objects/application/actions/about.c:151
+#: src/objects/application/actions/about.c:174
 msgid "Maintainers"
 msgstr "Mantenedores"
 
-#: ui/windows.ui.xml:348 ui/linux.ui.xml:348
+#: ui/windows.ui.xml:348 ui/macos.ui.xml:348 ui/linux.ui.xml:348
 msgid "Menu"
 msgstr "Menu"
 
-#: ui/windows.ui.xml:419 ui/windows.ui.xml:1059 ui/linux.ui.xml:419
-#: ui/linux.ui.xml:1059
+#: ui/windows.ui.xml:419 ui/windows.ui.xml:1059 ui/macos.ui.xml:419
+#: ui/macos.ui.xml:1059 ui/linux.ui.xml:419 ui/linux.ui.xml:1059
 msgid "Model 2 - 80x24"
 msgstr "Modelo 2 - 80x24"
 
-#: ui/windows.ui.xml:424 ui/windows.ui.xml:1064 ui/linux.ui.xml:424
-#: ui/linux.ui.xml:1064
+#: ui/windows.ui.xml:424 ui/windows.ui.xml:1064 ui/macos.ui.xml:424
+#: ui/macos.ui.xml:1064 ui/linux.ui.xml:424 ui/linux.ui.xml:1064
 msgid "Model 3 - 80x32"
 msgstr "Modelo 3 - 80x32"
 
-#: ui/windows.ui.xml:429 ui/windows.ui.xml:1069 ui/linux.ui.xml:429
-#: ui/linux.ui.xml:1069
+#: ui/windows.ui.xml:429 ui/windows.ui.xml:1069 ui/macos.ui.xml:429
+#: ui/macos.ui.xml:1069 ui/linux.ui.xml:429 ui/linux.ui.xml:1069
 msgid "Model 4 - 80x43"
 msgstr "Modelo 4 - 80x43"
 
-#: ui/windows.ui.xml:434 ui/windows.ui.xml:1074 ui/linux.ui.xml:434
-#: ui/linux.ui.xml:1074
+#: ui/windows.ui.xml:434 ui/windows.ui.xml:1074 ui/macos.ui.xml:434
+#: ui/macos.ui.xml:1074 ui/linux.ui.xml:434 ui/linux.ui.xml:1074
 msgid "Model 5 - 132x27"
 msgstr "Modelo 5 - 132x27"
 
-#: ui/windows.ui.xml:460 ui/windows.ui.xml:924 ui/linux.ui.xml:460
-#: ui/linux.ui.xml:924
+#: ui/windows.ui.xml:460 ui/windows.ui.xml:924 ui/macos.ui.xml:460
+#: ui/macos.ui.xml:924 ui/linux.ui.xml:460 ui/linux.ui.xml:924
 msgid "Monocase"
 msgstr "Só Maiúsculas"
 
-#: ui/windows.ui.xml:535 ui/linux.ui.xml:535
+#: ui/windows.ui.xml:535 ui/macos.ui.xml:535 ui/linux.ui.xml:535
 msgid "Network keep alive"
 msgstr "Network keep alive"
 
@@ -567,11 +579,11 @@ msgstr "Nova janela com sessão padrão"
 msgid "Open Session"
 msgstr "Abrir sessão"
 
-#: ui/windows.ui.xml:56 ui/linux.ui.xml:56
+#: ui/windows.ui.xml:56 ui/macos.ui.xml:56 ui/linux.ui.xml:56
 msgid "Open in New Tab"
 msgstr "Abrir em nova aba"
 
-#: ui/windows.ui.xml:51 ui/linux.ui.xml:51
+#: ui/windows.ui.xml:51 ui/macos.ui.xml:51 ui/linux.ui.xml:51
 msgid "Open in New Window"
 msgstr "Abrir em nova janela"
 
@@ -600,8 +612,9 @@ msgid "Open session on the active terminal"
 msgstr "Abrir sessão no terminal ativo"
 
 #: ui/windows.ui.xml:447 ui/windows.ui.xml:755 ui/windows.ui.xml:897
-#: ui/windows.ui.xml:1042 ui/linux.ui.xml:447 ui/linux.ui.xml:755
-#: ui/linux.ui.xml:897 ui/linux.ui.xml:1042
+#: ui/windows.ui.xml:1042 ui/macos.ui.xml:447 ui/macos.ui.xml:755
+#: ui/macos.ui.xml:897 ui/macos.ui.xml:1042 ui/linux.ui.xml:447
+#: ui/linux.ui.xml:755 ui/linux.ui.xml:897 ui/linux.ui.xml:1042
 msgid "Options"
 msgstr "Opções"
 
@@ -609,23 +622,23 @@ msgstr "Opções"
 msgid "Parameter Type"
 msgstr "Tipo de parâmetro"
 
-#: ui/windows.ui.xml:262 ui/windows.ui.xml:829 ui/linux.ui.xml:262
-#: ui/linux.ui.xml:829
+#: ui/windows.ui.xml:262 ui/windows.ui.xml:829 ui/macos.ui.xml:262
+#: ui/macos.ui.xml:829 ui/linux.ui.xml:262 ui/linux.ui.xml:829
 msgid "Paste from clipboard"
 msgstr "Colar da área de transferência"
 
-#: ui/windows.ui.xml:272 ui/windows.ui.xml:839 ui/linux.ui.xml:272
-#: ui/linux.ui.xml:839
+#: ui/windows.ui.xml:272 ui/windows.ui.xml:839 ui/macos.ui.xml:272
+#: ui/macos.ui.xml:839 ui/linux.ui.xml:272 ui/linux.ui.xml:839
 msgid "Paste from text file"
 msgstr "Colar de um arquivo texto"
 
-#: ui/windows.ui.xml:267 ui/windows.ui.xml:834 ui/linux.ui.xml:267
-#: ui/linux.ui.xml:834
+#: ui/windows.ui.xml:267 ui/windows.ui.xml:834 ui/macos.ui.xml:267
+#: ui/macos.ui.xml:834 ui/linux.ui.xml:267 ui/linux.ui.xml:834
 msgid "Paste next"
 msgstr "Colar próximo"
 
-#: ui/windows.ui.xml:485 ui/windows.ui.xml:941 ui/linux.ui.xml:485
-#: ui/linux.ui.xml:941
+#: ui/windows.ui.xml:485 ui/windows.ui.xml:941 ui/macos.ui.xml:485
+#: ui/macos.ui.xml:941 ui/linux.ui.xml:485 ui/linux.ui.xml:941
 msgid "Paste with left margin"
 msgstr "Colar com margem esquerda"
 
@@ -638,20 +651,20 @@ msgstr "Caminho para o novo atalho"
 msgid "Position"
 msgstr "Posição"
 
-#: ui/windows.ui.xml:662 ui/linux.ui.xml:662
+#: ui/windows.ui.xml:662 ui/macos.ui.xml:662 ui/linux.ui.xml:662
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ui/windows.ui.xml:174 ui/windows.ui.xml:641 ui/linux.ui.xml:174
-#: ui/linux.ui.xml:641
+#: ui/windows.ui.xml:174 ui/windows.ui.xml:641 ui/macos.ui.xml:174
+#: ui/macos.ui.xml:641 ui/linux.ui.xml:174 ui/linux.ui.xml:641
 msgid "Print"
 msgstr "Imprimir"
 
-#: ui/windows.ui.xml:992 ui/linux.ui.xml:992
+#: ui/windows.ui.xml:992 ui/macos.ui.xml:992 ui/linux.ui.xml:992
 msgid "Print screen"
 msgstr "Imrpimir o conteúdo da tela"
 
-#: ui/windows.ui.xml:795 ui/linux.ui.xml:795
+#: ui/windows.ui.xml:795 ui/macos.ui.xml:795 ui/linux.ui.xml:795
 msgid "Print selected"
 msgstr "Imprimir seleção"
 
@@ -661,7 +674,7 @@ msgid "Property \"%s\" is invalid for this object"
 msgstr "Propriedade \"%s\" é inválida para este objeto"
 
 #: src/objects/application/actions/window.c:64 ui/windows.ui.xml:89
-#: ui/linux.ui.xml:89
+#: ui/macos.ui.xml:89 ui/linux.ui.xml:89
 msgid "Quit"
 msgstr "Sair"
 
@@ -669,13 +682,13 @@ msgstr "Sair"
 msgid "Rename Session"
 msgstr "Renomear sessão"
 
-#: ui/windows.ui.xml:296 ui/windows.ui.xml:858 ui/linux.ui.xml:296
-#: ui/linux.ui.xml:858
+#: ui/windows.ui.xml:296 ui/windows.ui.xml:858 ui/macos.ui.xml:296
+#: ui/macos.ui.xml:858 ui/linux.ui.xml:296 ui/linux.ui.xml:858
 msgid "Reselect"
 msgstr "Reselecionar"
 
-#: ui/windows.ui.xml:480 ui/windows.ui.xml:912 ui/linux.ui.xml:480
-#: ui/linux.ui.xml:912
+#: ui/windows.ui.xml:480 ui/windows.ui.xml:912 ui/macos.ui.xml:480
+#: ui/macos.ui.xml:912 ui/linux.ui.xml:480 ui/linux.ui.xml:912
 msgid "Resize on alternate screen"
 msgstr "Mudar tamanho do terminal em tela alternativa"
 
@@ -683,8 +696,8 @@ msgstr "Mudar tamanho do terminal em tela alternativa"
 msgid "Right"
 msgstr "Direita"
 
-#: ui/windows.ui.xml:135 ui/windows.ui.xml:602 ui/linux.ui.xml:135
-#: ui/linux.ui.xml:602
+#: ui/windows.ui.xml:135 ui/windows.ui.xml:602 ui/macos.ui.xml:135
+#: ui/macos.ui.xml:602 ui/linux.ui.xml:135 ui/linux.ui.xml:602
 msgid "Save"
 msgstr "Salvar"
 
@@ -692,11 +705,11 @@ msgstr "Salvar"
 msgid "Save current session preferences to file"
 msgstr "Salvar preferências da sessão para arquivo"
 
-#: ui/windows.ui.xml:987 ui/linux.ui.xml:987
+#: ui/windows.ui.xml:987 ui/macos.ui.xml:987 ui/linux.ui.xml:987
 msgid "Save screen"
 msgstr "Salvar tela"
 
-#: ui/windows.ui.xml:790 ui/linux.ui.xml:790
+#: ui/windows.ui.xml:790 ui/macos.ui.xml:790 ui/linux.ui.xml:790
 msgid "Save selected"
 msgstr "Salvar seleção"
 
@@ -706,14 +719,15 @@ msgstr "Salvar preferências da sessão"
 
 #: src/objects/os/linux/savedesktopicon.c:113
 #: src/objects/os/windows/savedesktopicon.c:106
+#: src/objects/os/macos/savedesktopicon.c:53
 msgid "Save session shortcut"
 msgstr "Salvar atalho para a sessão"
 
-#: src/objects/os/linux/savedesktopicon.c:264
+#: src/objects/os/linux/savedesktopicon.c:230
 msgid "Save to session filename"
 msgstr "Salvar para arquivo de sessão"
 
-#: src/objects/os/linux/savedesktopicon.c:236
+#: src/objects/os/linux/savedesktopicon.c:202
 msgid "Save to shortcut file"
 msgstr "Salvar para arquivo de atalho"
 
@@ -721,23 +735,23 @@ msgstr "Salvar para arquivo de atalho"
 msgid "Save to windows shortcut"
 msgstr "Salvar para atalho windows"
 
-#: ui/windows.ui.xml:416 ui/windows.ui.xml:1056 ui/linux.ui.xml:416
-#: ui/linux.ui.xml:1056
+#: ui/windows.ui.xml:416 ui/windows.ui.xml:1056 ui/macos.ui.xml:416
+#: ui/macos.ui.xml:1056 ui/linux.ui.xml:416 ui/linux.ui.xml:1056
 msgid "Screen size"
 msgstr "Tamanho da tela"
 
-#: ui/windows.ui.xml:286 ui/windows.ui.xml:853 ui/linux.ui.xml:286
-#: ui/linux.ui.xml:853
+#: ui/windows.ui.xml:286 ui/windows.ui.xml:853 ui/macos.ui.xml:286
+#: ui/macos.ui.xml:853 ui/linux.ui.xml:286 ui/linux.ui.xml:853
 msgid "Select Field"
 msgstr "Selecionar campo"
 
-#: ui/windows.ui.xml:281 ui/windows.ui.xml:848 ui/linux.ui.xml:281
-#: ui/linux.ui.xml:848
+#: ui/windows.ui.xml:281 ui/windows.ui.xml:848 ui/macos.ui.xml:281
+#: ui/macos.ui.xml:848 ui/linux.ui.xml:281 ui/linux.ui.xml:848
 msgid "Select all"
 msgstr "Selecionar tudo"
 
-#: ui/windows.ui.xml:495 ui/windows.ui.xml:760 ui/linux.ui.xml:495
-#: ui/linux.ui.xml:760
+#: ui/windows.ui.xml:495 ui/windows.ui.xml:760 ui/macos.ui.xml:495
+#: ui/macos.ui.xml:760 ui/linux.ui.xml:495 ui/linux.ui.xml:760
 msgid "Select by rectangles"
 msgstr "Seleção retangular"
 
@@ -750,8 +764,9 @@ msgid "Selected"
 msgstr "Selecionado"
 
 #: ui/windows.ui.xml:145 ui/windows.ui.xml:182 ui/windows.ui.xml:612
-#: ui/windows.ui.xml:649 ui/linux.ui.xml:145 ui/linux.ui.xml:182
-#: ui/linux.ui.xml:612 ui/linux.ui.xml:649
+#: ui/windows.ui.xml:649 ui/macos.ui.xml:145 ui/macos.ui.xml:182
+#: ui/macos.ui.xml:612 ui/macos.ui.xml:649 ui/linux.ui.xml:145
+#: ui/linux.ui.xml:182 ui/linux.ui.xml:612 ui/linux.ui.xml:649
 msgid "Selected area"
 msgstr "Área selecionada"
 
@@ -760,7 +775,8 @@ msgid "Send/Receive"
 msgstr "Enviar/Receber"
 
 #: src/objects/window/actions/filetransfer.c:46 ui/windows.ui.xml:196
-#: ui/windows.ui.xml:997 ui/linux.ui.xml:196 ui/linux.ui.xml:997
+#: ui/windows.ui.xml:997 ui/macos.ui.xml:196 ui/macos.ui.xml:997
+#: ui/linux.ui.xml:196 ui/linux.ui.xml:997
 msgid "Send/Receive files"
 msgstr "Enviar/Receber arquivos"
 
@@ -768,12 +784,13 @@ msgstr "Enviar/Receber arquivos"
 msgid "Separator"
 msgstr "Separador"
 
-#: ui/windows.ui.xml:48 ui/windows.ui.xml:584 ui/linux.ui.xml:48
-#: ui/linux.ui.xml:584
+#: ui/windows.ui.xml:48 ui/windows.ui.xml:584 ui/macos.ui.xml:48
+#: ui/macos.ui.xml:584 ui/linux.ui.xml:48 ui/linux.ui.xml:584
 msgid "Session"
 msgstr "Sessão"
 
 #: ui/windows.ui.xml:77 ui/windows.ui.xml:978 ui/windows.ui.xml:1098
+#: ui/macos.ui.xml:77 ui/macos.ui.xml:978 ui/macos.ui.xml:1098
 #: ui/linux.ui.xml:77 ui/linux.ui.xml:978 ui/linux.ui.xml:1098
 msgid "Session Trace"
 msgstr "Trace da sessão"
@@ -783,13 +800,13 @@ msgstr "Trace da sessão"
 msgid "Session file"
 msgstr "Arquivo de sessão"
 
-#: ui/windows.ui.xml:127 ui/windows.ui.xml:594 ui/linux.ui.xml:127
-#: ui/linux.ui.xml:594
+#: ui/windows.ui.xml:127 ui/windows.ui.xml:594 ui/macos.ui.xml:127
+#: ui/macos.ui.xml:594 ui/linux.ui.xml:127 ui/linux.ui.xml:594
 msgid "Session in New Tab"
 msgstr "Sessão em nova aba"
 
-#: ui/windows.ui.xml:122 ui/windows.ui.xml:589 ui/linux.ui.xml:122
-#: ui/linux.ui.xml:589
+#: ui/windows.ui.xml:122 ui/windows.ui.xml:589 ui/macos.ui.xml:122
+#: ui/macos.ui.xml:589 ui/linux.ui.xml:122 ui/linux.ui.xml:589
 msgid "Session in new window"
 msgstr "Sessão em nova janela"
 
@@ -799,20 +816,21 @@ msgid "Session name"
 msgstr "Nome da sessão"
 
 #: src/objects/window/actions/sessionproperties.c:36 ui/windows.ui.xml:164
-#: ui/windows.ui.xml:631 ui/windows.ui.xml:1112 ui/linux.ui.xml:164
+#: ui/windows.ui.xml:631 ui/windows.ui.xml:1112 ui/macos.ui.xml:164
+#: ui/macos.ui.xml:631 ui/macos.ui.xml:1112 ui/linux.ui.xml:164
 #: ui/linux.ui.xml:631 ui/linux.ui.xml:1112
 msgid "Session preferences"
 msgstr "Preferências da sessão"
 
-#: src/objects/application/application.c:258
+#: src/objects/application/application.c:246
 msgid "Set default log file name"
 msgstr "Define o nome do arquivo de log padrão"
 
-#: src/objects/application/application.c:249
+#: src/objects/application/application.c:236
 msgid "Set the user-interface type"
 msgstr "Define o tipo de interface do usuário"
 
-#: ui/windows.ui.xml:382 ui/linux.ui.xml:382
+#: ui/windows.ui.xml:382 ui/macos.ui.xml:382 ui/linux.ui.xml:382
 msgid "Settings"
 msgstr "Configurações"
 
@@ -833,8 +851,8 @@ msgstr "Configurar barra de ferramentas"
 msgid "Shortcut file"
 msgstr "Arquivo de atalho"
 
-#: ui/windows.ui.xml:159 ui/windows.ui.xml:626 ui/linux.ui.xml:159
-#: ui/linux.ui.xml:626
+#: ui/windows.ui.xml:159 ui/windows.ui.xml:626 ui/macos.ui.xml:159
+#: ui/macos.ui.xml:626 ui/linux.ui.xml:159 ui/linux.ui.xml:626
 msgid "Shortcut for this session"
 msgstr "Atalho para essa sessão"
 
@@ -842,15 +860,15 @@ msgstr "Atalho para essa sessão"
 msgid "Shortcut name"
 msgstr "Nome do atalho"
 
-#: ui/windows.ui.xml:510 ui/linux.ui.xml:510
+#: ui/windows.ui.xml:510 ui/macos.ui.xml:510 ui/linux.ui.xml:510
 msgid "Show Underline"
 msgstr "Mostrar sublinhado"
 
-#: ui/windows.ui.xml:774 ui/linux.ui.xml:774
+#: ui/windows.ui.xml:774 ui/macos.ui.xml:774 ui/linux.ui.xml:774
 msgid "Show menu"
 msgstr "Mostrar menu"
 
-#: ui/windows.ui.xml:769 ui/linux.ui.xml:769
+#: ui/windows.ui.xml:769 ui/macos.ui.xml:769 ui/linux.ui.xml:769
 msgid "Show toolbar"
 msgstr "Mostrar barra de ferramentas"
 
@@ -858,12 +876,12 @@ msgstr "Mostrar barra de ferramentas"
 msgid "Small"
 msgstr "Pequeno"
 
-#: ui/windows.ui.xml:520 ui/windows.ui.xml:936 ui/linux.ui.xml:520
-#: ui/linux.ui.xml:936
+#: ui/windows.ui.xml:520 ui/windows.ui.xml:936 ui/macos.ui.xml:520
+#: ui/macos.ui.xml:936 ui/linux.ui.xml:520 ui/linux.ui.xml:936
 msgid "Smart paste"
 msgstr "Colar inteligente"
 
-#: src/objects/os/linux/savedesktopicon.c:239
+#: src/objects/os/linux/savedesktopicon.c:205
 msgid "Standard desktop files"
 msgstr "Arquivo de atalho padrão"
 
@@ -904,16 +922,16 @@ msgstr "Arquivos de sessão TN3270"
 msgid "TN3270 Session description"
 msgstr "Descrição de sessão TN3270"
 
-#: ui/windows.ui.xml:111 ui/windows.ui.xml:573 ui/linux.ui.xml:111
-#: ui/linux.ui.xml:573
+#: ui/windows.ui.xml:111 ui/windows.ui.xml:573 ui/macos.ui.xml:111
+#: ui/macos.ui.xml:573 ui/linux.ui.xml:111 ui/linux.ui.xml:573
 msgid "Tab with default session"
 msgstr "Aba com a sessão padrão"
 
-#: ui/windows.ui.xml:405 ui/linux.ui.xml:405
+#: ui/windows.ui.xml:405 ui/macos.ui.xml:405 ui/linux.ui.xml:405
 msgid "Terminal colors"
 msgstr "Cores do terminal"
 
-#: ui/windows.ui.xml:442 ui/linux.ui.xml:442
+#: ui/windows.ui.xml:442 ui/macos.ui.xml:442 ui/linux.ui.xml:442
 msgid "Terminal font"
 msgstr "Fonte do terminal"
 
@@ -933,7 +951,7 @@ msgstr "A etiqueta da ação"
 msgid "The action tooltip"
 msgstr "A dica da ação"
 
-#: src/objects/application/application.c:165
+#: src/objects/application/application.c:150
 msgid "The code of the User interface type"
 msgstr "Código identificando o tipo de interface do usuário"
 
@@ -946,7 +964,7 @@ msgstr "O arquivo com as preferências da sessão atual"
 msgid "The file with the session preferences for this shortcut"
 msgstr "O arquivo com as preferências da sessão para esse atalho"
 
-#: src/objects/application/application.c:180
+#: src/objects/application/application.c:165
 msgid "The full path of the default log file"
 msgstr "Caminho completo do arquivo default"
 
@@ -1021,6 +1039,10 @@ msgstr "The type of GVariant passed to activate()"
 msgid "The type of the state kept by the action"
 msgstr "O tipo do estado mantido pela ação"
 
+#: src/objects/os/macos/savedesktopicon.c:68
+msgid "This action is not available in this platform"
+msgstr ""
+
 #: src/objects/window/header-settings.c:84
 msgid "Title bar"
 msgstr "Barra de título"
@@ -1030,7 +1052,8 @@ msgid "Title bar actions"
 msgstr "Ações da barra de título"
 
 #: src/objects/toolbar/settings.c:94 ui/windows.ui.xml:343
-#: ui/windows.ui.xml:968 ui/windows.ui.xml:1088 ui/linux.ui.xml:343
+#: ui/windows.ui.xml:968 ui/windows.ui.xml:1088 ui/macos.ui.xml:343
+#: ui/macos.ui.xml:968 ui/macos.ui.xml:1088 ui/linux.ui.xml:343
 #: ui/linux.ui.xml:968 ui/linux.ui.xml:1088
 msgid "Toolbar"
 msgstr "Barra de ferramentas"
@@ -1051,20 +1074,20 @@ msgstr "Est_ilo da barra de ferramentas"
 msgid "Top (system default)"
 msgstr "Em cima (padrão do sistema)"
 
-#: ui/windows.ui.xml:973 ui/linux.ui.xml:973
+#: ui/windows.ui.xml:973 ui/macos.ui.xml:973 ui/linux.ui.xml:973
 msgid "Top menu"
 msgstr "Menu principal"
 
-#: ui/windows.ui.xml:338 ui/linux.ui.xml:338
+#: ui/windows.ui.xml:338 ui/macos.ui.xml:338 ui/linux.ui.xml:338
 msgid "Trace"
 msgstr "Trace"
 
-#: ui/windows.ui.xml:465 ui/windows.ui.xml:1027 ui/linux.ui.xml:465
-#: ui/linux.ui.xml:1027
+#: ui/windows.ui.xml:465 ui/windows.ui.xml:1027 ui/macos.ui.xml:465
+#: ui/macos.ui.xml:1027 ui/linux.ui.xml:465 ui/linux.ui.xml:1027
 msgid "Track Cursor"
 msgstr "Mostrar posição do cursor"
 
-#: src/objects/application/application.c:164
+#: src/objects/application/application.c:149
 msgid "UI Type"
 msgstr "Interface de usuário"
 
@@ -1081,38 +1104,39 @@ msgstr ""
 msgid "Unable to load session preferences from '%s'"
 msgstr "Incapaz de ler preferências de sessa de '%s'"
 
-#: ui/windows.ui.xml:291 ui/windows.ui.xml:800 ui/linux.ui.xml:291
-#: ui/linux.ui.xml:800
+#: ui/windows.ui.xml:291 ui/windows.ui.xml:800 ui/macos.ui.xml:291
+#: ui/macos.ui.xml:800 ui/linux.ui.xml:291 ui/linux.ui.xml:800
 msgid "Unselect"
 msgstr "Remover seleção"
 
-#: src/objects/application/actions/about.c:90
+#: src/objects/application/actions/about.c:113
 #, c-format
 msgid "Unstable version %s-%s"
 msgstr "Versão instável %s-%s"
 
-#: ui/windows.ui.xml:530 ui/windows.ui.xml:907 ui/linux.ui.xml:530
-#: ui/linux.ui.xml:907
+#: ui/windows.ui.xml:530 ui/windows.ui.xml:907 ui/macos.ui.xml:530
+#: ui/macos.ui.xml:907 ui/linux.ui.xml:530 ui/linux.ui.xml:907
 msgid "Use +/- for field navigation"
 msgstr "Usar teclas +/- para navegar por campos"
 
-#: src/objects/application/actions/about.c:92
+#: src/objects/application/actions/about.c:115
 #, c-format
 msgid "Version %s-%s"
 msgstr "Versão %s-%s"
 
 #: src/objects/window/header.c:63 ui/windows.ui.xml:64 ui/windows.ui.xml:965
-#: ui/windows.ui.xml:1085 ui/linux.ui.xml:64 ui/linux.ui.xml:965
+#: ui/windows.ui.xml:1085 ui/macos.ui.xml:64 ui/macos.ui.xml:965
+#: ui/macos.ui.xml:1085 ui/linux.ui.xml:64 ui/linux.ui.xml:965
 #: ui/linux.ui.xml:1085
 msgid "View"
 msgstr "Exibir"
 
-#: src/objects/application/actions/about.c:183
+#: src/objects/application/actions/about.c:206
 msgid "View this project on github"
 msgstr "Portal do Software Público Brasileiro"
 
-#: ui/windows.ui.xml:106 ui/windows.ui.xml:568 ui/linux.ui.xml:106
-#: ui/linux.ui.xml:568
+#: ui/windows.ui.xml:106 ui/windows.ui.xml:568 ui/macos.ui.xml:106
+#: ui/macos.ui.xml:568 ui/linux.ui.xml:106 ui/linux.ui.xml:568
 msgid "Window with default session"
 msgstr "Janela com sessão padrão"
 
@@ -1125,7 +1149,7 @@ msgid "_Apply"
 msgstr "_Aplicar"
 
 #: src/objects/actions/save.c:102 src/objects/settings/dialog.c:78
-#: src/objects/os/linux/savedesktopicon.c:174
+#: src/objects/os/linux/savedesktopicon.c:140
 #: src/objects/os/windows/savedesktopicon.c:132
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -1134,35 +1158,36 @@ msgstr "_Cancelar"
 msgid "_Close session"
 msgstr "_Fechar sessão"
 
-#: ui/windows.ui.xml:369 ui/windows.ui.xml:1107 ui/linux.ui.xml:369
-#: ui/linux.ui.xml:1107
+#: ui/windows.ui.xml:369 ui/windows.ui.xml:1107 ui/macos.ui.xml:369
+#: ui/macos.ui.xml:1107 ui/linux.ui.xml:369 ui/linux.ui.xml:1107
 msgid "_Connect"
 msgstr "_Conectar"
 
-#: ui/windows.ui.xml:374 ui/linux.ui.xml:374
+#: ui/windows.ui.xml:374 ui/macos.ui.xml:374 ui/linux.ui.xml:374
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
 #: ui/windows.ui.xml:232 ui/windows.ui.xml:681 ui/windows.ui.xml:824
+#: ui/macos.ui.xml:232 ui/macos.ui.xml:681 ui/macos.ui.xml:824
 #: ui/linux.ui.xml:232 ui/linux.ui.xml:681 ui/linux.ui.xml:824
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ui/windows.ui.xml:99 ui/linux.ui.xml:99
+#: ui/windows.ui.xml:99 ui/macos.ui.xml:99 ui/linux.ui.xml:99
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ui/windows.ui.xml:361 ui/linux.ui.xml:361
+#: ui/windows.ui.xml:361 ui/macos.ui.xml:361 ui/linux.ui.xml:361
 msgid "_Network"
 msgstr "_Rede"
 
-#: ui/windows.ui.xml:103 ui/windows.ui.xml:565 ui/linux.ui.xml:103
-#: ui/linux.ui.xml:565
+#: ui/windows.ui.xml:103 ui/windows.ui.xml:565 ui/macos.ui.xml:103
+#: ui/macos.ui.xml:565 ui/linux.ui.xml:103 ui/linux.ui.xml:565
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/windows.ui.xml:119 ui/windows.ui.xml:581 ui/linux.ui.xml:119
-#: ui/linux.ui.xml:581
+#: ui/windows.ui.xml:119 ui/windows.ui.xml:581 ui/macos.ui.xml:119
+#: ui/macos.ui.xml:581 ui/linux.ui.xml:119 ui/linux.ui.xml:581
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -1174,20 +1199,20 @@ msgstr "_Preferências"
 msgid "_Rename session"
 msgstr "Renomear sessão"
 
-#: src/objects/actions/save.c:103 src/objects/os/linux/savedesktopicon.c:175
+#: src/objects/actions/save.c:103 src/objects/os/linux/savedesktopicon.c:141
 #: src/objects/os/windows/savedesktopicon.c:133
 msgid "_Save"
 msgstr "_Salvar"
 
-#: ui/windows.ui.xml:335 ui/linux.ui.xml:335
+#: ui/windows.ui.xml:335 ui/macos.ui.xml:335 ui/linux.ui.xml:335
 msgid "_View"
 msgstr "_Exibir"
 
-#: src/objects/application/actions/about.c:182
+#: src/objects/application/actions/about.c:205
 msgid "https://github.com/PerryWerneck/pw3270"
 msgstr "https://portal.softwarepublico.gov.br/social/pw3270/"
 
-#: src/objects/application/actions/about.c:185
+#: src/objects/application/actions/about.c:208
 msgid "translator-credits"
 msgstr "translator-credits"
 
diff --git a/locale/pw3270.pot b/locale/pw3270.pot
index eacc9aa..2afad50 100644
--- a/locale/pw3270.pot
+++ b/locale/pw3270.pot
@@ -6,373 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  view.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  save.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  abstract.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  application.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  window.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  preferences.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  open.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  about.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  window.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  terminal.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  page.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  keyfile.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  header-settings.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  header.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  sessionproperties.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  filetransfer.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  connect.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  close.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  toolbar.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  settings.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  models.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  gsettings.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  dialog.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  actionview.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  tools.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  builder.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  model.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  element.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  attribute.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:54-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  savedesktopicon.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:55-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  savedesktopicon.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:56-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  open.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:56-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  windows.ui.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:56-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  linux.ui.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-23 01:56-0300\n"
+"POT-Creation-Date: 2022-05-18 15:30-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -381,34 +17,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/objects/application/application.c:225
+#: src/objects/application/application.c:211
 #, c-format
 msgid "\"%s\" is not a valid user interface name"
 msgstr ""
 
-#: src/objects/application/actions/about.c:110
+#: src/objects/application/actions/about.c:133
 #, c-format
 msgid "%s for %s."
 msgstr ""
 
-#: src/objects/application/actions/about.c:117
+#: src/objects/application/actions/about.c:140
 msgid "32 bits Linux"
 msgstr ""
 
-#: src/objects/application/actions/about.c:115
+#: src/objects/application/actions/about.c:138
 msgid "32 bits Windows"
 msgstr ""
 
-#: src/objects/actions/save.c:166 src/objects/os/linux/savedesktopicon.c:267
+#: src/objects/actions/save.c:166 src/objects/os/linux/savedesktopicon.c:233
 #: src/objects/os/windows/savedesktopicon.c:222
 msgid "3270 session files"
 msgstr ""
 
-#: src/objects/application/actions/about.c:119
+#: src/objects/application/actions/about.c:142
 msgid "64 bits Linux"
 msgstr ""
 
-#: src/objects/application/actions/about.c:113
+#: src/objects/application/actions/about.c:136
 msgid "64 bits Windows"
 msgstr ""
 
@@ -417,8 +53,9 @@ msgid ""
 "<small><b>The toolbar position only takes effect after restart</b></small>"
 msgstr ""
 
-#: src/objects/application/actions/about.c:209 ui/windows.ui.xml:40
-#: ui/windows.ui.xml:553 ui/linux.ui.xml:40 ui/linux.ui.xml:553
+#: src/objects/application/actions/about.c:232 ui/windows.ui.xml:40
+#: ui/windows.ui.xml:553 ui/macos.ui.xml:40 ui/macos.ui.xml:553
+#: ui/linux.ui.xml:40 ui/linux.ui.xml:553
 msgid "About PW3270"
 msgstr ""
 
@@ -431,6 +68,7 @@ msgid "Action Names"
 msgstr ""
 
 #: ui/windows.ui.xml:525 ui/windows.ui.xml:917 ui/windows.ui.xml:1032
+#: ui/macos.ui.xml:525 ui/macos.ui.xml:917 ui/macos.ui.xml:1032
 #: ui/linux.ui.xml:525 ui/linux.ui.xml:917 ui/linux.ui.xml:1032
 msgid "Alert sound"
 msgstr ""
@@ -439,17 +77,17 @@ msgstr ""
 msgid "All files"
 msgstr ""
 
-#: ui/windows.ui.xml:252 ui/windows.ui.xml:691 ui/linux.ui.xml:252
-#: ui/linux.ui.xml:691
+#: ui/windows.ui.xml:252 ui/windows.ui.xml:691 ui/macos.ui.xml:252
+#: ui/macos.ui.xml:691 ui/linux.ui.xml:252 ui/linux.ui.xml:691
 msgid "Append to copy"
 msgstr ""
 
-#: src/objects/application/actions/about.c:152
+#: src/objects/application/actions/about.c:175
 msgid "Apple version"
 msgstr ""
 
-#: ui/windows.ui.xml:385 ui/windows.ui.xml:665 ui/linux.ui.xml:385
-#: ui/linux.ui.xml:665
+#: ui/windows.ui.xml:385 ui/windows.ui.xml:665 ui/macos.ui.xml:385
+#: ui/macos.ui.xml:665 ui/linux.ui.xml:385 ui/linux.ui.xml:665
 msgid "Application"
 msgstr ""
 
@@ -458,7 +96,7 @@ msgid "Application menu"
 msgstr ""
 
 #: src/objects/application/actions/preferences.c:76 ui/windows.ui.xml:84
-#: ui/linux.ui.xml:84
+#: ui/macos.ui.xml:84 ui/linux.ui.xml:84
 msgid "Application preferences"
 msgstr ""
 
@@ -466,7 +104,7 @@ msgstr ""
 msgid "Apply"
 msgstr ""
 
-#: ui/windows.ui.xml:500 ui/linux.ui.xml:500
+#: ui/windows.ui.xml:500 ui/macos.ui.xml:500 ui/linux.ui.xml:500
 msgid "Auto-Reconnect"
 msgstr ""
 
@@ -474,20 +112,20 @@ msgstr ""
 msgid "Available"
 msgstr ""
 
-#: src/objects/application/actions/about.c:155
+#: src/objects/application/actions/about.c:178
 msgid "Based on X3270 from"
 msgstr ""
 
-#: ui/windows.ui.xml:490 ui/windows.ui.xml:946 ui/linux.ui.xml:490
-#: ui/linux.ui.xml:946
+#: ui/windows.ui.xml:490 ui/windows.ui.xml:946 ui/macos.ui.xml:490
+#: ui/macos.ui.xml:946 ui/linux.ui.xml:490 ui/linux.ui.xml:946
 msgid "Blank Fill"
 msgstr ""
 
-#: ui/windows.ui.xml:455 ui/linux.ui.xml:455
+#: ui/windows.ui.xml:455 ui/macos.ui.xml:455 ui/linux.ui.xml:455
 msgid "Blinking Cursor"
 msgstr ""
 
-#: ui/windows.ui.xml:505 ui/linux.ui.xml:505
+#: ui/windows.ui.xml:505 ui/macos.ui.xml:505 ui/linux.ui.xml:505
 msgid "Bold"
 msgstr ""
 
@@ -534,17 +172,19 @@ msgid "Change the preferences for the active session"
 msgstr ""
 
 #: ui/windows.ui.xml:305 ui/windows.ui.xml:725 ui/windows.ui.xml:867
+#: ui/macos.ui.xml:305 ui/macos.ui.xml:725 ui/macos.ui.xml:867
 #: ui/linux.ui.xml:305 ui/linux.ui.xml:725 ui/linux.ui.xml:867
 msgid "Clear"
 msgstr ""
 
-#: ui/windows.ui.xml:400 ui/linux.ui.xml:400
+#: ui/windows.ui.xml:400 ui/macos.ui.xml:400 ui/linux.ui.xml:400
 msgid "Clipboard"
 msgstr ""
 
 #: ui/windows.ui.xml:150 ui/windows.ui.xml:187 ui/windows.ui.xml:617
-#: ui/windows.ui.xml:654 ui/linux.ui.xml:150 ui/linux.ui.xml:187
-#: ui/linux.ui.xml:617 ui/linux.ui.xml:654
+#: ui/windows.ui.xml:654 ui/macos.ui.xml:150 ui/macos.ui.xml:187
+#: ui/macos.ui.xml:617 ui/macos.ui.xml:654 ui/linux.ui.xml:150
+#: ui/linux.ui.xml:187 ui/linux.ui.xml:617 ui/linux.ui.xml:654
 msgid "Clipboard contents"
 msgstr ""
 
@@ -558,8 +198,9 @@ msgstr ""
 
 #: src/objects/window/actions/close.c:60 ui/windows.ui.xml:217
 #: ui/windows.ui.xml:813 ui/windows.ui.xml:1011 ui/windows.ui.xml:1118
-#: ui/linux.ui.xml:217 ui/linux.ui.xml:813 ui/linux.ui.xml:1011
-#: ui/linux.ui.xml:1118
+#: ui/macos.ui.xml:217 ui/macos.ui.xml:813 ui/macos.ui.xml:1011
+#: ui/macos.ui.xml:1118 ui/linux.ui.xml:217 ui/linux.ui.xml:813
+#: ui/linux.ui.xml:1011 ui/linux.ui.xml:1118
 msgid "Close window"
 msgstr ""
 
@@ -571,7 +212,7 @@ msgstr ""
 msgid "Connect"
 msgstr ""
 
-#: ui/windows.ui.xml:450 ui/linux.ui.xml:450
+#: ui/windows.ui.xml:450 ui/macos.ui.xml:450 ui/linux.ui.xml:450
 msgid "Connect on startup"
 msgstr ""
 
@@ -579,71 +220,73 @@ msgstr ""
 msgid "Connect to host"
 msgstr ""
 
-#: src/objects/window/window.c:802 src/objects/window/page.c:218
+#: src/objects/window/window.c:808 src/objects/window/page.c:218
 msgid "Connected to host"
 msgstr ""
 
-#: src/objects/application/actions/about.c:153
+#: src/objects/application/actions/about.c:176
 msgid "Contributors"
 msgstr ""
 
-#: ui/windows.ui.xml:237 ui/windows.ui.xml:686 ui/linux.ui.xml:237
-#: ui/linux.ui.xml:686
+#: ui/windows.ui.xml:237 ui/windows.ui.xml:686 ui/macos.ui.xml:237
+#: ui/macos.ui.xml:686 ui/linux.ui.xml:237 ui/linux.ui.xml:686
 msgid "Copy"
 msgstr ""
 
-#: ui/windows.ui.xml:706 ui/linux.ui.xml:706
+#: ui/windows.ui.xml:706 ui/macos.ui.xml:706 ui/linux.ui.xml:706
 msgid "Copy as HTML"
 msgstr ""
 
-#: ui/windows.ui.xml:711 ui/linux.ui.xml:711
+#: ui/windows.ui.xml:711 ui/macos.ui.xml:711 ui/linux.ui.xml:711
 msgid "Copy as image"
 msgstr ""
 
-#: ui/windows.ui.xml:247 ui/windows.ui.xml:701 ui/linux.ui.xml:247
-#: ui/linux.ui.xml:701
+#: ui/windows.ui.xml:247 ui/windows.ui.xml:701 ui/macos.ui.xml:247
+#: ui/macos.ui.xml:701 ui/linux.ui.xml:247 ui/linux.ui.xml:701
 msgid "Copy as table"
 msgstr ""
 
-#: ui/windows.ui.xml:242 ui/windows.ui.xml:696 ui/linux.ui.xml:242
-#: ui/linux.ui.xml:696
+#: ui/windows.ui.xml:242 ui/windows.ui.xml:696 ui/macos.ui.xml:242
+#: ui/macos.ui.xml:696 ui/linux.ui.xml:242 ui/linux.ui.xml:696
 msgid "Copy as text"
 msgstr ""
 
-#: src/objects/application/actions/about.c:159
+#: src/objects/application/actions/about.c:182
 msgid "Copyright © 2008 Banco do Brasil S.A."
 msgstr ""
 
 #: src/objects/os/linux/savedesktopicon.c:114
 #: src/objects/os/windows/savedesktopicon.c:107
+#: src/objects/os/macos/savedesktopicon.c:54
 msgid "Create shortcut for the current session"
 msgstr ""
 
-#: ui/windows.ui.xml:475 ui/windows.ui.xml:902 ui/linux.ui.xml:475
-#: ui/linux.ui.xml:902
+#: ui/windows.ui.xml:475 ui/windows.ui.xml:902 ui/macos.ui.xml:475
+#: ui/macos.ui.xml:902 ui/linux.ui.xml:475 ui/linux.ui.xml:902
 msgid "Cross hair cursor"
 msgstr ""
 
-#: ui/windows.ui.xml:177 ui/windows.ui.xml:644 ui/linux.ui.xml:177
-#: ui/linux.ui.xml:644
+#: ui/windows.ui.xml:177 ui/windows.ui.xml:644 ui/macos.ui.xml:177
+#: ui/macos.ui.xml:644 ui/linux.ui.xml:177 ui/linux.ui.xml:644
 msgid "Current Screen"
 msgstr ""
 
-#: ui/windows.ui.xml:140 ui/windows.ui.xml:607 ui/linux.ui.xml:140
-#: ui/linux.ui.xml:607
+#: ui/windows.ui.xml:140 ui/windows.ui.xml:607 ui/macos.ui.xml:140
+#: ui/macos.ui.xml:607 ui/linux.ui.xml:140 ui/linux.ui.xml:607
 msgid "Current screen"
 msgstr ""
 
-#: ui/windows.ui.xml:670 ui/linux.ui.xml:670
+#: ui/windows.ui.xml:670 ui/macos.ui.xml:670 ui/linux.ui.xml:670
 msgid "Current session"
 msgstr ""
 
-#: ui/windows.ui.xml:257 ui/windows.ui.xml:716 ui/linux.ui.xml:257
-#: ui/linux.ui.xml:716
+#: ui/windows.ui.xml:257 ui/windows.ui.xml:716 ui/macos.ui.xml:257
+#: ui/macos.ui.xml:716 ui/linux.ui.xml:257 ui/linux.ui.xml:716
 msgid "Cut"
 msgstr ""
 
 #: ui/windows.ui.xml:315 ui/windows.ui.xml:735 ui/windows.ui.xml:877
+#: ui/macos.ui.xml:315 ui/macos.ui.xml:735 ui/macos.ui.xml:877
 #: ui/linux.ui.xml:315 ui/linux.ui.xml:735 ui/linux.ui.xml:877
 msgid "Delete Field"
 msgstr ""
@@ -652,17 +295,18 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ui/windows.ui.xml:808 ui/windows.ui.xml:1006 ui/linux.ui.xml:808
-#: ui/linux.ui.xml:1006
+#: ui/windows.ui.xml:808 ui/windows.ui.xml:1006 ui/macos.ui.xml:808
+#: ui/macos.ui.xml:1006 ui/linux.ui.xml:808 ui/linux.ui.xml:1006
 msgid "Disconnect"
 msgstr ""
 
-#: src/objects/window/window.c:802 src/objects/window/window.c:829
+#: src/objects/window/window.c:808 src/objects/window/window.c:835
 #: src/objects/window/page.c:207
 msgid "Disconnected from host"
 msgstr ""
 
 #: ui/windows.ui.xml:540 ui/windows.ui.xml:929 ui/windows.ui.xml:1045
+#: ui/macos.ui.xml:540 ui/macos.ui.xml:929 ui/macos.ui.xml:1045
 #: ui/linux.ui.xml:540 ui/linux.ui.xml:929 ui/linux.ui.xml:1045
 msgid "Dynamic font spacing"
 msgstr ""
@@ -692,16 +336,19 @@ msgid "End"
 msgstr ""
 
 #: ui/windows.ui.xml:310 ui/windows.ui.xml:730 ui/windows.ui.xml:872
+#: ui/macos.ui.xml:310 ui/macos.ui.xml:730 ui/macos.ui.xml:872
 #: ui/linux.ui.xml:310 ui/linux.ui.xml:730 ui/linux.ui.xml:872
 msgid "Erase input"
 msgstr ""
 
 #: ui/windows.ui.xml:320 ui/windows.ui.xml:740 ui/windows.ui.xml:882
+#: ui/macos.ui.xml:320 ui/macos.ui.xml:740 ui/macos.ui.xml:882
 #: ui/linux.ui.xml:320 ui/linux.ui.xml:740 ui/linux.ui.xml:882
 msgid "Erase to end of field"
 msgstr ""
 
 #: ui/windows.ui.xml:325 ui/windows.ui.xml:745 ui/windows.ui.xml:887
+#: ui/macos.ui.xml:325 ui/macos.ui.xml:745 ui/macos.ui.xml:887
 #: ui/linux.ui.xml:325 ui/linux.ui.xml:745 ui/linux.ui.xml:887
 msgid "Erase to end of line"
 msgstr ""
@@ -710,7 +357,7 @@ msgstr ""
 msgid "Error starting session"
 msgstr ""
 
-#: ui/windows.ui.xml:353 ui/linux.ui.xml:353
+#: ui/windows.ui.xml:353 ui/macos.ui.xml:353 ui/linux.ui.xml:353
 msgid "Field attributes"
 msgstr ""
 
@@ -718,11 +365,12 @@ msgstr ""
 msgid "File for session preferences"
 msgstr ""
 
-#: ui/windows.ui.xml:470 ui/linux.ui.xml:470
+#: ui/windows.ui.xml:470 ui/macos.ui.xml:470 ui/linux.ui.xml:470
 msgid "Full Screen"
 msgstr ""
 
 #: ui/windows.ui.xml:779 ui/windows.ui.xml:955 ui/windows.ui.xml:1050
+#: ui/macos.ui.xml:779 ui/macos.ui.xml:955 ui/macos.ui.xml:1050
 #: ui/linux.ui.xml:779 ui/linux.ui.xml:955 ui/linux.ui.xml:1050
 msgid "Full screen"
 msgstr ""
@@ -731,16 +379,16 @@ msgstr ""
 msgid "Generic name"
 msgstr ""
 
-#: ui/windows.ui.xml:37 ui/windows.ui.xml:550 ui/linux.ui.xml:37
-#: ui/linux.ui.xml:550
+#: ui/windows.ui.xml:37 ui/windows.ui.xml:550 ui/macos.ui.xml:37
+#: ui/macos.ui.xml:550 ui/linux.ui.xml:37 ui/linux.ui.xml:550
 msgid "Help"
 msgstr ""
 
-#: ui/windows.ui.xml:390 ui/linux.ui.xml:390
+#: ui/windows.ui.xml:390 ui/macos.ui.xml:390 ui/linux.ui.xml:390
 msgid "Host and Emulation settings"
 msgstr ""
 
-#: src/objects/application/actions/about.c:111 src/objects/window/window.c:592
+#: src/objects/application/actions/about.c:134 src/objects/window/window.c:592
 #: src/objects/os/linux/savedesktopicon.c:102
 #: src/objects/os/windows/savedesktopicon.c:269
 msgid "IBM 3270 Terminal emulator"
@@ -782,7 +430,7 @@ msgstr ""
 msgid "If the action can be activated"
 msgstr ""
 
-#: ui/windows.ui.xml:1022 ui/linux.ui.xml:1022
+#: ui/windows.ui.xml:1022 ui/macos.ui.xml:1022 ui/linux.ui.xml:1022
 msgid "Insert"
 msgstr ""
 
@@ -802,11 +450,11 @@ msgstr ""
 msgid "Itens"
 msgstr ""
 
-#: ui/windows.ui.xml:515 ui/linux.ui.xml:515
+#: ui/windows.ui.xml:515 ui/macos.ui.xml:515 ui/linux.ui.xml:515
 msgid "Keep selected"
 msgstr ""
 
-#: ui/windows.ui.xml:395 ui/linux.ui.xml:395
+#: ui/windows.ui.xml:395 ui/macos.ui.xml:395 ui/linux.ui.xml:395
 msgid "Keyboard accelerators"
 msgstr ""
 
@@ -830,7 +478,7 @@ msgstr ""
 msgid "Keypads"
 msgstr ""
 
-#: src/objects/application/actions/about.c:163
+#: src/objects/application/actions/about.c:186
 msgid "LICENSE"
 msgstr ""
 
@@ -850,56 +498,56 @@ msgstr ""
 msgid "List of the available and unpacked actions"
 msgstr ""
 
-#: src/objects/application/application.c:179
+#: src/objects/application/application.c:164
 msgid "Log name"
 msgstr ""
 
-#: ui/windows.ui.xml:72 ui/linux.ui.xml:72
+#: ui/windows.ui.xml:72 ui/macos.ui.xml:72 ui/linux.ui.xml:72
 msgid "Main Menu"
 msgstr ""
 
-#: ui/windows.ui.xml:67 ui/linux.ui.xml:67
+#: ui/windows.ui.xml:67 ui/macos.ui.xml:67 ui/linux.ui.xml:67
 msgid "Main Toolbar"
 msgstr ""
 
-#: ui/windows.ui.xml:1093 ui/linux.ui.xml:1093
+#: ui/windows.ui.xml:1093 ui/macos.ui.xml:1093 ui/linux.ui.xml:1093
 msgid "Main menu"
 msgstr ""
 
-#: src/objects/application/actions/about.c:151
+#: src/objects/application/actions/about.c:174
 msgid "Maintainers"
 msgstr ""
 
-#: ui/windows.ui.xml:348 ui/linux.ui.xml:348
+#: ui/windows.ui.xml:348 ui/macos.ui.xml:348 ui/linux.ui.xml:348
 msgid "Menu"
 msgstr ""
 
-#: ui/windows.ui.xml:419 ui/windows.ui.xml:1059 ui/linux.ui.xml:419
-#: ui/linux.ui.xml:1059
+#: ui/windows.ui.xml:419 ui/windows.ui.xml:1059 ui/macos.ui.xml:419
+#: ui/macos.ui.xml:1059 ui/linux.ui.xml:419 ui/linux.ui.xml:1059
 msgid "Model 2 - 80x24"
 msgstr ""
 
-#: ui/windows.ui.xml:424 ui/windows.ui.xml:1064 ui/linux.ui.xml:424
-#: ui/linux.ui.xml:1064
+#: ui/windows.ui.xml:424 ui/windows.ui.xml:1064 ui/macos.ui.xml:424
+#: ui/macos.ui.xml:1064 ui/linux.ui.xml:424 ui/linux.ui.xml:1064
 msgid "Model 3 - 80x32"
 msgstr ""
 
-#: ui/windows.ui.xml:429 ui/windows.ui.xml:1069 ui/linux.ui.xml:429
-#: ui/linux.ui.xml:1069
+#: ui/windows.ui.xml:429 ui/windows.ui.xml:1069 ui/macos.ui.xml:429
+#: ui/macos.ui.xml:1069 ui/linux.ui.xml:429 ui/linux.ui.xml:1069
 msgid "Model 4 - 80x43"
 msgstr ""
 
-#: ui/windows.ui.xml:434 ui/windows.ui.xml:1074 ui/linux.ui.xml:434
-#: ui/linux.ui.xml:1074
+#: ui/windows.ui.xml:434 ui/windows.ui.xml:1074 ui/macos.ui.xml:434
+#: ui/macos.ui.xml:1074 ui/linux.ui.xml:434 ui/linux.ui.xml:1074
 msgid "Model 5 - 132x27"
 msgstr ""
 
-#: ui/windows.ui.xml:460 ui/windows.ui.xml:924 ui/linux.ui.xml:460
-#: ui/linux.ui.xml:924
+#: ui/windows.ui.xml:460 ui/windows.ui.xml:924 ui/macos.ui.xml:460
+#: ui/macos.ui.xml:924 ui/linux.ui.xml:460 ui/linux.ui.xml:924
 msgid "Monocase"
 msgstr ""
 
-#: ui/windows.ui.xml:535 ui/linux.ui.xml:535
+#: ui/windows.ui.xml:535 ui/macos.ui.xml:535 ui/linux.ui.xml:535
 msgid "Network keep alive"
 msgstr ""
 
@@ -927,11 +575,11 @@ msgstr ""
 msgid "Open Session"
 msgstr ""
 
-#: ui/windows.ui.xml:56 ui/linux.ui.xml:56
+#: ui/windows.ui.xml:56 ui/macos.ui.xml:56 ui/linux.ui.xml:56
 msgid "Open in New Tab"
 msgstr ""
 
-#: ui/windows.ui.xml:51 ui/linux.ui.xml:51
+#: ui/windows.ui.xml:51 ui/macos.ui.xml:51 ui/linux.ui.xml:51
 msgid "Open in New Window"
 msgstr ""
 
@@ -960,8 +608,9 @@ msgid "Open session on the active terminal"
 msgstr ""
 
 #: ui/windows.ui.xml:447 ui/windows.ui.xml:755 ui/windows.ui.xml:897
-#: ui/windows.ui.xml:1042 ui/linux.ui.xml:447 ui/linux.ui.xml:755
-#: ui/linux.ui.xml:897 ui/linux.ui.xml:1042
+#: ui/windows.ui.xml:1042 ui/macos.ui.xml:447 ui/macos.ui.xml:755
+#: ui/macos.ui.xml:897 ui/macos.ui.xml:1042 ui/linux.ui.xml:447
+#: ui/linux.ui.xml:755 ui/linux.ui.xml:897 ui/linux.ui.xml:1042
 msgid "Options"
 msgstr ""
 
@@ -969,23 +618,23 @@ msgstr ""
 msgid "Parameter Type"
 msgstr ""
 
-#: ui/windows.ui.xml:262 ui/windows.ui.xml:829 ui/linux.ui.xml:262
-#: ui/linux.ui.xml:829
+#: ui/windows.ui.xml:262 ui/windows.ui.xml:829 ui/macos.ui.xml:262
+#: ui/macos.ui.xml:829 ui/linux.ui.xml:262 ui/linux.ui.xml:829
 msgid "Paste from clipboard"
 msgstr ""
 
-#: ui/windows.ui.xml:272 ui/windows.ui.xml:839 ui/linux.ui.xml:272
-#: ui/linux.ui.xml:839
+#: ui/windows.ui.xml:272 ui/windows.ui.xml:839 ui/macos.ui.xml:272
+#: ui/macos.ui.xml:839 ui/linux.ui.xml:272 ui/linux.ui.xml:839
 msgid "Paste from text file"
 msgstr ""
 
-#: ui/windows.ui.xml:267 ui/windows.ui.xml:834 ui/linux.ui.xml:267
-#: ui/linux.ui.xml:834
+#: ui/windows.ui.xml:267 ui/windows.ui.xml:834 ui/macos.ui.xml:267
+#: ui/macos.ui.xml:834 ui/linux.ui.xml:267 ui/linux.ui.xml:834
 msgid "Paste next"
 msgstr ""
 
-#: ui/windows.ui.xml:485 ui/windows.ui.xml:941 ui/linux.ui.xml:485
-#: ui/linux.ui.xml:941
+#: ui/windows.ui.xml:485 ui/windows.ui.xml:941 ui/macos.ui.xml:485
+#: ui/macos.ui.xml:941 ui/linux.ui.xml:485 ui/linux.ui.xml:941
 msgid "Paste with left margin"
 msgstr ""
 
@@ -998,20 +647,20 @@ msgstr ""
 msgid "Position"
 msgstr ""
 
-#: ui/windows.ui.xml:662 ui/linux.ui.xml:662
+#: ui/windows.ui.xml:662 ui/macos.ui.xml:662 ui/linux.ui.xml:662
 msgid "Preferences"
 msgstr ""
 
-#: ui/windows.ui.xml:174 ui/windows.ui.xml:641 ui/linux.ui.xml:174
-#: ui/linux.ui.xml:641
+#: ui/windows.ui.xml:174 ui/windows.ui.xml:641 ui/macos.ui.xml:174
+#: ui/macos.ui.xml:641 ui/linux.ui.xml:174 ui/linux.ui.xml:641
 msgid "Print"
 msgstr ""
 
-#: ui/windows.ui.xml:992 ui/linux.ui.xml:992
+#: ui/windows.ui.xml:992 ui/macos.ui.xml:992 ui/linux.ui.xml:992
 msgid "Print screen"
 msgstr ""
 
-#: ui/windows.ui.xml:795 ui/linux.ui.xml:795
+#: ui/windows.ui.xml:795 ui/macos.ui.xml:795 ui/linux.ui.xml:795
 msgid "Print selected"
 msgstr ""
 
@@ -1021,7 +670,7 @@ msgid "Property \"%s\" is invalid for this object"
 msgstr ""
 
 #: src/objects/application/actions/window.c:64 ui/windows.ui.xml:89
-#: ui/linux.ui.xml:89
+#: ui/macos.ui.xml:89 ui/linux.ui.xml:89
 msgid "Quit"
 msgstr ""
 
@@ -1029,13 +678,13 @@ msgstr ""
 msgid "Rename Session"
 msgstr ""
 
-#: ui/windows.ui.xml:296 ui/windows.ui.xml:858 ui/linux.ui.xml:296
-#: ui/linux.ui.xml:858
+#: ui/windows.ui.xml:296 ui/windows.ui.xml:858 ui/macos.ui.xml:296
+#: ui/macos.ui.xml:858 ui/linux.ui.xml:296 ui/linux.ui.xml:858
 msgid "Reselect"
 msgstr ""
 
-#: ui/windows.ui.xml:480 ui/windows.ui.xml:912 ui/linux.ui.xml:480
-#: ui/linux.ui.xml:912
+#: ui/windows.ui.xml:480 ui/windows.ui.xml:912 ui/macos.ui.xml:480
+#: ui/macos.ui.xml:912 ui/linux.ui.xml:480 ui/linux.ui.xml:912
 msgid "Resize on alternate screen"
 msgstr ""
 
@@ -1043,8 +692,8 @@ msgstr ""
 msgid "Right"
 msgstr ""
 
-#: ui/windows.ui.xml:135 ui/windows.ui.xml:602 ui/linux.ui.xml:135
-#: ui/linux.ui.xml:602
+#: ui/windows.ui.xml:135 ui/windows.ui.xml:602 ui/macos.ui.xml:135
+#: ui/macos.ui.xml:602 ui/linux.ui.xml:135 ui/linux.ui.xml:602
 msgid "Save"
 msgstr ""
 
@@ -1052,11 +701,11 @@ msgstr ""
 msgid "Save current session preferences to file"
 msgstr ""
 
-#: ui/windows.ui.xml:987 ui/linux.ui.xml:987
+#: ui/windows.ui.xml:987 ui/macos.ui.xml:987 ui/linux.ui.xml:987
 msgid "Save screen"
 msgstr ""
 
-#: ui/windows.ui.xml:790 ui/linux.ui.xml:790
+#: ui/windows.ui.xml:790 ui/macos.ui.xml:790 ui/linux.ui.xml:790
 msgid "Save selected"
 msgstr ""
 
@@ -1066,14 +715,15 @@ msgstr ""
 
 #: src/objects/os/linux/savedesktopicon.c:113
 #: src/objects/os/windows/savedesktopicon.c:106
+#: src/objects/os/macos/savedesktopicon.c:53
 msgid "Save session shortcut"
 msgstr ""
 
-#: src/objects/os/linux/savedesktopicon.c:264
+#: src/objects/os/linux/savedesktopicon.c:230
 msgid "Save to session filename"
 msgstr ""
 
-#: src/objects/os/linux/savedesktopicon.c:236
+#: src/objects/os/linux/savedesktopicon.c:202
 msgid "Save to shortcut file"
 msgstr ""
 
@@ -1081,23 +731,23 @@ msgstr ""
 msgid "Save to windows shortcut"
 msgstr ""
 
-#: ui/windows.ui.xml:416 ui/windows.ui.xml:1056 ui/linux.ui.xml:416
-#: ui/linux.ui.xml:1056
+#: ui/windows.ui.xml:416 ui/windows.ui.xml:1056 ui/macos.ui.xml:416
+#: ui/macos.ui.xml:1056 ui/linux.ui.xml:416 ui/linux.ui.xml:1056
 msgid "Screen size"
 msgstr ""
 
-#: ui/windows.ui.xml:286 ui/windows.ui.xml:853 ui/linux.ui.xml:286
-#: ui/linux.ui.xml:853
+#: ui/windows.ui.xml:286 ui/windows.ui.xml:853 ui/macos.ui.xml:286
+#: ui/macos.ui.xml:853 ui/linux.ui.xml:286 ui/linux.ui.xml:853
 msgid "Select Field"
 msgstr ""
 
-#: ui/windows.ui.xml:281 ui/windows.ui.xml:848 ui/linux.ui.xml:281
-#: ui/linux.ui.xml:848
+#: ui/windows.ui.xml:281 ui/windows.ui.xml:848 ui/macos.ui.xml:281
+#: ui/macos.ui.xml:848 ui/linux.ui.xml:281 ui/linux.ui.xml:848
 msgid "Select all"
 msgstr ""
 
-#: ui/windows.ui.xml:495 ui/windows.ui.xml:760 ui/linux.ui.xml:495
-#: ui/linux.ui.xml:760
+#: ui/windows.ui.xml:495 ui/windows.ui.xml:760 ui/macos.ui.xml:495
+#: ui/macos.ui.xml:760 ui/linux.ui.xml:495 ui/linux.ui.xml:760
 msgid "Select by rectangles"
 msgstr ""
 
@@ -1110,8 +760,9 @@ msgid "Selected"
 msgstr ""
 
 #: ui/windows.ui.xml:145 ui/windows.ui.xml:182 ui/windows.ui.xml:612
-#: ui/windows.ui.xml:649 ui/linux.ui.xml:145 ui/linux.ui.xml:182
-#: ui/linux.ui.xml:612 ui/linux.ui.xml:649
+#: ui/windows.ui.xml:649 ui/macos.ui.xml:145 ui/macos.ui.xml:182
+#: ui/macos.ui.xml:612 ui/macos.ui.xml:649 ui/linux.ui.xml:145
+#: ui/linux.ui.xml:182 ui/linux.ui.xml:612 ui/linux.ui.xml:649
 msgid "Selected area"
 msgstr ""
 
@@ -1120,7 +771,8 @@ msgid "Send/Receive"
 msgstr ""
 
 #: src/objects/window/actions/filetransfer.c:46 ui/windows.ui.xml:196
-#: ui/windows.ui.xml:997 ui/linux.ui.xml:196 ui/linux.ui.xml:997
+#: ui/windows.ui.xml:997 ui/macos.ui.xml:196 ui/macos.ui.xml:997
+#: ui/linux.ui.xml:196 ui/linux.ui.xml:997
 msgid "Send/Receive files"
 msgstr ""
 
@@ -1128,12 +780,13 @@ msgstr ""
 msgid "Separator"
 msgstr ""
 
-#: ui/windows.ui.xml:48 ui/windows.ui.xml:584 ui/linux.ui.xml:48
-#: ui/linux.ui.xml:584
+#: ui/windows.ui.xml:48 ui/windows.ui.xml:584 ui/macos.ui.xml:48
+#: ui/macos.ui.xml:584 ui/linux.ui.xml:48 ui/linux.ui.xml:584
 msgid "Session"
 msgstr ""
 
 #: ui/windows.ui.xml:77 ui/windows.ui.xml:978 ui/windows.ui.xml:1098
+#: ui/macos.ui.xml:77 ui/macos.ui.xml:978 ui/macos.ui.xml:1098
 #: ui/linux.ui.xml:77 ui/linux.ui.xml:978 ui/linux.ui.xml:1098
 msgid "Session Trace"
 msgstr ""
@@ -1143,13 +796,13 @@ msgstr ""
 msgid "Session file"
 msgstr ""
 
-#: ui/windows.ui.xml:127 ui/windows.ui.xml:594 ui/linux.ui.xml:127
-#: ui/linux.ui.xml:594
+#: ui/windows.ui.xml:127 ui/windows.ui.xml:594 ui/macos.ui.xml:127
+#: ui/macos.ui.xml:594 ui/linux.ui.xml:127 ui/linux.ui.xml:594
 msgid "Session in New Tab"
 msgstr ""
 
-#: ui/windows.ui.xml:122 ui/windows.ui.xml:589 ui/linux.ui.xml:122
-#: ui/linux.ui.xml:589
+#: ui/windows.ui.xml:122 ui/windows.ui.xml:589 ui/macos.ui.xml:122
+#: ui/macos.ui.xml:589 ui/linux.ui.xml:122 ui/linux.ui.xml:589
 msgid "Session in new window"
 msgstr ""
 
@@ -1159,20 +812,21 @@ msgid "Session name"
 msgstr ""
 
 #: src/objects/window/actions/sessionproperties.c:36 ui/windows.ui.xml:164
-#: ui/windows.ui.xml:631 ui/windows.ui.xml:1112 ui/linux.ui.xml:164
+#: ui/windows.ui.xml:631 ui/windows.ui.xml:1112 ui/macos.ui.xml:164
+#: ui/macos.ui.xml:631 ui/macos.ui.xml:1112 ui/linux.ui.xml:164
 #: ui/linux.ui.xml:631 ui/linux.ui.xml:1112
 msgid "Session preferences"
 msgstr ""
 
-#: src/objects/application/application.c:258
+#: src/objects/application/application.c:246
 msgid "Set default log file name"
 msgstr ""
 
-#: src/objects/application/application.c:249
+#: src/objects/application/application.c:236
 msgid "Set the user-interface type"
 msgstr ""
 
-#: ui/windows.ui.xml:382 ui/linux.ui.xml:382
+#: ui/windows.ui.xml:382 ui/macos.ui.xml:382 ui/linux.ui.xml:382
 msgid "Settings"
 msgstr ""
 
@@ -1193,8 +847,8 @@ msgstr ""
 msgid "Shortcut file"
 msgstr ""
 
-#: ui/windows.ui.xml:159 ui/windows.ui.xml:626 ui/linux.ui.xml:159
-#: ui/linux.ui.xml:626
+#: ui/windows.ui.xml:159 ui/windows.ui.xml:626 ui/macos.ui.xml:159
+#: ui/macos.ui.xml:626 ui/linux.ui.xml:159 ui/linux.ui.xml:626
 msgid "Shortcut for this session"
 msgstr ""
 
@@ -1202,15 +856,15 @@ msgstr ""
 msgid "Shortcut name"
 msgstr ""
 
-#: ui/windows.ui.xml:510 ui/linux.ui.xml:510
+#: ui/windows.ui.xml:510 ui/macos.ui.xml:510 ui/linux.ui.xml:510
 msgid "Show Underline"
 msgstr ""
 
-#: ui/windows.ui.xml:774 ui/linux.ui.xml:774
+#: ui/windows.ui.xml:774 ui/macos.ui.xml:774 ui/linux.ui.xml:774
 msgid "Show menu"
 msgstr ""
 
-#: ui/windows.ui.xml:769 ui/linux.ui.xml:769
+#: ui/windows.ui.xml:769 ui/macos.ui.xml:769 ui/linux.ui.xml:769
 msgid "Show toolbar"
 msgstr ""
 
@@ -1218,12 +872,12 @@ msgstr ""
 msgid "Small"
 msgstr ""
 
-#: ui/windows.ui.xml:520 ui/windows.ui.xml:936 ui/linux.ui.xml:520
-#: ui/linux.ui.xml:936
+#: ui/windows.ui.xml:520 ui/windows.ui.xml:936 ui/macos.ui.xml:520
+#: ui/macos.ui.xml:936 ui/linux.ui.xml:520 ui/linux.ui.xml:936
 msgid "Smart paste"
 msgstr ""
 
-#: src/objects/os/linux/savedesktopicon.c:239
+#: src/objects/os/linux/savedesktopicon.c:205
 msgid "Standard desktop files"
 msgstr ""
 
@@ -1264,16 +918,16 @@ msgstr ""
 msgid "TN3270 Session description"
 msgstr ""
 
-#: ui/windows.ui.xml:111 ui/windows.ui.xml:573 ui/linux.ui.xml:111
-#: ui/linux.ui.xml:573
+#: ui/windows.ui.xml:111 ui/windows.ui.xml:573 ui/macos.ui.xml:111
+#: ui/macos.ui.xml:573 ui/linux.ui.xml:111 ui/linux.ui.xml:573
 msgid "Tab with default session"
 msgstr ""
 
-#: ui/windows.ui.xml:405 ui/linux.ui.xml:405
+#: ui/windows.ui.xml:405 ui/macos.ui.xml:405 ui/linux.ui.xml:405
 msgid "Terminal colors"
 msgstr ""
 
-#: ui/windows.ui.xml:442 ui/linux.ui.xml:442
+#: ui/windows.ui.xml:442 ui/macos.ui.xml:442 ui/linux.ui.xml:442
 msgid "Terminal font"
 msgstr ""
 
@@ -1293,7 +947,7 @@ msgstr ""
 msgid "The action tooltip"
 msgstr ""
 
-#: src/objects/application/application.c:165
+#: src/objects/application/application.c:150
 msgid "The code of the User interface type"
 msgstr ""
 
@@ -1306,7 +960,7 @@ msgstr ""
 msgid "The file with the session preferences for this shortcut"
 msgstr ""
 
-#: src/objects/application/application.c:180
+#: src/objects/application/application.c:165
 msgid "The full path of the default log file"
 msgstr ""
 
@@ -1379,6 +1033,10 @@ msgstr ""
 msgid "The type of the state kept by the action"
 msgstr ""
 
+#: src/objects/os/macos/savedesktopicon.c:68
+msgid "This action is not available in this platform"
+msgstr ""
+
 #: src/objects/window/header-settings.c:84
 msgid "Title bar"
 msgstr ""
@@ -1388,7 +1046,8 @@ msgid "Title bar actions"
 msgstr ""
 
 #: src/objects/toolbar/settings.c:94 ui/windows.ui.xml:343
-#: ui/windows.ui.xml:968 ui/windows.ui.xml:1088 ui/linux.ui.xml:343
+#: ui/windows.ui.xml:968 ui/windows.ui.xml:1088 ui/macos.ui.xml:343
+#: ui/macos.ui.xml:968 ui/macos.ui.xml:1088 ui/linux.ui.xml:343
 #: ui/linux.ui.xml:968 ui/linux.ui.xml:1088
 msgid "Toolbar"
 msgstr ""
@@ -1409,20 +1068,20 @@ msgstr ""
 msgid "Top (system default)"
 msgstr ""
 
-#: ui/windows.ui.xml:973 ui/linux.ui.xml:973
+#: ui/windows.ui.xml:973 ui/macos.ui.xml:973 ui/linux.ui.xml:973
 msgid "Top menu"
 msgstr ""
 
-#: ui/windows.ui.xml:338 ui/linux.ui.xml:338
+#: ui/windows.ui.xml:338 ui/macos.ui.xml:338 ui/linux.ui.xml:338
 msgid "Trace"
 msgstr ""
 
-#: ui/windows.ui.xml:465 ui/windows.ui.xml:1027 ui/linux.ui.xml:465
-#: ui/linux.ui.xml:1027
+#: ui/windows.ui.xml:465 ui/windows.ui.xml:1027 ui/macos.ui.xml:465
+#: ui/macos.ui.xml:1027 ui/linux.ui.xml:465 ui/linux.ui.xml:1027
 msgid "Track Cursor"
 msgstr ""
 
-#: src/objects/application/application.c:164
+#: src/objects/application/application.c:149
 msgid "UI Type"
 msgstr ""
 
@@ -1437,38 +1096,39 @@ msgstr ""
 msgid "Unable to load session preferences from '%s'"
 msgstr ""
 
-#: ui/windows.ui.xml:291 ui/windows.ui.xml:800 ui/linux.ui.xml:291
-#: ui/linux.ui.xml:800
+#: ui/windows.ui.xml:291 ui/windows.ui.xml:800 ui/macos.ui.xml:291
+#: ui/macos.ui.xml:800 ui/linux.ui.xml:291 ui/linux.ui.xml:800
 msgid "Unselect"
 msgstr ""
 
-#: src/objects/application/actions/about.c:90
+#: src/objects/application/actions/about.c:113
 #, c-format
 msgid "Unstable version %s-%s"
 msgstr ""
 
-#: ui/windows.ui.xml:530 ui/windows.ui.xml:907 ui/linux.ui.xml:530
-#: ui/linux.ui.xml:907
+#: ui/windows.ui.xml:530 ui/windows.ui.xml:907 ui/macos.ui.xml:530
+#: ui/macos.ui.xml:907 ui/linux.ui.xml:530 ui/linux.ui.xml:907
 msgid "Use +/- for field navigation"
 msgstr ""
 
-#: src/objects/application/actions/about.c:92
+#: src/objects/application/actions/about.c:115
 #, c-format
 msgid "Version %s-%s"
 msgstr ""
 
 #: src/objects/window/header.c:63 ui/windows.ui.xml:64 ui/windows.ui.xml:965
-#: ui/windows.ui.xml:1085 ui/linux.ui.xml:64 ui/linux.ui.xml:965
+#: ui/windows.ui.xml:1085 ui/macos.ui.xml:64 ui/macos.ui.xml:965
+#: ui/macos.ui.xml:1085 ui/linux.ui.xml:64 ui/linux.ui.xml:965
 #: ui/linux.ui.xml:1085
 msgid "View"
 msgstr ""
 
-#: src/objects/application/actions/about.c:183
+#: src/objects/application/actions/about.c:206
 msgid "View this project on github"
 msgstr ""
 
-#: ui/windows.ui.xml:106 ui/windows.ui.xml:568 ui/linux.ui.xml:106
-#: ui/linux.ui.xml:568
+#: ui/windows.ui.xml:106 ui/windows.ui.xml:568 ui/macos.ui.xml:106
+#: ui/macos.ui.xml:568 ui/linux.ui.xml:106 ui/linux.ui.xml:568
 msgid "Window with default session"
 msgstr ""
 
@@ -1481,7 +1141,7 @@ msgid "_Apply"
 msgstr ""
 
 #: src/objects/actions/save.c:102 src/objects/settings/dialog.c:78
-#: src/objects/os/linux/savedesktopicon.c:174
+#: src/objects/os/linux/savedesktopicon.c:140
 #: src/objects/os/windows/savedesktopicon.c:132
 msgid "_Cancel"
 msgstr ""
@@ -1490,35 +1150,36 @@ msgstr ""
 msgid "_Close session"
 msgstr ""
 
-#: ui/windows.ui.xml:369 ui/windows.ui.xml:1107 ui/linux.ui.xml:369
-#: ui/linux.ui.xml:1107
+#: ui/windows.ui.xml:369 ui/windows.ui.xml:1107 ui/macos.ui.xml:369
+#: ui/macos.ui.xml:1107 ui/linux.ui.xml:369 ui/linux.ui.xml:1107
 msgid "_Connect"
 msgstr ""
 
-#: ui/windows.ui.xml:374 ui/linux.ui.xml:374
+#: ui/windows.ui.xml:374 ui/macos.ui.xml:374 ui/linux.ui.xml:374
 msgid "_Disconnect"
 msgstr ""
 
 #: ui/windows.ui.xml:232 ui/windows.ui.xml:681 ui/windows.ui.xml:824
+#: ui/macos.ui.xml:232 ui/macos.ui.xml:681 ui/macos.ui.xml:824
 #: ui/linux.ui.xml:232 ui/linux.ui.xml:681 ui/linux.ui.xml:824
 msgid "_Edit"
 msgstr ""
 
-#: ui/windows.ui.xml:99 ui/linux.ui.xml:99
+#: ui/windows.ui.xml:99 ui/macos.ui.xml:99 ui/linux.ui.xml:99
 msgid "_File"
 msgstr ""
 
-#: ui/windows.ui.xml:361 ui/linux.ui.xml:361
+#: ui/windows.ui.xml:361 ui/macos.ui.xml:361 ui/linux.ui.xml:361
 msgid "_Network"
 msgstr ""
 
-#: ui/windows.ui.xml:103 ui/windows.ui.xml:565 ui/linux.ui.xml:103
-#: ui/linux.ui.xml:565
+#: ui/windows.ui.xml:103 ui/windows.ui.xml:565 ui/macos.ui.xml:103
+#: ui/macos.ui.xml:565 ui/linux.ui.xml:103 ui/linux.ui.xml:565
 msgid "_New"
 msgstr ""
 
-#: ui/windows.ui.xml:119 ui/windows.ui.xml:581 ui/linux.ui.xml:119
-#: ui/linux.ui.xml:581
+#: ui/windows.ui.xml:119 ui/windows.ui.xml:581 ui/macos.ui.xml:119
+#: ui/macos.ui.xml:581 ui/linux.ui.xml:119 ui/linux.ui.xml:581
 msgid "_Open"
 msgstr ""
 
@@ -1530,19 +1191,19 @@ msgstr ""
 msgid "_Rename session"
 msgstr ""
 
-#: src/objects/actions/save.c:103 src/objects/os/linux/savedesktopicon.c:175
+#: src/objects/actions/save.c:103 src/objects/os/linux/savedesktopicon.c:141
 #: src/objects/os/windows/savedesktopicon.c:133
 msgid "_Save"
 msgstr ""
 
-#: ui/windows.ui.xml:335 ui/linux.ui.xml:335
+#: ui/windows.ui.xml:335 ui/macos.ui.xml:335 ui/linux.ui.xml:335
 msgid "_View"
 msgstr ""
 
-#: src/objects/application/actions/about.c:182
+#: src/objects/application/actions/about.c:205
 msgid "https://github.com/PerryWerneck/pw3270"
 msgstr ""
 
-#: src/objects/application/actions/about.c:185
+#: src/objects/application/actions/about.c:208
 msgid "translator-credits"
 msgstr ""
diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in
index e5b6611..d820dc0 100644
--- a/win/pw3270.nsi.in
+++ b/win/pw3270.nsi.in
@@ -110,6 +110,7 @@ SubSection "@PRODUCT_NAME@" SecMain
 
 		file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.svg"					"share\@PRODUCT_NAME@\@PRODUCT_NAME@-logo.svg"
 		file "/oname=$INSTDIR\@PRODUCT_NAME@.svg"						"share\@PRODUCT_NAME@\@PRODUCT_NAME@.svg"
+		file "/oname=$INSTDIR\@PRODUCT_NAME@.png"						"share\@PRODUCT_NAME@\@PRODUCT_NAME@.png"
 
 		# Schema
 		CreateDirectory "$INSTDIR\schemas"
@@ -177,7 +178,7 @@ SubSection "@PRODUCT_NAME@" SecMain
 		WriteRegStr 	HKLM	"Software\@PRODUCT_NAME@"				"InstallLocation"	"$INSTDIR"
 
 		# Customized options
-		WriteRegDWORD	HKLM	"Software\@PRODUCT_NAME@\toggles"		"autoconnect"		0x00000001
+		WriteRegDWORD	HKLM	"Software\@PRODUCT_NAME@\toggles"		"autoconnect"			0x00000001
 		WriteRegDWORD	HKLM	"Software\@PRODUCT_NAME@\toggles"		"blankfill"             0x00000000
 		WriteRegDWORD	HKLM	"Software\@PRODUCT_NAME@\toggles"		"bold"                  0x00000000
 		WriteRegDWORD	HKLM	"Software\@PRODUCT_NAME@\toggles"		"keepselected"          0x00000001
--
libgit2 0.21.2