Download as
Browse Code »

Commit 9dd6eef8805bccc62eab6e220e3151dafb81fc69

Authored by Perry Werneck
1 parent 8772691c
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Fixing windows builds.

Showing 2 changed files with 236 additions and 221 deletions   Show diff stats
locale/pw3270.pot
  Diff comments   View file @9dd6eef
... ... @@ -9,7 +9,7 @@ msgstr ""
9 9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 10 "Project-Id-Version: PACKAGE VERSION\n"
11 11 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2019-07-30 10:50-0300\n"
  12 +"POT-Creation-Date: 2019-08-02 14:04-0300\n"
13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 15 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 20 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 21 "Project-Id-Version: PACKAGE VERSION\n"
22 22 "Report-Msgid-Bugs-To: \n"
23   -"POT-Creation-Date: 2019-07-29 18:49+0000\n"
  23 +"POT-Creation-Date: 2019-08-02 16:10+0000\n"
24 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 26 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -31,7 +31,7 @@ msgstr &quot;&quot;
31 31 "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
32 32 "Project-Id-Version: PACKAGE VERSION\n"
33 33 "Report-Msgid-Bugs-To: \n"
34   -"POT-Creation-Date: 2019-07-30 14:02+0000\n"
  34 +"POT-Creation-Date: 2019-08-02 16:12+0000\n"
35 35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
36 36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
37 37 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -62,7 +62,7 @@ msgstr &quot;&quot;
62 62 msgid "%s"
63 63 msgstr ""
64 64  
65   -#: src/core/connect.c:160
  65 +#: src/core/connect.c:173
66 66 #, c-format
67 67 msgid "%s (SSL error %d)"
68 68 msgstr ""
... ... @@ -97,32 +97,32 @@ msgstr &quot;&quot;
97 97 msgid "%s requires GTK version %d.%d.%d"
98 98 msgstr ""
99 99  
100   -#: src/core/kybd.c:2444
  100 +#: src/core/keyboard/kybd.c:1906
101 101 #, c-format
102 102 msgid "%s: Bell not supported"
103 103 msgstr ""
104 104  
105   -#: src/core/kybd.c:2603
  105 +#: src/core/keyboard/kybd.c:2065
106 106 #, c-format
107 107 msgid "%s: Missing hex digits after \\x"
108 108 msgstr ""
109 109  
110   -#: src/core/kybd.c:2543
  110 +#: src/core/keyboard/kybd.c:2005
111 111 #, c-format
112 112 msgid "%s: Unknown character after \\p"
113 113 msgstr ""
114 114  
115   -#: src/core/kybd.c:2579
  115 +#: src/core/keyboard/kybd.c:2041
116 116 #, c-format
117 117 msgid "%s: Unknown character after \\pa"
118 118 msgstr ""
119 119  
120   -#: src/core/kybd.c:2557
  120 +#: src/core/keyboard/kybd.c:2019
121 121 #, c-format
122 122 msgid "%s: Unknown character after \\pf"
123 123 msgstr ""
124 124  
125   -#: src/core/kybd.c:2495
  125 +#: src/core/keyboard/kybd.c:1957
126 126 #, c-format
127 127 msgid "%s: Vertical tab not supported"
128 128 msgstr ""
... ... @@ -136,7 +136,7 @@ msgstr &quot;&quot;
136 136 msgid "- 3270 Emulator for Gtk"
137 137 msgstr ""
138 138  
139   -#: src/dialogs/hostselect.c:41
  139 +#: src/dialogs/hostselect.c:42
140 140 msgid "16 colors"
141 141 msgstr ""
142 142  
... ... @@ -164,7 +164,7 @@ msgstr &quot;&quot;
164 164 msgid "3270 terminal emulator for GTK %d.%d"
165 165 msgstr ""
166 166  
167   -#: src/dialogs/hostselect.c:42
  167 +#: src/dialogs/hostselect.c:43
168 168 msgid "8 colors"
169 169 msgstr ""
170 170  
... ... @@ -194,13 +194,13 @@ msgstr &quot;&quot;
194 194 msgid "<b>%s</b>\n"
195 195 msgstr ""
196 196  
197   -#: src/terminal/widget.c:198
  197 +#: src/terminal/widget.c:154
198 198 msgid ""
199 199 "<b>Identity not verified</b>\n"
200 200 "Disconnected from host"
201 201 msgstr ""
202 202  
203   -#: src/dialogs/print/print.c:112
  203 +#: src/dialogs/print/print.c:108
204 204 msgid "<b>Text options</b>"
205 205 msgstr ""
206 206  
... ... @@ -228,11 +228,11 @@ msgstr &quot;&quot;
228 228 msgid "A_ppend to file"
229 229 msgstr ""
230 230  
231   -#: src/core/ft.c:104
  231 +#: src/core/ft/ft.c:104
232 232 msgid "Abort sent; awaiting response"
233 233 msgstr ""
234 234  
235   -#: src/core/ft.c:677
  235 +#: src/core/ft/ft.c:677
236 236 msgid "Aborting..."
237 237 msgstr ""
238 238  
... ... @@ -240,7 +240,7 @@ msgstr &quot;&quot;
240 240 msgid "About security"
241 241 msgstr ""
242 242  
243   -#: src/core/ft.c:102
  243 +#: src/core/ft/ft.c:102
244 244 msgid "Ack received, data flowing"
245 245 msgstr ""
246 246  
... ... @@ -256,7 +256,7 @@ msgstr &quot;&quot;
256 256 msgid "Add to copy"
257 257 msgstr ""
258 258  
259   -#: src/dialogs/hostselect.c:139
  259 +#: src/dialogs/hostselect.c:140
260 260 msgid "Address or name of the host to connect."
261 261 msgstr ""
262 262  
... ... @@ -265,15 +265,15 @@ msgid &quot;Alert sound&quot;
265 265 msgstr ""
266 266  
267 267 #: src/filetransfer/v3270ft.c:310 src/filetransfer/settings.c:212
268   -#: src/dialogs/save/save.c:129
  268 +#: src/dialogs/save/save.c:117
269 269 msgid "All files"
270 270 msgstr ""
271 271  
272   -#: src/core/ftmessages.c:67 src/filetransfer/v3270ftprogress.c:82
  272 +#: src/core/ft/ftmessages.c:67 src/filetransfer/v3270ftprogress.c:82
273 273 msgid "An error exists in the PC's file name."
274 274 msgstr ""
275 275  
276   -#: src/core/ftmessages.c:46 src/filetransfer/v3270ftprogress.c:64
  276 +#: src/core/ft/ftmessages.c:46 src/filetransfer/v3270ftprogress.c:64
277 277 msgid ""
278 278 "An error occurred in the file transfer, which may be an error in the data "
279 279 "being transferred, or an unidentified system error."
... ... @@ -283,7 +283,7 @@ msgstr &quot;&quot;
283 283 msgid "An error occurred trying to allocate memory. This should never happen."
284 284 msgstr ""
285 285  
286   -#: src/core/ftmessages.c:102 src/filetransfer/v3270ftprogress.c:112
  286 +#: src/core/ft/ftmessages.c:102 src/filetransfer/v3270ftprogress.c:112
287 287 msgid "An invalid SEND or RECEIVE parameter was sent to the host."
288 288 msgstr ""
289 289  
... ... @@ -340,7 +340,7 @@ msgstr &quot;&quot;
340 340 msgid "Avblock"
341 341 msgstr ""
342 342  
343   -#: src/core/ft.c:103
  343 +#: src/core/ft/ft.c:103
344 344 msgid "Awaiting chance to send an abort"
345 345 msgstr ""
346 346  
... ... @@ -348,7 +348,7 @@ msgstr &quot;&quot;
348 348 msgid "B_egin transfer"
349 349 msgstr ""
350 350  
351   -#: colors.c:494 src/dialogs/colors.c:290
  351 +#: colors.c:494 src/dialogs/colors.c:291
352 352 msgid "Background"
353 353 msgstr ""
354 354  
... ... @@ -356,7 +356,7 @@ msgstr &quot;&quot;
356 356 msgid "Beep on errors"
357 357 msgstr ""
358 358  
359   -#: colors.c:502 src/dialogs/colors.c:298
  359 +#: colors.c:502 src/dialogs/colors.c:299
360 360 msgid "Black"
361 361 msgstr ""
362 362  
... ... @@ -372,7 +372,7 @@ msgstr &quot;&quot;
372 372 msgid "Block size"
373 373 msgstr ""
374 374  
375   -#: colors.c:495 src/dialogs/colors.c:291
  375 +#: colors.c:495 src/dialogs/colors.c:292
