diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | PACKAGE/debian/changelog | 6 | ||||
| -rw-r--r-- | PACKAGE/lynx.nsi | 6 | ||||
| -rw-r--r-- | PACKAGE/lynx.spec | 4 | ||||
| -rw-r--r-- | PACKAGE/version.iss | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | lynx.cfg | 6 | ||||
| -rw-r--r-- | makefile.in | 4 | ||||
| -rw-r--r-- | po/lynx.pot | 914 | ||||
| -rw-r--r-- | src/LYIcon.rc | 10 | ||||
| -rw-r--r-- | src/LYList.c | 4 | ||||
| -rw-r--r-- | src/LYMainLoop.c | 5 | ||||
| -rw-r--r-- | userdefs.h | 6 |
14 files changed, 492 insertions, 490 deletions
diff --git a/CHANGES b/CHANGES index 92630947..662c3a99 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,11 @@ --- $LynxId: CHANGES,v 1.983 2018/05/17 23:29:45 tom Exp $ +-- $LynxId: CHANGES,v 1.987 2018/06/10 21:35:39 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== +2018-06-10 (2.8.9pre.1) +* fix an inconsistency in message for "-listonly" option (Debian #805753) -TD + 2018-05-17 (2.8.9dev.19) * update test-packages to use current ncurses test-packages -TD * improve portability for sockaddr structures used in HTTP and FTP, for diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog index 88c67883..37abd240 100644 --- a/PACKAGE/debian/changelog +++ b/PACKAGE/debian/changelog @@ -1,8 +1,8 @@ -lynx-dev (2.8.9dev.19) unstable; urgency=low +lynx-dev (2.8.9pre.1) unstable; urgency=low - * maintenance updates + * prerelease - -- Thomas E. Dickey <dickey@invisible-island.net> Mon, 07 May 2018 19:37:31 -0400 + -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 10 Jun 2018 16:24:17 -0400 lynx-dev (2.8.8dev.16) unstable; urgency=high diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi index 1fab6659..961ea758 100644 --- a/PACKAGE/lynx.nsi +++ b/PACKAGE/lynx.nsi @@ -1,4 +1,4 @@ -; $LynxId: lynx.nsi,v 1.41 2018/05/07 23:37:31 tom Exp $ +; $LynxId: lynx.nsi,v 1.42 2018/06/10 20:24:17 tom Exp $ ; Script originally generated with the Venis Install Wizard, but customized. ; The Inno Setup script is preferred; but this can be built via cross-compiling. @@ -9,8 +9,8 @@ !define VERSION_EPOCH "2" !define VERSION_MAJOR "8" !define VERSION_MINOR "9" -!define VERSION_LEVEL "1019" -!define VERSION_PATCH "dev.19" +!define VERSION_LEVEL "2001" +!define VERSION_PATCH "pre.1" !define SUBKEY "Lynx" diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec index 27639c93..7f8263b3 100644 --- a/PACKAGE/lynx.spec +++ b/PACKAGE/lynx.spec @@ -1,8 +1,8 @@ -# $LynxId: lynx.spec,v 1.50 2018/05/17 22:00:16 tom Exp $ +# $LynxId: lynx.spec,v 1.51 2018/06/10 20:24:17 tom Exp $ Summary: A text-based Web browser Name: lynx-dev Version: 2.8.9 -Release: dev.19 +Release: pre.1 License: GPLv2 Group: Applications/Internet Source: lynx%{version}%{release}.tgz diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss index 9bf10105..1b55c525 100644 --- a/PACKAGE/version.iss +++ b/PACKAGE/version.iss @@ -1,7 +1,7 @@ ; version used for Inno Setup files. ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ -#define LYNX_VERSION "2.8.9dev.19" +#define LYNX_VERSION "2.8.9pre.1" ; most-recent full release and target #define LYNX_RELEASE "2.8.9" diff --git a/configure b/configure index 314cf9f7..a3abbd45 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in 2.8.9dev.17. +# From configure.in 2.8.9pre.1. # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20170501. # @@ -1274,7 +1274,7 @@ rm conftest.sed PACKAGE=lynx # $Format: "VERSION=$ProjectVersion$"$ -VERSION=2.8.9dev.19 +VERSION=2.8.9pre.1 echo "$as_me:1279: checking for DESTDIR" >&5 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6 diff --git a/configure.in b/configure.in index 80962ac8..151beb72 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $LynxId: configure.in,v 1.299 2018/05/07 23:37:31 tom Exp $ +dnl $LynxId: configure.in,v 1.300 2018/06/10 21:09:45 tom Exp $ dnl dnl Process this file with autoconf to produce a configure script. dnl @@ -29,7 +29,7 @@ dnl --------------------------------------------------------------------------- dnl dnl ask PRCS to plug-in the project-version for the configure-script. dnl $Format: "AC_REVISION($ProjectVersion$)"$ -AC_REVISION(2.8.9dev.19) +AC_REVISION(2.8.9pre.1) # Save the original $CFLAGS so we can distinguish whether the user set those # in the environment, or whether autoconf added -O and -g options: @@ -64,7 +64,7 @@ AC_ARG_PROGRAM PACKAGE=lynx dnl ask PRCS to plug-in the project-version for the packages. # $Format: "VERSION=$ProjectVersion$"$ -VERSION=2.8.9dev.19 +VERSION=2.8.9pre.1 AC_SUBST(PACKAGE) AC_SUBST(VERSION) diff --git a/lynx.cfg b/lynx.cfg index b8a7ac7d..69187d71 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1,13 +1,13 @@ -# $LynxId: lynx.cfg,v 1.297 2018/05/07 23:37:31 tom Exp $ +# $LynxId: lynx.cfg,v 1.299 2018/06/10 21:09:45 tom Exp $ # lynx.cfg file. # The default placement for this file is /usr/local/lib/lynx.cfg (Unix) # or Lynx_Dir:lynx.cfg (VMS) # # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ -#PRCS LYNX_VERSION "2.8.9dev.19" +#PRCS LYNX_VERSION "2.8.9pre.1" # # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ -#PRCS LYNX_DATE "Mon, 07 May 2018 19:37:31 -0400" +#PRCS LYNX_DATE "Sun, 10 Jun 2018 17:09:45 -0400" # # Definition pairs (configuration settings) are of the form # VARIABLE:DEFINITION diff --git a/makefile.in b/makefile.in index b8ccfc37..a5ff4923 100644 --- a/makefile.in +++ b/makefile.in @@ -1,4 +1,4 @@ -# $LynxId: makefile.in,v 1.170 2018/05/07 23:37:31 tom Exp $ +# $LynxId: makefile.in,v 1.171 2018/06/10 21:09:45 tom Exp $ ##makefile for lynx SHELL = @CONFIG_SHELL@ @@ -45,7 +45,7 @@ TAR_UP = $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@ TAR_DOWN = $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@ # $Format: "LYNX_VERSION = $ProjectVersion$"$ -LYNX_VERSION = 2.8.9dev.19 +LYNX_VERSION = 2.8.9pre.1 ## This is the version which we are developing (or, upon release, make this ## the same). Use no dots in the name, since it must work on VMS and MS-DOS. diff --git a/po/lynx.pot b/po/lynx.pot index 2b447b0d..a3176f87 100644 --- a/po/lynx.pot +++ b/po/lynx.pot @@ -1,9 +1,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lynx 2.8.9dev.16\n" +"Project-Id-Version: lynx 2.8.9pre.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-06 04:38-0400\n" +"POT-Creation-Date: 2018-06-10 16:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -525,8 +525,8 @@ msgstr "" #. #define NOVICE_LINE_TWO_A #: LYMessages.c:196 msgid "" -" O)ther cmds H)elp K)eymap G)oto P)rint M)ain screen o)ptions Q)" -"uit \n" +" O)ther cmds H)elp K)eymap G)oto P)rint M)ain screen o)ptions " +"Q)uit \n" msgstr "" #. #define NOVICE_LINE_TWO_B @@ -539,8 +539,8 @@ msgstr "" #. #define NOVICE_LINE_TWO_C #: LYMessages.c:200 msgid "" -"O)ther cmds C)omment History: <backspace> Bookmarks: V)iew, A)dd, R)" -"emove \n" +"O)ther cmds C)omment History: <backspace> Bookmarks: V)iew, A)dd, " +"R)emove \n" msgstr "" #. #define FORM_NOVICELINE_ONE @@ -2332,7 +2332,7 @@ msgstr "" msgid "(No value.)" msgstr "" -#: LYMessages.c:743 src/LYOptions.c:2446 +#: LYMessages.c:743 src/LYOptions.c:2459 msgid "None" msgstr "" @@ -2795,8 +2795,8 @@ msgstr "" #. #define DIRED_NOVICELINE #: LYMessages.c:882 msgid "" -" C)reate D)ownload E)dit F)ull menu M)odify R)emove T)ag U)" -"pload \n" +" C)reate D)ownload E)dit F)ull menu M)odify R)emove T)ag " +"U)pload \n" msgstr "" #: LYMessages.c:883 @@ -2846,42 +2846,42 @@ msgstr "" msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:569 +#: WWW/Library/Implementation/HTAABrow.c:575 #, c-format msgid "username for realm %s changed from %s to %s" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:585 +#: WWW/Library/Implementation/HTAABrow.c:591 #, c-format msgid "password for realm %s user %s changed" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:697 +#: WWW/Library/Implementation/HTAABrow.c:703 #, c-format msgid "Username for '%s' at %s '%s%s':" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:970 +#: WWW/Library/Implementation/HTAABrow.c:976 msgid "" "This client doesn't know how to compose proxy authorization information for " "scheme" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:1047 +#: WWW/Library/Implementation/HTAABrow.c:1053 msgid "" "This client doesn't know how to compose authorization information for scheme" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:1156 +#: WWW/Library/Implementation/HTAABrow.c:1162 #, c-format msgid "Invalid header '%s%s%s%s%s'" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:1260 +#: WWW/Library/Implementation/HTAABrow.c:1266 msgid "Proxy authorization required -- retrying" msgstr "" -#: WWW/Library/Implementation/HTAABrow.c:1316 +#: WWW/Library/Implementation/HTAABrow.c:1322 msgid "Access without authorization denied -- retrying" msgstr "" @@ -2889,31 +2889,31 @@ msgstr "" msgid "Access forbidden by rule" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:793 +#: WWW/Library/Implementation/HTAccess.c:795 msgid "Document with POST content not found in cache. Resubmit?" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:947 +#: WWW/Library/Implementation/HTAccess.c:949 msgid "Loading failed, use a previous copy." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8865 +#: WWW/Library/Implementation/HTAccess.c:1058 src/GridText.c:8880 msgid "Loading incomplete." msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1087 +#: WWW/Library/Implementation/HTAccess.c:1089 #, c-format msgid "" "**** HTAccess: socket or file number returned by obsolete load routine!\n" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1089 +#: WWW/Library/Implementation/HTAccess.c:1091 #, c-format msgid "" "**** HTAccess: Internal software error. Please mail lynx-dev@nongnu.org!\n" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1090 +#: WWW/Library/Implementation/HTAccess.c:1092 #, c-format msgid "**** HTAccess: Status returned was: %d\n" msgstr "" @@ -2922,11 +2922,11 @@ msgstr "" #. * hack: if we fail in HTAccess.c #. * avoid duplicating URL, oh. #. -#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8075 +#: WWW/Library/Implementation/HTAccess.c:1098 src/LYMainLoop.c:8076 msgid "Can't Access" msgstr "" -#: WWW/Library/Implementation/HTAccess.c:1104 +#: WWW/Library/Implementation/HTAccess.c:1106 msgid "Unable to access document." msgstr "" @@ -2943,24 +2943,24 @@ msgstr "" msgid "close master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:1199 +#: WWW/Library/Implementation/HTFTP.c:1194 msgid "socket for master socket" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:2948 +#: WWW/Library/Implementation/HTFTP.c:2922 msgid "Receiving FTP directory." msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3086 +#: WWW/Library/Implementation/HTFTP.c:3060 #, c-format msgid "Transferred %d bytes (%5d)" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:3444 +#: WWW/Library/Implementation/HTFTP.c:3417 msgid "connect for data" msgstr "" -#: WWW/Library/Implementation/HTFTP.c:4126 +#: WWW/Library/Implementation/HTFTP.c:4094 msgid "Receiving FTP file." msgstr "" @@ -2984,40 +2984,40 @@ msgstr "" msgid "No response from finger server." msgstr "" -#: WWW/Library/Implementation/HTNews.c:421 +#: WWW/Library/Implementation/HTNews.c:429 #, c-format msgid "Username for news host '%s':" msgstr "" -#: WWW/Library/Implementation/HTNews.c:474 +#: WWW/Library/Implementation/HTNews.c:482 msgid "Change username?" msgstr "" -#: WWW/Library/Implementation/HTNews.c:478 +#: WWW/Library/Implementation/HTNews.c:486 msgid "Username:" msgstr "" -#: WWW/Library/Implementation/HTNews.c:503 +#: WWW/Library/Implementation/HTNews.c:511 #, c-format msgid "Password for news host '%s':" msgstr "" -#: WWW/Library/Implementation/HTNews.c:586 +#: WWW/Library/Implementation/HTNews.c:594 msgid "Change password?" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1707 +#: WWW/Library/Implementation/HTNews.c:1715 #, c-format msgid "No matches for: %s" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1757 +#: WWW/Library/Implementation/HTNews.c:1765 msgid "" "\n" "No articles in this group.\n" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1769 +#: WWW/Library/Implementation/HTNews.c:1777 msgid "" "\n" "No articles in this range.\n" @@ -3026,16 +3026,16 @@ msgstr "" #. #. * Set window title. #. -#: WWW/Library/Implementation/HTNews.c:1782 +#: WWW/Library/Implementation/HTNews.c:1790 #, c-format msgid "%s, Articles %d-%d" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1805 +#: WWW/Library/Implementation/HTNews.c:1813 msgid "Earlier articles" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1818 +#: WWW/Library/Implementation/HTNews.c:1826 #, c-format msgid "" "\n" @@ -3043,41 +3043,41 @@ msgid "" "\n" msgstr "" -#: WWW/Library/Implementation/HTNews.c:1880 +#: WWW/Library/Implementation/HTNews.c:1888 msgid "All available articles in " msgstr "" -#: WWW/Library/Implementation/HTNews.c:2094 +#: WWW/Library/Implementation/HTNews.c:2102 msgid "Later articles" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2117 +#: WWW/Library/Implementation/HTNews.c:2125 msgid "Post to " msgstr "" -#: WWW/Library/Implementation/HTNews.c:2338 +#: WWW/Library/Implementation/HTNews.c:2346 msgid "This client does not contain support for SNEWS URLs." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2545 +#: WWW/Library/Implementation/HTNews.c:2553 msgid "No target for raw text!" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2575 +#: WWW/Library/Implementation/HTNews.c:2583 msgid "Connecting to NewsHost ..." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2627 +#: WWW/Library/Implementation/HTNews.c:2635 #, c-format msgid "Could not access %s." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2733 +#: WWW/Library/Implementation/HTNews.c:2741 #, c-format msgid "Can't read news info. News host %.20s responded: %.200s" msgstr "" -#: WWW/Library/Implementation/HTNews.c:2737 +#: WWW/Library/Implementation/HTNews.c:2745 #, c-format msgid "Can't read news info, empty response from host %s" msgstr "" @@ -3085,35 +3085,35 @@ msgstr "" #. #. * List available newsgroups. - FM #. -#: WWW/Library/Implementation/HTNews.c:2941 +#: WWW/Library/Implementation/HTNews.c:2949 msgid "Reading list of available newsgroups." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2962 +#: WWW/Library/Implementation/HTNews.c:2970 msgid "Reading list of articles in newsgroup." msgstr "" #. #. * Get an article from a news group. - FM #. -#: WWW/Library/Implementation/HTNews.c:2968 +#: WWW/Library/Implementation/HTNews.c:2976 msgid "Reading news article." msgstr "" -#: WWW/Library/Implementation/HTNews.c:2998 +#: WWW/Library/Implementation/HTNews.c:3006 msgid "Sorry, could not load requested news." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1323 +#: WWW/Library/Implementation/HTTCP.c:1339 msgid "Address has invalid port" msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1397 +#: WWW/Library/Implementation/HTTCP.c:1410 msgid "Address length looks invalid" msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1839 -#: WWW/Library/Implementation/HTTCP.c:1857 +#: WWW/Library/Implementation/HTTCP.c:1862 +#: WWW/Library/Implementation/HTTCP.c:1880 #, c-format msgid "Unable to locate remote host %s." msgstr "" @@ -3122,146 +3122,146 @@ msgstr "" #. * but not HTAlert, because typically there will be other #. * alerts from the callers. - kw #. -#: WWW/Library/Implementation/HTTCP.c:1854 +#: WWW/Library/Implementation/HTTCP.c:1877 #: WWW/Library/Implementation/HTTelnet.c:115 #, c-format msgid "Invalid hostname %s" msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1868 +#: WWW/Library/Implementation/HTTCP.c:1891 #, c-format msgid "Making %s connection to %s" msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1879 +#: WWW/Library/Implementation/HTTCP.c:1902 msgid "socket failed." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1893 +#: WWW/Library/Implementation/HTTCP.c:1916 #, c-format msgid "socket failed: family %d addr %s port %s." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1917 +#: WWW/Library/Implementation/HTTCP.c:1940 msgid "Could not make connection non-blocking." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:1985 +#: WWW/Library/Implementation/HTTCP.c:2006 msgid "Connection failed (too many retries)." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:2174 +#: WWW/Library/Implementation/HTTCP.c:2201 msgid "Could not restore socket to blocking." msgstr "" -#: WWW/Library/Implementation/HTTCP.c:2242 +#: WWW/Library/Implementation/HTTCP.c:2271 msgid "Socket read failed (too many tries)." msgstr "" -#: WWW/Library/Implementation/HTTP.c:134 +#: WWW/Library/Implementation/HTTP.c:165 #, c-format msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d" msgstr "" -#: WWW/Library/Implementation/HTTP.c:629 +#: WWW/Library/Implementation/HTTP.c:668 #, c-format msgid "User/password contains only punctuation: %s" msgstr "" -#: WWW/Library/Implementation/HTTP.c:633 +#: WWW/Library/Implementation/HTTP.c:672 #, c-format msgid "User/password may be confused with hostname: '%s' (e.g, '%s')" msgstr "" -#: WWW/Library/Implementation/HTTP.c:694 +#: WWW/Library/Implementation/HTTP.c:733 #, c-format msgid "Certificate issued by: %s" msgstr "" -#: WWW/Library/Implementation/HTTP.c:881 +#: WWW/Library/Implementation/HTTP.c:920 msgid "This client does not contain support for HTTPS URLs." msgstr "" -#: WWW/Library/Implementation/HTTP.c:906 +#: WWW/Library/Implementation/HTTP.c:945 msgid "Unable to connect to remote host." msgstr "" -#: WWW/Library/Implementation/HTTP.c:953 +#: WWW/Library/Implementation/HTTP.c:988 msgid "Retrying connection without TLS." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1005 +#: WWW/Library/Implementation/HTTP.c:1040 msgid "GnuTLS error when trying to verify certificate." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1018 +#: WWW/Library/Implementation/HTTP.c:1053 msgid "the certificate has no known issuer" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1020 +#: WWW/Library/Implementation/HTTP.c:1055 msgid "no issuer was found" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1022 +#: WWW/Library/Implementation/HTTP.c:1057 msgid "issuer is not a CA" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1024 +#: WWW/Library/Implementation/HTTP.c:1059 msgid "the certificate has been revoked" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1026 +#: WWW/Library/Implementation/HTTP.c:1061 msgid "the certificate is not trusted" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1101 +#: WWW/Library/Implementation/HTTP.c:1136 #, c-format msgid "Verified connection to %s (cert=%s)" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1151 -#: WWW/Library/Implementation/HTTP.c:1193 +#: WWW/Library/Implementation/HTTP.c:1186 +#: WWW/Library/Implementation/HTTP.c:1228 #, c-format msgid "Verified connection to %s (subj=%s)" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1223 +#: WWW/Library/Implementation/HTTP.c:1258 msgid "Can't find common name in certificate" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1226 +#: WWW/Library/Implementation/HTTP.c:1261 #, c-format msgid "SSL error:host(%s)!=cert(%s)-Continue?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1233 +#: WWW/Library/Implementation/HTTP.c:1268 msgid "SSL error" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1241 +#: WWW/Library/Implementation/HTTP.c:1276 #, c-format msgid "UNVERIFIED connection to %s (cert=%s)" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1250 +#: WWW/Library/Implementation/HTTP.c:1285 #, c-format msgid "Secure %d-bit %s (%s) HTTP connection" msgstr "" -#: WWW/Library/Implementation/HTTP.c:1718 +#: WWW/Library/Implementation/HTTP.c:1755 msgid "Sending HTTP request." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1760 +#: WWW/Library/Implementation/HTTP.c:1797 msgid "Unexpected network write error; connection aborted." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1766 +#: WWW/Library/Implementation/HTTP.c:1803 msgid "HTTP request sent; waiting for response." msgstr "" -#: WWW/Library/Implementation/HTTP.c:1839 -#: WWW/Library/Implementation/HTTP.c:1849 +#: WWW/Library/Implementation/HTTP.c:1876 +#: WWW/Library/Implementation/HTTP.c:1886 msgid "Unexpected network read error; connection aborted." msgstr "" @@ -3274,7 +3274,7 @@ msgstr "" #. * line and possibly other headers, so we'll deal with them by #. * showing the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:2051 +#: WWW/Library/Implementation/HTTP.c:2089 msgid "Got unexpected Informational Status." msgstr "" @@ -3284,7 +3284,7 @@ msgstr "" #. * content. We'll instruct the user to do that, and #. * restore the current document. - FM #. -#: WWW/Library/Implementation/HTTP.c:2085 +#: WWW/Library/Implementation/HTTP.c:2123 msgid "Request fulfilled. Reset Content." msgstr "" @@ -3294,27 +3294,27 @@ msgstr "" #. * status is inappropriate. We'll deal with it by showing #. * the full header to the user as text/plain. - FM #. -#: WWW/Library/Implementation/HTTP.c:2202 +#: WWW/Library/Implementation/HTTP.c:2240 msgid "Got unexpected 304 Not Modified status." msgstr "" -#: WWW/Library/Implementation/HTTP.c:2265 +#: WWW/Library/Implementation/HTTP.c:2303 msgid "Redirection of POST content requires user approval." msgstr "" -#: WWW/Library/Implementation/HTTP.c:2280 +#: WWW/Library/Implementation/HTTP.c:2318 msgid "Have POST content. Treating Permanent Redirection as Temporary.\n" msgstr "" -#: WWW/Library/Implementation/HTTP.c:2326 +#: WWW/Library/Implementation/HTTP.c:2364 msgid "Retrying with access authorization information." msgstr "" -#: WWW/Library/Implementation/HTTP.c:2338 +#: WWW/Library/Implementation/HTTP.c:2376 msgid "Show the 401 message body?" msgstr "" -#: WWW/Library/Implementation/HTTP.c:2382 +#: WWW/Library/Implementation/HTTP.c:2420 msgid "Show the 407 message body?" msgstr "" @@ -3322,7 +3322,7 @@ msgstr "" #. * Bad or unknown server_status number. Take a chance and hope #. * there is something to display. - FM #. -#: WWW/Library/Implementation/HTTP.c:2482 +#: WWW/Library/Implementation/HTTP.c:2520 msgid "Unknown status reply from server!" msgstr "" @@ -3500,110 +3500,110 @@ msgstr "" msgid "Host" msgstr "" -#: src/GridText.c:691 +#: src/GridText.c:702 msgid "Memory exhausted, display interrupted!" msgstr "" -#: src/GridText.c:696 +#: src/GridText.c:707 msgid "Memory exhausted, will interrupt transfer!" msgstr "" -#: src/GridText.c:3666 +#: src/GridText.c:3681 msgid " *** MEMORY EXHAUSTED ***" msgstr "" -#: src/GridText.c:6144 +#: src/GridText.c:6161 msgid "text entry field" msgstr "" -#: src/GridText.c:6147 +#: src/GridText.c:6164 msgid "password entry field" msgstr "" -#: src/GridText.c:6150 +#: src/GridText.c:6167 msgid "checkbox" msgstr "" -#: src/GridText.c:6153 +#: src/GridText.c:6170 msgid "radio button" msgstr "" -#: src/GridText.c:6156 +#: src/GridText.c:6173 msgid "submit button" msgstr "" -#: src/GridText.c:6159 +#: src/GridText.c:6176 msgid "reset button" msgstr "" -#: src/GridText.c:6162 +#: src/GridText.c:6179 msgid "script button" msgstr "" -#: src/GridText.c:6165 +#: src/GridText.c:6182 msgid "popup menu" msgstr "" -#: src/GridText.c:6168 +#: src/GridText.c:6185 msgid "hidden form field" msgstr "" -#: src/GridText.c:6171 +#: src/GridText.c:6188 msgid "text entry area" msgstr "" -#: src/GridText.c:6174 +#: src/GridText.c:6191 msgid "range entry field" msgstr "" -#: src/GridText.c:6177 +#: src/GridText.c:6194 msgid "file entry field" msgstr "" -#: src/GridText.c:6180 +#: src/GridText.c:6197 msgid "text-submit field" msgstr "" -#: src/GridText.c:6183 +#: src/GridText.c:6200 msgid "image-submit button" msgstr "" -#: src/GridText.c:6186 +#: src/GridText.c:6203 msgid "keygen field" msgstr "" -#: src/GridText.c:6189 +#: src/GridText.c:6206 msgid "unknown form field" msgstr "" -#: src/GridText.c:6209 src/GridText.c:6216 src/LYList.c:249 +#: src/GridText.c:6226 src/GridText.c:6233 src/LYList.c:249 msgid "unknown field or link" msgstr "" -#: src/GridText.c:10633 +#: src/GridText.c:10651 msgid "Can't open file for uploading" msgstr "" -#: src/GridText.c:11821 +#: src/GridText.c:11839 #, c-format msgid "Submitting %s" msgstr "" #. ugliness has happened; inform user and do the best we can -#: src/GridText.c:12891 +#: src/GridText.c:12909 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!" msgstr "" #. don't show previous state -#: src/GridText.c:13050 +#: src/GridText.c:13068 msgid "Wrap lines to fit displayed area?" msgstr "" -#: src/GridText.c:13680 +#: src/GridText.c:13698 msgid "Very long lines have been truncated!" msgstr "" -#: src/HTAlert.c:164 src/LYShowInfo.c:386 src/LYShowInfo.c:390 +#: src/HTAlert.c:164 src/LYShowInfo.c:389 src/LYShowInfo.c:393 msgid "bytes" msgstr "" @@ -3693,31 +3693,31 @@ msgstr "" msgid "Y/N/A/V" msgstr "" -#: src/HTML.c:5943 +#: src/HTML.c:5770 msgid "Description:" msgstr "" -#: src/HTML.c:5948 +#: src/HTML.c:5775 msgid "(none)" msgstr "" -#: src/HTML.c:5952 +#: src/HTML.c:5779 msgid "Filepath:" msgstr "" -#: src/HTML.c:5958 +#: src/HTML.c:5785 msgid "(unknown)" msgstr "" -#: src/HTML.c:7398 +#: src/HTML.c:7223 msgid "Document has only hidden links. Use the 'l'ist command." msgstr "" -#: src/HTML.c:7896 +#: src/HTML.c:7725 msgid "Source cache error - disk full?" msgstr "" -#: src/HTML.c:7909 +#: src/HTML.c:7738 msgid "Source cache error - not enough memory!" msgstr "" @@ -3811,42 +3811,42 @@ msgstr "" msgid "cookie_domain_flag_set error, aborting program" msgstr "" -#: src/LYCurses.c:1170 +#: src/LYCurses.c:1127 msgid "Terminal reinitialisation failed - unknown terminal type?" msgstr "" -#: src/LYCurses.c:1377 +#: src/LYCurses.c:1334 msgid "Terminal initialisation failed - unknown terminal type?" msgstr "" -#: src/LYCurses.c:1869 +#: src/LYCurses.c:1828 msgid "Terminal =" msgstr "" -#: src/LYCurses.c:1873 +#: src/LYCurses.c:1832 msgid "You must use a vt100, 200, etc. terminal with this program." msgstr "" -#: src/LYCurses.c:1922 +#: src/LYCurses.c:1881 msgid "Your Terminal type is unknown!" msgstr "" -#: src/LYCurses.c:1923 +#: src/LYCurses.c:1882 msgid "Enter a terminal type:" msgstr "" -#: src/LYCurses.c:1937 +#: src/LYCurses.c:1896 msgid "TERMINAL TYPE IS SET TO" msgstr "" -#: src/LYCurses.c:2491 +#: src/LYCurses.c:2455 #, c-format msgid "" "\n" "A Fatal error has occurred in %s Ver. %s\n" msgstr "" -#: src/LYCurses.c:2494 +#: src/LYCurses.c:2458 #, c-format msgid "" "\n" @@ -3871,39 +3871,39 @@ msgstr "" msgid "Editor returned with error status %s" msgstr "" -#: src/LYDownload.c:509 +#: src/LYDownload.c:510 msgid "Downloaded link:" msgstr "" -#: src/LYDownload.c:514 +#: src/LYDownload.c:515 msgid "Suggested file name:" msgstr "" -#: src/LYDownload.c:519 +#: src/LYDownload.c:520 msgid "Standard download options:" msgstr "" -#: src/LYDownload.c:520 +#: src/LYDownload.c:521 msgid "Download options:" msgstr "" -#: src/LYDownload.c:536 +#: src/LYDownload.c:537 msgid "Save to disk" msgstr "" -#: src/LYDownload.c:550 +#: src/LYDownload.c:551 msgid "View temporary file" msgstr "" -#: src/LYDownload.c:557 +#: src/LYDownload.c:558 msgid "Save to disk disabled." msgstr "" -#: src/LYDownload.c:561 src/LYPrint.c:1330 +#: src/LYDownload.c:562 src/LYPrint.c:1331 msgid "Local additions:" msgstr "" -#: src/LYDownload.c:572 src/LYUpload.c:206 +#: src/LYDownload.c:573 src/LYUpload.c:206 msgid "No Name Given" msgstr "" @@ -3999,7 +3999,7 @@ msgstr "" msgid "this document:" msgstr "" -#: src/LYList.c:98 +#: src/LYList.c:98 src/LYList.c:362 msgid "Visible links:" msgstr "" @@ -4011,10 +4011,6 @@ msgstr "" msgid "References" msgstr "" -#: src/LYList.c:362 -msgid "Visible links" -msgstr "" - #: src/LYLocal.c:289 #, c-format msgid "Unable to get status of '%s'." @@ -4175,7 +4171,7 @@ msgstr "" msgid "Specify permissions below:" msgstr "" -#: src/LYLocal.c:1406 src/LYShowInfo.c:287 +#: src/LYLocal.c:1406 src/LYShowInfo.c:291 msgid "Owner:" msgstr "" @@ -4310,19 +4306,19 @@ msgstr "" msgid "No system mailer configured" msgstr "" -#: src/LYMain.c:1074 +#: src/LYMain.c:1087 msgid "No Winsock found, sorry." msgstr "" -#: src/LYMain.c:1265 +#: src/LYMain.c:1277 msgid "You MUST define a valid TMP or TEMP area!" msgstr "" -#: src/LYMain.c:1318 src/LYMainLoop.c:5284 +#: src/LYMain.c:1330 src/LYMainLoop.c:5285 msgid "No such directory" msgstr "" -#: src/LYMain.c:1512 +#: src/LYMain.c:1524 #, c-format msgid "" "\n" @@ -4330,7 +4326,7 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1522 +#: src/LYMain.c:1534 #, c-format msgid "" "\n" @@ -4338,68 +4334,68 @@ msgid "" "\n" msgstr "" -#: src/LYMain.c:1678 +#: src/LYMain.c:1690 #, c-format msgid "Ignored %d characters from standard input.\n" msgstr "" -#: src/LYMain.c:1680 +#: src/LYMain.c:1692 #, c-format msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n" msgstr "" -#: src/LYMain.c:1838 +#: src/LYMain.c:1850 msgid "Warning:" msgstr "" -#: src/LYMain.c:2408 +#: src/LYMain.c:2421 msgid "persistent cookies state will be changed in next session only." msgstr "" -#: src/LYMain.c:2645 src/LYMain.c:2690 +#: src/LYMain.c:2657 src/LYMain.c:2701 #, c-format msgid "Lynx: ignoring unrecognized charset=%s\n" msgstr "" -#: src/LYMain.c:3209 +#: src/LYMain.c:3218 #, c-format msgid "%s Version %s (%s)" msgstr "" -#: src/LYMain.c:3250 +#: src/LYMain.c:3259 #, c-format msgid "Built on %s%s.\n" msgstr "" -#: src/LYMain.c:3264 +#: src/LYMain.c:3273 msgid "Copyrights held by the Lynx Developers Group," msgstr "" -#: src/LYMain.c:3265 +#: src/LYMain.c:3274 msgid "the University of Kansas, CERN, and other contributors." msgstr "" -#: src/LYMain.c:3266 +#: src/LYMain.c:3275 msgid "Distributed under the GNU General Public License (Version 2)." msgstr "" -#: src/LYMain.c:3267 +#: src/LYMain.c:3276 msgid "" "See http://lynx.invisible-island.net/ and the online help for more " "information." msgstr "" -#: src/LYMain.c:4118 +#: src/LYMain.c:4123 #, c-format msgid "USAGE: %s [options] [file]\n" msgstr "" -#: src/LYMain.c:4119 +#: src/LYMain.c:4124 #, c-format msgid "Options are:\n" msgstr "" -#: src/LYMain.c:4422 +#: src/LYMain.c:4427 #, c-format msgid "%s: Invalid Option: %s\n" msgstr "" @@ -4409,7 +4405,7 @@ msgstr "" msgid "Internal error: Invalid mouse link %d!" msgstr "" -#: src/LYMainLoop.c:693 src/LYMainLoop.c:5306 +#: src/LYMainLoop.c:693 src/LYMainLoop.c:5307 msgid "A URL specified by the user" msgstr "" @@ -4420,97 +4416,97 @@ msgstr "" #. #. * Make a name for this help file. #. -#: src/LYMainLoop.c:3196 +#: src/LYMainLoop.c:3197 msgid "Help Screen" msgstr "" -#: src/LYMainLoop.c:3327 +#: src/LYMainLoop.c:3328 msgid "System Index" msgstr "" -#: src/LYMainLoop.c:3576 +#: src/LYMainLoop.c:3577 #, c-format msgid "Query parameter %d: " msgstr "" -#: src/LYMainLoop.c:3805 src/LYMainLoop.c:5582 +#: src/LYMainLoop.c:3806 src/LYMainLoop.c:5583 msgid "Entry into main screen" msgstr "" -#: src/LYMainLoop.c:4063 +#: src/LYMainLoop.c:4064 msgid "No next document present" msgstr "" -#: src/LYMainLoop.c:4358 +#: src/LYMainLoop.c:4359 msgid "charset for this document specified explicitly, sorry..." msgstr "" -#: src/LYMainLoop.c:5264 +#: src/LYMainLoop.c:5265 msgid "cd to:" msgstr "" -#: src/LYMainLoop.c:5287 +#: src/LYMainLoop.c:5288 msgid "A component of path is not a directory" msgstr "" -#: src/LYMainLoop.c:5290 +#: src/LYMainLoop.c:5291 msgid "failed to change directory" msgstr "" -#: src/LYMainLoop.c:6516 +#: src/LYMainLoop.c:6517 msgid "Reparsing document under current settings..." msgstr "" -#: src/LYMainLoop.c:6810 +#: src/LYMainLoop.c:6811 #, c-format msgid "Fatal error - could not open output file %s\n" msgstr "" -#: src/LYMainLoop.c:7152 +#: src/LYMainLoop.c:7153 msgid "TABLE center enable." msgstr "" -#: src/LYMainLoop.c:7155 +#: src/LYMainLoop.c:7156 msgid "TABLE center disable." msgstr "" -#: src/LYMainLoop.c:7235 +#: src/LYMainLoop.c:7236 msgid "Current URL is empty." msgstr "" -#: src/LYMainLoop.c:7237 src/LYUtils.c:1915 +#: src/LYMainLoop.c:7238 src/LYUtils.c:1909 msgid "Copy to clipboard failed." msgstr "" -#: src/LYMainLoop.c:7239 +#: src/LYMainLoop.c:7240 msgid "Document URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:7241 +#: src/LYMainLoop.c:7242 msgid "Link URL put to clipboard." msgstr "" -#: src/LYMainLoop.c:7268 +#: src/LYMainLoop.c:7269 msgid "No URL in the clipboard." msgstr "" -#: src/LYMainLoop.c:7961 src/LYMainLoop.c:8132 +#: src/LYMainLoop.c:7962 src/LYMainLoop.c:8133 msgid "-index-" msgstr "" -#: src/LYMainLoop.c:8070 +#: src/LYMainLoop.c:8071 msgid "lynx: Can't access startfile" msgstr "" -#: src/LYMainLoop.c:8082 +#: src/LYMainLoop.c:8083 msgid "lynx: Start file could not be found or is not text/html or text/plain" msgstr "" -#: src/LYMainLoop.c:8083 +#: src/LYMainLoop.c:8084 msgid " Exiting..." msgstr "" -#: src/LYMainLoop.c:8126 +#: src/LYMainLoop.c:8127 msgid "-more-" msgstr "" @@ -4570,392 +4566,392 @@ msgstr "" msgid "B)ookmark file: " msgstr "" -#: src/LYOptions.c:2127 src/LYOptions.c:2134 +#: src/LYOptions.c:2131 src/LYOptions.c:2138 msgid "ON" msgstr "" #. verbose_img variable #. LYCollapseBRs variable #. LYtrimBlankLines variable -#: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2306 -#: src/LYOptions.c:2315 src/LYOptions.c:2324 src/LYOptions.c:2335 +#: src/LYOptions.c:2132 src/LYOptions.c:2137 src/LYOptions.c:2310 +#: src/LYOptions.c:2319 src/LYOptions.c:2328 src/LYOptions.c:2339 msgid "OFF" msgstr "" -#: src/LYOptions.c:2129 +#: src/LYOptions.c:2133 msgid "NEVER" msgstr "" -#: src/LYOptions.c:2130 +#: src/LYOptions.c:2134 msgid "ALWAYS" msgstr "" -#: src/LYOptions.c:2146 src/LYOptions.c:2298 +#: src/LYOptions.c:2150 src/LYOptions.c:2302 msgid "ignore" msgstr "" -#: src/LYOptions.c:2147 +#: src/LYOptions.c:2151 msgid "ask user" msgstr "" -#: src/LYOptions.c:2148 +#: src/LYOptions.c:2152 msgid "accept all" msgstr "" -#: src/LYOptions.c:2160 +#: src/LYOptions.c:2164 msgid "ALWAYS OFF" msgstr "" -#: src/LYOptions.c:2161 +#: src/LYOptions.c:2165 msgid "FOR LOCAL FILES ONLY" msgstr "" -#: src/LYOptions.c:2163 +#: src/LYOptions.c:2167 msgid "ALWAYS ON" msgstr "" -#: src/LYOptions.c:2175 +#: src/LYOptions.c:2179 msgid "Numbers act as arrows" msgstr "" -#: src/LYOptions.c:2177 +#: src/LYOptions.c:2181 msgid "Links are numbered" msgstr "" -#: src/LYOptions.c:2180 +#: src/LYOptions.c:2184 msgid "Links and form fields are numbered" msgstr "" -#: src/LYOptions.c:2183 +#: src/LYOptions.c:2187 msgid "Form fields are numbered" msgstr "" -#: src/LYOptions.c:2198 +#: src/LYOptions.c:2202 msgid "Case insensitive" msgstr "" -#: src/LYOptions.c:2199 +#: src/LYOptions.c:2203 msgid "Case sensitive" msgstr "" -#: src/LYOptions.c:2233 +#: src/LYOptions.c:2237 msgid "prompt normally" msgstr "" -#: src/LYOptions.c:2234 +#: src/LYOptions.c:2238 msgid "force yes-response" msgstr "" -#: src/LYOptions.c:2235 +#: src/LYOptions.c:2239 msgid "force no-response" msgstr "" -#: src/LYOptions.c:2253 +#: src/LYOptions.c:2257 msgid "Novice" msgstr "" -#: src/LYOptions.c:2254 +#: src/LYOptions.c:2258 msgid "Intermediate" msgstr "" -#: src/LYOptions.c:2255 +#: src/LYOptions.c:2259 msgid "Advanced" msgstr "" -#: src/LYOptions.c:2264 +#: src/LYOptions.c:2268 msgid "By First Visit" msgstr "" -#: src/LYOptions.c:2266 +#: src/LYOptions.c:2270 msgid "By First Visit Reversed" msgstr "" -#: src/LYOptions.c:2267 +#: src/LYOptions.c:2271 msgid "As Visit Tree" msgstr "" -#: src/LYOptions.c:2268 +#: src/LYOptions.c:2272 msgid "By Last Visit" msgstr "" -#: src/LYOptions.c:2270 +#: src/LYOptions.c:2274 msgid "By Last Visit Reversed" msgstr "" #. Old_DTD variable -#: src/LYOptions.c:2281 +#: src/LYOptions.c:2285 msgid "relaxed (TagSoup mode)" msgstr "" -#: src/LYOptions.c:2282 +#: src/LYOptions.c:2286 msgid "strict (SortaSGML mode)" msgstr "" -#: src/LYOptions.c:2289 +#: src/LYOptions.c:2293 msgid "Ignore" msgstr "" -#: src/LYOptions.c:2290 +#: src/LYOptions.c:2294 msgid "Add to trace-file" msgstr "" -#: src/LYOptions.c:2291 +#: src/LYOptions.c:2295 msgid "Add to LYNXMESSAGES" msgstr "" -#: src/LYOptions.c:2292 +#: src/LYOptions.c:2296 msgid "Warn, point to trace-file" msgstr "" -#: src/LYOptions.c:2299 +#: src/LYOptions.c:2303 msgid "as labels" msgstr "" -#: src/LYOptions.c:2300 +#: src/LYOptions.c:2304 msgid "as links" msgstr "" -#: src/LYOptions.c:2307 +#: src/LYOptions.c:2311 msgid "show filename" msgstr "" -#: src/LYOptions.c:2316 +#: src/LYOptions.c:2320 msgid "collapse" msgstr "" -#: src/LYOptions.c:2325 +#: src/LYOptions.c:2329 msgid "trim-lines" msgstr "" -#: src/LYOptions.c:2336 +#: src/LYOptions.c:2340 msgid "STANDARD" msgstr "" -#: src/LYOptions.c:2337 +#: src/LYOptions.c:2341 msgid "ADVANCED" msgstr "" -#: src/LYOptions.c:2371 +#: src/LYOptions.c:2375 msgid "Directories first" msgstr "" -#: src/LYOptions.c:2372 +#: src/LYOptions.c:2376 msgid "Files first" msgstr "" -#: src/LYOptions.c:2373 +#: src/LYOptions.c:2377 msgid "Mixed style" msgstr "" -#: src/LYOptions.c:2381 src/LYOptions.c:2401 +#: src/LYOptions.c:2385 src/LYOptions.c:2405 msgid "By Name" msgstr "" -#: src/LYOptions.c:2382 src/LYOptions.c:2402 +#: src/LYOptions.c:2386 src/LYOptions.c:2406 msgid "By Type" msgstr "" -#: src/LYOptions.c:2383 src/LYOptions.c:2403 +#: src/LYOptions.c:2387 src/LYOptions.c:2407 msgid "By Size" msgstr "" -#: src/LYOptions.c:2384 src/LYOptions.c:2404 +#: src/LYOptions.c:2388 src/LYOptions.c:2408 msgid "By Date" msgstr "" -#: src/LYOptions.c:2385 +#: src/LYOptions.c:2389 msgid "By Mode" msgstr "" -#: src/LYOptions.c:2387 +#: src/LYOptions.c:2391 msgid "By User" msgstr "" -#: src/LYOptions.c:2388 +#: src/LYOptions.c:2392 msgid "By Group" msgstr "" -#: src/LYOptions.c:2413 +#: src/LYOptions.c:2417 msgid "Do not show rate" msgstr "" -#: src/LYOptions.c:2414 src/LYOptions.c:2415 +#: src/LYOptions.c:2418 src/LYOptions.c:2419 #, c-format msgid "Show %s/sec rate" msgstr "" -#: src/LYOptions.c:2417 src/LYOptions.c:2418 +#: src/LYOptions.c:2421 src/LYOptions.c:2422 #, c-format msgid "Show %s/sec, ETA" msgstr "" -#: src/LYOptions.c:2419 src/LYOptions.c:2420 +#: src/LYOptions.c:2423 src/LYOptions.c:2424 #, c-format msgid "Show %s/sec (2-digits), ETA" msgstr "" -#: src/LYOptions.c:2423 +#: src/LYOptions.c:2427 msgid "Show progressbar" msgstr "" -#: src/LYOptions.c:2435 +#: src/LYOptions.c:2448 msgid "Accept lynx's internal types" msgstr "" -#: src/LYOptions.c:2436 +#: src/LYOptions.c:2449 msgid "Also accept lynx.cfg's types" msgstr "" -#: src/LYOptions.c:2437 +#: src/LYOptions.c:2450 msgid "Also accept user's types" msgstr "" -#: src/LYOptions.c:2438 +#: src/LYOptions.c:2451 msgid "Also accept system's types" msgstr "" -#: src/LYOptions.c:2439 +#: src/LYOptions.c:2452 msgid "Accept all types" msgstr "" -#: src/LYOptions.c:2448 +#: src/LYOptions.c:2461 msgid "gzip" msgstr "" -#: src/LYOptions.c:2449 +#: src/LYOptions.c:2462 msgid "deflate" msgstr "" -#: src/LYOptions.c:2452 +#: src/LYOptions.c:2465 msgid "compress" msgstr "" -#: src/LYOptions.c:2455 +#: src/LYOptions.c:2468 msgid "bzip2" msgstr "" -#: src/LYOptions.c:2457 +#: src/LYOptions.c:2470 msgid "All" msgstr "" -#: src/LYOptions.c:2467 +#: src/LYOptions.c:2480 msgid "HTTP 1.0" msgstr "" -#: src/LYOptions.c:2468 +#: src/LYOptions.c:2481 msgid "HTTP 1.1" msgstr "" -#: src/LYOptions.c:2827 src/LYOptions.c:2856 +#: src/LYOptions.c:2840 src/LYOptions.c:2869 #, c-format msgid "Use %s to invoke the Options menu!" msgstr "" -#: src/LYOptions.c:3739 +#: src/LYOptions.c:3757 msgid "(options marked with (!) will not be saved)" msgstr "" -#: src/LYOptions.c:3747 +#: src/LYOptions.c:3765 msgid "General Preferences" msgstr "" #. *************************************************************** #. User Mode: SELECT -#: src/LYOptions.c:3751 +#: src/LYOptions.c:3769 msgid "User mode" msgstr "" #. Editor: INPUT -#: src/LYOptions.c:3757 +#: src/LYOptions.c:3775 msgid "Editor" msgstr "" #. Search Type: SELECT -#: src/LYOptions.c:3762 +#: src/LYOptions.c:3780 msgid "Type of Search" msgstr "" -#: src/LYOptions.c:3767 +#: src/LYOptions.c:3785 msgid "Security and Privacy" msgstr "" #. *************************************************************** #. Cookies: SELECT -#: src/LYOptions.c:3771 +#: src/LYOptions.c:3789 msgid "Cookies" msgstr "" #. Cookie Prompting: SELECT -#: src/LYOptions.c:3785 +#: src/LYOptions.c:3803 msgid "Invalid-Cookie Prompting" msgstr "" #. SSL Prompting: SELECT -#: src/LYOptions.c:3792 +#: src/LYOptions.c:3810 msgid "SSL Prompting" msgstr "" -#: src/LYOptions.c:3797 +#: src/LYOptions.c:3815 msgid "SSL client certificate file" msgstr "" -#: src/LYOptions.c:3801 +#: src/LYOptions.c:3819 msgid "SSL client key file" msgstr "" -#: src/LYOptions.c:3807 +#: src/LYOptions.c:3825 msgid "Keyboard Input" msgstr "" #. *************************************************************** #. Keypad Mode: SELECT -#: src/LYOptions.c:3811 +#: src/LYOptions.c:3829 msgid "Keypad mode" msgstr "" #. Emacs keys: ON/OFF -#: src/LYOptions.c:3817 +#: src/LYOptions.c:3835 msgid "Emacs keys" msgstr "" #. VI Keys: ON/OFF -#: src/LYOptions.c:3823 +#: src/LYOptions.c:3841 msgid "VI keys" msgstr "" #. Line edit style: SELECT #. well, at least 2 line edit styles available -#: src/LYOptions.c:3830 +#: src/LYOptions.c:3848 msgid "Line edit style" msgstr "" #. Keyboard layout: SELECT -#: src/LYOptions.c:3842 +#: src/LYOptions.c:3860 msgid "Keyboard layout" msgstr "" #. #. * Display and Character Set #. -#: src/LYOptions.c:3856 +#: src/LYOptions.c:3874 msgid "Display and Character Set" msgstr "" #. Use locale-based character set: ON/OFF -#: src/LYOptions.c:3861 +#: src/LYOptions.c:3879 msgid "Use locale-based character set" msgstr "" -#: src/LYOptions.c:3868 +#: src/LYOptions.c:3886 msgid "Use HTML5 charset replacements" msgstr "" #. Display Character Set: SELECT -#: src/LYOptions.c:3874 +#: src/LYOptions.c:3892 msgid "Display character set" msgstr "" -#: src/LYOptions.c:3905 +#: src/LYOptions.c:3923 msgid "Assumed document character set" msgstr "" @@ -4964,287 +4960,291 @@ msgstr "" #. * we split the header to make it more readable: #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others. #. -#: src/LYOptions.c:3925 +#: src/LYOptions.c:3943 msgid "CJK mode" msgstr "" -#: src/LYOptions.c:3927 +#: src/LYOptions.c:3945 msgid "Raw 8-bit" msgstr "" #. X Display: INPUT -#: src/LYOptions.c:3935 +#: src/LYOptions.c:3953 msgid "X Display" msgstr "" #. #. * Document Appearance #. -#: src/LYOptions.c:3941 +#: src/LYOptions.c:3959 msgid "Document Appearance" msgstr "" -#: src/LYOptions.c:3947 +#: src/LYOptions.c:3965 msgid "Show color" msgstr "" -#. Color style: ON/OFF -#: src/LYOptions.c:3972 +#: src/LYOptions.c:3991 msgid "Color style" msgstr "" -#: src/LYOptions.c:3981 +#: src/LYOptions.c:4001 msgid "Default colors" msgstr "" #. Show cursor: ON/OFF -#: src/LYOptions.c:3989 +#: src/LYOptions.c:4009 msgid "Show cursor" msgstr "" #. Underline links: ON/OFF -#: src/LYOptions.c:3995 +#: src/LYOptions.c:4015 msgid "Underline links" msgstr "" #. Show scrollbar: ON/OFF -#: src/LYOptions.c:4002 +#: src/LYOptions.c:4022 msgid "Show scrollbar" msgstr "" #. Select Popups: ON/OFF -#: src/LYOptions.c:4009 +#: src/LYOptions.c:4029 msgid "Popups for select fields" msgstr "" #. HTML error recovery: SELECT -#: src/LYOptions.c:4015 +#: src/LYOptions.c:4035 msgid "HTML error recovery" msgstr "" #. Bad HTML messages: SELECT -#: src/LYOptions.c:4021 +#: src/LYOptions.c:4041 msgid "Bad HTML messages" msgstr "" #. Show Images: SELECT -#: src/LYOptions.c:4027 +#: src/LYOptions.c:4047 msgid "Show images" msgstr "" #. Verbose Images: ON/OFF -#: src/LYOptions.c:4041 +#: src/LYOptions.c:4061 msgid "Verbose images" msgstr "" #. Collapse BR Tags: ON/OFF -#: src/LYOptions.c:4047 +#: src/LYOptions.c:4067 msgid "Collapse BR tags" msgstr "" #. Trim blank lines: ON/OFF -#: src/LYOptions.c:4053 +#: src/LYOptions.c:4073 msgid "Trim blank lines" msgstr "" #. #. * Headers Transferred to Remote Servers #. -#: src/LYOptions.c:4061 +#: src/LYOptions.c:4081 msgid "Headers Transferred to Remote Servers" msgstr "" #. *************************************************************** #. Mail Address: INPUT -#: src/LYOptions.c:4065 +#: src/LYOptions.c:4085 msgid "Personal mail address" msgstr "" -#: src/LYOptions.c:4070 +#: src/LYOptions.c:4090 msgid "Personal name for mail" msgstr "" -#: src/LYOptions.c:4077 +#: src/LYOptions.c:4097 msgid "Password for anonymous ftp" msgstr "" +#. Preferred content type: SELECT +#: src/LYOptions.c:4103 +msgid "Preferred content type" +msgstr "" + #. Preferred media type: SELECT -#: src/LYOptions.c:4083 +#: src/LYOptions.c:4109 msgid "Preferred media type" msgstr "" #. Preferred encoding: SELECT -#: src/LYOptions.c:4089 +#: src/LYOptions.c:4115 msgid "Preferred encoding" msgstr "" #. Preferred Document Character Set: INPUT -#: src/LYOptions.c:4095 +#: src/LYOptions.c:4121 msgid "Preferred document character set" msgstr "" #. Preferred Document Language: INPUT -#: src/LYOptions.c:4100 +#: src/LYOptions.c:4126 msgid "Preferred document language" msgstr "" #. HTTP protocol SELECT -#: src/LYOptions.c:4105 +#: src/LYOptions.c:4131 msgid "HTTP protocol" msgstr "" -#: src/LYOptions.c:4112 +#: src/LYOptions.c:4138 msgid "Send User-Agent header" msgstr "" -#: src/LYOptions.c:4114 +#: src/LYOptions.c:4140 msgid "User-Agent header" msgstr "" #. #. * Listing and Accessing Files #. -#: src/LYOptions.c:4122 +#: src/LYOptions.c:4148 msgid "Listing and Accessing Files" msgstr "" #. FTP sort: SELECT -#: src/LYOptions.c:4127 +#: src/LYOptions.c:4153 msgid "Use Passive FTP" msgstr "" #. FTP sort: SELECT -#: src/LYOptions.c:4133 +#: src/LYOptions.c:4159 msgid "FTP sort criteria" msgstr "" #. Local Directory Sort: SELECT -#: src/LYOptions.c:4141 +#: src/LYOptions.c:4167 msgid "Local directory sort criteria" msgstr "" #. Local Directory Order: SELECT -#: src/LYOptions.c:4147 +#: src/LYOptions.c:4173 msgid "Local directory sort order" msgstr "" -#: src/LYOptions.c:4156 +#: src/LYOptions.c:4182 msgid "Show dot files" msgstr "" -#: src/LYOptions.c:4164 +#: src/LYOptions.c:4190 msgid "Execution links" msgstr "" -#: src/LYOptions.c:4182 +#: src/LYOptions.c:4208 msgid "Pause when showing message" msgstr "" #. Show transfer rate: SELECT -#: src/LYOptions.c:4189 +#: src/LYOptions.c:4215 msgid "Show transfer rate" msgstr "" #. #. * Special Files and Screens #. -#: src/LYOptions.c:4209 +#: src/LYOptions.c:4235 msgid "Special Files and Screens" msgstr "" -#: src/LYOptions.c:4214 +#: src/LYOptions.c:4240 msgid "Multi-bookmarks" msgstr "" -#: src/LYOptions.c:4222 +#: src/LYOptions.c:4248 msgid "Review/edit Bookmarks files" msgstr "" -#: src/LYOptions.c:4225 +#: src/LYOptions.c:4251 msgid "Goto multi-bookmark menu" msgstr "" -#: src/LYOptions.c:4227 +#: src/LYOptions.c:4253 msgid "Bookmarks file" msgstr "" #. Auto Session: ON/OFF -#: src/LYOptions.c:4234 +#: src/LYOptions.c:4260 msgid "Auto Session" msgstr "" #. Session File Menu: INPUT -#: src/LYOptions.c:4240 +#: src/LYOptions.c:4266 msgid "Session file" msgstr "" #. Visited Pages: SELECT -#: src/LYOptions.c:4246 +#: src/LYOptions.c:4272 msgid "Visited Pages" msgstr "" -#: src/LYOptions.c:4251 +#: src/LYOptions.c:4277 msgid "View the file " msgstr "" -#: src/LYPrint.c:955 +#: src/LYPrint.c:956 #, c-format msgid " Print job complete.\n" msgstr "" -#: src/LYPrint.c:1282 +#: src/LYPrint.c:1283 msgid "Document:" msgstr "" -#: src/LYPrint.c:1283 +#: src/LYPrint.c:1284 msgid "Number of lines:" msgstr "" -#: src/LYPrint.c:1284 +#: src/LYPrint.c:1285 msgid "Number of pages:" msgstr "" -#: src/LYPrint.c:1285 +#: src/LYPrint.c:1286 msgid "pages" msgstr "" -#: src/LYPrint.c:1285 +#: src/LYPrint.c:1286 msgid "page" msgstr "" -#: src/LYPrint.c:1286 +#: src/LYPrint.c:1287 msgid "(approximately)" msgstr "" -#: src/LYPrint.c:1293 +#: src/LYPrint.c:1294 msgid "Some print functions have been disabled!" msgstr "" -#: src/LYPrint.c:1297 +#: src/LYPrint.c:1298 msgid "Standard print options:" msgstr "" -#: src/LYPrint.c:1298 +#: src/LYPrint.c:1299 msgid "Print options:" msgstr "" -#: src/LYPrint.c:1305 +#: src/LYPrint.c:1306 msgid "Save to a local file" msgstr "" -#: src/LYPrint.c:1307 +#: src/LYPrint.c:1308 msgid "Save to disk disabled" msgstr "" -#: src/LYPrint.c:1314 +#: src/LYPrint.c:1315 msgid "Mail the file" msgstr "" -#: src/LYPrint.c:1321 +#: src/LYPrint.c:1322 msgid "Print to the screen" msgstr "" -#: src/LYPrint.c:1326 +#: src/LYPrint.c:1327 msgid "Print out on a printer attached to your vt100 terminal" msgstr "" @@ -5298,221 +5298,221 @@ msgstr "" msgid "(no name)" msgstr "" -#: src/LYReadCFG.c:2070 +#: src/LYReadCFG.c:2074 #, c-format msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n" msgstr "" -#: src/LYReadCFG.c:2072 +#: src/LYReadCFG.c:2076 #, c-format msgid "Last attempted include was '%s',\n" msgstr "" -#: src/LYReadCFG.c:2073 +#: src/LYReadCFG.c:2077 #, c-format msgid "included from '%s'.\n" msgstr "" -#: src/LYReadCFG.c:2476 src/LYReadCFG.c:2489 src/LYReadCFG.c:2547 +#: src/LYReadCFG.c:2480 src/LYReadCFG.c:2493 src/LYReadCFG.c:2551 msgid "The following is read from your lynx.cfg file." msgstr "" -#: src/LYReadCFG.c:2477 src/LYReadCFG.c:2490 +#: src/LYReadCFG.c:2481 src/LYReadCFG.c:2494 msgid "Please read the distribution" msgstr "" -#: src/LYReadCFG.c:2483 src/LYReadCFG.c:2493 +#: src/LYReadCFG.c:2487 src/LYReadCFG.c:2497 msgid "for more comments." msgstr "" -#: src/LYReadCFG.c:2529 +#: src/LYReadCFG.c:2533 msgid "RELOAD THE CHANGES" msgstr "" -#: src/LYReadCFG.c:2537 +#: src/LYReadCFG.c:2541 msgid "Your primary configuration" msgstr "" -#: src/LYShowInfo.c:111 +#: src/LYShowInfo.c:116 msgid "URL:" msgstr "" -#: src/LYShowInfo.c:196 +#: src/LYShowInfo.c:200 msgid "Directory that you are currently viewing" msgstr "" -#: src/LYShowInfo.c:199 +#: src/LYShowInfo.c:203 msgid "Name:" msgstr "" -#: src/LYShowInfo.c:216 +#: src/LYShowInfo.c:220 msgid "Directory that you have currently selected" msgstr "" -#: src/LYShowInfo.c:218 +#: src/LYShowInfo.c:222 msgid "File that you have currently selected" msgstr "" -#: src/LYShowInfo.c:221 +#: src/LYShowInfo.c:225 msgid "Symbolic link that you have currently selected" msgstr "" -#: src/LYShowInfo.c:224 +#: src/LYShowInfo.c:228 msgid "Item that you have currently selected" msgstr "" -#: src/LYShowInfo.c:226 +#: src/LYShowInfo.c:230 msgid "Full name:" msgstr "" -#: src/LYShowInfo.c:239 +#: src/LYShowInfo.c:243 msgid "Unable to follow link" msgstr "" -#: src/LYShowInfo.c:241 +#: src/LYShowInfo.c:245 msgid "Points to file:" msgstr "" -#: src/LYShowInfo.c:246 +#: src/LYShowInfo.c:250 msgid "Name of owner:" msgstr "" -#: src/LYShowInfo.c:249 +#: src/LYShowInfo.c:253 msgid "Group name:" msgstr "" -#: src/LYShowInfo.c:251 +#: src/LYShowInfo.c:255 msgid "File size:" msgstr "" -#: src/LYShowInfo.c:253 +#: src/LYShowInfo.c:257 msgid "(bytes)" msgstr "" #. #. * Include date and time information. #. -#: src/LYShowInfo.c:258 +#: src/LYShowInfo.c:262 msgid "Creation date:" msgstr "" -#: src/LYShowInfo.c:261 +#: src/LYShowInfo.c:265 msgid "Last modified:" msgstr "" -#: src/LYShowInfo.c:264 +#: src/LYShowInfo.c:268 msgid "Last accessed:" msgstr "" -#: src/LYShowInfo.c:270 +#: src/LYShowInfo.c:274 msgid "Access Permissions" msgstr "" -#: src/LYShowInfo.c:305 +#: src/LYShowInfo.c:309 msgid "Group:" msgstr "" -#: src/LYShowInfo.c:325 +#: src/LYShowInfo.c:329 msgid "World:" msgstr "" -#: src/LYShowInfo.c:332 +#: src/LYShowInfo.c:336 msgid "File that you are currently viewing" msgstr "" -#: src/LYShowInfo.c:340 src/LYShowInfo.c:444 +#: src/LYShowInfo.c:344 src/LYShowInfo.c:444 msgid "Linkname:" msgstr "" -#: src/LYShowInfo.c:346 src/LYShowInfo.c:361 +#: src/LYShowInfo.c:350 src/LYShowInfo.c:365 msgid "Charset:" msgstr "" -#: src/LYShowInfo.c:360 +#: src/LYShowInfo.c:364 msgid "(assumed)" msgstr "" -#: src/LYShowInfo.c:367 +#: src/LYShowInfo.c:371 msgid "Server:" msgstr "" -#: src/LYShowInfo.c:370 +#: src/LYShowInfo.c:374 msgid "Date:" msgstr "" -#: src/LYShowInfo.c:373 +#: src/LYShowInfo.c:377 msgid "Last Mod:" msgstr "" -#: src/LYShowInfo.c:378 +#: src/LYShowInfo.c:381 msgid "Expires:" msgstr "" -#: src/LYShowInfo.c:381 +#: src/LYShowInfo.c:384 msgid "Cache-Control:" msgstr "" -#: src/LYShowInfo.c:384 +#: src/LYShowInfo.c:387 msgid "Content-Length:" msgstr "" -#: src/LYShowInfo.c:388 +#: src/LYShowInfo.c:391 msgid "Length:" msgstr "" -#: src/LYShowInfo.c:393 +#: src/LYShowInfo.c:396 msgid "Language:" msgstr "" -#: src/LYShowInfo.c:400 +#: src/LYShowInfo.c:402 msgid "Post Data:" msgstr "" -#: src/LYShowInfo.c:403 +#: src/LYShowInfo.c:405 msgid "Post Content Type:" msgstr "" -#: src/LYShowInfo.c:406 +#: src/LYShowInfo.c:408 msgid "Owner(s):" msgstr "" -#: src/LYShowInfo.c:411 +#: src/LYShowInfo.c:413 msgid "size:" msgstr "" -#: src/LYShowInfo.c:413 +#: src/LYShowInfo.c:415 msgid "lines" msgstr "" -#: src/LYShowInfo.c:417 +#: src/LYShowInfo.c:419 msgid "forms mode" msgstr "" -#: src/LYShowInfo.c:419 +#: src/LYShowInfo.c:421 msgid "source" msgstr "" -#: src/LYShowInfo.c:420 +#: src/LYShowInfo.c:422 msgid "normal" msgstr "" -#: src/LYShowInfo.c:422 +#: src/LYShowInfo.c:424 msgid ", safe" msgstr "" -#: src/LYShowInfo.c:424 +#: src/LYShowInfo.c:426 msgid ", via internal link" msgstr "" -#: src/LYShowInfo.c:429 +#: src/LYShowInfo.c:430 msgid ", no-cache" msgstr "" -#: src/LYShowInfo.c:431 +#: src/LYShowInfo.c:432 msgid ", ISMAP script" msgstr "" -#: src/LYShowInfo.c:433 +#: src/LYShowInfo.c:434 msgid ", bookmark file" msgstr "" @@ -5544,11 +5544,11 @@ msgstr "" msgid "No Links on the current page" msgstr "" -#: src/LYShowInfo.c:484 +#: src/LYShowInfo.c:483 msgid "Server Headers:" msgstr "" -#: src/LYStyle.c:339 +#: src/LYStyle.c:332 #, c-format msgid "" "Syntax Error parsing style in lss file:\n" @@ -5559,7 +5559,7 @@ msgid "" "\n" msgstr "" -#: src/LYStyle.c:948 +#: src/LYStyle.c:939 #, c-format msgid "" "\n" @@ -5599,33 +5599,33 @@ msgstr "" msgid "Upload options:" msgstr "" -#: src/LYUtils.c:1917 +#: src/LYUtils.c:1911 msgid "Download document URL put to clipboard." msgstr "" -#: src/LYUtils.c:2664 +#: src/LYUtils.c:2658 msgid "Unexpected access protocol for this URL scheme." msgstr "" -#: src/LYUtils.c:3569 +#: src/LYUtils.c:3570 msgid "Too many tempfiles" msgstr "" -#: src/LYUtils.c:3869 +#: src/LYUtils.c:3870 msgid "unknown restriction" msgstr "" -#: src/LYUtils.c:3900 +#: src/LYUtils.c:3901 #, c-format msgid "No restrictions set.\n" msgstr "" -#: src/LYUtils.c:3903 +#: src/LYUtils.c:3904 #, c-format msgid "Restrictions set:\n" msgstr "" -#: src/LYUtils.c:5278 +#: src/LYUtils.c:5201 msgid "Cannot find HOME directory" msgstr "" @@ -5633,7 +5633,7 @@ msgstr "" msgid "Normally disabled. See ENABLE_LYNXRC in lynx.cfg\n" msgstr "" -#: src/LYrcFile.c:349 +#: src/LYrcFile.c:356 msgid "" "accept_all_cookies allows the user to tell Lynx to automatically\n" "accept all cookies if desired. The default is \"FALSE\" which will\n" @@ -5641,7 +5641,7 @@ msgid "" "all cookies.\n" msgstr "" -#: src/LYrcFile.c:357 +#: src/LYrcFile.c:364 msgid "" "anonftp_password allows the user to tell Lynx to use the personal\n" "email address as the password for anonymous ftp. If no value is given,\n" @@ -5649,21 +5649,21 @@ msgid "" "to a different value if you choose.\n" msgstr "" -#: src/LYrcFile.c:366 +#: src/LYrcFile.c:373 msgid "" "bookmark_file specifies the name and location of the default bookmark\n" "file into which the user can paste links for easy access at a later\n" "date.\n" msgstr "" -#: src/LYrcFile.c:371 +#: src/LYrcFile.c:378 msgid "" "If case_sensitive_searching is \"on\" then when the user invokes a search\n" "using the 's' or '/' keys, the search performed will be case sensitive\n" "instead of case INsensitive. The default is usually \"off\".\n" msgstr "" -#: src/LYrcFile.c:376 +#: src/LYrcFile.c:383 msgid "" "The character_set definition controls the representation of 8 bit\n" "characters for your terminal. If 8 bit characters do not show up\n" @@ -5672,7 +5672,7 @@ msgid "" "Current valid characters sets are:\n" msgstr "" -#: src/LYrcFile.c:384 +#: src/LYrcFile.c:391 msgid "" "cookie_accept_domains and cookie_reject_domains are comma-delimited\n" "lists of domains from which Lynx should automatically accept or reject\n" @@ -5681,13 +5681,13 @@ msgid "" "settings made here.\n" msgstr "" -#: src/LYrcFile.c:392 +#: src/LYrcFile.c:399 msgid "" "cookie_file specifies the file from which to read persistent cookies.\n" "The default is ~/" msgstr "" -#: src/LYrcFile.c:397 +#: src/LYrcFile.c:404 msgid "" "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n" "cookie_query_invalid_domains are comma-delimited lists of which domains\n" @@ -5698,13 +5698,13 @@ msgid "" "querying the user for an invalid path or domain.\n" msgstr "" -#: src/LYrcFile.c:411 +#: src/LYrcFile.c:418 msgid "" "dir_list_order specifies the directory list order under DIRED_SUPPORT\n" "(if implemented). The default is \"ORDER_BY_NAME\"\n" msgstr "" -#: src/LYrcFile.c:416 +#: src/LYrcFile.c:423 msgid "" "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n" "(if implemented). The default is \"MIXED_STYLE\", which sorts both\n" @@ -5712,7 +5712,7 @@ msgid "" "\"DIRECTORIES_FIRST\" lists directories first.\n" msgstr "" -#: src/LYrcFile.c:424 +#: src/LYrcFile.c:431 msgid "" "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n" " ^N = down ^P = up\n" @@ -5720,7 +5720,7 @@ msgid "" "will be enabled.\n" msgstr "" -#: src/LYrcFile.c:430 +#: src/LYrcFile.c:437 msgid "" "file_editor specifies the editor to be invoked when editing local files\n" "or sending mail. If no editor is specified, then file editing is disabled\n" @@ -5728,7 +5728,7 @@ msgid "" "will be used for sending mail.\n" msgstr "" -#: src/LYrcFile.c:437 +#: src/LYrcFile.c:444 msgid "" "The file_sorting_method specifies which value to sort on when viewing\n" "file lists such as FTP directories. The options are:\n" @@ -5738,7 +5738,7 @@ msgid "" " BY_DATE -- sorts on the date of the file\n" msgstr "" -#: src/LYrcFile.c:462 +#: src/LYrcFile.c:469 msgid "" "lineedit_mode specifies the key binding used for inputting strings in\n" "prompts and forms. If lineedit_mode is set to \"Default Binding\" then\n" @@ -5753,7 +5753,7 @@ msgid "" "Current lineedit modes are:\n" msgstr "" -#: src/LYrcFile.c:480 +#: src/LYrcFile.c:487 msgid "" "The following allow you to define sub-bookmark files and descriptions.\n" "The format is multi_bookmark<capital_letter>=<filename>,<description>\n" @@ -5761,7 +5761,7 @@ msgid "" "We start with \"multi_bookmarkB\" since 'A' is the default (see above).\n" msgstr "" -#: src/LYrcFile.c:486 +#: src/LYrcFile.c:493 msgid "" "personal_mail_address specifies your personal mail address. The\n" "address will be sent during HTTP file transfers for authorization and\n" @@ -5772,7 +5772,7 @@ msgid "" "your mailed comments.\n" msgstr "" -#: src/LYrcFile.c:495 +#: src/LYrcFile.c:502 msgid "" "personal_mail_name specifies your personal name, for mail. The\n" "name is sent for mailed comments. Lynx will prompt for this,\n" @@ -5784,7 +5784,7 @@ msgid "" "menu, or modify this file directly.\n" msgstr "" -#: src/LYrcFile.c:505 +#: src/LYrcFile.c:512 msgid "" "preferred_charset specifies the character set in MIME notation (e.g.,\n" "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n" @@ -5800,7 +5800,7 @@ msgid "" "is also allowed.\n" msgstr "" -#: src/LYrcFile.c:521 +#: src/LYrcFile.c:530 msgid "" "preferred_language specifies the language in MIME notation (e.g., en,\n" "fr, may be a comma-separated list in decreasing preference)\n" @@ -5809,7 +5809,7 @@ msgid "" "Otherwise, the server will send the file in its default language.\n" msgstr "" -#: src/LYrcFile.c:532 +#: src/LYrcFile.c:541 msgid "" "If run_all_execution_links is set \"on\" then all local execution links\n" "will be executed when they are selected.\n" @@ -5822,7 +5822,7 @@ msgid "" " you are viewing trusted source information.\n" msgstr "" -#: src/LYrcFile.c:543 +#: src/LYrcFile.c:552 msgid "" "If run_execution_links_on_local_files is set \"on\" then all local\n" "execution links that are found in LOCAL files will be executed when they\n" @@ -5838,7 +5838,7 @@ msgid "" " you are viewing trusted source information.\n" msgstr "" -#: src/LYrcFile.c:561 +#: src/LYrcFile.c:570 msgid "" "select_popups specifies whether the OPTIONs in a SELECT block which\n" "lacks a MULTIPLE attribute are presented as a vertical list of radio\n" @@ -5849,7 +5849,7 @@ msgid "" "The default can be overridden via the -popup command line toggle.\n" msgstr "" -#: src/LYrcFile.c:572 +#: src/LYrcFile.c:581 msgid "" "show_color specifies how to set the color mode at startup. A value of\n" "\"never\" will force color mode off (treat the terminal as monochrome)\n" @@ -5868,7 +5868,7 @@ msgid "" "\"off\" \"show color\" settings will be treated as \"default\".\n" msgstr "" -#: src/LYrcFile.c:589 +#: src/LYrcFile.c:598 msgid "" "show_cursor specifies whether to 'hide' the cursor to the right (and\n" "bottom, if possible) of the screen, or to place it to the left of the\n" @@ -5881,7 +5881,7 @@ msgid "" "The default can be overridden via the -show_cursor command line toggle.\n" msgstr "" -#: src/LYrcFile.c:600 +#: src/LYrcFile.c:609 msgid "" "show_dotfiles specifies that the directory listing should include\n" "\"hidden\" (dot) files/directories. If set \"on\", this will be\n" @@ -5890,7 +5890,7 @@ msgid "" "is disabled, creation of such files via Lynx also is disabled.\n" msgstr "" -#: src/LYrcFile.c:611 +#: src/LYrcFile.c:620 msgid "" "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n" "been defined (see below), then all bookmark operations will first\n" @@ -5903,7 +5903,7 @@ msgid "" "presented regardless of user mode.\n" msgstr "" -#: src/LYrcFile.c:626 +#: src/LYrcFile.c:635 msgid "" "user_mode specifies the users level of knowledge with Lynx. The\n" "default is \"NOVICE\" which displays two extra lines of help at the\n" @@ -5913,14 +5913,14 @@ msgid "" "bottom of the screen.\n" msgstr "" -#: src/LYrcFile.c:635 +#: src/LYrcFile.c:644 msgid "" "If verbose_images is \"on\", lynx will print the name of the image\n" "source file in place of [INLINE], [LINK] or [IMAGE]\n" "See also VERBOSE_IMAGES in lynx.cfg\n" msgstr "" -#: src/LYrcFile.c:640 +#: src/LYrcFile.c:649 msgid "" "If vi_keys is set to \"on\", then the normal VI movement keys:\n" " j = down k = up\n" @@ -5930,13 +5930,13 @@ msgid "" "and the keymap display, respectively.\n" msgstr "" -#: src/LYrcFile.c:648 +#: src/LYrcFile.c:657 msgid "" "The visited_links setting controls how Lynx organizes the information\n" "in the Visited Links Page.\n" msgstr "" -#: src/LYrcFile.c:890 +#: src/LYrcFile.c:901 msgid "" "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n" "your keypad when the numlock is on will act as arrow keys:\n" @@ -5947,13 +5947,13 @@ msgid "" "regardless of whether numlock is on.\n" msgstr "" -#: src/LYrcFile.c:899 +#: src/LYrcFile.c:910 msgid "" "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n" "appear next to each link and numbers are used to select links.\n" msgstr "" -#: src/LYrcFile.c:903 +#: src/LYrcFile.c:914 msgid "" "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n" "numbers will appear next to each link and visible form input field.\n" @@ -5964,33 +5964,33 @@ msgid "" "lists and output from the list command also enumerate form inputs.\n" msgstr "" -#: src/LYrcFile.c:912 +#: src/LYrcFile.c:923 msgid "" "NOTE: Some fixed format documents may look disfigured when\n" "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n" "enabled.\n" msgstr "" -#: src/LYrcFile.c:944 +#: src/LYrcFile.c:955 msgid "" "Lynx User Defaults File\n" "\n" msgstr "" -#: src/LYrcFile.c:953 +#: src/LYrcFile.c:964 msgid "" "This file contains options saved from the Lynx Options Screen (normally\n" "with the 'o' key). To save options with that screen, you must select the\n" "checkbox:\n" msgstr "" -#: src/LYrcFile.c:960 +#: src/LYrcFile.c:971 msgid "" "You must then save the settings using the link on the line above the\n" "checkbox:\n" msgstr "" -#: src/LYrcFile.c:967 +#: src/LYrcFile.c:978 msgid "" "You may also use the command-line option \"-forms_options\", which displays\n" "the simpler Options Menu instead. Save options with that using the '>' " @@ -5998,14 +5998,14 @@ msgid "" "\n" msgstr "" -#: src/LYrcFile.c:974 +#: src/LYrcFile.c:985 msgid "" "This file contains options saved from the Lynx Options Screen (normally\n" "with the '>' key).\n" "\n" msgstr "" -#: src/LYrcFile.c:981 +#: src/LYrcFile.c:992 msgid "" "There is normally no need to edit this file manually, since the defaults\n" "here can be controlled from the Options Screen, and the next time options\n" diff --git a/src/LYIcon.rc b/src/LYIcon.rc index 1ca88f80..4862bb86 100644 --- a/src/LYIcon.rc +++ b/src/LYIcon.rc @@ -1,12 +1,12 @@ -// $LynxId: LYIcon.rc,v 1.35 2018/05/07 23:37:31 tom Exp $ +// $LynxId: LYIcon.rc,v 1.36 2018/06/10 20:24:17 tom Exp $ #include <windows.h> 100 ICON "../samples/lynx.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION 2,8,9,1019 -PRODUCTVERSION 2,8,9,1019 +FILEVERSION 2,8,9,2001 +PRODUCTVERSION 2,8,9,2001 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "http://invisible-island.net/lynx" VALUE "FileDescription", "Lynx - web browser" - VALUE "FileVersion", "2.8.9.1019" + VALUE "FileVersion", "2.8.9.2001" VALUE "InternalName", "Lynx" VALUE "LegalCopyright", "©1997-2018 Thomas E. Dickey" VALUE "OriginalFilename", "lynx.exe" VALUE "ProductName", "Lynx - web browser" - VALUE "ProductVersion", "2.8.9.1019" + VALUE "ProductVersion", "2.8.9.2001" END END BLOCK "VarFileInfo" diff --git a/src/LYList.c b/src/LYList.c index edd4f52a..71633fc4 100644 --- a/src/LYList.c +++ b/src/LYList.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYList.c,v 1.53 2013/10/03 07:46:14 tom Exp $ + * $LynxId: LYList.c,v 1.54 2018/06/10 20:27:01 tom Exp $ * * Lynx Document Reference List Support LYList.c * ==================================== @@ -359,7 +359,7 @@ void printlist(FILE *fp, int titles) if (LYHiddenLinks == HIDDENLINKS_IGNORE) hidden_links = 0; if (hidden_links > 0) { - fprintf(fp, " %s\n", gettext("Visible links")); + fprintf(fp, " %s\n", gettext("Visible links:")); } refs = print_refs(fp, titles, refs) + 1; diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index 638765eb..0a46ce10 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYMainLoop.c,v 1.240 2018/05/04 22:49:06 tom Exp $ + * $LynxId: LYMainLoop.c,v 1.241 2018/06/10 20:44:10 tom Exp $ */ #include <HTUtils.h> #include <HTAccess.h> @@ -8080,8 +8080,7 @@ static void exit_immediately_with_error_message(int state, int first_file) if (state == NULLFILE) { HTSprintf0(&buf, "%s\n%s\n%s\n", NonNull(buf2), - gettext("lynx: Start file could not be found or is not " - STR_HTML " or " STR_PLAINTEXT), + gettext("lynx: Start file could not be found or is not text/html or text/plain"), gettext(" Exiting...")); } diff --git a/userdefs.h b/userdefs.h index d9b716cb..9e509603 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1,5 +1,5 @@ /* - * $LynxId: userdefs.h,v 1.337 2018/05/15 21:12:20 tom Exp $ + * $LynxId: userdefs.h,v 1.339 2018/06/10 21:09:45 tom Exp $ * * Lynx - Hypertext navigation system * @@ -1445,11 +1445,11 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.9dev.19" +#define LYNX_VERSION "2.8.9pre.1" #define LYNX_WWW_HOME "http://lynx.invisible-island.net/" #define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/" /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Mon, 07 May 2018 19:37:31 -0400" +#define LYNX_DATE "Sun, 10 Jun 2018 17:09:45 -0400" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ |