Searching for locale on standard path.

Perry Werneck
1 parent a6bb7b1f
Showing 4 changed files with 64 additions and 74 deletions Show diff stats
locale/pt_BR.po
locale/pw3270.pot
src/include/config.h.in
src/main/main.c
@@ -5,7 +5,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-31 11:13-0300\n"
+"POT-Creation-Date: 2023-03-22 07:20-0300\n"
 "PO-Revision-Date: 2023-01-31 11:14-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <perry.werneck@gmail.com>\n"
@@ -38,7 +38,7 @@ msgid &quot;32 bits Windows&quot;
 msgstr "Windows 32 bits"
 #: src/objects/actions/save.c:167 src/objects/os/linux/savedesktopicon.c:233
-#: src/objects/os/windows/savedesktopicon.c:224
+#: src/objects/os/windows/savedesktopicon.c:214
 msgid "3270 session files"
 msgstr "Arquivos de sessão TN3270"
@@ -146,10 +146,6 @@ msgstr &quot;Não foi possível carregar arquivo de sessão&quot;
 msgid "Can't load session preferences"
 msgstr "Não foi possível carregar preferências da sessão"
-#: src/objects/settings/gsettings.c:128
-msgid "Can't load system settings"
-msgstr "Não foi possível carregar configurações de sistema"
-
 #: src/objects/application/actions/open.c:99 src/objects/window/terminal.c:192
 #, c-format
 msgid "Can't use \"%s\""
@@ -260,7 +256,7 @@ msgid &quot;Copyright © 2008 Banco do Brasil S.A.&quot;
 msgstr "Copyright © 2008 Banco do Brasil S.A."
 #: src/objects/os/linux/savedesktopicon.c:114
-#: src/objects/os/windows/savedesktopicon.c:109
+#: src/objects/os/windows/savedesktopicon.c:99
 #: src/objects/os/macos/savedesktopicon.c:54
 msgid "Create shortcut for the current session"
 msgstr "Criar atalho para a sessão atual."
@@ -295,7 +291,7 @@ msgstr &quot;Recortar&quot;
 msgid "Delete Field"
 msgstr "Apagar campo"
-#: src/objects/os/windows/savedesktopicon.c:82
+#: src/objects/os/windows/savedesktopicon.c:72
 msgid "Description"
 msgstr "Descrição"
@@ -365,7 +361,7 @@ msgstr &quot;Erro iniciando sessão&quot;
 msgid "Field attributes"
 msgstr "Atributos de campo"
-#: src/objects/os/windows/savedesktopicon.c:221
+#: src/objects/os/windows/savedesktopicon.c:211
 msgid "File for session preferences"
 msgstr "Arquivo para preferências da sessão"
@@ -394,7 +390,7 @@ msgstr &quot;Configuração de servidor e emulação&quot;
 #: src/objects/application/actions/about.c:119 src/objects/window/window.c:564
 #: src/objects/os/linux/savedesktopicon.c:102
-#: src/objects/os/windows/savedesktopicon.c:271
+#: src/objects/os/windows/savedesktopicon.c:261
 msgid "IBM 3270 Terminal emulator"
 msgstr "Emulador de terminal IBM 3270"
@@ -643,7 +639,7 @@ msgid &quot;Paste with left margin&quot;
 msgstr "Colar com margem esquerda"
 #: src/objects/os/linux/savedesktopicon.c:71
-#: src/objects/os/windows/savedesktopicon.c:76
+#: src/objects/os/windows/savedesktopicon.c:66
 msgid "Path for the new shortcut"
 msgstr "Caminho para o novo atalho"
@@ -718,7 +714,7 @@ msgid &quot;Save session preferences&quot;
 msgstr "Salvar preferências da sessão"
 #: src/objects/os/linux/savedesktopicon.c:113
-#: src/objects/os/windows/savedesktopicon.c:108
+#: src/objects/os/windows/savedesktopicon.c:98
 #: src/objects/os/macos/savedesktopicon.c:53
 msgid "Save session shortcut"
 msgstr "Salvar atalho para a sessão"
@@ -731,7 +727,7 @@ msgstr &quot;Salvar para arquivo de sessão&quot;
 msgid "Save to shortcut file"
 msgstr "Salvar para arquivo de atalho"
-#: src/objects/os/windows/savedesktopicon.c:186
+#: src/objects/os/windows/savedesktopicon.c:176
 msgid "Save to windows shortcut"
 msgstr "Salvar para atalho windows"
@@ -796,7 +792,7 @@ msgid &quot;Session Trace&quot;
 msgstr "Trace da sessão"
 #: src/objects/actions/save.c:63 src/objects/os/linux/savedesktopicon.c:85
-#: src/objects/os/windows/savedesktopicon.c:96
+#: src/objects/os/windows/savedesktopicon.c:86
 msgid "Session file"
 msgstr "Arquivo de sessão"
@@ -811,7 +807,7 @@ msgid &quot;Session in new window&quot;
 msgstr "Sessão em nova janela"
 #: src/objects/actions/save.c:56 src/objects/os/linux/savedesktopicon.c:77
-#: src/objects/os/windows/savedesktopicon.c:88
+#: src/objects/os/windows/savedesktopicon.c:78
 msgid "Session name"
 msgstr "Nome da sessão"
@@ -847,7 +843,7 @@ msgid &quot;Setup toolbar&quot;
 msgstr "Configurar barra de ferramentas"
 #: src/objects/os/linux/savedesktopicon.c:70
-#: src/objects/os/windows/savedesktopicon.c:75
+#: src/objects/os/windows/savedesktopicon.c:65
 msgid "Shortcut file"
 msgstr "Arquivo de atalho"
@@ -910,10 +906,6 @@ msgstr &quot;Simbólico&quot;
 msgid "System default"
 msgstr "Padrão do sistema"
-#: src/objects/settings/gsettings.c:133
-msgid "System settings error"
-msgstr "Erro nas configurações de sistema"
-
 #: src/main/tools.c:75
 msgid "TN3270 Session Files"
 msgstr "Arquivos de sessão TN3270"
@@ -960,7 +952,7 @@ msgid &quot;The file to save the current session preferences&quot;
 msgstr "O arquivo com as preferências da sessão atual"
 #: src/objects/os/linux/savedesktopicon.c:86
-#: src/objects/os/windows/savedesktopicon.c:97
+#: src/objects/os/windows/savedesktopicon.c:87
 msgid "The file with the session preferences for this shortcut"
 msgstr "O arquivo com as preferências da sessão para esse atalho"
@@ -1005,7 +997,7 @@ msgid &quot;The position of the keypad&quot;
 msgstr "A posição do painel"
 #: src/objects/actions/save.c:57 src/objects/os/linux/savedesktopicon.c:79
-#: src/objects/os/windows/savedesktopicon.c:90
+#: src/objects/os/windows/savedesktopicon.c:80
 msgid "The session name used in the window/tab title (empty for default)"
 msgstr ""
 "O nome da sessão usada no título da janela/aba. Vazio para usar o valor "
@@ -1091,14 +1083,6 @@ msgstr &quot;Mostrar posição do cursor&quot;
 msgid "UI Type"
 msgstr "Interface de usuário"
-#: src/objects/settings/gsettings.c:131
-msgid ""
-"Unable to initialize system settings. Application may crash in unexpected "
-"ways"
-msgstr ""
-"Não foi possível iniciar configuração de sistema. Aplicação pode falhar de "
-"forma inesperada"
-
 #: src/objects/os/windows/open.c:137
 #, c-format
 msgid "Unable to load session preferences from '%s'"
@@ -1140,7 +1124,7 @@ msgstr &quot;Visite-nos no github&quot;
 msgid "Window with default session"
 msgstr "Janela com sessão padrão"
-#: src/objects/os/windows/savedesktopicon.c:189
+#: src/objects/os/windows/savedesktopicon.c:179
 msgid "Windows shortcuts"
 msgstr "Atalhos windows"
@@ -1150,7 +1134,7 @@ msgstr &quot;_Aplicar&quot;
 #: src/objects/actions/save.c:103 src/objects/settings/dialog.c:78
 #: src/objects/os/linux/savedesktopicon.c:140
-#: src/objects/os/windows/savedesktopicon.c:134
+#: src/objects/os/windows/savedesktopicon.c:124
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -1200,7 +1184,7 @@ msgid &quot;_Rename session&quot;
 msgstr "Renomear sessão"
 #: src/objects/actions/save.c:104 src/objects/os/linux/savedesktopicon.c:141
-#: src/objects/os/windows/savedesktopicon.c:135
+#: src/objects/os/windows/savedesktopicon.c:125
 msgid "_Save"
 msgstr "_Salvar"
@@ -1647,6 +1631,9 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Can't load plugin %s"
 #~ msgstr "Não foi possível carregar plugin %s"
+#~ msgid "Can't load system settings"
+#~ msgstr "Não foi possível carregar configurações de sistema"
+
 #~ msgid "Can't open \"%s\""
 #~ msgstr "Não foi possível abrir %s"
@@ -3439,6 +3426,9 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Subject issuer mismatch"
 #~ msgstr "Divergência na identidade do emissor"
+#~ msgid "System settings error"
+#~ msgstr "Erro nas configurações de sistema"
+
 #~ msgid "TELNET Proxy: send error"
 #~ msgstr "TELNET Proxy: Erro ao enviar"
@@ -3898,6 +3888,13 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Unable to get local issuer certificate"
 #~ msgstr "Unable to get local issuer certificate"
+#~ msgid ""
+#~ "Unable to initialize system settings. Application may crash in unexpected "
+#~ "ways"
+#~ msgstr ""
+#~ "Não foi possível iniciar configuração de sistema. Aplicação pode falhar "
+#~ "de forma inesperada"
+
 #~ msgid "Unable to load from file"
 #~ msgstr "Não foi possível ler do arquivo"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-20 19:26-0300\n"
+"POT-Creation-Date: 2023-03-22 07:20-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"
@@ -36,7 +36,7 @@ msgid &quot;32 bits Windows&quot;
 msgstr ""
 #: src/objects/actions/save.c:167 src/objects/os/linux/savedesktopicon.c:233
-#: src/objects/os/windows/savedesktopicon.c:224
+#: src/objects/os/windows/savedesktopicon.c:214
 msgid "3270 session files"
 msgstr ""
@@ -142,10 +142,6 @@ msgstr &quot;&quot;
 msgid "Can't load session preferences"
 msgstr ""
-#: src/objects/settings/gsettings.c:128
-msgid "Can't load system settings"
-msgstr ""
-
 #: src/objects/application/actions/open.c:99 src/objects/window/terminal.c:192
 #, c-format
 msgid "Can't use \"%s\""
@@ -256,7 +252,7 @@ msgid &quot;Copyright © 2008 Banco do Brasil S.A.&quot;
 msgstr ""
 #: src/objects/os/linux/savedesktopicon.c:114
-#: src/objects/os/windows/savedesktopicon.c:109
+#: src/objects/os/windows/savedesktopicon.c:99
 #: src/objects/os/macos/savedesktopicon.c:54
 msgid "Create shortcut for the current session"
 msgstr ""
@@ -291,7 +287,7 @@ msgstr &quot;&quot;
 msgid "Delete Field"
 msgstr ""
-#: src/objects/os/windows/savedesktopicon.c:82
+#: src/objects/os/windows/savedesktopicon.c:72
 msgid "Description"
 msgstr ""
@@ -361,7 +357,7 @@ msgstr &quot;&quot;
 msgid "Field attributes"
 msgstr ""
-#: src/objects/os/windows/savedesktopicon.c:221
+#: src/objects/os/windows/savedesktopicon.c:211
 msgid "File for session preferences"
 msgstr ""