376 376 msgid "Blue"
377 377 msgstr ""
378 378  
... ... @@ -392,19 +392,19 @@ msgstr &quot;&quot;
392 392 msgid "Broken pipe"
393 393 msgstr ""
394 394  
395   -#: src/core/ftmessages.c:215
  395 +#: src/core/ft/ftmessages.c:215
396 396 msgid "CMS disk is full: file transfer canceled"
397 397 msgstr ""
398 398  
399   -#: src/core/ftmessages.c:208
  399 +#: src/core/ft/ftmessages.c:208
400 400 msgid "CMS disk is not accessed: file transfer canceled"
401 401 msgstr ""
402 402  
403   -#: src/core/ftmessages.c:201
  403 +#: src/core/ft/ftmessages.c:201
404 404 msgid "CMS disk is read-only: file transfer canceled"
405 405 msgstr ""
406 406  
407   -#: src/core/ftmessages.c:194
  407 +#: src/core/ft/ftmessages.c:194
408 408 msgid "CMS file not found: file transfer canceled"
409 409 msgstr ""
410 410  
... ... @@ -412,7 +412,7 @@ msgstr &quot;&quot;
412 412 msgid "CRL signature failure"
413 413 msgstr ""
414 414  
415   -#: src/dialogs/save/save.c:230
  415 +#: src/dialogs/save/save.c:215
416 416 msgid "C_haracter Coding"
417 417 msgstr ""
418 418  
... ... @@ -420,11 +420,11 @@ msgstr &quot;&quot;
420 420 msgid "C_haracter Coding:"
421 421 msgstr ""
422 422  
423   -#: print.c:421 src/dialogs/print/print.c:88
  423 +#: src/dialogs/print/settings.c:78
424 424 msgid "C_olor scheme:"
425 425 msgstr ""
426 426  
427   -#: src/dialogs/hostselect.c:313
  427 +#: src/dialogs/hostselect.c:314
428 428 msgid "C_onnect"
429 429 msgstr ""
430 430  
... ... @@ -442,7 +442,7 @@ msgstr &quot;&quot;
442 442 msgid "Can't add activity"
443 443 msgstr ""
444 444  
445   -#: src/ssl/linux/getcrl.c:354
  445 +#: src/ssl/linux/ldap.c:146
446 446 msgid "Can't bind to LDAP server"
447 447 msgstr ""
448 448  
... ... @@ -461,27 +461,34 @@ msgstr &quot;&quot;
461 461 msgid "Can't convert line %lu from %s to %s"
462 462 msgstr ""
463 463  
464   -#: src/ssl/linux/getcrl.c:280 src/ssl/linux/getcrl.c:426
465   -#: src/ssl/linux/getcrl.c:523
  464 +#: src/ssl/linux/getcrl.c:87
466 465 msgid "Can't decode CRL"
467 466 msgstr ""
468 467  
469   -#: src/ssl/linux/getcrl.c:576
470   -msgid "Can't decode CRL got from LDAP server"
  468 +#: src/ssl/linux/ldap.c:218 src/ssl/linux/curl.c:271
  469 +msgid "Can't decode certificate revocation list"
  470 +msgstr ""
  471 +
  472 +#: src/ssl/linux/curl.c:312
  473 +msgid "Can't decode certificate revocation list got from LDAP server"
471 474 msgstr ""
472 475  
473   -#: src/ssl/linux/getcrl.c:390 src/ssl/linux/getcrl.c:402
  476 +#: src/ssl/linux/ldap.c:182 src/ssl/linux/ldap.c:194
474 477 msgid "Can't get LDAP attribute"
475 478 msgstr ""
476 479  
477   -#: src/core/ft.c:432
  480 +#: src/core/ft/ft.c:432
478 481 msgid "Can't get file size"
479 482 msgstr ""
480 483  
481   -#: src/ssl/linux/getcrl.c:332
  484 +#: src/ssl/linux/ldap.c:124
482 485 msgid "Can't initialize LDAP"
483 486 msgstr ""
484 487  
  488 +#: src/ssl/linux/curl.c:196
  489 +msgid "Can't initialize curl operation"
  490 +msgstr ""
  491 +
485 492 #: parsefile.c:328 src/filetransfer/load.c:270
486 493 #, c-format
487 494 msgid "Can't load %s"
... ... @@ -500,7 +507,7 @@ msgstr &quot;&quot;
500 507 msgid "Can't load plugin %s"
501 508 msgstr ""
502 509  
503   -#: src/ssl/linux/getcrl.c:249 src/ssl/linux/getcrl.c:268
  510 +#: src/ssl/linux/getcrl.c:56 src/ssl/linux/getcrl.c:75
504 511 msgid "Can't open CRL File"
505 512 msgstr ""
506 513  
... ... @@ -538,7 +545,7 @@ msgstr &quot;&quot;
538 545 msgid "Can't paste"
539 546 msgstr ""
540 547  
541   -#: src/core/session.c:198 src/terminal/callbacks.c:345
  548 +#: src/core/session.c:198
542 549 msgid "Can't print"
543 550 msgstr ""
544 551  
... ... @@ -562,7 +569,7 @@ msgid &quot;Can&#39;t save \&quot;%s\&quot;: %s&quot;
562 569 msgstr ""
563 570  
564 571 #: src/filetransfer/save.c:116 src/filetransfer/activitylist.c:437
565   -#: src/trace/widget.c:495 src/dialogs/transfer.c:96 src/dialogs/save/save.c:495
  572 +#: src/trace/widget.c:495 src/dialogs/transfer.c:96 src/dialogs/save/save.c:454
566 573 #, c-format
567 574 msgid "Can't save %s"
568 575 msgstr ""
... ... @@ -576,12 +583,12 @@ msgstr &quot;&quot;
576 583 msgid "Can't save trace data to file %s"
577 584 msgstr ""
578 585  
579   -#: src/ssl/linux/getcrl.c:379
  586 +#: src/ssl/linux/ldap.c:171
580 587 msgid "Can't search LDAP server"
581 588 msgstr ""
582 589  
583   -#: src/ssl/linux/getcrl.c:343
584   -msgid "Can't set LDAP version"
  590 +#: src/ssl/linux/ldap.c:135
  591 +msgid "Can't set LDAP protocol version"
585 592 msgstr ""
586 593  
587 594 #: src/filetransfer/worker.c:611 src/filetransfer/v3270ftprogress.c:772
... ... @@ -608,7 +615,7 @@ msgstr &quot;&quot;
608 615 msgid "Can't start file transfer session"
609 616 msgstr ""
610 617  
611   -#: src/core/ft.c:209
  618 +#: src/core/ft/ft.c:209
612 619 msgid "Can't start file transfer."
613 620 msgstr ""
614 621  
... ... @@ -616,8 +623,8 @@ msgstr &quot;&quot;
616 623 msgid "Can't verify."
617 624 msgstr ""
618 625  
619   -#: src/terminal/callbacks.c:467 src/filetransfer/v3270ftprogress.c:432
620   -#: src/filetransfer/transfer.c:89 src/dialogs/save/save.c:150
  626 +#: src/terminal/callbacks.c:442 src/filetransfer/v3270ftprogress.c:432
  627 +#: src/filetransfer/transfer.c:89 src/dialogs/save/save.c:138
621 628 msgid "Cancel"
622 629 msgstr ""
623 630  
... ... @@ -625,7 +632,7 @@ msgstr &quot;&quot;
625 632 msgid "Cancel transfer operation."
626 633 msgstr ""
627 634  
628   -#: src/core/ft.c:161
  635 +#: src/core/ft/ft.c:161
629 636 msgid "Cancelled by user"
630 637 msgstr ""
631 638  
... ... @@ -675,7 +682,7 @@ msgstr &quot;&quot;
675 682 msgid "Charset error"
676 683 msgstr ""
677 684  
678   -#: src/dialogs/hostselect.c:163
  685 +#: src/dialogs/hostselect.c:164
679 686 msgid "Check for SSL secure connection."
680 687 msgstr ""
681 688  
... ... @@ -687,11 +694,11 @@ msgstr &quot;&quot;
687 694 msgid "Clear"
688 695 msgstr ""
689 696  
690   -#: src/dialogs/save/save.c:308
  697 +#: src/dialogs/save/save.c:267
691 698 msgid "Click to cancel operation"
692 699 msgstr ""
693 700  
694   -#: src/dialogs/save/save.c:313
  701 +#: src/dialogs/save/save.c:272
695 702 msgid "Click to save file"
696 703 msgstr ""
697 704  
... ... @@ -715,7 +722,7 @@ msgstr &quot;&quot;
715 722 msgid "Comma-separated values (CSV)"
716 723 msgstr ""
717 724  
718   -#: src/core/ftmessages.c:73
  725 +#: src/core/ft/ftmessages.c:73
