vasilito
068a1ca63e
Bootloader fork rebase:
- Base changed from 0.1.0 pre-patched archive to upstream 1.0.0 tag (c7eeb9f)
- Applied 0001-redbear-local-forks.patch (Cargo.toml crate path redirects)
- Applied fix-uefi-alloc-panic.patch equivalents (4 panic!() -> graceful
error handling in src/main.rs)
- Applied P5-live-preload-cap-1gib.patch (1 GiB cap on live image preload)
- Skipped: P0 GPT partition scan (requires new module + integration),
P1 timeout/default-resolution, P2 live preload guard (subsumed by
panic fixes + cap), P3 live image safe read, P4 large ISO boot,
redox.patch — to be applied in dedicated rebase session.
firmware-loader/Cargo.toml: version 0.1.0 -> 0.3.0 (sync with other
Red Bear custom crates which are at 0.3.0).
fork-upstream-map.toml: bootloader back from PENDING_REBASE to 1.0.0
since the partial rebase matches upstream 1.0.0 content.
fork-upstream-map.toml: base restored to 'main' tracked (was correctly
tracked by build-redbear.sh).
1319 lines
29 KiB
Plaintext
1319 lines
29 KiB
Plaintext
# SOME DESCRIPTIVE TITLE.
|
|
# Copyright (C) YEAR Free Software Foundation, Inc.
|
|
# This file is distributed under the same license as the GNU diffutils package.
|
|
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
|
#
|
|
#, fuzzy
|
|
msgid ""
|
|
msgstr ""
|
|
"Project-Id-Version: GNU diffutils 3.12\n"
|
|
"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
|
|
"POT-Creation-Date: 2025-04-08 19:38-0700\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"
|
|
"Language: \n"
|
|
"MIME-Version: 1.0\n"
|
|
"Content-Type: text/plain; charset=CHARSET\n"
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
|
|
#: lib/argmatch.c:145
|
|
#, c-format
|
|
msgid "invalid argument %s for %s"
|
|
msgstr ""
|
|
|
|
#: lib/argmatch.c:146
|
|
#, c-format
|
|
msgid "ambiguous argument %s for %s"
|
|
msgstr ""
|
|
|
|
#: lib/argmatch.c:165 lib/argmatch.h:242
|
|
msgid "Valid arguments are:"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:40
|
|
msgid "regular empty file"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:40
|
|
msgid "regular file"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:43
|
|
msgid "directory"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:46
|
|
msgid "symbolic link"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:52
|
|
msgid "message queue"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:55
|
|
msgid "semaphore"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:58
|
|
msgid "shared memory object"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:61
|
|
msgid "typed memory object"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:66
|
|
msgid "block special file"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:69
|
|
msgid "character special file"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:72
|
|
msgid "contiguous data"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:75
|
|
msgid "fifo"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:78
|
|
msgid "door"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:81
|
|
msgid "multiplexed block special file"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:84
|
|
msgid "multiplexed character special file"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:87
|
|
msgid "multiplexed file"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:90
|
|
msgid "named file"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:93
|
|
msgid "network special file"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:96
|
|
msgid "migrated file with data"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:99
|
|
msgid "migrated file without data"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:102
|
|
msgid "port"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:105
|
|
msgid "socket"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:108
|
|
msgid "whiteout"
|
|
msgstr ""
|
|
|
|
#: lib/c-file-type.c:110
|
|
msgid "weird file"
|
|
msgstr ""
|
|
|
|
#: lib/c-stack.c:190
|
|
msgid "program error"
|
|
msgstr ""
|
|
|
|
#: lib/c-stack.c:191
|
|
msgid "stack overflow"
|
|
msgstr ""
|
|
|
|
#: lib/diagnose.c:51
|
|
#, c-format
|
|
msgid "Try '%s --help' for more information."
|
|
msgstr ""
|
|
|
|
#: lib/error.c:208
|
|
msgid "Unknown system error"
|
|
msgstr ""
|
|
|
|
#: lib/getopt.c:282
|
|
#, c-format
|
|
msgid "%s: option '%s%s' is ambiguous\n"
|
|
msgstr ""
|
|
|
|
#: lib/getopt.c:288
|
|
#, c-format
|
|
msgid "%s: option '%s%s' is ambiguous; possibilities:"
|
|
msgstr ""
|
|
|
|
#: lib/getopt.c:322
|
|
#, c-format
|
|
msgid "%s: unrecognized option '%s%s'\n"
|
|
msgstr ""
|
|
|
|
#: lib/getopt.c:348
|
|
#, c-format
|
|
msgid "%s: option '%s%s' doesn't allow an argument\n"
|
|
msgstr ""
|
|
|
|
#: lib/getopt.c:363
|
|
#, c-format
|
|
msgid "%s: option '%s%s' requires an argument\n"
|
|
msgstr ""
|
|
|
|
#: lib/getopt.c:624
|
|
#, c-format
|
|
msgid "%s: invalid option -- '%c'\n"
|
|
msgstr ""
|
|
|
|
#: lib/getopt.c:639 lib/getopt.c:685
|
|
#, c-format
|
|
msgid "%s: option requires an argument -- '%c'\n"
|
|
msgstr ""
|
|
|
|
#: lib/openat-die.c:38
|
|
msgid "unable to record current working directory"
|
|
msgstr ""
|
|
|
|
#: lib/openat-die.c:57
|
|
msgid "failed to return to initial working directory"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS:
|
|
#. Get translations for open and closing quotation marks.
|
|
#. The message catalog should translate "`" to a left
|
|
#. quotation mark suitable for the locale, and similarly for
|
|
#. "'". For example, a French Unicode local should translate
|
|
#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
|
|
#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
|
|
#. QUOTATION MARK), respectively.
|
|
#.
|
|
#. If the catalog has no translation, we will try to
|
|
#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
|
|
#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the
|
|
#. current locale is not Unicode, locale_quoting_style
|
|
#. will quote 'like this', and clocale_quoting_style will
|
|
#. quote "like this". You should always include translations
|
|
#. for "`" and "'" even if U+2018 and U+2019 are appropriate
|
|
#. for your locale.
|
|
#.
|
|
#. If you don't know what to put here, please see
|
|
#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
|
|
#. and use glyphs suitable for your language.
|
|
#: lib/quotearg.c:354
|
|
msgid "`"
|
|
msgstr ""
|
|
|
|
#: lib/quotearg.c:355
|
|
msgid "'"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:122
|
|
msgid "Success"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:125
|
|
msgid "No match"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:128
|
|
msgid "Invalid regular expression"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:131
|
|
msgid "Invalid collation character"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:134
|
|
msgid "Invalid character class name"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:137
|
|
msgid "Trailing backslash"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:140
|
|
msgid "Invalid back reference"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:143
|
|
msgid "Unmatched [, [^, [:, [., or [="
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:146
|
|
msgid "Unmatched ( or \\("
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:149
|
|
msgid "Unmatched \\{"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:152
|
|
msgid "Invalid content of \\{\\}"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:155
|
|
msgid "Invalid range end"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:158
|
|
msgid "Memory exhausted"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:161
|
|
msgid "Invalid preceding regular expression"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:164
|
|
msgid "Premature end of regular expression"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:167
|
|
msgid "Regular expression too big"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:170
|
|
msgid "Unmatched ) or \\)"
|
|
msgstr ""
|
|
|
|
#: lib/regcomp.c:650
|
|
msgid "No previous regular expression"
|
|
msgstr ""
|
|
|
|
#: lib/version-etc.c:73
|
|
#, c-format
|
|
msgid "Packaged by %s (%s)\n"
|
|
msgstr ""
|
|
|
|
#: lib/version-etc.c:76
|
|
#, c-format
|
|
msgid "Packaged by %s\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Translate "(C)" to the copyright symbol
|
|
#. (C-in-a-circle), if this symbol is available in the user's
|
|
#. locale. Otherwise, do not translate "(C)"; leave it as-is.
|
|
#: lib/version-etc.c:83
|
|
msgid "(C)"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: The %s placeholder is the web address of the GPL license.
|
|
#: lib/version-etc.c:88
|
|
#, c-format
|
|
msgid ""
|
|
"License GPLv3+: GNU GPL version 3 or later <%s>.\n"
|
|
"This is free software: you are free to change and redistribute it.\n"
|
|
"There is NO WARRANTY, to the extent permitted by law.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: %s denotes an author name.
|
|
#: lib/version-etc.c:105
|
|
#, c-format
|
|
msgid "Written by %s.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Each %s denotes an author name.
|
|
#: lib/version-etc.c:109
|
|
#, c-format
|
|
msgid "Written by %s and %s.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Each %s denotes an author name.
|
|
#: lib/version-etc.c:113
|
|
#, c-format
|
|
msgid "Written by %s, %s, and %s.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Each %s denotes an author name.
|
|
#. You can use line breaks, estimating that each author name occupies
|
|
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
|
|
#: lib/version-etc.c:120
|
|
#, c-format
|
|
msgid ""
|
|
"Written by %s, %s, %s,\n"
|
|
"and %s.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Each %s denotes an author name.
|
|
#. You can use line breaks, estimating that each author name occupies
|
|
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
|
|
#: lib/version-etc.c:127
|
|
#, c-format
|
|
msgid ""
|
|
"Written by %s, %s, %s,\n"
|
|
"%s, and %s.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Each %s denotes an author name.
|
|
#. You can use line breaks, estimating that each author name occupies
|
|
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
|
|
#: lib/version-etc.c:134
|
|
#, c-format
|
|
msgid ""
|
|
"Written by %s, %s, %s,\n"
|
|
"%s, %s, and %s.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Each %s denotes an author name.
|
|
#. You can use line breaks, estimating that each author name occupies
|
|
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
|
|
#: lib/version-etc.c:142
|
|
#, c-format
|
|
msgid ""
|
|
"Written by %s, %s, %s,\n"
|
|
"%s, %s, %s, and %s.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Each %s denotes an author name.
|
|
#. You can use line breaks, estimating that each author name occupies
|
|
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
|
|
#: lib/version-etc.c:150
|
|
#, c-format
|
|
msgid ""
|
|
"Written by %s, %s, %s,\n"
|
|
"%s, %s, %s, %s,\n"
|
|
"and %s.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Each %s denotes an author name.
|
|
#. You can use line breaks, estimating that each author name occupies
|
|
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
|
|
#: lib/version-etc.c:159
|
|
#, c-format
|
|
msgid ""
|
|
"Written by %s, %s, %s,\n"
|
|
"%s, %s, %s, %s,\n"
|
|
"%s, and %s.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: Each %s denotes an author name.
|
|
#. You can use line breaks, estimating that each author name occupies
|
|
#. ca. 16 screen columns and that a screen line has ca. 80 columns.
|
|
#: lib/version-etc.c:170
|
|
#, c-format
|
|
msgid ""
|
|
"Written by %s, %s, %s,\n"
|
|
"%s, %s, %s, %s,\n"
|
|
"%s, %s, and others.\n"
|
|
msgstr ""
|
|
|
|
#. TRANSLATORS: The placeholder indicates the bug-reporting address
|
|
#. for this package. Please add _another line_ saying
|
|
#. "Report translation bugs to <...>\n" with the address for translation
|
|
#. bugs (typically your translation team's web or email address).
|
|
#: lib/version-etc.c:249
|
|
#, c-format
|
|
msgid "Report bugs to: %s\n"
|
|
msgstr ""
|
|
|
|
#: lib/version-etc.c:251
|
|
#, c-format
|
|
msgid "Report %s bugs to: %s\n"
|
|
msgstr ""
|
|
|
|
#: lib/version-etc.c:255 lib/version-etc.c:257
|
|
#, c-format
|
|
msgid "%s home page: <%s>\n"
|
|
msgstr ""
|
|
|
|
#: lib/version-etc.c:260
|
|
#, c-format
|
|
msgid "General help using GNU software: <%s>\n"
|
|
msgstr ""
|
|
|
|
#: lib/xalloc-die.c:34
|
|
msgid "memory exhausted"
|
|
msgstr ""
|
|
|
|
#: lib/xfreopen.c:34
|
|
msgid "stdin"
|
|
msgstr ""
|
|
|
|
#: lib/xfreopen.c:35
|
|
msgid "stdout"
|
|
msgstr ""
|
|
|
|
#: lib/xfreopen.c:36
|
|
msgid "stderr"
|
|
msgstr ""
|
|
|
|
#: lib/xfreopen.c:37
|
|
msgid "unknown stream"
|
|
msgstr ""
|
|
|
|
#: lib/xfreopen.c:38
|
|
#, c-format
|
|
msgid "failed to reopen %s with mode %s"
|
|
msgstr ""
|
|
|
|
#: lib/xstdopen.c:37
|
|
#, c-format
|
|
msgid ""
|
|
"failed to open all three standard file descriptors; maybe %s or %s are not "
|
|
"working right?"
|
|
msgstr ""
|
|
|
|
#: src/analyze.c:445 src/diff.c:1332
|
|
#, c-format
|
|
msgid "Files %s and %s differ\n"
|
|
msgstr ""
|
|
|
|
#: src/analyze.c:446
|
|
#, c-format
|
|
msgid "Binary files %s and %s differ\n"
|
|
msgstr ""
|
|
|
|
#: src/analyze.c:687 src/diff3.c:1348 src/util.c:1033
|
|
msgid "No newline at end of file"
|
|
msgstr ""
|
|
|
|
#. This is a proper name. See the gettext manual, section Names.
|
|
#: src/cmp.c:46
|
|
msgid "Torbjorn Granlund"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:47
|
|
msgid "David MacKenzie"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:143
|
|
#, c-format
|
|
msgid "invalid --ignore-initial value %s"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:153
|
|
#, c-format
|
|
msgid "options -l and -s are incompatible"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:161 src/diff.c:962 src/diff3.c:422 src/sdiff.c:170 src/sdiff.c:315
|
|
#: src/sdiff.c:322 src/sdiff.c:867 src/util.c:825 src/util.c:903 src/util.c:910
|
|
msgid "write failed"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:163 src/diff.c:964 src/diff.c:1662 src/diff3.c:424 src/sdiff.c:172
|
|
msgid "standard output"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:167
|
|
msgid "-b, --print-bytes print differing bytes"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:168
|
|
msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:169
|
|
msgid ""
|
|
"-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n"
|
|
" first SKIP2 bytes of FILE2"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:171
|
|
msgid ""
|
|
"-l, --verbose output byte numbers and differing byte values"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:172
|
|
msgid "-n, --bytes=LIMIT compare at most LIMIT bytes"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:173
|
|
msgid "-s, --quiet, --silent suppress all normal output"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:174
|
|
msgid " --help display this help and exit"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:175
|
|
msgid "-v, --version output version information and exit"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:182
|
|
#, c-format
|
|
msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:184
|
|
msgid "Compare two files byte by byte."
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:186
|
|
msgid ""
|
|
"The optional SKIP1 and SKIP2 specify the number of bytes to skip\n"
|
|
"at the beginning of each file (zero by default)."
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:189 src/diff.c:1072 src/diff3.c:460 src/sdiff.c:211
|
|
msgid ""
|
|
"Mandatory arguments to long options are mandatory for short options too.\n"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:195
|
|
msgid ""
|
|
"SKIP values may be followed by the following multiplicative suffixes:\n"
|
|
"kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n"
|
|
"GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y."
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:198
|
|
msgid "If a FILE is '-' or missing, read standard input."
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:199 src/diff.c:1062 src/sdiff.c:221
|
|
msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:244
|
|
#, c-format
|
|
msgid "invalid --bytes value %s"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:269 src/diff.c:877 src/diff3.c:329 src/sdiff.c:562
|
|
#, c-format
|
|
msgid "missing operand after %s"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:281 src/diff.c:879 src/diff3.c:331 src/sdiff.c:564
|
|
#, c-format
|
|
msgid "extra operand %s"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:552
|
|
#, c-format
|
|
msgid "%s %s differ: byte %<PRIdMAX>, line %<PRIdMAX>\n"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:568
|
|
#, c-format
|
|
msgid "%s %s differ: byte %<PRIdMAX>, line %<PRIdMAX> is %3o %s %3o %s\n"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:625
|
|
#, c-format
|
|
msgid "cmp: EOF on %s which is empty\n"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:627
|
|
#, c-format
|
|
msgid "cmp: EOF on %s after byte %<PRIdMAX>\n"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:629
|
|
#, c-format
|
|
msgid "cmp: EOF on %s after byte %<PRIdMAX>, line %<PRIdMAX>\n"
|
|
msgstr ""
|
|
|
|
#: src/cmp.c:631
|
|
#, c-format
|
|
msgid "cmp: EOF on %s after byte %<PRIdMAX>, in line %<PRIdMAX>\n"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:60
|
|
msgid "Paul Eggert"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:61
|
|
msgid "Mike Haertel"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:62
|
|
msgid "David Hayes"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:63
|
|
msgid "Richard Stallman"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:64
|
|
msgid "Len Tower"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:378
|
|
#, c-format
|
|
msgid "invalid context length %s"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:495
|
|
#, c-format
|
|
msgid "pagination not supported on this host"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:510 src/diff3.c:310
|
|
#, c-format
|
|
msgid "too many file label options"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:589
|
|
#, c-format
|
|
msgid "invalid width %s"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:593
|
|
msgid "conflicting width options"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:621
|
|
#, c-format
|
|
msgid "invalid horizon length %s"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:680
|
|
#, c-format
|
|
msgid "invalid tabsize %s"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:684
|
|
msgid "conflicting tabsize options"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:852
|
|
msgid "--from-file and --to-file both specified"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:968
|
|
msgid " --normal output a normal diff (the default)"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:969
|
|
msgid "-q, --brief report only when files differ"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:970
|
|
msgid "-s, --report-identical-files report when two files are the same"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:971
|
|
msgid ""
|
|
"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:972
|
|
msgid ""
|
|
"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:973
|
|
msgid "-e, --ed output an ed script"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:974
|
|
msgid "-n, --rcs output an RCS format diff"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:975
|
|
msgid "-y, --side-by-side output in two columns"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:976
|
|
msgid ""
|
|
"-W, --width=NUM output at most NUM (default 130) print columns"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:977
|
|
msgid ""
|
|
" --left-column output only the left column of common lines"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:978
|
|
msgid " --suppress-common-lines do not output common lines"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:980
|
|
msgid "-p, --show-c-function show which C function each change is in"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:981
|
|
msgid "-F, --show-function-line=RE show the most recent line matching RE"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:982
|
|
msgid ""
|
|
" --label LABEL use LABEL instead of file name and timestamp\n"
|
|
" (can be repeated)"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:985
|
|
msgid "-t, --expand-tabs expand tabs to spaces in output"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:986
|
|
msgid "-T, --initial-tab make tabs line up by prepending a tab"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:987
|
|
msgid ""
|
|
" --tabsize=NUM tab stops every NUM (default 8) print columns"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:988
|
|
msgid ""
|
|
" --suppress-blank-empty suppress space or tab before empty output lines"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:989
|
|
msgid "-l, --paginate pass output through 'pr' to paginate it"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:991
|
|
msgid ""
|
|
"-r, --recursive recursively compare any subdirectories found"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:992
|
|
msgid " --no-dereference don't follow symbolic links"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:993
|
|
msgid "-N, --new-file treat absent files as empty"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:994
|
|
msgid " --unidirectional-new-file treat absent first files as empty"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:995
|
|
msgid " --ignore-file-name-case ignore case when comparing file names"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:996
|
|
msgid " --no-ignore-file-name-case consider case when comparing file names"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:997
|
|
msgid "-x, --exclude=PAT exclude files that match PAT"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:998
|
|
msgid ""
|
|
"-X, --exclude-from=FILE exclude files that match any pattern in FILE"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:999
|
|
msgid ""
|
|
"-S, --starting-file=FILE start with FILE when comparing directories"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1000
|
|
msgid ""
|
|
" --from-file=FILE1 compare FILE1 to all operands;\n"
|
|
" FILE1 can be a directory"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1002
|
|
msgid ""
|
|
" --to-file=FILE2 compare all operands to FILE2;\n"
|
|
" FILE2 can be a directory"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1005
|
|
msgid ""
|
|
"-i, --ignore-case ignore case differences in file contents"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1006
|
|
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1007
|
|
msgid "-Z, --ignore-trailing-space ignore white space at line end"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1008
|
|
msgid ""
|
|
"-b, --ignore-space-change ignore changes in the amount of white space"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1009
|
|
msgid "-w, --ignore-all-space ignore all white space"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1010
|
|
msgid ""
|
|
"-B, --ignore-blank-lines ignore changes where lines are all blank"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1011
|
|
msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1013
|
|
msgid "-a, --text treat all files as text"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1014
|
|
msgid " --strip-trailing-cr strip trailing carriage return on input"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1016
|
|
msgid " --binary read and write data in binary mode"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1019
|
|
msgid ""
|
|
"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1020
|
|
msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1021
|
|
msgid " --line-format=LFMT format all input lines with LFMT"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1022
|
|
msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1023
|
|
msgid ""
|
|
" These format options provide fine-grained control over the output\n"
|
|
" of diff, generalizing -D/--ifdef."
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1025
|
|
msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'."
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1026
|
|
msgid ""
|
|
" GFMT (only) may contain:\n"
|
|
" %< lines from FILE1\n"
|
|
" %> lines from FILE2\n"
|
|
" %= lines common to FILE1 and FILE2\n"
|
|
" %[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER\n"
|
|
" LETTERs are as follows for new group, lower case for old group:\n"
|
|
" F first line number\n"
|
|
" L last line number\n"
|
|
" N number of lines = L-F+1\n"
|
|
" E F-1\n"
|
|
" M L+1\n"
|
|
" %(A=B?T:E) if A equals B then T else E"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1038
|
|
msgid ""
|
|
" LFMT (only) may contain:\n"
|
|
" %L contents of line\n"
|
|
" %l contents of line, excluding any trailing newline\n"
|
|
" %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1042
|
|
msgid ""
|
|
" Both GFMT and LFMT may contain:\n"
|
|
" %% %\n"
|
|
" %c'C' the single character C\n"
|
|
" %c'\\OOO' the character with octal code OOO\n"
|
|
" C the character C (other characters represent themselves)"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1048
|
|
msgid "-d, --minimal try hard to find a smaller set of changes"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1049
|
|
msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1050
|
|
msgid ""
|
|
" --speed-large-files assume large files and many scattered small changes"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1051
|
|
msgid ""
|
|
" --color[=WHEN] color output; WHEN is 'never', 'always', or "
|
|
"'auto';\n"
|
|
" plain --color means --color='auto'"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1053
|
|
msgid ""
|
|
" --palette=PALETTE the colors to use when --color is active; PALETTE "
|
|
"is\n"
|
|
" a colon-separated list of terminfo capabilities"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1056
|
|
msgid " --help display this help and exit"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1057
|
|
msgid "-v, --version output version information and exit"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1059
|
|
msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1060
|
|
msgid ""
|
|
"If --from-file or --to-file is given, there are no restrictions on FILE(s)."
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1061 src/diff3.c:479 src/sdiff.c:220
|
|
msgid "If a FILE is '-', read standard input."
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1069
|
|
#, c-format
|
|
msgid "Usage: %s [OPTION]... FILES\n"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1070
|
|
msgid "Compare FILES line by line."
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1104
|
|
#, c-format
|
|
msgid "conflicting %s option value %s"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1117
|
|
#, c-format
|
|
msgid "conflicting output style options"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1133
|
|
#, c-format
|
|
msgid "invalid color %s"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1194
|
|
msgid "-D option not supported with directories"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1201
|
|
#, c-format
|
|
msgid "Common subdirectories: %s and %s\n"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1218 src/diff.c:1404
|
|
#, c-format
|
|
msgid "Only in %s: %s\n"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1237
|
|
#, c-format
|
|
msgid "File %s is a %s while file %s is a %s\n"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1283
|
|
#, c-format
|
|
msgid "Symbolic links %s -> %s and %s -> %s differ\n"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1566
|
|
msgid "cannot compare '-' to a directory"
|
|
msgstr ""
|
|
|
|
#: src/diff.c:1653
|
|
#, c-format
|
|
msgid "Files %s and %s are identical\n"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:53
|
|
msgid "Randy Smith"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:324
|
|
#, c-format
|
|
msgid "incompatible options"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:364
|
|
msgid "'-' specified for more than one input file"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:406 src/diff3.c:1184 src/diff3.c:1570 src/diff3.c:1626
|
|
#: src/sdiff.c:307 src/sdiff.c:832 src/sdiff.c:842
|
|
msgid "read failed"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:428
|
|
msgid "-A, --show-all output all changes, bracketing conflicts"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:430
|
|
msgid ""
|
|
"-e, --ed output ed script incorporating changes\n"
|
|
" from OLDFILE to YOURFILE into MYFILE"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:432
|
|
msgid "-E, --show-overlap like -e, but bracket conflicts"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:433
|
|
msgid ""
|
|
"-3, --easy-only like -e, but incorporate only nonoverlapping "
|
|
"changes"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:434
|
|
msgid ""
|
|
"-x, --overlap-only like -e, but incorporate only overlapping changes"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:435
|
|
msgid "-X like -x, but bracket conflicts"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:436
|
|
msgid "-i append 'w' and 'q' commands to ed scripts"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:438
|
|
msgid ""
|
|
"-m, --merge output actual merged file, according to\n"
|
|
" -A if no other options are given"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:441
|
|
msgid "-a, --text treat all files as text"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:442
|
|
msgid " --strip-trailing-cr strip trailing carriage return on input"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:443
|
|
msgid "-T, --initial-tab make tabs line up by prepending a tab"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:444
|
|
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:445
|
|
msgid ""
|
|
"-L, --label=LABEL use LABEL instead of file name\n"
|
|
" (can be repeated up to three times)"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:448
|
|
msgid " --help display this help and exit"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:449
|
|
msgid "-v, --version output version information and exit"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:456
|
|
#, c-format
|
|
msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:458
|
|
msgid "Compare three files line by line."
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:468
|
|
msgid ""
|
|
"\n"
|
|
"The default output format is a somewhat human-readable representation of\n"
|
|
"the changes.\n"
|
|
"\n"
|
|
"The -e, -E, -x, -X (and corresponding long) options cause an ed script\n"
|
|
"to be output instead of the default.\n"
|
|
"\n"
|
|
"Finally, the -m (--merge) option causes diff3 to do the merge internally\n"
|
|
"and output the actual merged file. For unusual input, this is more\n"
|
|
"robust than using ed.\n"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:480
|
|
msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble."
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:649
|
|
msgid "internal error: screwup in format of diff blocks"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:925
|
|
#, c-format
|
|
msgid "%s: diff failed: "
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:947
|
|
msgid "internal error: invalid diff type in process_diff"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:970
|
|
msgid "invalid diff format; invalid change separator"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:1191
|
|
msgid "invalid diff format; incomplete last line"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:1218 src/sdiff.c:275 src/util.c:920
|
|
#, c-format
|
|
msgid "subsidiary program %s could not be invoked"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:1241
|
|
msgid "invalid diff format; incorrect leading line chars"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:1309
|
|
msgid "internal error: invalid diff type passed to output"
|
|
msgstr ""
|
|
|
|
#: src/diff3.c:1572 src/diff3.c:1630
|
|
msgid "input file shrank"
|
|
msgstr ""
|
|
|
|
#: src/dir.c:194
|
|
#, c-format
|
|
msgid "cannot compare file names %s and %s"
|
|
msgstr ""
|
|
|
|
#: src/dir.c:246
|
|
#, c-format
|
|
msgid "%s: recursive directory loop"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:46
|
|
msgid "Thomas Lord"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:176
|
|
msgid ""
|
|
"-o, --output=FILE operate interactively, sending output to FILE"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:178
|
|
msgid ""
|
|
"-i, --ignore-case consider upper- and lower-case to be the same"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:179
|
|
msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:180
|
|
msgid "-Z, --ignore-trailing-space ignore white space at line end"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:181
|
|
msgid ""
|
|
"-b, --ignore-space-change ignore changes in the amount of white space"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:182
|
|
msgid "-W, --ignore-all-space ignore all white space"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:183
|
|
msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:184
|
|
msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:185
|
|
msgid " --strip-trailing-cr strip trailing carriage return on input"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:186
|
|
msgid "-a, --text treat all files as text"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:188
|
|
msgid ""
|
|
"-w, --width=NUM output at most NUM (default 130) print columns"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:189
|
|
msgid ""
|
|
"-l, --left-column output only the left column of common lines"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:190
|
|
msgid "-s, --suppress-common-lines do not output common lines"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:192
|
|
msgid "-t, --expand-tabs expand tabs to spaces in output"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:193
|
|
msgid ""
|
|
" --tabsize=NUM tab stops at every NUM (default 8) print columns"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:195
|
|
msgid "-d, --minimal try hard to find a smaller set of changes"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:196
|
|
msgid ""
|
|
"-H, --speed-large-files assume large files, many scattered small changes"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:197
|
|
msgid " --diff-program=PROGRAM use PROGRAM to compare files"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:199
|
|
msgid " --help display this help and exit"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:200
|
|
msgid "-v, --version output version information and exit"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:207
|
|
#, c-format
|
|
msgid "Usage: %s [OPTION]... FILE1 FILE2\n"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:209
|
|
msgid "Side-by-side merge of differences between FILE1 and FILE2."
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:329
|
|
msgid "cannot interactively merge standard input"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:586
|
|
msgid "both files to be compared are directories"
|
|
msgstr ""
|
|
|
|
#: src/sdiff.c:806
|
|
msgid ""
|
|
"ed:\tEdit then use both versions, each decorated with a header.\n"
|
|
"eb:\tEdit then use both versions.\n"
|
|
"el or e1:\tEdit then use the left version.\n"
|
|
"er or e2:\tEdit then use the right version.\n"
|
|
"e:\tDiscard both versions then edit a new one.\n"
|
|
"l or 1:\tUse the left version.\n"
|
|
"r or 2:\tUse the right version.\n"
|
|
"s:\tSilently include common lines.\n"
|
|
"v:\tVerbosely include common lines.\n"
|
|
"q:\tQuit.\n"
|
|
msgstr ""
|
|
|
|
#: src/util.c:727
|
|
#, c-format
|
|
msgid "unrecognized prefix: %s"
|
|
msgstr ""
|
|
|
|
#: src/util.c:748
|
|
#, c-format
|
|
msgid "unparsable value for --palette"
|
|
msgstr ""
|