@@ -390,7 +386,7 @@ msgstr &quot;&quot;
 #: src/objects/application/actions/about.c:119 src/objects/window/window.c:564
 #: src/objects/os/linux/savedesktopicon.c:102
-#: src/objects/os/windows/savedesktopicon.c:271
+#: src/objects/os/windows/savedesktopicon.c:261
 msgid "IBM 3270 Terminal emulator"
 msgstr ""
@@ -639,7 +635,7 @@ msgid &quot;Paste with left margin&quot;
 msgstr ""
 #: src/objects/os/linux/savedesktopicon.c:71
-#: src/objects/os/windows/savedesktopicon.c:76
+#: src/objects/os/windows/savedesktopicon.c:66
 msgid "Path for the new shortcut"
 msgstr ""
@@ -714,7 +710,7 @@ msgid &quot;Save session preferences&quot;
 msgstr ""
 #: src/objects/os/linux/savedesktopicon.c:113
-#: src/objects/os/windows/savedesktopicon.c:108
+#: src/objects/os/windows/savedesktopicon.c:98
 #: src/objects/os/macos/savedesktopicon.c:53
 msgid "Save session shortcut"
 msgstr ""
@@ -727,7 +723,7 @@ msgstr &quot;&quot;
 msgid "Save to shortcut file"
 msgstr ""
-#: src/objects/os/windows/savedesktopicon.c:186
+#: src/objects/os/windows/savedesktopicon.c:176
 msgid "Save to windows shortcut"
 msgstr ""
@@ -792,7 +788,7 @@ msgid &quot;Session Trace&quot;
 msgstr ""
 #: src/objects/actions/save.c:63 src/objects/os/linux/savedesktopicon.c:85
-#: src/objects/os/windows/savedesktopicon.c:96
+#: src/objects/os/windows/savedesktopicon.c:86
 msgid "Session file"
 msgstr ""
@@ -807,7 +803,7 @@ msgid &quot;Session in new window&quot;
 msgstr ""
 #: src/objects/actions/save.c:56 src/objects/os/linux/savedesktopicon.c:77
-#: src/objects/os/windows/savedesktopicon.c:88
+#: src/objects/os/windows/savedesktopicon.c:78
 msgid "Session name"
 msgstr ""
@@ -843,7 +839,7 @@ msgid &quot;Setup toolbar&quot;
 msgstr ""
 #: src/objects/os/linux/savedesktopicon.c:70
-#: src/objects/os/windows/savedesktopicon.c:75
+#: src/objects/os/windows/savedesktopicon.c:65
 msgid "Shortcut file"
 msgstr ""
@@ -906,10 +902,6 @@ msgstr &quot;&quot;
 msgid "System default"
 msgstr ""
-#: src/objects/settings/gsettings.c:133
-msgid "System settings error"
-msgstr ""
-
 #: src/main/tools.c:75
 msgid "TN3270 Session Files"
 msgstr ""
@@ -956,7 +948,7 @@ msgid &quot;The file to save the current session preferences&quot;
 msgstr ""
 #: src/objects/os/linux/savedesktopicon.c:86
-#: src/objects/os/windows/savedesktopicon.c:97
+#: src/objects/os/windows/savedesktopicon.c:87
 msgid "The file with the session preferences for this shortcut"
 msgstr ""
@@ -1001,7 +993,7 @@ msgid &quot;The position of the keypad&quot;
 msgstr ""
 #: src/objects/actions/save.c:57 src/objects/os/linux/savedesktopicon.c:79
-#: src/objects/os/windows/savedesktopicon.c:90
+#: src/objects/os/windows/savedesktopicon.c:80
 msgid "The session name used in the window/tab title (empty for default)"
 msgstr ""
@@ -1085,12 +1077,6 @@ msgstr &quot;&quot;
 msgid "UI Type"
 msgstr ""
-#: src/objects/settings/gsettings.c:131
-msgid ""
-"Unable to initialize system settings. Application may crash in unexpected "
-"ways"
-msgstr ""
-
 #: src/objects/os/windows/open.c:137
 #, c-format
 msgid "Unable to load session preferences from '%s'"