719 726 msgid "Command incomplete: file transfer canceled"
720 727 msgstr ""
721 728  
... ... @@ -748,7 +755,7 @@ msgstr &quot;&quot;
748 755 msgid "Connection state"
749 756 msgstr ""
750 757  
751   -#: src/terminal/callbacks.c:468
  758 +#: src/terminal/callbacks.c:443
752 759 msgid "Continue"
753 760 msgstr ""
754 761  
... ... @@ -776,12 +783,12 @@ msgstr &quot;&quot;
776 783 msgid "Creates a file with variable-length records."
777 784 msgstr ""
778 785  
779   -#: colors.c:519 src/core/toggles.c:142 src/dialogs/colors.c:315
  786 +#: colors.c:519 src/core/toggles.c:142 src/dialogs/colors.c:316
780 787 #: 00default.xml:121
781 788 msgid "Cross hair cursor"
782 789 msgstr ""
783 790  
784   -#: dialog.c:138 src/dialogs/save/save.c:239
  791 +#: dialog.c:138 src/dialogs/tools.c:148
785 792 #, c-format
786 793 msgid "Current (%s)"
787 794 msgstr ""
... ... @@ -826,19 +833,19 @@ msgstr &quot;&quot;
826 833 msgid "DFT B_uffer size"
827 834 msgstr ""
828 835  
829   -#: colors.c:503 src/dialogs/colors.c:299
  836 +#: colors.c:503 src/dialogs/colors.c:300
830 837 msgid "Dark Blue"
831 838 msgstr ""
832 839  
833   -#: colors.c:506 src/dialogs/colors.c:302
  840 +#: colors.c:506 src/dialogs/colors.c:303
834 841 msgid "Dark Green"
835 842 msgstr ""
836 843  
837   -#: colors.c:507 src/dialogs/colors.c:303
  844 +#: colors.c:507 src/dialogs/colors.c:304
838 845 msgid "Dark Turquoise"
839 846 msgstr ""
840 847  
841   -#: src/core/ft_cut.c:157 src/core/ft_cut.c:166
  848 +#: src/core/ft/ft_cut.c:157 src/core/ft/ft_cut.c:166
842 849 msgid "Data conversion error"
843 850 msgstr ""
844 851  
... ... @@ -870,7 +877,7 @@ msgstr &quot;&quot;
870 877 msgid "Device type rejected"
871 878 msgstr ""
872 879  
873   -#: src/core/ft.c:267
  880 +#: src/core/ft/ft.c:267
874 881 msgid "Disconnected from host."
875 882 msgstr ""
876 883  
... ... @@ -930,21 +937,22 @@ msgstr &quot;&quot;
930 937 msgid "Erase to end of line"
931 938 msgstr ""
932 939  
933   -#: print.c:247 src/core/util.c:590 src/terminal/widget.c:159
  940 +#: src/core/util.c:590 src/dialogs/popups.c:56 src/dialogs/popups.c:91
  941 +#: src/dialogs/print/print.c:61
934 942 msgid "Error"
935 943 msgstr ""
936 944  
937   -#: src/core/ft_dft.c:452 src/core/ft_cut.c:423
  945 +#: src/core/ft/ft_dft.c:454 src/core/ft/ft_cut.c:423
938 946 #, c-format
939 947 msgid "Error \"%s\" reading from local file (rc=%d)"
940 948 msgstr ""
941 949  
942   -#: src/core/ft_dft.c:330 src/core/ft_cut.c:528
  950 +#: src/core/ft/ft_dft.c:332 src/core/ft/ft_cut.c:528
943 951 #, c-format
944 952 msgid "Error \"%s\" writing to local file (rc=%d)"
945 953 msgstr ""
946 954  
947   -#: src/core/ftmessages.c:45
  955 +#: src/core/ft/ftmessages.c:45
948 956 msgid "Error in file transfer: file transfer canceled"
949 957 msgstr ""
950 958  
... ... @@ -953,19 +961,19 @@ msgstr &quot;&quot;
953 961 msgid "Error loading %s"
954 962 msgstr ""
955 963  
956   -#: src/ssl/linux/getcrl.c:485 src/ssl/linux/getcrl.c:501
957   -msgid "Error loading CRL"
  964 +#: src/ssl/linux/curl.c:195 src/ssl/linux/curl.c:233 src/ssl/linux/curl.c:249
  965 +msgid "Error loading certificate revocation list"
958 966 msgstr ""
959 967  
960   -#: src/core/ftmessages.c:87
  968 +#: src/core/ft/ftmessages.c:87
961 969 msgid "Error reading file from host: file transfer canceled"
962 970 msgstr ""
963 971  
964   -#: src/core/ftmessages.c:145
  972 +#: src/core/ft/ftmessages.c:145
965 973 msgid "Error while reading or writing to host disk: file transfer canceled"
966 974 msgstr ""
967 975  
968   -#: src/core/ftmessages.c:80
  976 +#: src/core/ft/ftmessages.c:80
969 977 msgid "Error writing file to host: file transfer canceled"
970 978 msgstr ""
971 979  
... ... @@ -977,23 +985,23 @@ msgstr &quot;&quot;
977 985 msgid "Field Delimiters"
978 986 msgstr ""
979 987  
980   -#: colors.c:488 src/dialogs/colors.c:284
  988 +#: colors.c:488 src/dialogs/colors.c:285
981 989 msgid "Field colors"
982 990 msgstr ""
983 991  
984   -#: src/dialogs/save/save.c:270
  992 +#: src/dialogs/save/save.c:229
985 993 msgid "File _Format"
986 994 msgstr ""
987 995  
988   -#: src/core/ftmessages.c:52
  996 +#: src/core/ft/ftmessages.c:52
989 997 msgid "File transfer complete"
990 998 msgstr ""
991 999  
992   -#: src/core/ftmessages.c:59
  1000 +#: src/core/ft/ftmessages.c:59
993 1001 msgid "File transfer complete with records segmented"
994 1002 msgstr ""
995 1003  
996   -#: src/core/ft.c:272
  1004 +#: src/core/ft/ft.c:272
997 1005 msgid "File transfer is already active in this session."
998 1006 msgstr ""
999 1007  
... ... @@ -1069,19 +1077,19 @@ msgstr &quot;&quot;
1069 1077 msgid "Get transfer queue from file"
1070 1078 msgstr ""
1071 1079  
1072   -#: src/ssl/linux/getcrl.c:546
1073   -msgid "Got a bad formatted CRL from LDAP server"
  1080 +#: src/ssl/linux/curl.c:294
  1081 +msgid "Got a bad formatted certificate revocation list from LDAP server"
1074 1082 msgstr ""
1075 1083  
1076   -#: src/ssl/linux/getcrl.c:532
1077   -msgid "Got an invalid CRL from server"
  1084 +#: src/ssl/linux/curl.c:280
  1085 +msgid "Got an invalid certificate revocation list from server"
1078 1086 msgstr ""
1079 1087  
1080   -#: colors.c:509 src/dialogs/colors.c:305
  1088 +#: colors.c:509 src/dialogs/colors.c:306
1081 1089 msgid "Gray"
1082 1090 msgstr ""
1083 1091  
1084   -#: colors.c:498 src/dialogs/colors.c:294
  1092 +#: colors.c:498 src/dialogs/colors.c:295
1085 1093 msgid "Green"
1086 1094 msgstr ""
1087 1095  
... ... @@ -1097,7 +1105,7 @@ msgstr &quot;&quot;
1097 1105 msgid "Host charset"
1098 1106 msgstr ""
1099 1107  
1100   -#: src/core/ft.c:686
  1108 +#: src/core/ft/ft.c:686
1101 1109 msgid "Host disconnected, transfer cancelled"
1102 1110 msgstr ""
1103 1111  
... ... @@ -1105,7 +1113,7 @@ msgstr &quot;&quot;
1105 1113 msgid "Host illegally added function(s)"
1106 1114 msgstr ""
1107 1115  
1108   -#: src/core/ftmessages.c:222
  1116 +#: src/core/ft/ftmessages.c:222
1109 1117 msgid "Host program error code xxxxxxxxxx: file transfer canceled"
1110 1118 msgstr ""
1111 1119  
... ... @@ -1189,15 +1197,15 @@ msgstr &quot;&quot;
1189 1197 msgid "Ignore the fail and remove the file from queue."
1190 1198 msgstr ""
1191 1199  
1192   -#: src/core/ft_cut.c:505
  1200 +#: src/core/ft/ft_cut.c:505
1193 1201 msgid "Illegal frame length"
1194 1202 msgstr ""
1195 1203  
1196   -#: src/core/ftmessages.c:138
  1204 +#: src/core/ft/ftmessages.c:138
