diff options
-rw-r--r-- | po/de.po | 25 | ||||
-rw-r--r-- | po/es_MX.po | 128 | ||||
-rw-r--r-- | po/fi.po | 5 | ||||
-rw-r--r-- | po/ie.po | 455 | ||||
-rw-r--r-- | po/ru.po | 5 | ||||
-rw-r--r-- | po/zh_Hans.po | 5 | ||||
-rw-r--r-- | po/zh_Hant.po | 5 | ||||
-rw-r--r-- | res/lang/es.bin | bin | 17904 -> 17958 bytes | |||
-rw-r--r-- | res/lang/fi.bin | bin | 17561 -> 17617 bytes | |||
-rw-r--r-- | res/lang/ru.bin | bin | 26788 -> 26905 bytes | |||
-rw-r--r-- | res/lang/zh_Hans.bin | bin | 15485 -> 15534 bytes | |||
-rw-r--r-- | src/gmdocument.c | 4 | ||||
-rw-r--r-- | src/macos.m | 4 | ||||
-rw-r--r-- | src/ui/documentwidget.c | 5 | ||||
-rw-r--r-- | src/ui/keys.h | 2 | ||||
-rw-r--r-- | src/ui/labelwidget.c | 25 | ||||
-rw-r--r-- | src/ui/util.c | 7 |
17 files changed, 654 insertions, 21 deletions
@@ -1,8 +1,8 @@ | |||
1 | msgid "" | 1 | msgid "" |
2 | msgstr "" | 2 | msgstr "" |
3 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" | 3 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" |
4 | "PO-Revision-Date: 2021-03-27 04:56+0000\n" | 4 | "PO-Revision-Date: 2021-03-29 05:43+0000\n" |
5 | "Last-Translator: Jaakko Keränen <jaakko.keranen@iki.fi>\n" | 5 | "Last-Translator: Aaron Fischer <mail@aaron-fischer.net>\n" |
6 | "Language-Team: German <http://weblate.skyjake.fi/projects/lagrange/ui/de/>\n" | 6 | "Language-Team: German <http://weblate.skyjake.fi/projects/lagrange/ui/de/>\n" |
7 | "Language: de\n" | 7 | "Language: de\n" |
8 | "MIME-Version: 1.0\n" | 8 | "MIME-Version: 1.0\n" |
@@ -629,3 +629,24 @@ msgstr "Eine Seite vor" | |||
629 | 629 | ||
630 | msgid "keys.back" | 630 | msgid "keys.back" |
631 | msgstr "Eine Seite zurück" | 631 | msgstr "Eine Seite zurück" |
632 | |||
633 | msgid "num.bytes" | ||
634 | msgid_plural "num.bytes.n" | ||
635 | msgstr[0] "%zu Byte" | ||
636 | msgstr[1] "%zu Bytes" | ||
637 | |||
638 | # strftime() formatted, split on two lines | ||
639 | #, c-format | ||
640 | msgid "page.timestamp" | ||
641 | msgstr "" | ||
642 | "Empfangen am %I:%M %p\n" | ||
643 | "um %b %d, %Y" | ||
644 | |||
645 | msgid "doc.pre.nocaption" | ||
646 | msgstr "Formatierter Text ohne Überschrift" | ||
647 | |||
648 | msgid "menu.aboutpages" | ||
649 | msgstr "About-Seiten" | ||
650 | |||
651 | msgid "menu.bookmarks.refresh" | ||
652 | msgstr "Remote-Lesezeichen aktualisieren" | ||
diff --git a/po/es_MX.po b/po/es_MX.po index b27844d0..cfb32ce0 100644 --- a/po/es_MX.po +++ b/po/es_MX.po | |||
@@ -1,7 +1,7 @@ | |||
1 | msgid "" | 1 | msgid "" |
2 | msgstr "" | 2 | msgstr "" |
3 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" | 3 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" |
4 | "PO-Revision-Date: 2021-03-28 06:32+0000\n" | 4 | "PO-Revision-Date: 2021-03-29 05:43+0000\n" |
5 | "Last-Translator: El Mau <public@correolibre.net>\n" | 5 | "Last-Translator: El Mau <public@correolibre.net>\n" |
6 | "Language-Team: Spanish (Mexico) <http://weblate.skyjake.fi/projects/lagrange/" | 6 | "Language-Team: Spanish (Mexico) <http://weblate.skyjake.fi/projects/lagrange/" |
7 | "ui/es_MX/>\n" | 7 | "ui/es_MX/>\n" |
@@ -269,3 +269,129 @@ msgstr "Esquema de la Página" | |||
269 | 269 | ||
270 | msgid "hint.findtext" | 270 | msgid "hint.findtext" |
271 | msgstr "Buscar Texto en la Página" | 271 | msgstr "Buscar Texto en la Página" |
272 | |||
273 | msgid "num.bytes" | ||
274 | msgid_plural "num.bytes.n" | ||
275 | msgstr[0] "%zu byte" | ||
276 | msgstr[1] "%zu bytes" | ||
277 | |||
278 | msgid "status.query" | ||
279 | msgstr "Consulta de Búsqueda" | ||
280 | |||
281 | msgid "status.feeds" | ||
282 | msgstr "Actualizando Suscripciones" | ||
283 | |||
284 | # megabytes, used as the unit after a number | ||
285 | msgid "mb" | ||
286 | msgstr "MB" | ||
287 | |||
288 | # kilobytes, used as the unit after a number | ||
289 | msgid "kb" | ||
290 | msgstr "KB" | ||
291 | |||
292 | # strftime() formatted, split on two lines | ||
293 | #, c-format | ||
294 | msgid "page.timestamp" | ||
295 | msgstr "" | ||
296 | "Recibido a las %I:%M %p\n" | ||
297 | "el %d, %b, %Y" | ||
298 | |||
299 | # strftime() formatted | ||
300 | #, c-format | ||
301 | msgid "sidebar.date.thisyear" | ||
302 | msgstr "%d. %b" | ||
303 | |||
304 | # strftime() formatted | ||
305 | #, c-format | ||
306 | msgid "sidebar.date.otheryear" | ||
307 | msgstr "%d.%b, %Y" | ||
308 | |||
309 | msgid "feeds.today" | ||
310 | msgstr "Hoy" | ||
311 | |||
312 | msgid "feeds.entry.newtab" | ||
313 | msgstr "Abrir Entrada en Nueva Pestaña" | ||
314 | |||
315 | msgid "feeds.entry.markread" | ||
316 | msgstr "Marcar como leído" | ||
317 | |||
318 | msgid "sidebar.entry.bookmark" | ||
319 | msgstr "Añadir favorito…" | ||
320 | |||
321 | msgid "feeds.entry.bookmark" | ||
322 | msgstr "Agregar favorito…" | ||
323 | |||
324 | msgid "feeds.entry.openfeed" | ||
325 | msgstr "Abrir Página de Suscripciones" | ||
326 | |||
327 | msgid "feeds.edit" | ||
328 | msgstr "Editar Suscripción…" | ||
329 | |||
330 | msgid "feeds.unsubscribe" | ||
331 | msgstr "Eliminar Suscripción…" | ||
332 | |||
333 | msgid "feeds.refresh" | ||
334 | msgstr "Refrescar Suscripciones" | ||
335 | |||
336 | msgid "menu.opentab" | ||
337 | msgstr "Abrir en Nueva Pestaña" | ||
338 | |||
339 | msgid "menu.opentab.background" | ||
340 | msgstr "Abrir en Pestaña de Fondo" | ||
341 | |||
342 | msgid "menu.edit" | ||
343 | msgstr "Editar…" | ||
344 | |||
345 | msgid "menu.dup" | ||
346 | msgstr "Duplicar…" | ||
347 | |||
348 | msgid "menu.copyurl" | ||
349 | msgstr "Copiar URL" | ||
350 | |||
351 | msgid "history.clear" | ||
352 | msgstr "Limpiar Historial…" | ||
353 | |||
354 | msgid "heading.history.clear" | ||
355 | msgstr "LIMPIAR HISTORIAL" | ||
356 | |||
357 | msgid "feeds.entry.markunread" | ||
358 | msgstr "Marcar como no leído" | ||
359 | |||
360 | msgid "feeds.markallread" | ||
361 | msgstr "Marcar Todo como Leído" | ||
362 | |||
363 | msgid "menu.forgeturl" | ||
364 | msgstr "Olvidar URL" | ||
365 | |||
366 | msgid "dlg.confirm.history.clear" | ||
367 | msgstr "¿De verdad quiere borrar el historial de todas las páginas visitadas?" | ||
368 | |||
369 | msgid "dlg.history.clear" | ||
370 | msgstr "Limpiar Historial" | ||
371 | |||
372 | msgid "bookmark.tag.home" | ||
373 | msgstr "Usar como Página de Inicio" | ||
374 | |||
375 | msgid "bookmark.tag.sub" | ||
376 | msgstr "Suscribirse" | ||
377 | |||
378 | msgid "bookmark.tag.remote" | ||
379 | msgstr "Usar como Fuente de Marcador" | ||
380 | |||
381 | msgid "bookmark.untag.home" | ||
382 | msgstr "Remover Página de Inicio" | ||
383 | |||
384 | msgid "bookmark.untag.sub" | ||
385 | msgstr "Eliminar Suscripción" | ||
386 | |||
387 | msgid "bookmark.untag.remote" | ||
388 | msgstr "Remover Fuente de Marcador" | ||
389 | |||
390 | msgid "bookmark.delete" | ||
391 | msgstr "Borrar favorita" | ||
392 | |||
393 | msgid "bookmarks.reload" | ||
394 | msgstr "Refrescar Fuentes Remotas" | ||
395 | |||
396 | msgid "doc.pre.nocaption" | ||
397 | msgstr "Texto preformateado sin título" | ||
@@ -3,7 +3,7 @@ msgstr "" | |||
3 | "Project-Id-Version: PACKAGE VERSION\n" | 3 | "Project-Id-Version: PACKAGE VERSION\n" |
4 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" | 4 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" |
5 | "POT-Creation-Date: 2021-03-23 09:09+0000\n" | 5 | "POT-Creation-Date: 2021-03-23 09:09+0000\n" |
6 | "PO-Revision-Date: 2021-03-28 06:32+0000\n" | 6 | "PO-Revision-Date: 2021-03-29 05:43+0000\n" |
7 | "Last-Translator: Jaakko Keränen <jaakko.keranen@iki.fi>\n" | 7 | "Last-Translator: Jaakko Keränen <jaakko.keranen@iki.fi>\n" |
8 | "Language-Team: Finnish <http://weblate.skyjake.fi/projects/lagrange/ui/fi/>\n" | 8 | "Language-Team: Finnish <http://weblate.skyjake.fi/projects/lagrange/ui/fi/>\n" |
9 | "Language: fi\n" | 9 | "Language: fi\n" |
@@ -1308,3 +1308,6 @@ msgid "num.hours" | |||
1308 | msgid_plural "num.hours.n" | 1308 | msgid_plural "num.hours.n" |
1309 | msgstr[0] "%d tunti" | 1309 | msgstr[0] "%d tunti" |
1310 | msgstr[1] "%d tuntia" | 1310 | msgstr[1] "%d tuntia" |
1311 | |||
1312 | msgid "doc.pre.nocaption" | ||
1313 | msgstr "Esimuotoiltua tekstiä ilman kuvausta" | ||
@@ -1,7 +1,7 @@ | |||
1 | msgid "" | 1 | msgid "" |
2 | msgstr "" | 2 | msgstr "" |
3 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" | 3 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" |
4 | "PO-Revision-Date: 2021-03-27 04:56+0000\n" | 4 | "PO-Revision-Date: 2021-03-28 19:06+0000\n" |
5 | "Last-Translator: Olga Smirnova <mistresssilvara@hotmail.com>\n" | 5 | "Last-Translator: Olga Smirnova <mistresssilvara@hotmail.com>\n" |
6 | "Language-Team: Occidental <http://weblate.skyjake.fi/projects/lagrange/ui/ie/" | 6 | "Language-Team: Occidental <http://weblate.skyjake.fi/projects/lagrange/ui/ie/" |
7 | ">\n" | 7 | ">\n" |
@@ -845,3 +845,456 @@ msgstr "Li demande ne successat, ma posse successar si on repena plu tard." | |||
845 | 845 | ||
846 | msgid "error.gone" | 846 | msgid "error.gone" |
847 | msgstr "Foreat" | 847 | msgstr "Foreat" |
848 | |||
849 | # Alt-text of the preformatted logo. | ||
850 | msgid "about.logo" | ||
851 | msgstr "Dessine ASCII: li parol «Lagrange» in un grand fonde" | ||
852 | |||
853 | msgid "about.powered" | ||
854 | msgstr "Functiona med SDL 2, OpenSSL e ☕️" | ||
855 | |||
856 | msgid "menu.copy.source" | ||
857 | msgstr "Copiar li textu del fonte" | ||
858 | |||
859 | msgid "menu.bookmarks.list" | ||
860 | msgstr "Monstrar omni marca-págines" | ||
861 | |||
862 | msgid "macos.menu.bookmarks.list" | ||
863 | msgstr "Monstrar omni" | ||
864 | |||
865 | msgid "menu.bookmarks.bytag" | ||
866 | msgstr "Monstrar marca-págines secun li tags" | ||
867 | |||
868 | msgid "macos.menu.bookmarks.bytag" | ||
869 | msgstr "Secun tags" | ||
870 | |||
871 | msgid "menu.page.bookmark" | ||
872 | msgstr "Adjuncter un marca-págine…" | ||
873 | |||
874 | msgid "menu.aboutpages" | ||
875 | msgstr "Págine pri li application" | ||
876 | |||
877 | msgid "menu.debug" | ||
878 | msgstr "Information de debug" | ||
879 | |||
880 | msgid "menu.page.copyurl" | ||
881 | msgstr "Copiar li URL del págine" | ||
882 | |||
883 | msgid "menu.page.copysource" | ||
884 | msgstr "Copiar li fonte del págine" | ||
885 | |||
886 | msgid "hint.findtext" | ||
887 | msgstr "Trovar textu sur li págine" | ||
888 | |||
889 | msgid "status.query" | ||
890 | msgstr "Sercha" | ||
891 | |||
892 | msgid "status.feeds" | ||
893 | msgstr "Actualisante feeds" | ||
894 | |||
895 | # strftime() formatted, split on two lines | ||
896 | #, c-format | ||
897 | msgid "page.timestamp" | ||
898 | msgstr "" | ||
899 | "Recivet a %H:%M\n" | ||
900 | "ye %d.%m.%Y" | ||
901 | |||
902 | msgid "feeds.entry.openfeed" | ||
903 | msgstr "Aperter li págine del feed" | ||
904 | |||
905 | msgid "feeds.edit" | ||
906 | msgstr "Modificar li feed…" | ||
907 | |||
908 | msgid "menu.forgeturl" | ||
909 | msgstr "Obliviar li URL" | ||
910 | |||
911 | msgid "bookmark.tag.remote" | ||
912 | msgstr "Usar quam fonte de marca-págines" | ||
913 | |||
914 | msgid "bookmark.untag.home" | ||
915 | msgstr "Remover li hem-págine" | ||
916 | |||
917 | # %s refers to name of an identity. | ||
918 | #, c-format | ||
919 | msgid "dlg.ident.notes" | ||
920 | msgstr "Notas pri %s:" | ||
921 | |||
922 | msgid "pageinfo.cert.ca.verified" | ||
923 | msgstr "Verificat de CA" | ||
924 | |||
925 | #, c-format | ||
926 | msgid "dlg.input.prompt" | ||
927 | msgstr "Ples provider li intrada por %s:" | ||
928 | |||
929 | msgid "heading.save" | ||
930 | msgstr "FILE STA GARDAT" | ||
931 | |||
932 | msgid "dlg.save.incomplete" | ||
933 | msgstr "Li contenete del págine es ancor descargat." | ||
934 | |||
935 | msgid "heading.save.error" | ||
936 | msgstr "ERRORE GARDANTE LI FILE" | ||
937 | |||
938 | msgid "dlg.import.notnew" | ||
939 | msgstr "Omni ligamentes sur li págine ja es adjuntet." | ||
940 | |||
941 | msgid "heading.autoreload" | ||
942 | msgstr "AUTO-RECARGAR" | ||
943 | |||
944 | msgid "dlg.autoreload" | ||
945 | msgstr "Selecter li intervalle de auto-recarga por ti carte." | ||
946 | |||
947 | msgid "link.bookmark" | ||
948 | msgstr "Adjunter al marca-págines…" | ||
949 | |||
950 | msgid "heading.openlink" | ||
951 | msgstr "APERTER LI LIGAMENT" | ||
952 | |||
953 | msgid "heading.certimport.pasted" | ||
954 | msgstr "COLLAT EX LI PAPERIERE" | ||
955 | |||
956 | msgid "heading.translate" | ||
957 | msgstr "TRADUCTER LI PÁGINE" | ||
958 | |||
959 | msgid "error.unsupported.media" | ||
960 | msgstr "Ínsuportat tip de contenete" | ||
961 | |||
962 | msgid "error.cgi" | ||
963 | msgstr "Errore de CGI" | ||
964 | |||
965 | msgid "menu.bookmarks.bytime" | ||
966 | msgstr "Monstrar marca-págines secun li creation" | ||
967 | |||
968 | msgid "macos.menu.bookmarks.bytime" | ||
969 | msgstr "Secun date de creation" | ||
970 | |||
971 | msgid "menu.feeds.entrylist" | ||
972 | msgstr "Monstrar li elementes del feed" | ||
973 | |||
974 | msgid "menu.releasenotes" | ||
975 | msgstr "Notas del publication" | ||
976 | |||
977 | msgid "menu.autoreload" | ||
978 | msgstr "Auto-recarga…" | ||
979 | |||
980 | msgid "heading.history.clear" | ||
981 | msgstr "VACUAR LI DIARIUM" | ||
982 | |||
983 | msgid "dlg.confirm.history.clear" | ||
984 | msgstr "Esque vu vole efaciar li diarium de omni visitat págines?" | ||
985 | |||
986 | msgid "bookmark.tag.home" | ||
987 | msgstr "Usar quam Hem-págine" | ||
988 | |||
989 | msgid "bookmark.tag.sub" | ||
990 | msgstr "Abonnar li feed" | ||
991 | |||
992 | msgid "bookmark.untag.sub" | ||
993 | msgstr "Desabonnar li feed" | ||
994 | |||
995 | msgid "bookmark.untag.remote" | ||
996 | msgstr "Remover li fonte de marca-págines" | ||
997 | |||
998 | # strftime() formatted | ||
999 | #, c-format | ||
1000 | msgid "ident.expiry" | ||
1001 | msgstr "Expira %d %B %Y" | ||
1002 | |||
1003 | msgid "ident.use" | ||
1004 | msgstr "Usar por ti págine" | ||
1005 | |||
1006 | msgid "ident.stopuse" | ||
1007 | msgstr "Cessar usar por ti págine" | ||
1008 | |||
1009 | msgid "ident.stopuse.all" | ||
1010 | msgstr "Cessar usar partú" | ||
1011 | |||
1012 | msgid "ident.showuse" | ||
1013 | msgstr "Monstrar li usage" | ||
1014 | |||
1015 | msgid "heading.ident.use" | ||
1016 | msgstr "USAGE DEL IDENTITÁ" | ||
1017 | |||
1018 | msgid "menu.edit.notes" | ||
1019 | msgstr "Redacter notas…" | ||
1020 | |||
1021 | msgid "heading.ident.notes" | ||
1022 | msgstr "NOTAS DEL IDENTITÁ" | ||
1023 | |||
1024 | msgid "heading.ident.delete" | ||
1025 | msgstr "REMOVER LI IDENTITÁ" | ||
1026 | |||
1027 | #, c-format | ||
1028 | msgid "dlg.confirm.ident.delete" | ||
1029 | msgstr "" | ||
1030 | "Esque vu vole remover li identitá\n" | ||
1031 | "%s%s%s\n" | ||
1032 | "con su certificate e clave privat?" | ||
1033 | |||
1034 | msgid "dlg.ident.delete" | ||
1035 | msgstr "Remover li identitá e files" | ||
1036 | |||
1037 | # The %s format characters are used to highlight the word "Help" and must be used in the translation in same way as here. | ||
1038 | #, c-format | ||
1039 | msgid "ident.gotohelp" | ||
1040 | msgstr "Vi %sAuxilie%s por plu information pri certificates TLS de cliente." | ||
1041 | |||
1042 | #, c-format | ||
1043 | msgid "error.unsupported.suggestsave" | ||
1044 | msgstr "" | ||
1045 | "Benque vu posse gardar it a vor fólder Descargates. Tippa %s o selecte «%s» " | ||
1046 | "in li menú." | ||
1047 | |||
1048 | msgid "pageinfo.cert.ca.unverified" | ||
1049 | msgstr "Ne verificat de CA" | ||
1050 | |||
1051 | msgid "heading.certwarn" | ||
1052 | msgstr "ÍNFIDET CERTIFICATE" | ||
1053 | |||
1054 | msgid "dlg.certwarn.different" | ||
1055 | msgstr "Li recivet certificate es valid ma ne es li quel es fidet." | ||
1056 | |||
1057 | msgid "dlg.certwarn.domain" | ||
1058 | msgstr "" | ||
1059 | "Li recivet certificate es por un altri dominia (%s). To posse esser un " | ||
1060 | "problema con li configuration del servitor." | ||
1061 | |||
1062 | msgid "dlg.newident.notsaved" | ||
1063 | msgstr "ne gardat sur li disco" | ||
1064 | |||
1065 | msgid "heading.feedcfg" | ||
1066 | msgstr "PARAMETRES DEL FEED" | ||
1067 | |||
1068 | msgid "heading.subscribe" | ||
1069 | msgstr "ABONNAR LI PÁGINE" | ||
1070 | |||
1071 | msgid "heading.bookmark.add" | ||
1072 | msgstr "ADJUNTER UN MARCA-PÁGINE" | ||
1073 | |||
1074 | msgid "heading.bookmark.edit" | ||
1075 | msgstr "REDACTER LI MARCA-PÁGINE" | ||
1076 | |||
1077 | msgid "dlg.bookmark.save" | ||
1078 | msgstr "Gardar li marca-págines" | ||
1079 | |||
1080 | msgid "heading.prefs.pagecontent" | ||
1081 | msgstr "CONTENETE DE PÁGINE" | ||
1082 | |||
1083 | msgid "heading.prefs.sizing" | ||
1084 | msgstr "DIMENSION" | ||
1085 | |||
1086 | msgid "heading.prefs.widelayout" | ||
1087 | msgstr "LARG ARANGEMENT" | ||
1088 | |||
1089 | msgid "prefs.hoverlink" | ||
1090 | msgstr "Monstrar li URL sub li apuntator:" | ||
1091 | |||
1092 | msgid "prefs.hidetoolbarscroll" | ||
1093 | msgstr "Celar li instrumentarium:" | ||
1094 | |||
1095 | msgid "prefs.uiscale" | ||
1096 | msgstr "Scale del UI:" | ||
1097 | |||
1098 | msgid "prefs.customframe" | ||
1099 | msgstr "Special borde de fenestre:" | ||
1100 | |||
1101 | msgid "prefs.plaintext.wrap" | ||
1102 | msgstr "Rupter lineas de simplic textu:" | ||
1103 | |||
1104 | msgid "prefs.decodeurls" | ||
1105 | msgstr "Decodificar URLs:" | ||
1106 | |||
1107 | msgid "keys.bottom" | ||
1108 | msgstr "Ear al fin" | ||
1109 | |||
1110 | msgid "keys.scroll.up" | ||
1111 | msgstr "Rular ad-alt" | ||
1112 | |||
1113 | msgid "keys.scroll.down" | ||
1114 | msgstr "Rular a-bass" | ||
1115 | |||
1116 | msgid "keys.scroll.halfpage.up" | ||
1117 | msgstr "Rular un mi-págine ad-alt" | ||
1118 | |||
1119 | msgid "keys.scroll.halfpage.down" | ||
1120 | msgstr "Rular un mi-págine a-bass" | ||
1121 | |||
1122 | msgid "keys.scroll.page.up" | ||
1123 | msgstr "Rular un págine ad-alt" | ||
1124 | |||
1125 | msgid "keys.scroll.page.down" | ||
1126 | msgstr "Rular un págine a-bass" | ||
1127 | |||
1128 | msgid "keys.link.modkey" | ||
1129 | msgstr "Aperter li ligament med clave-modificator" | ||
1130 | |||
1131 | msgid "keys.hoverurl" | ||
1132 | msgstr "Monstrar li URL sub li apuntator" | ||
1133 | |||
1134 | msgid "error.badstatus.msg" | ||
1135 | msgstr "" | ||
1136 | "Li servitor respondet de un code de statu quel manca del specification del " | ||
1137 | "protocol Gemini. Fórsan li servitor es tro nov o simplicmen malfunctiona." | ||
1138 | |||
1139 | msgid "error.openfile.msg" | ||
1140 | msgstr "" | ||
1141 | "Li demandat file ne existe o es ínaccessibil. Ples controlar li rute de file." | ||
1142 | |||
1143 | msgid "error.badresource" | ||
1144 | msgstr "Ressurse es ínvalid" | ||
1145 | |||
1146 | msgid "error.badresource.msg" | ||
1147 | msgstr "Li demandat ressurse ne existe." | ||
1148 | |||
1149 | msgid "error.unsupported.media.msg" | ||
1150 | msgstr "Li recivet contenete ne posse esser monstrat med ti-ci application." | ||
1151 | |||
1152 | msgid "error.unsupported.protocol" | ||
1153 | msgstr "Ínsuportat protocol" | ||
1154 | |||
1155 | msgid "error.unsupported.protocol.msg" | ||
1156 | msgstr "Li demandat protocol ne es supportat de ti application." | ||
1157 | |||
1158 | msgid "error.badheader" | ||
1159 | msgstr "Cap-linea ínvalid" | ||
1160 | |||
1161 | msgid "error.badheader.msg" | ||
1162 | msgstr "" | ||
1163 | "Li recivet cap-linea ne conforma al specification del protocol Gemini. " | ||
1164 | "Fórsan li servitor malfunctiona o vu contacte un servitor non-Gemini." | ||
1165 | |||
1166 | msgid "error.badredirect" | ||
1167 | msgstr "Redirection ínvalid" | ||
1168 | |||
1169 | msgid "error.badredirect.msg" | ||
1170 | msgstr "" | ||
1171 | "Li servitor respondet con un redirection ma ne providet un valid URL de " | ||
1172 | "destination. Fórsan li servitor malfunctiona." | ||
1173 | |||
1174 | msgid "error.schemeredirect" | ||
1175 | msgstr "Redirection a un altri schema" | ||
1176 | |||
1177 | msgid "error.schemeredirect.msg" | ||
1178 | msgstr "" | ||
1179 | "Li servitor provat redirecter nos a un URL con un schema quel es different " | ||
1180 | "de ti del original URL. Vi li ligament se vu vole aperter it manualmen." | ||
1181 | |||
1182 | msgid "error.manyredirects" | ||
1183 | msgstr "Tro mult redirectiones" | ||
1184 | |||
1185 | msgid "error.tls" | ||
1186 | msgstr "Dessuccesse del rete o TLS" | ||
1187 | |||
1188 | msgid "error.tls.msg" | ||
1189 | msgstr "Ne successat communicar con li servitor. Vi li textu de errore:" | ||
1190 | |||
1191 | msgid "error.temporary" | ||
1192 | msgstr "Temporari dessuccesse" | ||
1193 | |||
1194 | msgid "error.unavail.msg" | ||
1195 | msgstr "" | ||
1196 | "Li servitor es índisponibil pro supercarga o mantenentie. Ples repenar plu " | ||
1197 | "tard." | ||
1198 | |||
1199 | msgid "error.cgi.msg" | ||
1200 | msgstr "" | ||
1201 | "Generation de contenete dinamic del servitor ne successat. Fórsan programmas " | ||
1202 | "del servitor malfunctiona." | ||
1203 | |||
1204 | msgid "error.proxy" | ||
1205 | msgstr "Errore de proxy" | ||
1206 | |||
1207 | msgid "error.slowdown" | ||
1208 | msgstr "Alentation" | ||
1209 | |||
1210 | msgid "error.slowdown.msg" | ||
1211 | msgstr "Li servitor limita li frequentie de demandas. Ples atender…" | ||
1212 | |||
1213 | msgid "error.permanent" | ||
1214 | msgstr "Permanent dessuccesse" | ||
1215 | |||
1216 | msgid "error.permanent.msg" | ||
1217 | msgstr "Vor demanda ne successat e va ne successar in li futur." | ||
1218 | |||
1219 | msgid "error.notfound" | ||
1220 | msgstr "Ne trovat" | ||
1221 | |||
1222 | msgid "error.notfound.msg" | ||
1223 | msgstr "Li demandat ressurse ne posse esset trovat in ho-témpor." | ||
1224 | |||
1225 | msgid "error.gone.msg" | ||
1226 | msgstr "Li demandat ressurse ne es plu disponibil." | ||
1227 | |||
1228 | msgid "error.proxyrefusal" | ||
1229 | msgstr "Demanda de proxy refusat" | ||
1230 | |||
1231 | msgid "error.badrequest" | ||
1232 | msgstr "Ínvalid demande" | ||
1233 | |||
1234 | msgid "error.badrequest.msg" | ||
1235 | msgstr "Li servitor ne comprendet vor demande." | ||
1236 | |||
1237 | msgid "error.cert.needed" | ||
1238 | msgstr "Un certificate es besonat" | ||
1239 | |||
1240 | msgid "error.cert.needed.msg" | ||
1241 | msgstr "" | ||
1242 | "Li accesse al demandat ressurse besona li identification med un certificate " | ||
1243 | "de cliente." | ||
1244 | |||
1245 | msgid "error.cert.auth" | ||
1246 | msgstr "Certificate ne es autorisat" | ||
1247 | |||
1248 | msgid "error.cert.auth.msg" | ||
1249 | msgstr "" | ||
1250 | "Li providet certificate de cliente es valid, ma ne es autorisat por accesse " | ||
1251 | "al demandat ressurse." | ||
1252 | |||
1253 | msgid "error.cert.invalid" | ||
1254 | msgstr "Certificate es ínvalid" | ||
1255 | |||
1256 | msgid "prefs.smoothscroll" | ||
1257 | msgstr "Glissid rulament:" | ||
1258 | |||
1259 | #, c-format | ||
1260 | msgid "dlg.certwarn.mayberenewed" | ||
1261 | msgid_plural "dlg.certwarn.mayberenewed.n" | ||
1262 | msgstr[0] "" | ||
1263 | "Fórsan li recivet certificate esset renovat recentmen — it es por li corect " | ||
1264 | "domina e ne expirat. Li certificate fidet actualmen va expirar ye %s, pos ún " | ||
1265 | "die." | ||
1266 | msgstr[1] "" | ||
1267 | "Fórsan li recivet certificate esset renovat recentmen — it es por li corect " | ||
1268 | "domina e ne expirat. Li certificate fidet actualmen va expirar ye %s, pos %d " | ||
1269 | "dies." | ||
1270 | |||
1271 | # Interpret as "Results from page content..." | ||
1272 | msgid "heading.lookup.pagecontent" | ||
1273 | msgstr "CONTENETE DE PÁGINE" | ||
1274 | |||
1275 | msgid "prefs.imageloadscroll" | ||
1276 | msgstr "Cargar images:" | ||
1277 | |||
1278 | msgid "prefs.mono" | ||
1279 | msgstr "Textu monospacial:" | ||
1280 | |||
1281 | msgid "keys.top" | ||
1282 | msgstr "Ear al inicie" | ||
1283 | |||
1284 | msgid "reload.never" | ||
1285 | msgstr "Nequande" | ||
1286 | |||
1287 | msgid "reload.onceperday" | ||
1288 | msgstr "Un vez per die" | ||
1289 | |||
1290 | #, c-format | ||
1291 | msgid "num.minutes" | ||
1292 | msgid_plural "num.minutes.n" | ||
1293 | msgstr[0] "%d minute" | ||
1294 | msgstr[1] "%d minutes" | ||
1295 | |||
1296 | #, c-format | ||
1297 | msgid "num.hours" | ||
1298 | msgid_plural "num.hours.n" | ||
1299 | msgstr[0] "%d hor" | ||
1300 | msgstr[1] "%d hores" | ||
@@ -3,7 +3,7 @@ msgstr "" | |||
3 | "Project-Id-Version: PACKAGE VERSION\n" | 3 | "Project-Id-Version: PACKAGE VERSION\n" |
4 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" | 4 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" |
5 | "POT-Creation-Date: 2021-03-23 19:02+0000\n" | 5 | "POT-Creation-Date: 2021-03-23 19:02+0000\n" |
6 | "PO-Revision-Date: 2021-03-28 06:32+0000\n" | 6 | "PO-Revision-Date: 2021-03-29 05:43+0000\n" |
7 | "Last-Translator: Nikolay Korotkiy <sikmir@gmail.com>\n" | 7 | "Last-Translator: Nikolay Korotkiy <sikmir@gmail.com>\n" |
8 | "Language-Team: Russian <http://weblate.skyjake.fi/projects/lagrange/ui/ru/>\n" | 8 | "Language-Team: Russian <http://weblate.skyjake.fi/projects/lagrange/ui/ru/>\n" |
9 | "Language: ru\n" | 9 | "Language: ru\n" |
@@ -1319,3 +1319,6 @@ msgid_plural "num.hours.n" | |||
1319 | msgstr[0] "%d час" | 1319 | msgstr[0] "%d час" |
1320 | msgstr[1] "%d часа" | 1320 | msgstr[1] "%d часа" |
1321 | msgstr[2] "%d часов" | 1321 | msgstr[2] "%d часов" |
1322 | |||
1323 | msgid "doc.pre.nocaption" | ||
1324 | msgstr "Предварительно отформатированный текст без описания" | ||
diff --git a/po/zh_Hans.po b/po/zh_Hans.po index c352be6c..6a5be138 100644 --- a/po/zh_Hans.po +++ b/po/zh_Hans.po | |||
@@ -1,7 +1,7 @@ | |||
1 | msgid "" | 1 | msgid "" |
2 | msgstr "" | 2 | msgstr "" |
3 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" | 3 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" |
4 | "PO-Revision-Date: 2021-03-28 04:52+0000\n" | 4 | "PO-Revision-Date: 2021-03-29 05:43+0000\n" |
5 | "Last-Translator: Shibo Lyu <github@of.sb>\n" | 5 | "Last-Translator: Shibo Lyu <github@of.sb>\n" |
6 | "Language-Team: Chinese (Simplified) <http://weblate.skyjake.fi/projects/" | 6 | "Language-Team: Chinese (Simplified) <http://weblate.skyjake.fi/projects/" |
7 | "lagrange/ui/zh_Hans/>\n" | 7 | "lagrange/ui/zh_Hans/>\n" |
@@ -1284,3 +1284,6 @@ msgstr[0] "%d 分钟" | |||
1284 | msgid "num.hours" | 1284 | msgid "num.hours" |
1285 | msgid_plural "num.hours.n" | 1285 | msgid_plural "num.hours.n" |
1286 | msgstr[0] "%d 小时" | 1286 | msgstr[0] "%d 小时" |
1287 | |||
1288 | msgid "doc.pre.nocaption" | ||
1289 | msgstr "无说明的预格式化文本" | ||
diff --git a/po/zh_Hant.po b/po/zh_Hant.po index 1c9309e0..2331fcb7 100644 --- a/po/zh_Hant.po +++ b/po/zh_Hant.po | |||
@@ -1,7 +1,7 @@ | |||
1 | msgid "" | 1 | msgid "" |
2 | msgstr "" | 2 | msgstr "" |
3 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" | 3 | "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n" |
4 | "PO-Revision-Date: 2021-03-28 06:32+0000\n" | 4 | "PO-Revision-Date: 2021-03-29 05:43+0000\n" |
5 | "Last-Translator: Shibo Lyu <github@of.sb>\n" | 5 | "Last-Translator: Shibo Lyu <github@of.sb>\n" |
6 | "Language-Team: Chinese (Traditional) <http://weblate.skyjake.fi/projects/" | 6 | "Language-Team: Chinese (Traditional) <http://weblate.skyjake.fi/projects/" |
7 | "lagrange/ui/zh_Hant/>\n" | 7 | "lagrange/ui/zh_Hant/>\n" |
@@ -1285,3 +1285,6 @@ msgstr "日語" | |||
1285 | 1285 | ||
1286 | msgid "lang.pt" | 1286 | msgid "lang.pt" |
1287 | msgstr "葡萄牙語" | 1287 | msgstr "葡萄牙語" |
1288 | |||
1289 | msgid "doc.pre.nocaption" | ||
1290 | msgstr "無說明的預格式文字" | ||
diff --git a/res/lang/es.bin b/res/lang/es.bin index f54730bb..36d898b8 100644 --- a/res/lang/es.bin +++ b/res/lang/es.bin | |||
Binary files differ | |||
diff --git a/res/lang/fi.bin b/res/lang/fi.bin index 508eb525..566842be 100644 --- a/res/lang/fi.bin +++ b/res/lang/fi.bin | |||
Binary files differ | |||
diff --git a/res/lang/ru.bin b/res/lang/ru.bin index 92c9e066..b581a252 100644 --- a/res/lang/ru.bin +++ b/res/lang/ru.bin | |||
Binary files differ | |||
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin index 48a4f684..59dcae3c 100644 --- a/res/lang/zh_Hans.bin +++ b/res/lang/zh_Hans.bin | |||
Binary files differ | |||
diff --git a/src/gmdocument.c b/src/gmdocument.c index 874a117e..007311d2 100644 --- a/src/gmdocument.c +++ b/src/gmdocument.c | |||
@@ -537,7 +537,7 @@ static void doLayout_GmDocument_(iGmDocument *d) { | |||
537 | } | 537 | } |
538 | } | 538 | } |
539 | /* Folded blocks are represented by a single run with the alt text. */ | 539 | /* Folded blocks are represented by a single run with the alt text. */ |
540 | if (isPreformat) { | 540 | if (isPreformat && d->format != plainText_GmDocumentFormat) { |
541 | const iGmPreMeta *meta = constAt_Array(&d->preMeta, preId - 1); | 541 | const iGmPreMeta *meta = constAt_Array(&d->preMeta, preId - 1); |
542 | if (meta->flags & folded_GmPreMetaFlag) { | 542 | if (meta->flags & folded_GmPreMetaFlag) { |
543 | const iBool isBlank = isEmpty_Range(&meta->altText); | 543 | const iBool isBlank = isEmpty_Range(&meta->altText); |
@@ -669,7 +669,7 @@ static void doLayout_GmDocument_(iGmDocument *d) { | |||
669 | type == quote_GmLineType ? 4 : 0); | 669 | type == quote_GmLineType ? 4 : 0); |
670 | const iBool isWordWrapped = | 670 | const iBool isWordWrapped = |
671 | (d->format == plainText_GmDocumentFormat ? prefs->plainTextWrap : !isPreformat); | 671 | (d->format == plainText_GmDocumentFormat ? prefs->plainTextWrap : !isPreformat); |
672 | if (isPreformat) { | 672 | if (isPreformat && d->format != plainText_GmDocumentFormat) { |
673 | /* Remember the top left coordinates of the block (first line of block). */ | 673 | /* Remember the top left coordinates of the block (first line of block). */ |
674 | iGmPreMeta *meta = at_Array(&d->preMeta, preId - 1); | 674 | iGmPreMeta *meta = at_Array(&d->preMeta, preId - 1); |
675 | if (~meta->flags & topLeft_GmPreMetaFlag) { | 675 | if (~meta->flags & topLeft_GmPreMetaFlag) { |
diff --git a/src/macos.m b/src/macos.m index 0dcc3ef5..61507b6f 100644 --- a/src/macos.m +++ b/src/macos.m | |||
@@ -497,7 +497,7 @@ void insertMenuItems_MacOS(const char *menuLabel, int atIndex, const iMenuItem * | |||
497 | [myDel setCommand:[NSString stringWithUTF8String:items[i].command] forMenuItem:item]; | 497 | [myDel setCommand:[NSString stringWithUTF8String:items[i].command] forMenuItem:item]; |
498 | /* Bindings may have a different key. */ | 498 | /* Bindings may have a different key. */ |
499 | const iBinding *bind = findCommand_Keys(items[i].command); | 499 | const iBinding *bind = findCommand_Keys(items[i].command); |
500 | if (bind) { | 500 | if (bind && bind->id < builtIn_BindingId) { |
501 | key = bind->key; | 501 | key = bind->key; |
502 | kmods = bind->mods; | 502 | kmods = bind->mods; |
503 | } | 503 | } |
@@ -533,7 +533,7 @@ void handleCommand_MacOS(const char *cmd) { | |||
533 | if (command) { | 533 | if (command) { |
534 | const iBinding *bind = findCommand_Keys( | 534 | const iBinding *bind = findCommand_Keys( |
535 | [command cStringUsingEncoding:NSUTF8StringEncoding]); | 535 | [command cStringUsingEncoding:NSUTF8StringEncoding]); |
536 | if (bind) { | 536 | if (bind && bind->id < builtIn_BindingId) { |
537 | setShortcut_NSMenuItem_(menuItem, bind->key, bind->mods); | 537 | setShortcut_NSMenuItem_(menuItem, bind->key, bind->mods); |
538 | } | 538 | } |
539 | } | 539 | } |
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c index 891d8588..d338cf04 100644 --- a/src/ui/documentwidget.c +++ b/src/ui/documentwidget.c | |||
@@ -562,7 +562,8 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) { | |||
562 | animate_DocumentWidget_(d); | 562 | animate_DocumentWidget_(d); |
563 | refresh_Widget(w); | 563 | refresh_Widget(w); |
564 | } | 564 | } |
565 | else if (d->hoverPre && targetValue_Anim(&d->altTextOpacity) < 0.5f) { | 565 | else if (d->hoverPre && targetValue_Anim(&d->altTextOpacity) < 0.5f && |
566 | ~d->flags & noHoverWhileScrolling_DocumentWidgetFlag) { | ||
566 | setValue_Anim(&d->altTextOpacity, 1.0f, 0); | 567 | setValue_Anim(&d->altTextOpacity, 1.0f, 0); |
567 | refresh_Widget(w); | 568 | refresh_Widget(w); |
568 | } | 569 | } |
@@ -3477,7 +3478,7 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) { | |||
3477 | const iGmPreMeta *meta = preMeta_GmDocument(d->doc, d->hoverAltPre->preId); | 3478 | const iGmPreMeta *meta = preMeta_GmDocument(d->doc, d->hoverAltPre->preId); |
3478 | if (meta->flags & topLeft_GmPreMetaFlag && ~meta->flags & decoration_GmRunFlag && | 3479 | if (meta->flags & topLeft_GmPreMetaFlag && ~meta->flags & decoration_GmRunFlag && |
3479 | !isEmpty_Range(&meta->altText)) { | 3480 | !isEmpty_Range(&meta->altText)) { |
3480 | const int margin = 2 * gap_UI; | 3481 | const int margin = 3 * gap_UI / 2; |
3481 | const int altFont = uiLabel_FontId; | 3482 | const int altFont = uiLabel_FontId; |
3482 | const int wrap = docBounds.size.x - 2 * margin; | 3483 | const int wrap = docBounds.size.x - 2 * margin; |
3483 | iInt2 pos = addY_I2(add_I2(docBounds.pos, meta->pixelRect.pos), | 3484 | iInt2 pos = addY_I2(add_I2(docBounds.pos, meta->pixelRect.pos), |
diff --git a/src/ui/keys.h b/src/ui/keys.h index 90e33b7c..4cbca3b7 100644 --- a/src/ui/keys.h +++ b/src/ui/keys.h | |||
@@ -56,6 +56,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ | |||
56 | # define subscribeToPage_KeyModifier SDLK_d, KMOD_SHIFT | KMOD_PRIMARY | 56 | # define subscribeToPage_KeyModifier SDLK_d, KMOD_SHIFT | KMOD_PRIMARY |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | #define builtIn_BindingId 1000 /* not user-configurable */ | ||
60 | |||
59 | iDeclareType(Binding) | 61 | iDeclareType(Binding) |
60 | 62 | ||
61 | struct Impl_Binding { | 63 | struct Impl_Binding { |
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c index 1805525c..d16ef69d 100644 --- a/src/ui/labelwidget.c +++ b/src/ui/labelwidget.c | |||
@@ -172,6 +172,10 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int | |||
172 | *frame2 = uiEmbossSelected2_ColorId; | 172 | *frame2 = uiEmbossSelected2_ColorId; |
173 | } | 173 | } |
174 | } | 174 | } |
175 | int colorEscape = none_ColorId; | ||
176 | if (startsWith_String(&d->label, "\r")) { | ||
177 | colorEscape = cstr_String(&d->label)[1] - asciiBase_ColorEscape; /* TODO: can be two bytes long */ | ||
178 | } | ||
175 | if (isHover_Widget(w)) { | 179 | if (isHover_Widget(w)) { |
176 | if (isFrameless) { | 180 | if (isFrameless) { |
177 | *bg = uiBackgroundFramelessHover_ColorId; | 181 | *bg = uiBackgroundFramelessHover_ColorId; |
@@ -179,14 +183,14 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int | |||
179 | } | 183 | } |
180 | else { | 184 | else { |
181 | /* Frames matching color escaped text. */ | 185 | /* Frames matching color escaped text. */ |
182 | if (startsWith_String(&d->label, "\r")) { | 186 | if (colorEscape != none_ColorId) { |
183 | if (isDark_ColorTheme(colorTheme_App())) { | 187 | if (isDark_ColorTheme(colorTheme_App())) { |
184 | *frame1 = cstr_String(&d->label)[1] - asciiBase_ColorEscape; | 188 | *frame1 = colorEscape; |
185 | *frame2 = darker_Color(*frame1); | 189 | *frame2 = darker_Color(*frame1); |
186 | } | 190 | } |
187 | else { | 191 | else { |
188 | *bg = *frame1 = *frame2 = cstr_String(&d->label)[1] - asciiBase_ColorEscape; | 192 | *bg = *frame1 = *frame2 = colorEscape; |
189 | *fg = uiBackground_ColorId | permanent_ColorId; | 193 | *fg = uiText_ColorId | permanent_ColorId; |
190 | } | 194 | } |
191 | } | 195 | } |
192 | else if (isSel) { | 196 | else if (isSel) { |
@@ -204,9 +208,14 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int | |||
204 | *bg = uiBackgroundPressed_ColorId | permanent_ColorId; | 208 | *bg = uiBackgroundPressed_ColorId | permanent_ColorId; |
205 | if (isButton) { | 209 | if (isButton) { |
206 | *frame1 = uiEmbossPressed1_ColorId; | 210 | *frame1 = uiEmbossPressed1_ColorId; |
207 | *frame2 = uiEmbossPressed2_ColorId; | 211 | *frame2 = colorEscape != none_ColorId ? colorEscape : uiEmbossPressed2_ColorId; |
212 | } | ||
213 | if (colorEscape == none_ColorId || colorEscape == uiTextAction_ColorId) { | ||
214 | *fg = uiTextPressed_ColorId | permanent_ColorId; | ||
215 | } | ||
216 | else { | ||
217 | *fg = isDark_ColorTheme(colorTheme_App()) ? white_ColorId : black_ColorId; | ||
208 | } | 218 | } |
209 | *fg = uiTextPressed_ColorId | permanent_ColorId; | ||
210 | } | 219 | } |
211 | if (d->forceFg >= 0) { | 220 | if (d->forceFg >= 0) { |
212 | *fg = d->forceFg; | 221 | *fg = d->forceFg; |
@@ -288,7 +297,9 @@ static void draw_LabelWidget_(const iLabelWidget *d) { | |||
288 | add_I2(topRight_Rect(bounds), | 297 | add_I2(topRight_Rect(bounds), |
289 | addX_I2(negX_I2(padding_(flags)), | 298 | addX_I2(negX_I2(padding_(flags)), |
290 | deviceType_App() == tablet_AppDeviceType ? gap_UI : 0)), | 299 | deviceType_App() == tablet_AppDeviceType ? gap_UI : 0)), |
291 | flags & pressed_WidgetFlag ? fg : uiTextShortcut_ColorId, | 300 | flags & pressed_WidgetFlag ? fg |
301 | : isCaution ? uiTextCaution_ColorId | ||
302 | : uiTextShortcut_ColorId, | ||
292 | right_Alignment, | 303 | right_Alignment, |
293 | cstr_String(&str)); | 304 | cstr_String(&str)); |
294 | deinit_String(&str); | 305 | deinit_String(&str); |
diff --git a/src/ui/util.c b/src/ui/util.c index 19fba3a4..08a04105 100644 --- a/src/ui/util.c +++ b/src/ui/util.c | |||
@@ -96,6 +96,9 @@ void toString_Sym(int key, int kmods, iString *str) { | |||
96 | if (key == 0x20) { | 96 | if (key == 0x20) { |
97 | appendCStr_String(str, "Space"); | 97 | appendCStr_String(str, "Space"); |
98 | } | 98 | } |
99 | else if (key == SDLK_ESCAPE) { | ||
100 | appendCStr_String(str, "Esc"); | ||
101 | } | ||
99 | else if (key == SDLK_LEFT) { | 102 | else if (key == SDLK_LEFT) { |
100 | appendChar_String(str, 0x2190); | 103 | appendChar_String(str, 0x2190); |
101 | } | 104 | } |
@@ -117,6 +120,9 @@ void toString_Sym(int key, int kmods, iString *str) { | |||
117 | else if (key == SDLK_DELETE) { | 120 | else if (key == SDLK_DELETE) { |
118 | appendChar_String(str, 0x2326); /* Erase to the Right */ | 121 | appendChar_String(str, 0x2326); /* Erase to the Right */ |
119 | } | 122 | } |
123 | else if (key == SDLK_RETURN) { | ||
124 | appendChar_String(str, 0x21a9); /* Leftwards arrow with a hook */ | ||
125 | } | ||
120 | else { | 126 | else { |
121 | appendCStr_String(str, SDL_GetKeyName(key)); | 127 | appendCStr_String(str, SDL_GetKeyName(key)); |
122 | } | 128 | } |
@@ -1631,6 +1637,7 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) { | |||
1631 | } | 1637 | } |
1632 | iLabelWidget *button = | 1638 | iLabelWidget *button = |
1633 | addChild_Widget(div, iClob(newKeyMods_LabelWidget(label, key, kmods, cmd))); | 1639 | addChild_Widget(div, iClob(newKeyMods_LabelWidget(label, key, kmods, cmd))); |
1640 | setFlags_Widget(as_Widget(button), alignLeft_WidgetFlag | drawKey_WidgetFlag, isDefault); | ||
1634 | setFont_LabelWidget(button, isDefault ? fonts[1] : fonts[0]); | 1641 | setFont_LabelWidget(button, isDefault ? fonts[1] : fonts[0]); |
1635 | } | 1642 | } |
1636 | return div; | 1643 | return div; |