@@ -1132,7 +1118,7 @@ msgstr &quot;&quot;
 msgid "Window with default session"
 msgstr ""
-#: src/objects/os/windows/savedesktopicon.c:189
+#: src/objects/os/windows/savedesktopicon.c:179
 msgid "Windows shortcuts"
 msgstr ""
@@ -1142,7 +1128,7 @@ msgstr &quot;&quot;
 #: src/objects/actions/save.c:103 src/objects/settings/dialog.c:78
 #: src/objects/os/linux/savedesktopicon.c:140
-#: src/objects/os/windows/savedesktopicon.c:134
+#: src/objects/os/windows/savedesktopicon.c:124
 msgid "_Cancel"
 msgstr ""
@@ -1192,7 +1178,7 @@ msgid &quot;_Rename session&quot;
 msgstr ""
 #: src/objects/actions/save.c:104 src/objects/os/linux/savedesktopicon.c:141
-#: src/objects/os/windows/savedesktopicon.c:135
+#: src/objects/os/windows/savedesktopicon.c:125
 msgid "_Save"
 msgstr ""
@@ -24,12 +24,12 @@
 /* do we have malloc.h? */
 #undef HAVE_MALLOC_H
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
@@ -99,9 +99,7 @@
 /* The product name */
 #undef PRODUCT_NAME
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
-   required in a freestanding environment). This macro is provided for
-   backward compatibility; new code need not use it. */
+/* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 /* Version number of package */
@@ -74,10 +74,19 @@ int main (int argc, char **argv) {
 #ifdef _WIN32
 	{
-		g_autofree gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL);
-		g_autofree gchar * locdir = g_build_filename(appdir,"locale",NULL);
-		debug("Locale from \"%s\"\n",locdir);
-		bindtextdomain( PACKAGE_NAME, locdir );
+		g_autofree gchar * pkgdir = g_win32_get_package_installation_directory_of_module(NULL);
+		{
+			g_autofree gchar * appdir = g_build_filename(pkgdir,"locale",NULL);
+			if(g_file_test(appdir,G_FILE_TEST_IS_DIR)) {
+				bindtextdomain( PACKAGE_NAME, appdir );
+			} else {
+				g_autofree gchar * sysdir = g_build_filename(pkgdir,"share","locale",NULL);
+				if(g_file_test(sysdir,G_FILE_TEST_IS_DIR)) {
+					bindtextdomain( PACKAGE_NAME, sysdir );
+				}
+			}
+
+		}
 	}
 #endif // _WIN32
	@@ -74,10 +74,19 @@ int main (int argc, char **argv) {		@@ -74,10 +74,19 @@ int main (int argc, char **argv) {
74		74
75	#ifdef _WIN32	75	#ifdef _WIN32
76	{	76	{
77	- g_autofree gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL);
78	- g_autofree gchar * locdir = g_build_filename(appdir,"locale",NULL);
79	- debug("Locale from \"%s\"\n",locdir);
80	- bindtextdomain( PACKAGE_NAME, locdir );	77	+ g_autofree gchar * pkgdir = g_win32_get_package_installation_directory_of_module(NULL);
		78	+ {
		79	+ g_autofree gchar * appdir = g_build_filename(pkgdir,"locale",NULL);
		80	+ if(g_file_test(appdir,G_FILE_TEST_IS_DIR)) {
		81	+ bindtextdomain( PACKAGE_NAME, appdir );
		82	+ } else {
		83	+ g_autofree gchar * sysdir = g_build_filename(pkgdir,"share","locale",NULL);
		84	+ if(g_file_test(sysdir,G_FILE_TEST_IS_DIR)) {
		85	+ bindtextdomain( PACKAGE_NAME, sysdir );
		86	+ }
		87	+ }
		88	+
		89	+ }
81	}	90	}
82	#endif // _WIN32	91	#endif // _WIN32
83		92