1197 1205 msgid "Incorrect option specified: file transfer canceled"
1198 1206 msgstr ""
1199 1207  
1200   -#: src/core/ftmessages.c:101
  1208 +#: src/core/ft/ftmessages.c:101
1201 1209 msgid "Incorrect request code: file transfer canceled"
1202 1210 msgstr ""
1203 1211  
... ... @@ -1209,11 +1217,11 @@ msgstr &quot;&quot;
1209 1217 msgid "Insert new file in the transfer queue"
1210 1218 msgstr ""
1211 1219  
1212   -#: colors.c:514 src/dialogs/colors.c:310
  1220 +#: colors.c:514 src/dialogs/colors.c:311
1213 1221 msgid "Intensified/Protected"
1214 1222 msgstr ""
1215 1223  
1216   -#: colors.c:512 src/dialogs/colors.c:308
  1224 +#: colors.c:512 src/dialogs/colors.c:309
1217 1225 msgid "Intensified/Unprotected"
1218 1226 msgstr ""
1219 1227  
... ... @@ -1221,7 +1229,7 @@ msgstr &quot;&quot;
1221 1229 msgid "Invalid CA certificate"
1222 1230 msgstr ""
1223 1231  
1224   -#: src/terminal/callbacks.c:495
  1232 +#: src/terminal/callbacks.c:470
1225 1233 msgid "Invalid callback table, possible version mismatch in lib3270"
1226 1234 msgstr ""
1227 1235  
... ... @@ -1233,23 +1241,23 @@ msgstr &quot;&quot;
1233 1241 msgid "Invalid character value"
1234 1242 msgstr ""
1235 1243  
1236   -#: src/core/ftmessages.c:166
  1244 +#: src/core/ft/ftmessages.c:166
1237 1245 msgid "Invalid option xxxxxxxx with APPEND: file transfer canceled"
1238 1246 msgstr ""
1239 1247  
1240   -#: src/core/ftmessages.c:180
  1248 +#: src/core/ft/ftmessages.c:180
1241 1249 msgid "Invalid option xxxxxxxx with PDS: file transfer canceled"
1242 1250 msgstr ""
1243 1251  
1244   -#: src/core/ftmessages.c:159
  1252 +#: src/core/ft/ftmessages.c:159
1245 1253 msgid "Invalid option xxxxxxxx with RECEIVE: file transfer canceled"
1246 1254 msgstr ""
1247 1255  
1248   -#: src/core/ftmessages.c:173
  1256 +#: src/core/ft/ftmessages.c:173
1249 1257 msgid "Invalid option xxxxxxxx without SPACE: file transfer canceled"
1250 1258 msgstr ""
1251 1259  
1252   -#: src/core/ftmessages.c:152
  1260 +#: src/core/ft/ftmessages.c:152
1253 1261 msgid "Invalid option xxxxxxxx: file transfer canceled"
1254 1262 msgstr ""
1255 1263  
... ... @@ -1326,7 +1334,7 @@ msgstr &quot;&quot;
1326 1334 msgid "Minutes for auto-disconnect"
1327 1335 msgstr ""
1328 1336  
1329   -#: colors.c:489 src/dialogs/colors.c:285
  1337 +#: colors.c:489 src/dialogs/colors.c:286
1330 1338 msgid "Misc colors"
1331 1339 msgstr ""
1332 1340  
... ... @@ -1343,7 +1351,7 @@ msgstr &quot;&quot;
1343 1351 msgid "Monocase"
1344 1352 msgstr ""
1345 1353  
1346   -#: src/dialogs/hostselect.c:43
  1354 +#: src/dialogs/hostselect.c:44
1347 1355 msgid "Monochrome"
1348 1356 msgstr ""
1349 1357  
... ... @@ -1351,7 +1359,7 @@ msgstr &quot;&quot;
1351 1359 msgid "Move action needs target & direction attributes"
1352 1360 msgstr ""
1353 1361  
1354   -#: colors.c:508 src/dialogs/colors.c:304
  1362 +#: colors.c:508 src/dialogs/colors.c:305
1355 1363 msgid "Mustard"
1356 1364 msgstr ""
1357 1365  
... ... @@ -1368,11 +1376,11 @@ msgstr &quot;&quot;
1368 1376 msgid "Next field"
1369 1377 msgstr ""
1370 1378  
1371   -#: src/ssl/linux/getcrl.c:300
  1379 +#: src/ssl/linux/ldap.c:90
1372 1380 msgid "No DN of the entry at which to start the search on the URL"
1373 1381 msgstr ""
1374 1382  
1375   -#: src/ssl/linux/getcrl.c:312
  1383 +#: src/ssl/linux/ldap.c:103
1376 1384 msgid "No LDAP attribute on the URL"
1377 1385 msgstr ""
1378 1386  
... ... @@ -1390,7 +1398,7 @@ msgstr &quot;&quot;
1390 1398 msgid "No transfer"
1391 1399 msgstr ""
1392 1400  
1393   -#: src/core/ft.c:101 src/filetransfer/worker.c:602
  1401 +#: src/core/ft/ft.c:101 src/filetransfer/worker.c:602
1394 1402 msgid "No transfer in progress"
1395 1403 msgstr ""
1396 1404  
... ... @@ -1402,15 +1410,15 @@ msgstr &quot;&quot;
1402 1410 msgid "Non zero if the host is TSO."
1403 1411 msgstr ""
1404 1412  
1405   -#: colors.c:513 src/dialogs/colors.c:309
  1413 +#: colors.c:513 src/dialogs/colors.c:310
1406 1414 msgid "Normal/Protected"
1407 1415 msgstr ""
1408 1416  
1409   -#: colors.c:511 src/dialogs/colors.c:307
  1417 +#: colors.c:511 src/dialogs/colors.c:308
1410 1418 msgid "Normal/Unprotected"
1411 1419 msgstr ""
1412 1420  
1413   -#: src/core/ft.c:693
  1421 +#: src/core/ft/ft.c:693
1414 1422 msgid "Not in 3270 mode, transfer cancelled"
1415 1423 msgstr ""
1416 1424  
... ... @@ -1418,46 +1426,46 @@ msgstr &quot;&quot;
1418 1426 msgid "Not the same terminal type"
1419 1427 msgstr ""
1420 1428  
1421   -#: colors.c:526 src/dialogs/colors.c:322
  1429 +#: colors.c:526 src/dialogs/colors.c:323
1422 1430 msgid "OIA Warning"
1423 1431 msgstr ""
1424 1432  
1425   -#: colors.c:522 src/dialogs/colors.c:318
  1433 +#: colors.c:522 src/dialogs/colors.c:319
1426 1434 msgid "OIA background"
1427 1435 msgstr ""
1428 1436  
1429   -#: colors.c:523 src/dialogs/colors.c:319
  1437 +#: colors.c:523 src/dialogs/colors.c:320
1430 1438 msgid "OIA foreground"
1431 1439 msgstr ""
1432 1440  
1433   -#: colors.c:524 src/dialogs/colors.c:320
  1441 +#: colors.c:524 src/dialogs/colors.c:321
1434 1442 msgid "OIA separator"
1435 1443 msgstr ""
1436 1444  
1437   -#: colors.c:527 src/dialogs/colors.c:323
  1445 +#: colors.c:527 src/dialogs/colors.c:324
1438 1446 msgid "OIA status invalid"
1439 1447 msgstr ""
1440 1448  
1441   -#: colors.c:525 src/dialogs/colors.c:321
  1449 +#: colors.c:525 src/dialogs/colors.c:322
1442 1450 msgid "OIA status ok"
1443 1451 msgstr ""
1444 1452  
1445   -#: src/core/ftmessages.c:187
  1453 +#: src/core/ft/ftmessages.c:187
1446 1454 msgid "Only one of TRACKS, CYLINDERS, AVBLOCK allowed: file transfer canceled"
1447 1455 msgstr ""
1448 1456  
1449   -#: src/terminal/callbacks.c:343 src/filetransfer/save.c:118
  1457 +#: print.c:205 print.c:226 src/filetransfer/save.c:118
1450 1458 #: src/filetransfer/load.c:272 src/filetransfer/activitylist.c:440
1451   -#: src/dialogs/transfer.c:99 src/dialogs/save/save.c:498
  1459 +#: src/dialogs/transfer.c:99 src/dialogs/save/save.c:457
1452 1460 #: src/dialogs/save/convenience.c:65 src/dialogs/save/convenience.c:94
1453 1461 msgid "Operation has failed"
1454 1462 msgstr ""
1455 1463  
1456   -#: print.c:613 src/dialogs/print/print.c:206
  1464 +#: src/dialogs/print/print.c:167
