Download as
Browse Code »

Commit e9ce3fc41457f068f3395090ace0e2234f1ac1c2

Authored by Perry Werneck
1 parent a6bb7b1f
Exists in develop

Searching for locale on standard path.

Showing 4 changed files with 64 additions and 74 deletions   Show diff stats
locale/pt_BR.po
  Diff comments   View file @e9ce3fc
... ... @@ -5,7 +5,7 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2023-01-31 11:13-0300\n"
  8 +"POT-Creation-Date: 2023-03-22 07:20-0300\n"
9 9 "PO-Revision-Date: 2023-01-31 11:14-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Brazilian Portuguese <perry.werneck@gmail.com>\n"
... ... @@ -38,7 +38,7 @@ msgid &quot;32 bits Windows&quot;
38 38 msgstr "Windows 32 bits"
39 39  
40 40 #: src/objects/actions/save.c:167 src/objects/os/linux/savedesktopicon.c:233
41   -#: src/objects/os/windows/savedesktopicon.c:224
  41 +#: src/objects/os/windows/savedesktopicon.c:214
42 42 msgid "3270 session files"
43 43 msgstr "Arquivos de sessão TN3270"
44 44  
... ... @@ -146,10 +146,6 @@ msgstr &quot;Não foi possível carregar arquivo de sessão&quot;
146 146 msgid "Can't load session preferences"
147 147 msgstr "Não foi possível carregar preferências da sessão"
148 148  
149   -#: src/objects/settings/gsettings.c:128
150   -msgid "Can't load system settings"
151   -msgstr "Não foi possível carregar configurações de sistema"
152   -
153 149 #: src/objects/application/actions/open.c:99 src/objects/window/terminal.c:192
154 150 #, c-format
155 151 msgid "Can't use \"%s\""
... ... @@ -260,7 +256,7 @@ msgid &quot;Copyright © 2008 Banco do Brasil S.A.&quot;
260 256 msgstr "Copyright © 2008 Banco do Brasil S.A."
261 257  
262 258 #: src/objects/os/linux/savedesktopicon.c:114
263   -#: src/objects/os/windows/savedesktopicon.c:109
  259 +#: src/objects/os/windows/savedesktopicon.c:99
264 260 #: src/objects/os/macos/savedesktopicon.c:54
265 261 msgid "Create shortcut for the current session"
266 262 msgstr "Criar atalho para a sessão atual."
... ... @@ -295,7 +291,7 @@ msgstr &quot;Recortar&quot;
295 291 msgid "Delete Field"
296 292 msgstr "Apagar campo"
297 293  
298   -#: src/objects/os/windows/savedesktopicon.c:82
  294 +#: src/objects/os/windows/savedesktopicon.c:72
299 295 msgid "Description"
300 296 msgstr "Descrição"
301 297  
... ... @@ -365,7 +361,7 @@ msgstr &quot;Erro iniciando sessão&quot;
365 361 msgid "Field attributes"
366 362 msgstr "Atributos de campo"
367 363  
368   -#: src/objects/os/windows/savedesktopicon.c:221
  364 +#: src/objects/os/windows/savedesktopicon.c:211
369 365 msgid "File for session preferences"
370 366 msgstr "Arquivo para preferências da sessão"
371 367  
... ... @@ -394,7 +390,7 @@ msgstr &quot;Configuração de servidor e emulação&quot;
394 390  
395 391 #: src/objects/application/actions/about.c:119 src/objects/window/window.c:564
396 392 #: src/objects/os/linux/savedesktopicon.c:102
397   -#: src/objects/os/windows/savedesktopicon.c:271
  393 +#: src/objects/os/windows/savedesktopicon.c:261
398 394 msgid "IBM 3270 Terminal emulator"
399 395 msgstr "Emulador de terminal IBM 3270"
400 396  
... ... @@ -643,7 +639,7 @@ msgid &quot;Paste with left margin&quot;
643 639 msgstr "Colar com margem esquerda"
644 640  
645 641 #: src/objects/os/linux/savedesktopicon.c:71
646   -#: src/objects/os/windows/savedesktopicon.c:76
  642 +#: src/objects/os/windows/savedesktopicon.c:66
647 643 msgid "Path for the new shortcut"
648 644 msgstr "Caminho para o novo atalho"
649 645  
... ... @@ -718,7 +714,7 @@ msgid &quot;Save session preferences&quot;
718 714 msgstr "Salvar preferências da sessão"
719 715  
720 716 #: src/objects/os/linux/savedesktopicon.c:113
721   -#: src/objects/os/windows/savedesktopicon.c:108
  717 +#: src/objects/os/windows/savedesktopicon.c:98