1457 1465 msgid "Options"
1458 1466 msgstr ""
1459 1467  
1460   -#: colors.c:504 src/dialogs/colors.c:300
  1468 +#: colors.c:504 src/dialogs/colors.c:301
1461 1469 msgid "Orange"
1462 1470 msgstr ""
1463 1471  
... ... @@ -1626,11 +1634,11 @@ msgstr &quot;&quot;
1626 1634 msgid "Peer certificate"
1627 1635 msgstr ""
1628 1636  
1629   -#: src/core/ftmessages.c:66
  1637 +#: src/core/ft/ftmessages.c:66
1630 1638 msgid "Personal computer filespec incorrect: file transfer canceled"
1631 1639 msgstr ""
1632 1640  
1633   -#: colors.c:497 src/dialogs/colors.c:293
  1641 +#: colors.c:497 src/dialogs/colors.c:294
1634 1642 msgid "Pink"
1635 1643 msgstr ""
1636 1644  
... ... @@ -1638,11 +1646,11 @@ msgstr &quot;&quot;
1638 1646 msgid "Plain text"
1639 1647 msgstr ""
1640 1648  
1641   -#: src/dialogs/hostselect.c:140
  1649 +#: src/dialogs/hostselect.c:141
1642 1650 msgid "Port or service name (empty for \"telnet\")."
1643 1651 msgstr ""
1644 1652  
1645   -#: src/dialogs/colors.c:257
  1653 +#: src/dialogs/colors.c:258
1646 1654 msgid "Predefined color schemes"
1647 1655 msgstr ""
1648 1656  
... ... @@ -1672,19 +1680,23 @@ msgstr &quot;&quot;
1672 1680 msgid "Print copy"
1673 1681 msgstr ""
1674 1682  
1675   -#: print.c:243
  1683 +#: src/dialogs/print/print.c:56
1676 1684 msgid "Print operation failed"
1677 1685 msgstr ""
1678 1686  
  1687 +#: src/dialogs/print/convenience.c:82
  1688 +msgid "Print operation has failed"
  1689 +msgstr ""
  1690 +
1679 1691 #: 00default.xml:48
1680 1692 msgid "Print selected"
1681 1693 msgstr ""
1682 1694  
1683   -#: print.c:507 src/dialogs/print/print.c:104
  1695 +#: src/dialogs/print/settings.c:84
1684 1696 msgid "Print selection box"
1685 1697 msgstr ""
1686 1698  
1687   -#: print.c:914 00default.xml:105
  1699 +#: print.c:265 00default.xml:105
1688 1700 msgid "Print settings"
1689 1701 msgstr ""
1690 1702  
... ... @@ -1692,7 +1704,7 @@ msgstr &quot;&quot;
1692 1704 msgid "Progress"
1693 1705 msgstr ""
1694 1706  
1695   -#: colors.c:505 src/dialogs/colors.c:301
  1707 +#: colors.c:505 src/dialogs/colors.c:302
1696 1708 msgid "Purple"
1697 1709 msgstr ""
1698 1710  
... ... @@ -1800,7 +1812,7 @@ msgstr &quot;&quot;
1800 1812 msgid "Record format"
1801 1813 msgstr ""
1802 1814  
1803   -#: colors.c:496 src/dialogs/colors.c:292
  1815 +#: colors.c:496 src/dialogs/colors.c:293
1804 1816 msgid "Red"
1805 1817 msgstr ""
1806 1818  
... ... @@ -1838,11 +1850,11 @@ msgstr &quot;&quot;
1838 1850 msgid "Remove selection"
1839 1851 msgstr ""
1840 1852  
1841   -#: src/core/ft.c:209
  1853 +#: src/core/ft/ft.c:209
1842 1854 msgid "Request failed"
1843 1855 msgstr ""
1844 1856  
1845   -#: src/core/ftmessages.c:94
  1857 +#: src/core/ft/ftmessages.c:94
1846 1858 msgid "Required host storage unavailable: file transfer canceled"
1847 1859 msgstr ""
1848 1860  
... ... @@ -1870,7 +1882,7 @@ msgstr &quot;&quot;
1870 1882 msgid "Revocation list"
1871 1883 msgstr ""
1872 1884  
1873   -#: src/core/ftmessages.c:188 src/filetransfer/v3270ftprogress.c:186
  1885 +#: src/core/ft/ftmessages.c:188 src/filetransfer/v3270ftprogress.c:186
1874 1886 msgid ""
1875 1887 "SPACE can be specified in units of TRACKS, CYLINDERS, or AVBLOCK, and only "
1876 1888 "one option can be used."
... ... @@ -1908,11 +1920,7 @@ msgstr &quot;&quot;
1908 1920 msgid "Save _As"
1909 1921 msgstr ""
1910 1922  
1911   -#: src/dialogs/save/save.c:342
1912   -msgid "Save copied data"
1913   -msgstr ""
1914   -
1915   -#: 00default.xml:44
  1923 +#: src/dialogs/save/save.c:301 00default.xml:44
1916 1924 msgid "Save copy"
1917 1925 msgstr ""
1918 1926  
... ... @@ -1928,11 +1936,11 @@ msgstr &quot;&quot;
1928 1936 msgid "Save selected"
1929 1937 msgstr ""
1930 1938  
1931   -#: src/dialogs/save/save.c:341
  1939 +#: src/dialogs/save/save.c:300
1932 1940 msgid "Save selected area"
1933 1941 msgstr ""
1934 1942  
1935   -#: src/dialogs/save/save.c:340
  1943 +#: src/dialogs/save/save.c:299
1936 1944 msgid "Save terminal contents"
1937 1945 msgstr ""
1938 1946  
... ... @@ -1977,11 +1985,11 @@ msgstr &quot;&quot;
1977 1985 msgid "Scripts"
1978 1986 msgstr ""
1979 1987  
1980   -#: src/ssl/linux/getcrl.c:391
  1988 +#: src/ssl/linux/ldap.c:183
1981 1989 msgid "Search did not produce any attributes."
1982 1990 msgstr ""
1983 1991  
1984   -#: src/ssl/linux/getcrl.c:403
  1992 +#: src/ssl/linux/ldap.c:195
1985 1993 msgid "Search did not produce any values."
1986 1994 msgstr ""
1987 1995  
... ... @@ -2001,16 +2009,14 @@ msgstr &quot;&quot;
2001 2009  
2002 2010 #: src/ssl/negotiate.c:104 src/ssl/negotiate.c:133 src/ssl/negotiate.c:156
2003 2011 #: src/ssl/negotiate.c:176 src/ssl/negotiate.c:199 src/ssl/negotiate.c:218
2004   -#: src/ssl/ctx_init.c:124 src/ssl/ctx_init.c:151 src/ssl/linux/getcrl.c:248
2005   -#: src/ssl/linux/getcrl.c:267 src/ssl/linux/getcrl.c:279
2006   -#: src/ssl/linux/getcrl.c:299 src/ssl/linux/getcrl.c:311
2007   -#: src/ssl/linux/getcrl.c:331 src/ssl/linux/getcrl.c:342
2008   -#: src/ssl/linux/getcrl.c:353 src/ssl/linux/getcrl.c:378
2009   -#: src/ssl/linux/getcrl.c:389 src/ssl/linux/getcrl.c:401
2010   -#: src/ssl/linux/getcrl.c:425 src/ssl/linux/getcrl.c:476
2011   -#: src/ssl/linux/getcrl.c:500 src/ssl/linux/getcrl.c:522
2012   -#: src/ssl/linux/getcrl.c:531 src/ssl/linux/getcrl.c:545
2013   -#: src/ssl/linux/getcrl.c:575 src/ssl/linux/getcrl.c:590
  2012 +#: src/ssl/ctx_init.c:124 src/ssl/ctx_init.c:151 src/ssl/linux/ldap.c:89
  2013 +#: src/ssl/linux/ldap.c:102 src/ssl/linux/ldap.c:123 src/ssl/linux/ldap.c:134
  2014 +#: src/ssl/linux/ldap.c:145 src/ssl/linux/ldap.c:170 src/ssl/linux/ldap.c:181
  2015 +#: src/ssl/linux/ldap.c:193 src/ssl/linux/ldap.c:217 src/ssl/linux/getcrl.c:55
  2016 +#: src/ssl/linux/getcrl.c:74 src/ssl/linux/getcrl.c:86
  2017 +#: src/ssl/linux/getcrl.c:112 src/ssl/linux/curl.c:194 src/ssl/linux/curl.c:224
  2018 +#: src/ssl/linux/curl.c:248 src/ssl/linux/curl.c:270 src/ssl/linux/curl.c:279
  2019 +#: src/ssl/linux/curl.c:293 src/ssl/linux/curl.c:311