722 718 #: src/objects/os/macos/savedesktopicon.c:53
723 719 msgid "Save session shortcut"
724 720 msgstr "Salvar atalho para a sessão"
... ... @@ -731,7 +727,7 @@ msgstr &quot;Salvar para arquivo de sessão&quot;
731 727 msgid "Save to shortcut file"
732 728 msgstr "Salvar para arquivo de atalho"
733 729  
734   -#: src/objects/os/windows/savedesktopicon.c:186
  730 +#: src/objects/os/windows/savedesktopicon.c:176
735 731 msgid "Save to windows shortcut"
736 732 msgstr "Salvar para atalho windows"
737 733  
... ... @@ -796,7 +792,7 @@ msgid &quot;Session Trace&quot;
796 792 msgstr "Trace da sessão"
797 793  
798 794 #: src/objects/actions/save.c:63 src/objects/os/linux/savedesktopicon.c:85
799   -#: src/objects/os/windows/savedesktopicon.c:96
  795 +#: src/objects/os/windows/savedesktopicon.c:86
800 796 msgid "Session file"
801 797 msgstr "Arquivo de sessão"
802 798  
... ... @@ -811,7 +807,7 @@ msgid &quot;Session in new window&quot;
811 807 msgstr "Sessão em nova janela"
812 808  
813 809 #: src/objects/actions/save.c:56 src/objects/os/linux/savedesktopicon.c:77
814   -#: src/objects/os/windows/savedesktopicon.c:88
  810 +#: src/objects/os/windows/savedesktopicon.c:78
815 811 msgid "Session name"
816 812 msgstr "Nome da sessão"
817 813  
... ... @@ -847,7 +843,7 @@ msgid &quot;Setup toolbar&quot;
847 843 msgstr "Configurar barra de ferramentas"
848 844  
849 845 #: src/objects/os/linux/savedesktopicon.c:70
850   -#: src/objects/os/windows/savedesktopicon.c:75
  846 +#: src/objects/os/windows/savedesktopicon.c:65
851 847 msgid "Shortcut file"
852 848 msgstr "Arquivo de atalho"
853 849  
... ... @@ -910,10 +906,6 @@ msgstr &quot;Simbólico&quot;
910 906 msgid "System default"
911 907 msgstr "Padrão do sistema"
912 908  
913   -#: src/objects/settings/gsettings.c:133
914   -msgid "System settings error"
915   -msgstr "Erro nas configurações de sistema"
916   -
917 909 #: src/main/tools.c:75
918 910 msgid "TN3270 Session Files"
919 911 msgstr "Arquivos de sessão TN3270"
... ... @@ -960,7 +952,7 @@ msgid &quot;The file to save the current session preferences&quot;
960 952 msgstr "O arquivo com as preferências da sessão atual"
961 953  
962 954 #: src/objects/os/linux/savedesktopicon.c:86
963   -#: src/objects/os/windows/savedesktopicon.c:97
  955 +#: src/objects/os/windows/savedesktopicon.c:87
964 956 msgid "The file with the session preferences for this shortcut"
965 957 msgstr "O arquivo com as preferências da sessão para esse atalho"
966 958  
... ... @@ -1005,7 +997,7 @@ msgid &quot;The position of the keypad&quot;
1005 997 msgstr "A posição do painel"
1006 998  
1007 999 #: src/objects/actions/save.c:57 src/objects/os/linux/savedesktopicon.c:79
1008   -#: src/objects/os/windows/savedesktopicon.c:90
  1000 +#: src/objects/os/windows/savedesktopicon.c:80
1009 1001 msgid "The session name used in the window/tab title (empty for default)"
1010 1002 msgstr ""
1011 1003 "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;
1091 1083 msgid "UI Type"
1092 1084 msgstr "Interface de usuário"
1093 1085  
1094   -#: src/objects/settings/gsettings.c:131
1095   -msgid ""
1096   -"Unable to initialize system settings. Application may crash in unexpected "
1097   -"ways"
1098   -msgstr ""
1099   -"Não foi possível iniciar configuração de sistema. Aplicação pode falhar de "
1100   -"forma inesperada"
1101   -
1102 1086 #: src/objects/os/windows/open.c:137
1103 1087 #, c-format
1104 1088 msgid "Unable to load session preferences from '%s'"
... ... @@ -1140,7 +1124,7 @@ msgstr &quot;Visite-nos no github&quot;
1140 1124 msgid "Window with default session"
1141 1125 msgstr "Janela com sessão padrão"
1142 1126  
1143   -#: src/objects/os/windows/savedesktopicon.c:189
  1127 +#: src/objects/os/windows/savedesktopicon.c:179