2014 2020 msgid "Security error"
2015 2021 msgstr ""
2016 2022  
... ... @@ -2019,7 +2025,7 @@ msgid &quot;Security warning&quot;
2019 2025 msgstr ""
2020 2026  
2021 2027 #: src/filetransfer/v3270ft.c:307 src/filetransfer/settings.c:209
2022   -#: src/dialogs/save/save.c:126 src/dialogs/save/save.c:151
  2028 +#: src/dialogs/save/save.c:114 src/dialogs/save/save.c:139
2023 2029 msgid "Select"
2024 2030 msgstr ""
2025 2031  
... ... @@ -2035,12 +2041,12 @@ msgstr &quot;&quot;
2035 2041 msgid "Select by rectangles"
2036 2042 msgstr ""
2037 2043  
2038   -#: src/dialogs/save/save.c:125 src/dialogs/save/save.c:147
  2044 +#: src/dialogs/save/save.c:113 src/dialogs/save/save.c:135
2039 2045 msgid "Select destination file"
2040 2046 msgstr ""
2041 2047  
2042 2048 #: src/filetransfer/v3270ft.c:577 src/filetransfer/settings.c:470
2043   -#: src/dialogs/save/save.c:216
  2049 +#: src/dialogs/save/save.c:204
2044 2050 msgid "Select file"
2045 2051 msgstr ""
2046 2052  
... ... @@ -2072,11 +2078,11 @@ msgstr &quot;&quot;
2072 2078 msgid "Select() failed when processing for events."
2073 2079 msgstr ""
2074 2080  
2075   -#: colors.c:516 src/dialogs/colors.c:312
  2081 +#: colors.c:516 src/dialogs/colors.c:313
2076 2082 msgid "Selection background"
2077 2083 msgstr ""
2078 2084  
2079   -#: colors.c:517 src/dialogs/colors.c:313
  2085 +#: colors.c:517 src/dialogs/colors.c:314
2080 2086 msgid "Selection foreground"
2081 2087 msgstr ""
2082 2088  
... ... @@ -2136,7 +2142,7 @@ msgstr &quot;&quot;
2136 2142 msgid "Settings"
2137 2143 msgstr ""
2138 2144  
2139   -#: src/dialogs/hostselect.c:313
  2145 +#: src/dialogs/hostselect.c:314
2140 2146 msgid "Setup host"
2141 2147 msgstr ""
2142 2148  
... ... @@ -2242,7 +2248,7 @@ msgstr &quot;&quot;
2242 2248 msgid "Subject issuer mismatch"
2243 2249 msgstr ""
2244 2250  
2245   -#: src/dialogs/hostselect.c:54
  2251 +#: src/dialogs/hostselect.c:55
2246 2252 msgid "System _type"
2247 2253 msgstr ""
2248 2254  
... ... @@ -2254,7 +2260,7 @@ msgstr &quot;&quot;
2254 2260 msgid "TN3270 Session name"
2255 2261 msgstr ""
2256 2262  
2257   -#: colors.c:487 src/dialogs/colors.c:206 src/dialogs/colors.c:283
  2263 +#: colors.c:487 src/dialogs/colors.c:207 src/dialogs/colors.c:284
2258 2264 msgid "Terminal colors"
2259 2265 msgstr ""
2260 2266  
... ... @@ -2266,7 +2272,7 @@ msgstr &quot;&quot;
2266 2272 msgid "Text files"
2267 2273 msgstr ""
2268 2274  
2269   -#: src/core/ftmessages.c:216 src/filetransfer/v3270ftprogress.c:210
  2275 +#: src/core/ft/ftmessages.c:216 src/filetransfer/v3270ftprogress.c:210
2270 2276 msgid ""
2271 2277 "The CMS disk is full, or the maximum number of files on the minidisk (3400) "
2272 2278 "has been reached, or the maximum number of data blocks per file (16060) has "
... ... @@ -2313,15 +2319,15 @@ msgstr &quot;&quot;
2313 2319 msgid "The SSL certificate for this host is not trusted."
2314 2320 msgstr ""
2315 2321  
2316   -#: src/ssl/linux/getcrl.c:301 src/ssl/linux/getcrl.c:313
  2322 +#: src/ssl/linux/ldap.c:91 src/ssl/linux/ldap.c:104
2317 2323 msgid "The URL argument should be in the format ldap://[HOST]/[DN]?attribute"
2318 2324 msgstr ""
2319 2325  
2320   -#: src/ssl/linux/getcrl.c:250
  2326 +#: src/ssl/linux/getcrl.c:57
2321 2327 msgid "The URL for the CRL is undefined or empty"
2322 2328 msgstr ""
2323 2329  
2324   -#: src/ssl/linux/getcrl.c:592
  2330 +#: src/ssl/linux/getcrl.c:114
2325 2331 msgid "The URL scheme is unknown"
2326 2332 msgstr ""
2327 2333  
... ... @@ -2416,28 +2422,28 @@ msgstr &quot;&quot;
2416 2422 msgid "The delay between the host unlocking the keyboard and the actual unlock"
2417 2423 msgstr ""
2418 2424  
2419   -#: src/terminal/callbacks.c:462
  2425 +#: src/terminal/callbacks.c:437
2420 2426 #, c-format
2421 2427 msgid "The error code was %d"
2422 2428 msgstr ""
2423 2429  
2424   -#: src/dialogs/save/save.c:455
  2430 +#: src/dialogs/save/save.c:414
2425 2431 #, c-format
2426 2432 msgid "The file \"%s\" already exists. Replace it?"
2427 2433 msgstr ""
2428 2434  
2429   -#: src/core/ftmessages.c:60 src/filetransfer/v3270ftprogress.c:76
  2435 +#: src/core/ft/ftmessages.c:60 src/filetransfer/v3270ftprogress.c:76
2430 2436 msgid ""
2431 2437 "The file transfer operation has been completed, and any record greater than "
2432 2438 "the logical record length (LRECL) of the file being appended has been "
2433 2439 "divided and becomes multiple records."
2434 2440 msgstr ""
2435 2441  
2436   -#: src/core/ftmessages.c:53 src/filetransfer/v3270ftprogress.c:70
  2442 +#: src/core/ft/ftmessages.c:53 src/filetransfer/v3270ftprogress.c:70
2437 2443 msgid "The file transfer operation has been successfully completed."
2438 2444 msgstr ""
2439 2445  
2440   -#: src/core/ftmessages.c:81 src/core/ftmessages.c:88
  2446 +#: src/core/ft/ftmessages.c:81 src/core/ft/ftmessages.c:88
2441 2447 #: src/filetransfer/v3270ftprogress.c:94 src/filetransfer/v3270ftprogress.c:100
2442 2448 msgid ""
2443 2449 "The host program has detected an error in the file data during a RECEIVE "
... ... @@ -2488,7 +2494,7 @@ msgid &quot;&quot;
2488 2494 "The public key in the certificate SubjectPublicKeyInfo could not be read."
2489 2495 msgstr ""
2490 2496  
2491   -#: src/core/ft.c:278
  2497 +#: src/core/ft/ft.c:278
2492 2498 msgid "The remote file name is invalid."
2493 2499 msgstr ""
2494 2500  
... ... @@ -2518,7 +2524,7 @@ msgstr &quot;&quot;
2518 2524 msgid "The supplied certificate cannot be used for the specified purpose."
2519 2525 msgstr ""
2520 2526  
2521   -#: src/core/ftmessages.c:146 src/filetransfer/v3270ftprogress.c:150
  2527 +#: src/core/ft/ftmessages.c:146 src/filetransfer/v3270ftprogress.c:150
2522 2528 msgid "There is not enough space available for data on the host."
2523 2529 msgstr ""
2524 2530  
... ... @@ -2531,7 +2537,7 @@ msgstr &quot;&quot;
2531 2537 msgid "There's no security information in the session"
2532 2538 msgstr ""
2533 2539  
2534   -#: src/core/ftmessages.c:223 src/filetransfer/v3270ftprogress.c:216
  2540 +#: src/core/ft/ftmessages.c:223 src/filetransfer/v3270ftprogress.c:216
2535 2541 msgid "This is a host program error."
2536 2542 msgstr ""
2537 2543  
... ... @@ -2609,20 +2615,20 @@ msgstr &quot;&quot;
2609 2615 msgid "Tracks"
2610 2616 msgstr ""
2611 2617  
2612   -#: src/core/ft_cut.c:371
  2618 +#: src/core/ft/ft_cut.c:371
2613 2619 msgid "Transfer cancelled by host"
2614 2620 msgstr ""
2615 2621  
2616   -#: src/core/ft_dft.c:228 src/core/ft_dft.c:371 src/core/ft_cut.c:400
2617   -#: src/core/ft_cut.c:495
  2622 +#: src/core/ft/ft_dft.c:230 src/core/ft/ft_dft.c:373 src/core/ft/ft_cut.c:400
  2623 +#: src/core/ft/ft_cut.c:495