1144 1128 msgid "Windows shortcuts"
1145 1129 msgstr "Atalhos windows"
1146 1130  
... ... @@ -1150,7 +1134,7 @@ msgstr &quot;_Aplicar&quot;
1150 1134  
1151 1135 #: src/objects/actions/save.c:103 src/objects/settings/dialog.c:78
1152 1136 #: src/objects/os/linux/savedesktopicon.c:140
1153   -#: src/objects/os/windows/savedesktopicon.c:134
  1137 +#: src/objects/os/windows/savedesktopicon.c:124
1154 1138 msgid "_Cancel"
1155 1139 msgstr "_Cancelar"
1156 1140  
... ... @@ -1200,7 +1184,7 @@ msgid &quot;_Rename session&quot;
1200 1184 msgstr "Renomear sessão"
1201 1185  
1202 1186 #: src/objects/actions/save.c:104 src/objects/os/linux/savedesktopicon.c:141
1203   -#: src/objects/os/windows/savedesktopicon.c:135
  1187 +#: src/objects/os/windows/savedesktopicon.c:125
1204 1188 msgid "_Save"
1205 1189 msgstr "_Salvar"
1206 1190  
... ... @@ -1647,6 +1631,9 @@ msgstr &quot;translator-credits&quot;
1647 1631 #~ msgid "Can't load plugin %s"
1648 1632 #~ msgstr "Não foi possível carregar plugin %s"
1649 1633  
  1634 +#~ msgid "Can't load system settings"
  1635 +#~ msgstr "Não foi possível carregar configurações de sistema"
  1636 +
1650 1637 #~ msgid "Can't open \"%s\""
1651 1638 #~ msgstr "Não foi possível abrir %s"
1652 1639  
... ... @@ -3439,6 +3426,9 @@ msgstr &quot;translator-credits&quot;
3439 3426 #~ msgid "Subject issuer mismatch"
3440 3427 #~ msgstr "Divergência na identidade do emissor"
3441 3428  
  3429 +#~ msgid "System settings error"
  3430 +#~ msgstr "Erro nas configurações de sistema"
  3431 +
3442 3432 #~ msgid "TELNET Proxy: send error"
3443 3433 #~ msgstr "TELNET Proxy: Erro ao enviar"
3444 3434  
... ... @@ -3898,6 +3888,13 @@ msgstr &quot;translator-credits&quot;
3898 3888 #~ msgid "Unable to get local issuer certificate"
3899 3889 #~ msgstr "Unable to get local issuer certificate"
3900 3890  
  3891 +#~ msgid ""
  3892 +#~ "Unable to initialize system settings. Application may crash in unexpected "
  3893 +#~ "ways"
  3894 +#~ msgstr ""
  3895 +#~ "Não foi possível iniciar configuração de sistema. Aplicação pode falhar "
  3896 +#~ "de forma inesperada"
  3897 +
3901 3898 #~ msgid "Unable to load from file"
3902 3899 #~ msgstr "Não foi possível ler do arquivo"
3903 3900  
... ...
locale/pw3270.pot
  Diff comments   View file @e9ce3fc
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2023-03-20 19:26-0300\n"
  11 +"POT-Creation-Date: 2023-03-22 07:20-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -36,7 +36,7 @@ msgid &quot;32 bits Windows&quot;
36 36 msgstr ""
37 37  
38 38 #: src/objects/actions/save.c:167 src/objects/os/linux/savedesktopicon.c:233
39   -#: src/objects/os/windows/savedesktopicon.c:224
  39 +#: src/objects/os/windows/savedesktopicon.c:214
40 40 msgid "3270 session files"
41 41 msgstr ""
42 42  
... ... @@ -142,10 +142,6 @@ msgstr &quot;&quot;
142 142 msgid "Can't load session preferences"
143 143 msgstr ""
144 144  
145   -#: src/objects/settings/gsettings.c:128
146   -msgid "Can't load system settings"
147   -msgstr ""
148   -
149 145 #: src/objects/application/actions/open.c:99 src/objects/window/terminal.c:192
150 146 #, c-format
151 147 msgid "Can't use \"%s\""
... ... @@ -256,7 +252,7 @@ msgid &quot;Copyright © 2008 Banco do Brasil S.A.&quot;
256 252 msgstr ""
257 253  
258 254 #: src/objects/os/linux/savedesktopicon.c:114
259   -#: src/objects/os/windows/savedesktopicon.c:109
  255 +#: src/objects/os/windows/savedesktopicon.c:99