2618 2624 msgid "Transfer cancelled by user"
2619 2625 msgstr ""
2620 2626  
2621   -#: src/core/ft.c:581
  2627 +#: src/core/ft/ft.c:581
2622 2628 msgid "Transfer complete"
2623 2629 msgstr ""
2624 2630  
2625   -#: src/core/ft.c:586 src/filetransfer/worker.c:569
  2631 +#: src/core/ft/ft.c:586 src/filetransfer/worker.c:569
2626 2632 #: src/filetransfer/v3270ftprogress.c:720
2627 2633 msgid "Transfer failed"
2628 2634 msgstr ""
... ... @@ -2644,7 +2650,7 @@ msgstr &quot;&quot;
2644 2650 msgid "Transfer speed"
2645 2651 msgstr ""
2646 2652  
2647   -#: src/core/ft_cut.c:464
  2653 +#: src/core/ft/ft_cut.c:464
2648 2654 msgid "Transmission error"
2649 2655 msgstr ""
2650 2656  
... ... @@ -2652,7 +2658,7 @@ msgstr &quot;&quot;
2652 2658 msgid "Try again with the same file."
2653 2659 msgstr ""
2654 2660  
2655   -#: colors.c:499 src/dialogs/colors.c:295
  2661 +#: colors.c:499 src/dialogs/colors.c:296
2656 2662 msgid "Turquoise"
2657 2663 msgstr ""
2658 2664  
... ... @@ -2664,14 +2670,18 @@ msgstr &quot;&quot;
2664 2670 msgid "URL of the current host"
2665 2671 msgstr ""
2666 2672  
2667   -#: dialog.c:64 src/dialogs/save/save.c:71
  2673 +#: dialog.c:64 src/dialogs/tools.c:137
2668 2674 msgid "UTF-8"
2669 2675 msgstr ""
2670 2676  
2671   -#: src/core/ft_dft.c:168
  2677 +#: src/core/ft/ft_dft.c:170
2672 2678 msgid "Uknown DFT Open type from host"
2673 2679 msgstr ""
2674 2680  
  2681 +#: print.c:206 print.c:227
  2682 +msgid "Unable to complete print job"
  2683 +msgstr ""
  2684 +
2675 2685 #: src/ssl/state.c:132
2676 2686 msgid "Unable to decode issuer public key"
2677 2687 msgstr ""
... ... @@ -2716,7 +2726,7 @@ msgstr &quot;&quot;
2716 2726 msgid "Unable to save"
2717 2727 msgstr ""
2718 2728  
2719   -#: src/core/ft.c:529
  2729 +#: src/core/ft/ft.c:529
2720 2730 msgid "Unable to send file-transfer request"
2721 2731 msgstr ""
2722 2732  
... ... @@ -2737,7 +2747,7 @@ msgstr &quot;&quot;
2737 2747 msgid "Unexpected error"
2738 2748 msgstr ""
2739 2749  
2740   -#: src/dialogs/save/save.c:440
  2750 +#: src/dialogs/save/save.c:399
2741 2751 #, c-format
2742 2752 msgid "Unexpected format %d"
2743 2753 msgstr ""
... ... @@ -2747,7 +2757,7 @@ msgstr &quot;&quot;
2747 2757 msgid "Unexpected group \"%s\""
2748 2758 msgstr ""
2749 2759  
2750   -#: src/dialogs/save/save.c:410
  2760 +#: src/dialogs/save/save.c:369
2751 2761 #, c-format
2752 2762 msgid "Unexpected mode %d"
2753 2763 msgstr ""
... ... @@ -2757,7 +2767,7 @@ msgstr &quot;&quot;
2757 2767 msgid "Unexpected or invalid %s attribute: \"%s\""
2758 2768 msgstr ""
2759 2769  
2760   -#: src/ssl/linux/getcrl.c:591
  2770 +#: src/ssl/linux/getcrl.c:113
2761 2771 msgid "Unexpected or invalid CRL URL"
2762 2772 msgstr ""
2763 2773  
... ... @@ -2784,7 +2794,7 @@ msgstr &quot;&quot;
2784 2794 msgid "Unexpected target \"%s\""
2785 2795 msgstr ""
2786 2796  
2787   -#: src/core/kybd.c:290
  2797 +#: src/core/keyboard/kybd.c:278
2788 2798 #, c-format
2789 2799 msgid "Unexpected type %d in typeahead queue"
2790 2800 msgstr ""
... ... @@ -2794,21 +2804,21 @@ msgstr &quot;&quot;
2794 2804 msgid "Unknown 3270 Data Stream command: 0x%X"
2795 2805 msgstr ""
2796 2806  
2797   -#: src/core/ft_cut.c:379
  2807 +#: src/core/ft/ft_cut.c:379
2798 2808 msgid "Unknown FT control code from host"
2799 2809 msgstr ""
2800 2810  
2801   -#: src/core/kybd.c:2207
  2811 +#: src/core/keyboard/kybd.c:1669
2802 2812 #, c-format
2803 2813 msgid "Unknown PA key %d"
2804 2814 msgstr ""
2805 2815  
2806   -#: src/core/kybd.c:2222
  2816 +#: src/core/keyboard/kybd.c:1684
2807 2817 #, c-format
2808 2818 msgid "Unknown PF key %d"
2809 2819 msgstr ""
2810 2820  
2811   -#: src/core/ft_cut.c:303
  2821 +#: src/core/ft/ft_cut.c:303
2812 2822 msgid "Unknown frame type from host"
2813 2823 msgstr ""
2814 2824  
... ... @@ -2825,7 +2835,7 @@ msgstr &quot;&quot;
2825 2835 msgid "Unsupported certificate purpose"
2826 2836 msgstr ""
2827 2837  
2828   -#: src/dialogs/save/save.c:163
  2838 +#: src/dialogs/save/save.c:151
2829 2839 msgid "Untitled document"
2830 2840 msgstr ""
2831 2841  
... ... @@ -2850,19 +2860,19 @@ msgstr &quot;&quot;
2850 2860 msgid "Version %s-%s"
2851 2861 msgstr ""
2852 2862  
2853   -#: src/core/ft.c:538
  2863 +#: src/core/ft/ft.c:538
2854 2864 msgid "Waiting for GET response"
2855 2865 msgstr ""
2856 2866  
2857   -#: src/core/ft.c:540
  2867 +#: src/core/ft/ft.c:540
2858 2868 msgid "Waiting for PUT response"
2859 2869 msgstr ""
2860 2870  
2861   -#: dialog.c:65 src/dialogs/save/save.c:72
  2871 +#: dialog.c:65 src/dialogs/tools.c:138
2862 2872 msgid "Western Europe (ISO 8859-1)"
2863 2873 msgstr ""
2864 2874  
2865   -#: colors.c:501 src/dialogs/colors.c:297
  2875 +#: colors.c:501 src/dialogs/colors.c:298
2866 2876 msgid "White"
2867 2877 msgstr ""
2868 2878  
... ... @@ -2870,10 +2880,15 @@ msgstr &quot;&quot;
2870 2880 msgid "Window"
2871 2881 msgstr ""
2872 2882  
2873   -#: dialog.c:66 src/dialogs/save/save.c:73
  2883 +#: dialog.c:66 src/dialogs/tools.c:139
2874 2884 msgid "Windows Western languages (CP1252)"
2875 2885 msgstr ""
2876 2886  
  2887 +#: src/core/connect.c:162
  2888 +#, c-format
  2889 +msgid "Windows error was \"%s\" (%u)"
  2890 +msgstr ""
  2891 +
2877 2892 #: src/terminal/oia.c:432 src/terminal/oia.c:456 src/terminal/oia.c:460
2878 2893 msgid "X"
2879 2894 msgstr ""
... ... @@ -2924,7 +2939,7 @@ msgstr &quot;&quot;
2924 2939 msgid "XML file"
2925 2940 msgstr ""
2926 2941  
2927   -#: colors.c:500 src/dialogs/colors.c:296
  2942 +#: colors.c:500 src/dialogs/colors.c:297
2928 2943 msgid "Yellow"
2929 2944 msgstr ""
2930 2945  
... ... @@ -2932,60 +2947,60 @@ msgstr &quot;&quot;
2932 2947 msgid "You can't add more than one acitivity with the same files."
2933 2948 msgstr ""
2934 2949  
2935   -#: src/core/ftmessages.c:74 src/filetransfer/v3270ftprogress.c:88
  2950 +#: src/core/ft/ftmessages.c:74 src/filetransfer/v3270ftprogress.c:88
2936 2951 msgid ""
2937 2952 "You did not enter the required parameters after a SEND or RECEIVE command."
2938 2953 msgstr ""
2939 2954  
2940   -#: src/core/ftmessages.c:195 src/filetransfer/v3270ftprogress.c:192
  2955 +#: src/core/ft/ftmessages.c:195 src/filetransfer/v3270ftprogress.c:192
2941 2956 msgid "You did not specify an existing CMS file for RECEIVE."
2942 2957 msgstr ""
2943 2958  
2944   -#: src/core/ftmessages.c:95 src/filetransfer/v3270ftprogress.c:106
  2959 +#: src/core/ft/ftmessages.c:95 src/filetransfer/v3270ftprogress.c:106
2945 2960 msgid ""
2946 2961 "You need 30 KB of main storage (not disk space) on the host for the file "
2947 2962 "transfer, in addition to the host requirement."
2948 2963 msgstr ""
2949 2964  
2950   -#: src/core/ftmessages.c:174 src/filetransfer/v3270ftprogress.c:174
  2965 +#: src/core/ft/ftmessages.c:174 src/filetransfer/v3270ftprogress.c:174
2951 2966 msgid ""
2952 2967 "You selected an option that can only be used if SPACE is also specified."
2953 2968 msgstr ""
2954 2969  
2955   -#: src/core/ftmessages.c:153 src/filetransfer/v3270ftprogress.c:156
  2970 +#: src/core/ft/ftmessages.c:153 src/filetransfer/v3270ftprogress.c:156
2956 2971 msgid ""
2957 2972 "You selected an option that is either not recognized, is specified as a "
2958 2973 "positional keyword, or has an associated value that is incorrect."
2959 2974 msgstr ""
2960 2975  
2961   -#: src/core/ftmessages.c:181 src/filetransfer/v3270ftprogress.c:180
  2976 +#: src/core/ft/ftmessages.c:181 src/filetransfer/v3270ftprogress.c:180
2962 2977 msgid ""
2963 2978 "You selected an option that is invalid with a host-partitioned data set."
2964 2979 msgstr ""
2965 2980  
2966   -#: src/core/ftmessages.c:167 src/filetransfer/v3270ftprogress.c:168
  2981 +#: src/core/ft/ftmessages.c:167 src/filetransfer/v3270ftprogress.c:168
2967 2982 msgid ""
2968 2983 "You selected an option that is not valid with APPEND, but otherwise may be "
2969 2984 "used."
2970 2985 msgstr ""
2971 2986  
2972   -#: src/core/ftmessages.c:160 src/filetransfer/v3270ftprogress.c:162
  2987 +#: src/core/ft/ftmessages.c:160 src/filetransfer/v3270ftprogress.c:162
2973 2988 msgid ""
2974 2989 "You selected an option that is not valid with RECEIVE, but can be used with "
2975 2990 "SEND."
2976 2991 msgstr ""
2977 2992  
2978   -#: src/core/ftmessages.c:202 src/filetransfer/v3270ftprogress.c:198
  2993 +#: src/core/ft/ftmessages.c:202 src/filetransfer/v3270ftprogress.c:198
2979 2994 msgid ""
2980 2995 "You specified a CMS file mode for the SEND key that does not allow write "
2981 2996 "access."
2982 2997 msgstr ""
2983 2998  
2984   -#: src/core/ftmessages.c:209 src/filetransfer/v3270ftprogress.c:204
  2999 +#: src/core/ft/ftmessages.c:209 src/filetransfer/v3270ftprogress.c:204
2985 3000 msgid "You specified a CMS file mode that is not in the CMS search order."
2986 3001 msgstr ""
2987 3002  
2988   -#: src/core/ftmessages.c:139 src/filetransfer/v3270ftprogress.c:144
  3003 +#: src/core/ft/ftmessages.c:139 src/filetransfer/v3270ftprogress.c:144
2989 3004 msgid "You specified an option that is invalid."
2990 3005 msgstr ""
2991 3006  
... ... @@ -2997,8 +3012,8 @@ msgstr &quot;&quot;
2997 3012 #: src/dialogs/settingsdialog.c:410 src/dialogs/settingsdialog.c:429
2998 3013 #: src/dialogs/commondialog.c:94 src/dialogs/commondialog.c:108
2999 3014 #: src/dialogs/commondialog.c:125 src/dialogs/linux/select.c:49
3000   -#: src/dialogs/linux/select.c:93 src/dialogs/save/save.c:307
3001   -#: src/dialogs/save/save.c:326
  3015 +#: src/dialogs/linux/select.c:93 src/dialogs/save/save.c:266
  3016 +#: src/dialogs/save/save.c:285
3002 3017 msgid "_Cancel"
3003 3018 msgstr ""
3004 3019  
... ... @@ -3007,7 +3022,7 @@ msgstr &quot;&quot;
3007 3022 msgid "_Close"
3008 3023 msgstr ""
3009 3024  
3010   -#: src/dialogs/hostselect.c:54
  3025 +#: src/dialogs/hostselect.c:55
3011 3026 msgid "_Color table"
3012 3027 msgstr ""
3013 3028  
... ... @@ -3027,15 +3042,15 @@ msgstr &quot;&quot;
3027 3042 msgid "_File"
3028 3043 msgstr ""
3029 3044  
3030   -#: src/dialogs/save/save.c:203
  3045 +#: src/dialogs/save/save.c:191
3031 3046 msgid "_Filename"
3032 3047 msgstr ""
3033 3048  
3034   -#: print.c:421 src/dialogs/print/print.c:87
  3049 +#: src/dialogs/print/settings.c:77
3035 3050 msgid "_Font:"
3036 3051 msgstr ""
3037 3052  
3038   -#: src/dialogs/hostselect.c:128
  3053 +#: src/dialogs/hostselect.c:129
3039 3054 msgid "_Host"
3040 3055 msgstr ""
3041 3056  
... ... @@ -3063,16 +3078,16 @@ msgstr &quot;&quot;
3063 3078 msgid "_Remote file"
3064 3079 msgstr ""
3065 3080  
3066   -#: src/trace/widget.c:449 src/dialogs/save/save.c:312
3067   -#: src/dialogs/save/save.c:327
  3081 +#: src/trace/widget.c:449 src/dialogs/save/save.c:271
  3082 +#: src/dialogs/save/save.c:286
3068 3083 msgid "_Save"
3069 3084 msgstr ""
3070 3085  
3071   -#: src/dialogs/hostselect.c:162
  3086 +#: src/dialogs/hostselect.c:163
3072 3087 msgid "_Secure connection."
3073 3088 msgstr ""
3074 3089  
3075   -#: src/dialogs/hostselect.c:129
  3090 +#: src/dialogs/hostselect.c:130
3076 3091 msgid "_Service"
3077 3092 msgstr ""
3078 3093  
... ...
src/pw3270/Makefile.in
  Diff comments   View file @9dd6eef
... ... @@ -42,7 +42,7 @@ LIB_SOURCES=\
42 42  
43 43 APP_SOURCES=\
44 44 main.c \
45   - @APP_RESOURCES@
  45 + $(wildcard @OSNAME@/*.rc)
46 46  
47 47 MODULES=\
48 48 uiparser \
... ... @@ -130,16 +130,16 @@ $(OBJDBG)/%.o: \
130 130 -DBUILD_DATE=`date +"0x%Y%m%d"`\
131 131 -o $@ -c $<
132 132  
133   -%.ico: \
  133 +@OSNAME@/%.ico: \
134 134 $(BASEDIR)/branding/%.svg
135 135  
136 136 @echo $< ...
137 137 @$(MKDIR) `dirname $@`
138 138 @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@
139 139  
140   -$(OBJDBG)/%.o: \
141   - %.rc \
142   - @PACKAGE_TARNAME@.ico \
  140 +$(OBJDBG)/@OSNAME@/%.o: \
  141 + @OSNAME@/%.rc \
  142 + @OSNAME@/@PACKAGE_TARNAME@.ico \
143 143 $(DEPENDS)
144 144  
145 145 @echo $< ...
... ... @@ -163,9 +163,9 @@ $(OBJRLS)/%.o: \
163 163 -DBUILD_DATE=`date +"0x%Y%m%d"` \
164 164 -o $@ -c $<
165 165  
166   -$(OBJRLS)/%.o: \
167   - %.rc \
168   - @PACKAGE_TARNAME@.ico \
  166 +$(OBJRLS)/@OSNAME@/%.o: \
  167 + @OSNAME@/%.rc \
  168 + @OSNAME@/@PACKAGE_TARNAME@.ico \
169 169 $(DEPENDS)
170 170  
171 171 @echo $< ...
... ...