260 256 #: src/objects/os/macos/savedesktopicon.c:54
261 257 msgid "Create shortcut for the current session"
262 258 msgstr ""
... ... @@ -291,7 +287,7 @@ msgstr &quot;&quot;
291 287 msgid "Delete Field"
292 288 msgstr ""
293 289  
294   -#: src/objects/os/windows/savedesktopicon.c:82
  290 +#: src/objects/os/windows/savedesktopicon.c:72
295 291 msgid "Description"
296 292 msgstr ""
297 293  
... ... @@ -361,7 +357,7 @@ msgstr &quot;&quot;
361 357 msgid "Field attributes"
362 358 msgstr ""
363 359  
364   -#: src/objects/os/windows/savedesktopicon.c:221
  360 +#: src/objects/os/windows/savedesktopicon.c:211
365 361 msgid "File for session preferences"
366 362 msgstr ""
367 363  
... ... @@ -390,7 +386,7 @@ msgstr &quot;&quot;
390 386  
391 387 #: src/objects/application/actions/about.c:119 src/objects/window/window.c:564
392 388 #: src/objects/os/linux/savedesktopicon.c:102
393   -#: src/objects/os/windows/savedesktopicon.c:271
  389 +#: src/objects/os/windows/savedesktopicon.c:261
394 390 msgid "IBM 3270 Terminal emulator"
395 391 msgstr ""
396 392  
... ... @@ -639,7 +635,7 @@ msgid &quot;Paste with left margin&quot;
639 635 msgstr ""
640 636  
641 637 #: src/objects/os/linux/savedesktopicon.c:71
642   -#: src/objects/os/windows/savedesktopicon.c:76
  638 +#: src/objects/os/windows/savedesktopicon.c:66
643 639 msgid "Path for the new shortcut"
644 640 msgstr ""
645 641  
... ... @@ -714,7 +710,7 @@ msgid &quot;Save session preferences&quot;
714 710 msgstr ""
715 711  
716 712 #: src/objects/os/linux/savedesktopicon.c:113
717   -#: src/objects/os/windows/savedesktopicon.c:108
  713 +#: src/objects/os/windows/savedesktopicon.c:98
718 714 #: src/objects/os/macos/savedesktopicon.c:53
719 715 msgid "Save session shortcut"
720 716 msgstr ""
... ... @@ -727,7 +723,7 @@ msgstr &quot;&quot;
727 723 msgid "Save to shortcut file"
728 724 msgstr ""
729 725  
730   -#: src/objects/os/windows/savedesktopicon.c:186
  726 +#: src/objects/os/windows/savedesktopicon.c:176
731 727 msgid "Save to windows shortcut"
732 728 msgstr ""
733 729  
... ... @@ -792,7 +788,7 @@ msgid &quot;Session Trace&quot;
792 788 msgstr ""
793 789  
794 790 #: src/objects/actions/save.c:63 src/objects/os/linux/savedesktopicon.c:85
795   -#: src/objects/os/windows/savedesktopicon.c:96
  791 +#: src/objects/os/windows/savedesktopicon.c:86
796 792 msgid "Session file"
797 793 msgstr ""
798 794  
... ... @@ -807,7 +803,7 @@ msgid &quot;Session in new window&quot;
807 803 msgstr ""
808 804  
809 805 #: src/objects/actions/save.c:56 src/objects/os/linux/savedesktopicon.c:77
810   -#: src/objects/os/windows/savedesktopicon.c:88
  806 +#: src/objects/os/windows/savedesktopicon.c:78
811 807 msgid "Session name"
812 808 msgstr ""
813 809  
... ... @@ -843,7 +839,7 @@ msgid &quot;Setup toolbar&quot;
843 839 msgstr ""
844 840  
845 841 #: src/objects/os/linux/savedesktopicon.c:70
846   -#: src/objects/os/windows/savedesktopicon.c:75
  842 +#: src/objects/os/windows/savedesktopicon.c:65
847 843 msgid "Shortcut file"
848 844 msgstr ""
849 845  
... ... @@ -906,10 +902,6 @@ msgstr &quot;&quot;
906 902 msgid "System default"
907 903 msgstr ""
908 904  
909   -#: src/objects/settings/gsettings.c:133
910   -msgid "System settings error"
911   -msgstr ""
912   -
913 905 #: src/main/tools.c:75
914 906 msgid "TN3270 Session Files"
915 907 msgstr ""
... ... @@ -956,7 +948,7 @@ msgid &quot;The file to save the current session preferences&quot;
956 948 msgstr ""
957 949  
958 950 #: src/objects/os/linux/savedesktopicon.c:86
959   -#: src/objects/os/windows/savedesktopicon.c:97
  951 +#: src/objects/os/windows/savedesktopicon.c:87
960 952 msgid "The file with the session preferences for this shortcut"
961 953 msgstr ""
962 954  
... ... @@ -1001,7 +993,7 @@ msgid &quot;The position of the keypad&quot;
1001 993 msgstr ""
1002 994  
1003 995 #: src/objects/actions/save.c:57 src/objects/os/linux/savedesktopicon.c:79
1004   -#: src/objects/os/windows/savedesktopicon.c:90
  996 +#: src/objects/os/windows/savedesktopicon.c:80
1005 997 msgid "The session name used in the window/tab title (empty for default)"
1006 998 msgstr ""
1007 999  
... ... @@ -1085,12 +1077,6 @@ msgstr &quot;&quot;
1085 1077 msgid "UI Type"
1086 1078 msgstr ""
1087 1079  
1088   -#: src/objects/settings/gsettings.c:131
1089   -msgid ""
1090   -"Unable to initialize system settings. Application may crash in unexpected "
1091   -"ways"
1092   -msgstr ""
1093   -
1094 1080 #: src/objects/os/windows/open.c:137
1095 1081 #, c-format
1096 1082 msgid "Unable to load session preferences from '%s'"
... ... @@ -1132,7 +1118,7 @@ msgstr &quot;&quot;
1132 1118 msgid "Window with default session"
1133 1119 msgstr ""
1134 1120  
1135   -#: src/objects/os/windows/savedesktopicon.c:189
  1121 +#: src/objects/os/windows/savedesktopicon.c:179
1136 1122 msgid "Windows shortcuts"
1137 1123 msgstr ""
1138 1124  
... ... @@ -1142,7 +1128,7 @@ msgstr &quot;&quot;
1142 1128  
1143 1129 #: src/objects/actions/save.c:103 src/objects/settings/dialog.c:78
1144 1130 #: src/objects/os/linux/savedesktopicon.c:140
1145   -#: src/objects/os/windows/savedesktopicon.c:134
  1131 +#: src/objects/os/windows/savedesktopicon.c:124
1146 1132 msgid "_Cancel"
1147 1133 msgstr ""
1148 1134  
... ... @@ -1192,7 +1178,7 @@ msgid &quot;_Rename session&quot;
1192 1178 msgstr ""
1193 1179  
1194 1180 #: src/objects/actions/save.c:104 src/objects/os/linux/savedesktopicon.c:141
1195   -#: src/objects/os/windows/savedesktopicon.c:135
  1181 +#: src/objects/os/windows/savedesktopicon.c:125
1196 1182 msgid "_Save"
1197 1183 msgstr ""
1198 1184  
... ...
src/include/config.h.in
  Diff comments   View file @e9ce3fc
... ... @@ -24,12 +24,12 @@
24 24 /* do we have malloc.h? */
25 25 #undef HAVE_MALLOC_H
26 26  
  27 +/* Define to 1 if you have the <memory.h> header file. */
  28 +#undef HAVE_MEMORY_H
  29 +
27 30 /* Define to 1 if you have the <stdint.h> header file. */
28 31 #undef HAVE_STDINT_H
29 32  
30   -/* Define to 1 if you have the <stdio.h> header file. */
31   -#undef HAVE_STDIO_H
32   -
33 33 /* Define to 1 if you have the <stdlib.h> header file. */
34 34 #undef HAVE_STDLIB_H
35 35  
... ... @@ -99,9 +99,7 @@
99 99 /* The product name */
100 100 #undef PRODUCT_NAME
101 101  
102   -/* Define to 1 if all of the C90 standard headers exist (not just the ones
103   - required in a freestanding environment). This macro is provided for
104   - backward compatibility; new code need not use it. */
  102 +/* Define to 1 if you have the ANSI C header files. */
105 103 #undef STDC_HEADERS
106 104  
107 105 /* Version number of package */
... ...
src/main/main.c
  Diff comments   View file @e9ce3fc
... ... @@ -74,10 +74,19 @@ int main (int argc, char **argv) {
74 74  
75 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 91 #endif // _WIN32
83 92  
... ...