From: JinWang An Date: Tue, 28 Dec 2021 06:15:18 +0000 (+0900) Subject: Imported Upstream version 4.2.1 X-Git-Tag: upstream/4.2.1^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a1cba99f5ce73ae0cacdbf9ab1186137efd77f7;p=platform%2Fupstream%2Fmake.git Imported Upstream version 4.2.1 --- diff --git a/ChangeLog b/ChangeLog index 581723c..3dee3b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,56 @@ +2016-06-10 Paul Smith + + GNU Make release 4.2.1. + +2016-06-06 Paul Smith + + * maintMakefile: TP recommends rsync for retrieving PO files. + +2016-05-31 Jeremy Devenport (tiny change) + + * main.c (main): [SV 48009] Reset stack limit for make re-exec. + +2016-05-31 Paul Smith + + [SV 47995] Ensure forced double-colon rules work with -j. + The fix for SV 44742 had a side-effect that some double-colon targets + were skipped. This happens because the "considered" facility assumed + that all targets would be visited on each walk through the dependency + graph: we used a bit for considered and toggled it on each pass; if + we didn't walk the entire graph on every pass the bit would get out + of sync. The new behavior after SV 44742 might return early without + walking the entire graph. To fix this I changed the considered value + to an integer which is monotonically increasing: it is then never + possible to incorrectly determine that a previous pass through the + graph already considered the current target. + + * filedef.h (struct file): make CONSIDERED an unsigned int. + * main.c (main): No longer need to reset CONSIDERED. + * remake.c (update_goal_chain): increment CONSIDERED rather than + inverting it between 0<->1. + (update_file_1): Reset CONSIDERED to 0 so it's re-considered. + (check_dep): Ditto. + * tests/scripts/features/double_colon: Add a regression test. + +2016-05-31 Paul Smith + + * DELETE_ON_ERROR: [SV 48061] Use "exit 1" for portability. + Reported by Joel Fredrikson + + * w32/pathstuff.c: [SV 47996] Use ISBLANK() not isblank(). + +2016-05-28 Eli Zaretskii + + Fix printing time stamps on MS-Windows + * dir.c (print_dir_data_base) [WINDOWS32]: Use %I64u format for + printing unsigned 64-bit data types, as %ull is not universally + supported. + +2016-05-27 Luke Allardyce (tiny change) + + [SV 48037] Fix MinGW build with Posix configury tools + * w32/Makefile.am (libw32_a_CPPFLAGS): Add -I$(srcdir)/glob. + 2016-05-22 Paul Smith GNU Make release 4.2. diff --git a/Makefile.DOS b/Makefile.DOS index 7883fcc..d05acd4 100644 --- a/Makefile.DOS +++ b/Makefile.DOS @@ -71,7 +71,7 @@ PACKAGE = make PERL = perl RANLIB = ranlib REMOTE = stub -VERSION = 4.2 +VERSION = 4.2.1 AUTOMAKE_OPTIONS = 1.2 diff --git a/NEWS b/NEWS index 27f6f06..0b04245 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ GNU make NEWS -*-indented-text-*- History of user-visible changes. - 22 May 2016 + 10 June 2016 See the end of this file for copyrights and conditions. @@ -8,6 +8,15 @@ All changes mentioned here are more fully described in the GNU make manual, which is contained in this distribution as the file doc/make.texi. See the README file and the GNU make manual for instructions for reporting bugs. + +Version 4.2.1 (10 Jun 2016) + +A complete list of bugs fixed in this version is available here: +h +ttp://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=107&set=custom + +This release is a bug-fix release. + Version 4.2 (22 May 2016) diff --git a/README b/README index ab78043..88630da 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This directory contains the 4.2 release of GNU Make. +This directory contains the 4.2.1 release of GNU Make. See the file NEWS for the user-visible changes from previous releases. In addition, there have been bugs fixed. diff --git a/README.DOS b/README.DOS index 66e83d0..5419d3d 100644 --- a/README.DOS +++ b/README.DOS @@ -62,7 +62,7 @@ To build from sources: [Enter]. Otherwise, you need to supply the path to the source directory as an argument to the batch file, like this: - c:\djgpp\gnu\make-4.2\configure.bat c:/djgpp/gnu/make-4.2 + c:\djgpp\gnu\make-4.2.1\configure.bat c:/djgpp/gnu/make-4.2.1 Note the forward slashes in the source path argument: you MUST use them here. @@ -84,7 +84,7 @@ To build from sources: If you are building from outside of the source directory, you need to tell Make where the sources are, like this: - make srcdir=c:/djgpp/gnu/make-4.2 + make srcdir=c:/djgpp/gnu/make-4.2.1 (configure.bat will tell you this when it finishes). You MUST use a full, not relative, name of the source directory here, or diff --git a/README.W32 b/README.W32 index 2da7e94..1bdce48 100644 --- a/README.W32 +++ b/README.W32 @@ -212,7 +212,7 @@ GNU make handling of drive letters in pathnames (PATH, vpath, VPATH): GNU make test suite: I verified all functionality with a slightly modified version - of make-test-4.2 (modifications to get test suite to run + of make-test-4.2.1 (modifications to get test suite to run on Windows NT). All tests pass in an environment that includes sh.exe. Tests were performed on both Windows NT and Windows 95. diff --git a/SMakefile b/SMakefile index 160af57..159d489 100644 --- a/SMakefile +++ b/SMakefile @@ -24,9 +24,9 @@ # # Ultrix 2.2 make doesn't expand the value of VPATH. -VPATH = /make-4.2/ +VPATH = /make-4.2.1/ # This must repeat the value, because configure will remove 'VPATH = .'. -srcdir = /make-4.2/ +srcdir = /make-4.2.1/ CC = sc RM = delete diff --git a/config.ami b/config.ami index ccf6aa1..b342a83 100644 --- a/config.ami +++ b/config.ami @@ -177,7 +177,7 @@ this program. If not, see . */ #define PACKAGE "make" /* Version of this package (needed by automake) */ -#define VERSION "4.2" +#define VERSION "4.2.1" /* Define to the name of the SCCS 'get' command. */ #define SCCS_GET "get" diff --git a/config.h-vms b/config.h-vms index 1bf57ea..c538672 100644 --- a/config.h-vms +++ b/config.h-vms @@ -217,7 +217,7 @@ this program. If not, see . */ #define PACKAGE "make" /* Version of this package (needed by automake) */ -#define VERSION "4.2" +#define VERSION "4.2.1" /* Define to the name of the SCCS 'get' command. */ /* #undef SCCS_GET */ diff --git a/config.h.W32 b/config.h.W32 index 4a412a2..2c6fc53 100644 --- a/config.h.W32 +++ b/config.h.W32 @@ -384,7 +384,7 @@ char *ttyname (int); #define PACKAGE_URL "http://www.gnu.org/software/make/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.2" +#define PACKAGE_VERSION "4.2.1" /* Define to the character that separates directories in PATH. */ #define PATH_SEPARATOR_CHAR ';' @@ -436,7 +436,7 @@ char *ttyname (int); /* #undef UMAX4_3 */ /* Version number of package */ -#define VERSION "4.2" +#define VERSION "4.2.1" /* Define if using the dmalloc debugging malloc package */ /* #undef WITH_DMALLOC */ diff --git a/config/texinfo.tex b/config/texinfo.tex index 314063c..e60dd17 100644 --- a/config/texinfo.tex +++ b/config/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2016-05-07.20} +\def\texinfoversion{2016-06-07.21} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -1192,6 +1192,7 @@ where each line of input produces a line of output.} \ifx\pdfescapestring\thisisundefined % No primitive available; should we give a warning or log? % Many times it won't matter. + \xdef#1{#1}% \else % The expandable \pdfescapestring primitive escapes parentheses, % backslashes, and other special chars. @@ -1311,8 +1312,10 @@ output) for that.)} % We have to set dummies so commands such as @code, and characters % such as \, aren't expanded when present in a section title. \indexnofonts - \turnoffactive \makevalueexpandable + \turnoffactive + % Use ASCII approximations in destination names. + \passthroughcharsfalse \def\pdfdestname{#1}% \txiescapepdf\pdfdestname \safewhatsit{\pdfdest name{\pdfdestname} xyz}% @@ -1357,8 +1360,21 @@ output) for that.)} \fi % % Also escape PDF chars in the display string. - \edef\pdfoutlinetext{#1}% - \txiescapepdf\pdfoutlinetext + \bgroup + \ifx \declaredencoding \latone + % The PDF format can use an extended form of Latin-1 in bookmark + % strings. See Appendix D of the PDF Reference, Sixth Edition, for + % the "PDFDocEncoding". + \passthroughcharstrue + \fi + \ifx \declaredencoding \utfeight + % TODO: the PDF format can use UTF-16 in bookmark strings, but the + % code for this isn't done yet. + \fi + \globaldefs=1 + \edef\pdfoutlinetext{#1}% + \txiescapepdf\pdfoutlinetext + \egroup % \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% } @@ -4606,6 +4622,31 @@ end \fi } +% Like \expandablevalue, but completely expandable (the \message in the +% definition above operates at the execution level of TeX). Used when +% writing to auxiliary files, due to the expansion that \write does. +% If flag is undefined, pass through an unexpanded @value command: maybe it +% will be set by the time it is read back in. +% +% NB flag names containing - or _ may not work here. +\def\dummyvalue#1{% + \expandafter\ifx\csname SET#1\endcsname\relax + \noexpand\value{#1}% + \else + \csname SET#1\endcsname + \fi +} + +% Used for @value's in index entries to form the sort key: expand the @value +% if possible, otherwise sort late. +\def\indexnofontsvalue#1{% + \expandafter\ifx\csname SET#1\endcsname\relax + ZZZZZZZ + \else + \csname SET#1\endcsname + \fi +} + % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined % with @set. % @@ -4747,7 +4788,7 @@ end % Define \doindex, the driver for all index macros. % Argument #1 is generated by the calling \fooindex macro, -% and it the two-letter name of the index. +% and it is the two-letter name of the index. \def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx} \def\doindexxxx #1{\doind{\indexname}{#1}} @@ -4756,6 +4797,7 @@ end \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx} \def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}} + % Used when writing an index entry out to an index file to prevent % expansion of Texinfo commands that can appear in an index entry. % @@ -4774,9 +4816,11 @@ end \def\}{{\tt\char125}}% % % Do the redefinitions. - \commondummies + \definedummies } +% Used for the aux and toc files, where @ is the escape character. +% % For the aux and toc files, @ is the escape character. So we want to % redefine everything using @ as the escape character (instead of % \realbackslash, still used for index files). When everything uses @, @@ -4789,30 +4833,35 @@ end \let\} = \rbraceatcmd % % Do the redefinitions. - \commondummies + \definedummies \otherbackslash } -% Called from \indexdummies and \atdummies. +% \definedummyword defines \#1 as \string\#1\space, thus effectively +% preventing its expansion. This is used only for control words, +% not control letters, because the \space would be incorrect for +% control characters, but is needed to separate the control word +% from whatever follows. % -\def\commondummies{% - % \definedummyword defines \#1 as \string\#1\space, thus effectively - % preventing its expansion. This is used only for control words, - % not control letters, because the \space would be incorrect for - % control characters, but is needed to separate the control word - % from whatever follows. - % - % For control letters, we have \definedummyletter, which omits the - % space. - % - % These can be used both for control words that take an argument and - % those that do not. If it is followed by {arg} in the input, then - % that will dutifully get written to the index (or wherever). - % - \def\definedummyword ##1{\def##1{\string##1\space}}% - \def\definedummyletter##1{\def##1{\string##1}}% - \let\definedummyaccent\definedummyletter +% These can be used both for control words that take an argument and +% those that do not. If it is followed by {arg} in the input, then +% that will dutifully get written to the index (or wherever). +% +% For control letters, we have \definedummyletter, which omits the +% space. +% +\def\definedummyword #1{\def#1{\string#1\space}}% +\def\definedummyletter#1{\def#1{\string#1}}% +\let\definedummyaccent\definedummyletter + +% Called from \indexdummies and \atdummies, to effectively prevent +% the expansion of commands. +% +\def\definedummies{% % + \let\commondummyword\definedummyword + \let\commondummyletter\definedummyletter + \let\commondummyaccent\definedummyaccent \commondummiesnofonts % \definedummyletter\_% @@ -4892,82 +4941,82 @@ end % % We want to disable all macros so that they are not expanded by \write. \macrolist - \definedummyword\value + \let\value\dummyvalue % \normalturnoffactive } -% \commondummiesnofonts: common to \commondummies and \indexnofonts. -% Define \definedumyletter, \definedummyaccent and \definedummyword before -% using. +% \commondummiesnofonts: common to \definedummies and \indexnofonts. +% Define \commondummyletter, \commondummyaccent and \commondummyword before +% using. Used for accents, font commands, and various control letters. % \def\commondummiesnofonts{% % Control letters and accents. - \definedummyletter\!% - \definedummyaccent\"% - \definedummyaccent\'% - \definedummyletter\*% - \definedummyaccent\,% - \definedummyletter\.% - \definedummyletter\/% - \definedummyletter\:% - \definedummyaccent\=% - \definedummyletter\?% - \definedummyaccent\^% - \definedummyaccent\`% - \definedummyaccent\~% - \definedummyword\u - \definedummyword\v - \definedummyword\H - \definedummyword\dotaccent - \definedummyword\ogonek - \definedummyword\ringaccent - \definedummyword\tieaccent - \definedummyword\ubaraccent - \definedummyword\udotaccent - \definedummyword\dotless + \commondummyletter\!% + \commondummyaccent\"% + \commondummyaccent\'% + \commondummyletter\*% + \commondummyaccent\,% + \commondummyletter\.% + \commondummyletter\/% + \commondummyletter\:% + \commondummyaccent\=% + \commondummyletter\?% + \commondummyaccent\^% + \commondummyaccent\`% + \commondummyaccent\~% + \commondummyword\u + \commondummyword\v + \commondummyword\H + \commondummyword\dotaccent + \commondummyword\ogonek + \commondummyword\ringaccent + \commondummyword\tieaccent + \commondummyword\ubaraccent + \commondummyword\udotaccent + \commondummyword\dotless % % Texinfo font commands. - \definedummyword\b - \definedummyword\i - \definedummyword\r - \definedummyword\sansserif - \definedummyword\sc - \definedummyword\slanted - \definedummyword\t + \commondummyword\b + \commondummyword\i + \commondummyword\r + \commondummyword\sansserif + \commondummyword\sc + \commondummyword\slanted + \commondummyword\t % % Commands that take arguments. - \definedummyword\abbr - \definedummyword\acronym - \definedummyword\anchor - \definedummyword\cite - \definedummyword\code - \definedummyword\command - \definedummyword\dfn - \definedummyword\dmn - \definedummyword\email - \definedummyword\emph - \definedummyword\env - \definedummyword\file - \definedummyword\image - \definedummyword\indicateurl - \definedummyword\inforef - \definedummyword\kbd - \definedummyword\key - \definedummyword\math - \definedummyword\option - \definedummyword\pxref - \definedummyword\ref - \definedummyword\samp - \definedummyword\strong - \definedummyword\tie - \definedummyword\U - \definedummyword\uref - \definedummyword\url - \definedummyword\var - \definedummyword\verb - \definedummyword\w - \definedummyword\xref + \commondummyword\abbr + \commondummyword\acronym + \commondummyword\anchor + \commondummyword\cite + \commondummyword\code + \commondummyword\command + \commondummyword\dfn + \commondummyword\dmn + \commondummyword\email + \commondummyword\emph + \commondummyword\env + \commondummyword\file + \commondummyword\image + \commondummyword\indicateurl + \commondummyword\inforef + \commondummyword\kbd + \commondummyword\key + \commondummyword\math + \commondummyword\option + \commondummyword\pxref + \commondummyword\ref + \commondummyword\samp + \commondummyword\strong + \commondummyword\tie + \commondummyword\U + \commondummyword\uref + \commondummyword\url + \commondummyword\var + \commondummyword\verb + \commondummyword\w + \commondummyword\xref } % For testing: output @{ and @} in index sort strings as \{ and \}. @@ -5023,11 +5072,11 @@ end % \def\indexnofonts{% % Accent commands should become @asis. - \def\definedummyaccent##1{\let##1\asis}% + \def\commondummyaccent##1{\let##1\asis}% % We can just ignore other control letters. - \def\definedummyletter##1{\let##1\empty}% + \def\commondummyletter##1{\let##1\empty}% % All control words become @asis by default; overrides below. - \let\definedummyword\definedummyaccent + \let\commondummyword\commondummyaccent \commondummiesnofonts % % Don't no-op \tt, since it isn't a user-level command @@ -5112,8 +5161,11 @@ end % goes to end-of-line is not handled. % \macrolist + \let\value\indexnofontsvalue } + + \let\SETmarginindex=\relax % put index entries in margin (undocumented)? @@ -8707,6 +8759,8 @@ end {% \requireauxfile \atdummies % preserve commands, but don't expand them + % match definition in \xrdef, \refx, \xrefX. + \def\value##1{##1}% \edef\writexrdef##1##2{% \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef ##1}{##2}}% these are parameters of \writexrdef @@ -10212,7 +10266,7 @@ directory should work if nowhere else does.} \countUTFx = "80 \countUTFy = "C2 \def\UTFviiiTmp{% - \gdef~{ + \gdef~{% \ifpassthroughchars $\fi}}% \UTFviiiLoop @@ -10263,6 +10317,15 @@ directory should work if nowhere else does.} \fi } +% These macros are used here to construct the name of a control +% sequence to be defined. +\def\UTFviiiTwoOctetsName#1#2{% + \csname u8:#1\string #2\endcsname}% +\def\UTFviiiThreeOctetsName#1#2#3{% + \csname u8:#1\string #2\string #3\endcsname}% +\def\UTFviiiFourOctetsName#1#2#3#4{% + \csname u8:#1\string #2\string #3\string #4\endcsname}% + % For UTF-8 byte sequence (TeX, e-TeX and pdfTeX) % Definition macro to replace the Unicode character % Definition macro that is used by @U command @@ -10279,17 +10342,18 @@ directory should work if nowhere else does.} \countUTFz = "#1\relax \begingroup \parseXMLCharref + + % Give \u8:... its definition. The sequence of seven \expandafter's + % expands after the \gdef three times, e.g. % - % Access definitions of characters given UTF-8 sequences - \def\UTFviiiTwoOctets##1##2{% - \csname u8:##1\string ##2\endcsname}% - \def\UTFviiiThreeOctets##1##2##3{% - \csname u8:##1\string ##2\string ##3\endcsname}% - \def\UTFviiiFourOctets##1##2##3##4{% - \csname u8:##1\string ##2\string ##3\string ##4\endcsname}% - \expandafter\expandafter\expandafter\expandafter - \expandafter\expandafter\expandafter - \gdef\UTFviiiTmp{#2}% + % 1. \UTFviiTwoOctetsName B1 B2 + % 2. \csname u8:B1 \string B2 \endcsname + % 3. \u8: B1 B2 (a single control sequence token) + % + \expandafter\expandafter + \expandafter\expandafter + \expandafter\expandafter + \expandafter\gdef \UTFviiiTmp{#2}% % \expandafter\ifx\csname uni:#1\endcsname \relax \else \message{Internal error, already defined: #1}% @@ -10299,37 +10363,53 @@ directory should work if nowhere else does.} \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp \endgroup} % - % Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp. + % Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp + % to the corresponding UTF-8 sequence. \gdef\parseXMLCharref{% \ifnum\countUTFz < "A0\relax \errhelp = \EMsimple \errmessage{Cannot define Unicode char value < 00A0}% \else\ifnum\countUTFz < "800\relax \parseUTFviiiA,% - \parseUTFviiiB C\UTFviiiTwoOctets.,% + \parseUTFviiiB C\UTFviiiTwoOctetsName.,% \else\ifnum\countUTFz < "10000\relax \parseUTFviiiA;% \parseUTFviiiA,% - \parseUTFviiiB E\UTFviiiThreeOctets.{,;}% + \parseUTFviiiB E\UTFviiiThreeOctetsName.{,;}% \else \parseUTFviiiA;% \parseUTFviiiA,% \parseUTFviiiA!% - \parseUTFviiiB F\UTFviiiFourOctets.{!,;}% + \parseUTFviiiB F\UTFviiiFourOctetsName.{!,;}% \fi\fi\fi } + % Extract a byte from the end of the UTF-8 representation of \countUTFx. + % It must be a non-initial byte in the sequence. + % Change \uccode of #1 for it to be used in \parseUTFviiiB as one + % of the bytes. \gdef\parseUTFviiiA#1{% \countUTFx = \countUTFz \divide\countUTFz by 64 - \countUTFy = \countUTFz + \countUTFy = \countUTFz % Save to be the future value of \countUTFz. \multiply\countUTFz by 64 + + % \countUTFz is now \countUTFx with the last 5 bits cleared. Subtract + % in order to get the last five bits. \advance\countUTFx by -\countUTFz + + % Convert this to the byte in the UTF-8 sequence. \advance\countUTFx by 128 \uccode `#1\countUTFx \countUTFz = \countUTFy} - % Used to set \UTFviiiTmp to a UTF-8 byte sequence + % Used to put a UTF-8 byte sequence into \UTFviiiTmp + % #1 is the increment for \countUTFz to yield a the first byte of the UTF-8 + % sequence. + % #2 is one of the \UTFviii*OctetsName macros. + % #3 is always a full stop (.) + % #4 is a template for the other bytes in the sequence. The values for these + % bytes is substituted in here with \uppercase using the \uccode's. \gdef\parseUTFviiiB#1#2#3#4{% \advance\countUTFz by "#10\relax \uccode `#3\countUTFz diff --git a/configh.dos b/configh.dos index adafaf1..58bfeb0 100644 --- a/configh.dos +++ b/configh.dos @@ -92,19 +92,19 @@ this program. If not, see . */ #define PACKAGE_NAME "GNU make" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU make 4.2" +#define PACKAGE_STRING "GNU make 4.2.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "make" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.2" +#define PACKAGE_VERSION "4.2.1" /* Output sync sypport */ #define NO_OUTPUT_SYNC /* Version number of package */ -#define VERSION "4.2" +#define VERSION "4.2.1" /* Build host information. */ #define MAKE_HOST "i386-pc-msdosdjgpp" diff --git a/configure b/configure index ddd9441..bc62691 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU make 4.2. +# Generated by GNU Autoconf 2.69 for GNU make 4.2.1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU make' PACKAGE_TARNAME='make' -PACKAGE_VERSION='4.2' -PACKAGE_STRING='GNU make 4.2' +PACKAGE_VERSION='4.2.1' +PACKAGE_STRING='GNU make 4.2.1' PACKAGE_BUGREPORT='bug-make@gnu.org' PACKAGE_URL='http://www.gnu.org/software/make/' @@ -1347,7 +1347,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU make 4.2 to adapt to many kinds of systems. +\`configure' configures GNU make 4.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1418,7 +1418,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU make 4.2:";; + short | recursive ) echo "Configuration of GNU make 4.2.1:";; esac cat <<\_ACEOF @@ -1538,7 +1538,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU make configure 4.2 +GNU make configure 4.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2064,7 +2064,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU make $as_me 4.2, which was +It was created by GNU make $as_me 4.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2940,7 +2940,7 @@ fi # Define the identity of the package. PACKAGE='make' - VERSION='4.2' + VERSION='4.2.1' cat >>confdefs.h <<_ACEOF @@ -12222,7 +12222,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU make $as_me 4.2, which was +This file was extended by GNU make $as_me 4.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12290,7 +12290,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU make config.status 4.2 +GNU make config.status 4.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1902823..64ec870 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see . -AC_INIT([GNU make],[4.2],[bug-make@gnu.org]) +AC_INIT([GNU make],[4.2.1],[bug-make@gnu.org]) AC_PREREQ([2.69]) diff --git a/dir.c b/dir.c index 63c82a0..f34bbf5 100644 --- a/dir.c +++ b/dir.c @@ -1082,7 +1082,7 @@ print_dir_data_base (void) else if (dir->contents->dirfiles.ht_vec == 0) { #ifdef WINDOWS32 - printf (_("# %s (key %s, mtime %ull): could not be opened.\n"), + printf (_("# %s (key %s, mtime %I64u): could not be opened.\n"), dir->name, dir->contents->path_key, (unsigned long long)dir->contents->mtime); #else /* WINDOWS32 */ @@ -1119,7 +1119,7 @@ print_dir_data_base (void) } } #ifdef WINDOWS32 - printf (_("# %s (key %s, mtime %ull): "), + printf (_("# %s (key %s, mtime %I64u): "), dir->name, dir->contents->path_key, (unsigned long long)dir->contents->mtime); #else /* WINDOWS32 */ diff --git a/doc/make.info b/doc/make.info index 50f6c0c..5e39e99 100644 --- a/doc/make.info +++ b/doc/make.info @@ -5,7 +5,7 @@ automatically which pieces of a large program need to be recompiled, and issues the commands to recompile them. This is Edition 0.74, last updated 21 May 2016, of 'The GNU Make -Manual', for GNU 'make' version 4.2. +Manual', for GNU 'make' version 4.2.1. Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, @@ -29,177 +29,177 @@ END-INFO-DIR-ENTRY  Indirect: -make.info-1: 1351 -make.info-2: 307134 +make.info-1: 1353 +make.info-2: 307140  Tag Table: (Indirect) -Node: Top1351 -Node: Overview16531 -Node: Preparing17544 -Node: Reading18512 -Node: Bugs19439 -Node: Introduction21268 -Node: Rule Introduction22861 -Node: Simple Makefile24794 -Node: How Make Works28530 -Node: Variables Simplify31179 -Node: make Deduces33385 -Node: Combine By Prerequisite35118 -Node: Cleanup36147 -Node: Makefiles37565 -Node: Makefile Contents38401 -Node: Splitting Lines41574 -Node: Makefile Names43334 -Node: Include44941 -Ref: Include-Footnote-148685 -Node: MAKEFILES Variable48819 -Node: Remaking Makefiles50360 -Node: Overriding Makefiles54585 -Node: Reading Makefiles56613 -Node: Secondary Expansion60075 -Node: Rules67536 -Node: Rule Example70209 -Node: Rule Syntax71062 -Node: Prerequisite Types73657 -Node: Wildcards76524 -Node: Wildcard Examples78243 -Node: Wildcard Pitfall79593 -Node: Wildcard Function81382 -Node: Directory Search83166 -Node: General Search84301 -Node: Selective Search86008 -Node: Search Algorithm88998 -Node: Recipes/Search91516 -Node: Implicit/Search92839 -Node: Libraries/Search93781 -Node: Phony Targets95752 -Node: Force Targets100589 -Node: Empty Targets101626 -Node: Special Targets102928 -Node: Multiple Targets110801 -Node: Multiple Rules112661 -Node: Static Pattern114879 -Node: Static Usage115531 -Node: Static versus Implicit119250 -Node: Double-Colon120990 -Node: Automatic Prerequisites122750 -Node: Recipes127011 -Node: Recipe Syntax128183 -Node: Splitting Recipe Lines130298 -Node: Variables in Recipes133451 -Node: Echoing134777 -Node: Execution136052 -Ref: Execution-Footnote-1137465 -Node: One Shell137610 -Node: Choosing the Shell140925 -Node: Parallel145069 -Node: Parallel Output147738 -Node: Parallel Input152165 -Node: Errors153284 -Node: Interrupts156948 -Node: Recursion158531 -Node: MAKE Variable160628 -Node: Variables/Recursion162871 -Node: Options/Recursion168316 -Node: -w Option174322 -Node: Canned Recipes175317 -Node: Empty Recipes178300 -Node: Using Variables179740 -Node: Reference183168 -Node: Flavors184726 -Node: Advanced190705 -Node: Substitution Refs191210 -Node: Computed Names192763 -Node: Values197311 -Node: Setting198228 -Node: Appending201267 -Node: Override Directive205211 -Node: Multi-Line206838 -Node: Undefine Directive209662 -Node: Environment210751 -Node: Target-specific213003 -Node: Pattern-specific216030 -Node: Suppressing Inheritance217877 -Node: Special Variables219330 -Node: Conditionals225739 -Node: Conditional Example226452 -Node: Conditional Syntax229015 -Node: Testing Flags234775 -Node: Functions235876 -Node: Syntax of Functions237436 -Node: Text Functions239770 -Node: File Name Functions248335 -Node: Conditional Functions253561 -Node: Foreach Function255936 -Node: File Function259149 -Node: Call Function261706 -Node: Value Function264591 -Node: Eval Function266028 -Node: Origin Function268304 -Node: Flavor Function271530 -Node: Make Control Functions272574 -Node: Shell Function274260 -Node: Guile Function276019 -Node: Running276769 -Node: Makefile Arguments278750 -Node: Goals279466 -Node: Instead of Execution284205 -Node: Avoiding Compilation287920 -Node: Overriding289895 -Node: Testing292207 -Node: Options Summary294091 -Node: Implicit Rules307134 -Node: Using Implicit309271 -Node: Catalogue of Rules312790 -Node: Implicit Variables322134 -Node: Chained Rules327207 -Node: Pattern Rules331217 -Node: Pattern Intro332751 -Node: Pattern Examples335333 -Node: Automatic Variables337140 -Node: Pattern Match344492 -Node: Match-Anything Rules347815 -Node: Canceling Rules351694 -Node: Last Resort352408 -Node: Suffix Rules354237 -Node: Implicit Rule Search357962 -Node: Archives361461 -Node: Archive Members362166 -Node: Archive Update363776 -Node: Archive Symbols365687 -Node: Archive Pitfalls366920 -Node: Archive Suffix Rules367642 -Node: Extending make369190 -Node: Guile Integration370335 -Node: Guile Types371563 -Node: Guile Interface373983 -Node: Guile Example375269 -Node: Loading Objects377460 -Node: load Directive378950 -Node: Remaking Loaded Objects381704 -Node: Loaded Object API382338 -Node: Loaded Object Example389100 -Node: Integrating make391347 -Node: Job Slots392098 -Node: POSIX Jobserver395530 -Node: Windows Jobserver397924 -Node: Terminal Output399277 -Node: Features401666 -Node: Missing410835 -Node: Makefile Conventions414560 -Node: Makefile Basics415539 -Node: Utilities in Makefiles418706 -Node: Command Variables421205 -Node: DESTDIR424445 -Node: Directory Variables426612 -Node: Standard Targets441969 -Node: Install Command Categories456075 -Node: Quick Reference460601 -Node: Error Messages473315 -Node: Complex Makefile481211 -Node: GNU Free Documentation License489829 -Node: Concept Index514971 -Node: Name Index586479 +Node: Top1353 +Node: Overview16535 +Node: Preparing17548 +Node: Reading18516 +Node: Bugs19443 +Node: Introduction21272 +Node: Rule Introduction22865 +Node: Simple Makefile24798 +Node: How Make Works28534 +Node: Variables Simplify31183 +Node: make Deduces33389 +Node: Combine By Prerequisite35122 +Node: Cleanup36151 +Node: Makefiles37569 +Node: Makefile Contents38405 +Node: Splitting Lines41578 +Node: Makefile Names43338 +Node: Include44945 +Ref: Include-Footnote-148689 +Node: MAKEFILES Variable48823 +Node: Remaking Makefiles50364 +Node: Overriding Makefiles54589 +Node: Reading Makefiles56617 +Node: Secondary Expansion60079 +Node: Rules67540 +Node: Rule Example70213 +Node: Rule Syntax71066 +Node: Prerequisite Types73661 +Node: Wildcards76528 +Node: Wildcard Examples78247 +Node: Wildcard Pitfall79597 +Node: Wildcard Function81386 +Node: Directory Search83170 +Node: General Search84305 +Node: Selective Search86012 +Node: Search Algorithm89002 +Node: Recipes/Search91520 +Node: Implicit/Search92843 +Node: Libraries/Search93785 +Node: Phony Targets95756 +Node: Force Targets100593 +Node: Empty Targets101630 +Node: Special Targets102932 +Node: Multiple Targets110805 +Node: Multiple Rules112665 +Node: Static Pattern114883 +Node: Static Usage115535 +Node: Static versus Implicit119254 +Node: Double-Colon120994 +Node: Automatic Prerequisites122754 +Node: Recipes127015 +Node: Recipe Syntax128187 +Node: Splitting Recipe Lines130302 +Node: Variables in Recipes133455 +Node: Echoing134781 +Node: Execution136056 +Ref: Execution-Footnote-1137469 +Node: One Shell137614 +Node: Choosing the Shell140929 +Node: Parallel145073 +Node: Parallel Output147742 +Node: Parallel Input152169 +Node: Errors153288 +Node: Interrupts156952 +Node: Recursion158535 +Node: MAKE Variable160632 +Node: Variables/Recursion162875 +Node: Options/Recursion168320 +Node: -w Option174326 +Node: Canned Recipes175321 +Node: Empty Recipes178304 +Node: Using Variables179744 +Node: Reference183172 +Node: Flavors184730 +Node: Advanced190709 +Node: Substitution Refs191214 +Node: Computed Names192767 +Node: Values197315 +Node: Setting198232 +Node: Appending201271 +Node: Override Directive205215 +Node: Multi-Line206842 +Node: Undefine Directive209666 +Node: Environment210755 +Node: Target-specific213007 +Node: Pattern-specific216034 +Node: Suppressing Inheritance217881 +Node: Special Variables219334 +Node: Conditionals225743 +Node: Conditional Example226456 +Node: Conditional Syntax229019 +Node: Testing Flags234779 +Node: Functions235880 +Node: Syntax of Functions237440 +Node: Text Functions239774 +Node: File Name Functions248339 +Node: Conditional Functions253565 +Node: Foreach Function255940 +Node: File Function259153 +Node: Call Function261710 +Node: Value Function264595 +Node: Eval Function266032 +Node: Origin Function268308 +Node: Flavor Function271534 +Node: Make Control Functions272578 +Node: Shell Function274264 +Node: Guile Function276023 +Node: Running276773 +Node: Makefile Arguments278754 +Node: Goals279470 +Node: Instead of Execution284209 +Node: Avoiding Compilation287924 +Node: Overriding289899 +Node: Testing292211 +Node: Options Summary294095 +Node: Implicit Rules307140 +Node: Using Implicit309277 +Node: Catalogue of Rules312796 +Node: Implicit Variables322140 +Node: Chained Rules327213 +Node: Pattern Rules331223 +Node: Pattern Intro332757 +Node: Pattern Examples335339 +Node: Automatic Variables337146 +Node: Pattern Match344498 +Node: Match-Anything Rules347821 +Node: Canceling Rules351700 +Node: Last Resort352414 +Node: Suffix Rules354243 +Node: Implicit Rule Search357968 +Node: Archives361467 +Node: Archive Members362172 +Node: Archive Update363782 +Node: Archive Symbols365693 +Node: Archive Pitfalls366926 +Node: Archive Suffix Rules367648 +Node: Extending make369196 +Node: Guile Integration370341 +Node: Guile Types371569 +Node: Guile Interface373989 +Node: Guile Example375275 +Node: Loading Objects377466 +Node: load Directive378956 +Node: Remaking Loaded Objects381710 +Node: Loaded Object API382344 +Node: Loaded Object Example389106 +Node: Integrating make391353 +Node: Job Slots392104 +Node: POSIX Jobserver395536 +Node: Windows Jobserver397930 +Node: Terminal Output399283 +Node: Features401672 +Node: Missing410841 +Node: Makefile Conventions414566 +Node: Makefile Basics415545 +Node: Utilities in Makefiles418712 +Node: Command Variables421211 +Node: DESTDIR424451 +Node: Directory Variables426618 +Node: Standard Targets441975 +Node: Install Command Categories456081 +Node: Quick Reference460607 +Node: Error Messages473321 +Node: Complex Makefile481217 +Node: GNU Free Documentation License489835 +Node: Concept Index514977 +Node: Name Index586485  End Tag Table diff --git a/doc/make.info-1 b/doc/make.info-1 index 259d408..5d67dc8 100644 --- a/doc/make.info-1 +++ b/doc/make.info-1 @@ -5,7 +5,7 @@ automatically which pieces of a large program need to be recompiled, and issues the commands to recompile them. This is Edition 0.74, last updated 21 May 2016, of 'The GNU Make -Manual', for GNU 'make' version 4.2. +Manual', for GNU 'make' version 4.2.1. Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, @@ -38,7 +38,7 @@ automatically which pieces of a large program need to be recompiled, and issues the commands to recompile them. This is Edition 0.74, last updated 21 May 2016, of 'The GNU Make -Manual', for GNU 'make' version 4.2. +Manual', for GNU 'make' version 4.2.1. Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, diff --git a/doc/make.info-2 b/doc/make.info-2 index 1556b8f..e52cb17 100644 --- a/doc/make.info-2 +++ b/doc/make.info-2 @@ -5,7 +5,7 @@ automatically which pieces of a large program need to be recompiled, and issues the commands to recompile them. This is Edition 0.74, last updated 21 May 2016, of 'The GNU Make -Manual', for GNU 'make' version 4.2. +Manual', for GNU 'make' version 4.2.1. Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, diff --git a/doc/stamp-vti b/doc/stamp-vti index 477e1a2..b119bad 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ @set UPDATED 21 May 2016 @set UPDATED-MONTH May 2016 -@set EDITION 4.2 -@set VERSION 4.2 +@set EDITION 4.2.1 +@set VERSION 4.2.1 diff --git a/doc/version.texi b/doc/version.texi index 477e1a2..b119bad 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ @set UPDATED 21 May 2016 @set UPDATED-MONTH May 2016 -@set EDITION 4.2 -@set VERSION 4.2 +@set EDITION 4.2.1 +@set VERSION 4.2.1 diff --git a/filedef.h b/filedef.h index 507a027..14b4187 100644 --- a/filedef.h +++ b/filedef.h @@ -58,6 +58,8 @@ struct file FILE_TIMESTAMP last_mtime; /* File's modtime, if already known. */ FILE_TIMESTAMP mtime_before_update; /* File's modtime before any updating has been performed. */ + unsigned int considered; /* equal to 'considered' if file has been + considered on current scan of goal chain */ int command_flags; /* Flags OR'd in for cmds; see commands.h. */ enum update_status /* Status of the last attempt to update. */ { @@ -96,8 +98,6 @@ struct file unsigned int ignore_vpath:1;/* Nonzero if we threw out VPATH name. */ unsigned int pat_searched:1;/* Nonzero if we already searched for pattern-specific variables. */ - unsigned int considered:1; /* equal to 'considered' if file has been - considered on current scan of goal chain */ unsigned int no_diag:1; /* True if the file failed to update and no diagnostics has been issued (dontcare). */ }; diff --git a/main.c b/main.c index 576f2e9..fa8045f 100644 --- a/main.c +++ b/main.c @@ -2262,10 +2262,6 @@ main (int argc, char **argv, char **envp) for (i = 0, d = read_files; d != 0; ++i, d = d->next) { - /* Reset the considered flag; we may need to look at the file - again to print an error. */ - d->file->considered = 0; - if (d->file->updated) { /* This makefile was updated. */ @@ -2458,6 +2454,11 @@ main (int argc, char **argv, char **envp) exit (WIFEXITED(r) ? WEXITSTATUS(r) : EXIT_FAILURE); } #else +#ifdef SET_STACK_SIZE + /* Reset limits, if necessary. */ + if (stack_limit.rlim_cur) + setrlimit (RLIMIT_STACK, &stack_limit); +#endif exec_command ((char **)nargv, environ); #endif free (aargv); diff --git a/po/be.gmo b/po/be.gmo index e77d95e..ca376b2 100644 Binary files a/po/be.gmo and b/po/be.gmo differ diff --git a/po/be.po b/po/be.po index 4ca96fe..7f8b309 100644 --- a/po/be.po +++ b/po/be.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: make 3.80\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2016-05-22 09:27-0400\n" +"POT-Creation-Date: 2016-06-10 19:03-0400\n" "PO-Revision-Date: 2003-10-21 11:50+0300\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -136,8 +136,7 @@ msgid "# %s: could not be stat'd.\n" msgstr "" #: dir.c:1085 -#, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "" #: dir.c:1090 @@ -151,8 +150,7 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "" #: dir.c:1122 -#, c-format -msgid "# %s (key %s, mtime %ull): " +msgid "# %s (key %s, mtime %I64u): " msgstr "" #: dir.c:1127 @@ -1104,60 +1102,60 @@ msgstr "Абнаўляюцца make-файлы....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "" -#: main.c:2303 +#: main.c:2299 #, fuzzy, c-format msgid "Included makefile '%s' was not found." msgstr "Makefile \"%s\" ня знойдзен" -#: main.c:2308 +#: main.c:2304 #, fuzzy, c-format msgid "Makefile '%s' was not found" msgstr "Makefile \"%s\" ня знойдзен" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "" -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (часовы файл): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr "" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Няма мэт" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Выкарыстаньне: %s [выбары] [мэта] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1166,7 +1164,7 @@ msgstr "" "\n" "Гэта праграма пабудавана для %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1175,36 +1173,36 @@ msgstr "" "\n" "Гэта праграма падубавана для %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Паведамляйце пра памылкі на .\n" -#: main.c:2869 +#: main.c:2870 #, fuzzy, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "выбар \"-%c\" патрабуе станоўчы цэлы довад" -#: main.c:2933 +#: main.c:2934 #, fuzzy, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "выбар \"-%c\" патрабуе станоўчы цэлы довад" -#: main.c:3331 +#: main.c:3332 #, fuzzy, c-format msgid "%sBuilt for %s\n" msgstr "" "\n" "Гэта праграма пабудавана для %s\n" -#: main.c:3333 +#: main.c:3334 #, fuzzy, c-format msgid "%sBuilt for %s (%s)\n" msgstr "" "\n" "Гэта праграма падубавана для %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Czech \n" "Language: cs\n" @@ -157,9 +157,9 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: nebylo možné nad ním zavolat stat().\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" -msgstr "# %s (klíč %s, čas změny obsahu %d): nebylo možné otevřít.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" +msgstr "# %s (klíč %s, čas změny obsahu %ull): nebylo možné otevřít.\n" #: dir.c:1090 #, c-format @@ -172,9 +172,9 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (zařízení %ld, iuzel %ld): nebylo možné otevřít.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " -msgstr "# %s (klíč %s, čas změny obsahu %d): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " +msgstr "# %s (klíč %s, čas změny obsahu %ull): " #: dir.c:1127 #, c-format @@ -494,14 +494,14 @@ msgid "Function name too long: %s" msgstr "Název funkce je příliÅ¡ dlouhý: %s" #: function.c:2657 -#, fuzzy, c-format +#, c-format msgid "Invalid minimum argument count (%u) for function %s" -msgstr "Neplatný minimální počet argumentů (%d) funkce %s" +msgstr "Neplatný minimální počet argumentů (%u) funkce %s" #: function.c:2660 -#, fuzzy, c-format +#, c-format msgid "Invalid maximum argument count (%u) for function %s" -msgstr "Neplatný maximální počet argumentů (%d) funkce %s" +msgstr "Neplatný maximální počet argumentů (%u) funkce %s" #: getopt.c:659 #, c-format @@ -1175,60 +1175,60 @@ msgstr "Soubory makefile se aktualizují…\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Makefile „%s“ může cyklit, nebude znovu vyroben.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Výroba nového makefilu „%s“ selhala." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Vložený makefile „%s“ nebyl nalezen." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Makefile „%s“ nebyl nalezen" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Nebylo možné se vrátit do původního adresáře." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Znovu se spouÅ¡tí [%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (dočasný soubor): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL obsahuje více než jeden cíl" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Nezadány žádné cíle a žádné makefily nenalezeny" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Žádné cíle" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Aktualizují se cíle…\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "pozor: ZjiÅ¡těn posun hodin. VaÅ¡e sestavení možná nebude úplné." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Použití: %s [PŘEPÍNAČE] [CÍLE]…\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1237,7 +1237,7 @@ msgstr "" "\n" "Tento program byl sestaven pro %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1246,34 +1246,34 @@ msgstr "" "\n" "Tento program byl sestaven pro %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "" "Chyby v programu hlaste anglicky na . Nedostatky\n" "v překladu hlaste česky na .\n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "přepínače „%s%s“ vyžaduje neprázdný řetězcový argument" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "přepínač „-%c“ vyžaduje kladný celočíselný argument" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sSestaveno pro %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%s Sestaveno pro %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Danish \n" @@ -137,8 +137,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: kunne ikke undersøges med stat.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (nøgle %s, mtime %d): kunne ikke Ã¥bnes.\n" #: dir.c:1090 @@ -152,8 +152,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (enhed %ld, inode %ld): kunne ikke Ã¥bnes.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (nøgle %s, mtime %d): " #: dir.c:1127 @@ -1163,60 +1163,60 @@ msgstr "Opdaterer makefiler....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Makefilen '%s' fÃ¥r mÃ¥ske make til at gÃ¥ i ring; genskaber den ikke.\n" -#: main.c:2283 +#: main.c:2279 #, fuzzy, c-format msgid "Failed to remake makefile '%s'." msgstr "Genskabelse af makefilen '%s' mislykkedes." -#: main.c:2303 +#: main.c:2299 #, fuzzy, c-format msgid "Included makefile '%s' was not found." msgstr "Inkluderet makefil '%s' blev ikke fundet." -#: main.c:2308 +#: main.c:2304 #, fuzzy, c-format msgid "Makefile '%s' was not found" msgstr "Makefil '%s' blev ikke fundet." -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Kunne ikke skifte tilbage til det originale katalog." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Udfører igen[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (midlertidig fil): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL indeholder mere end et mÃ¥l" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Ingen angivne mÃ¥l og ingen makefil fundet" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Ingen mÃ¥l" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Opdaterer endemÃ¥l....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "advarsel: Fejl i urets tid opdaget. Din bygning kan være ukomplet." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Brug: %s [tilvalg] [mÃ¥l] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1225,7 +1225,7 @@ msgstr "" "\n" "Dette program er bygget til %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1234,32 +1234,32 @@ msgstr "" "\n" "Dette program er bygget til %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Send fejlmeldinger (pÃ¥ engelsk) til .\n" -#: main.c:2869 +#: main.c:2870 #, fuzzy, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "'-%s%s'-tilvalget kræver et strengargument, der ikke er tomt" -#: main.c:2933 +#: main.c:2934 #, fuzzy, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "'-%c'-tilvalget kræver et positivt heltalligt argument" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sBygget til %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sBygget til %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: German \n" @@ -152,8 +152,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: Status konnte nicht festgestellt werden.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "" "# %s ( Schlüssel (key) %s, letzte Änderung (mtime) %d): \n" "Konnte nicht geöffnet werden.\n" @@ -173,8 +173,8 @@ msgstr "" "Konnte nicht geöffnet werden.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (Schlüssel (key) %s, letzte Änderung (mtime) %d): " #: dir.c:1127 @@ -1223,62 +1223,62 @@ msgstr "" "„make“-Steuerdatei „%s“ könnte eine Schleife enthalten; \n" "es wird nicht neu erzeugt.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Konnte die „make“-Steuerdatei „%s“ nicht neu erstellen." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Die eingebundene „make“-Steuerdatei „%s“ wurde nicht gefunden." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Die „make“-Steuerdatei „%s“ wurde nicht gefunden" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Konnte nicht in das ursprüngliche Verzeichnis wechseln." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Erneute Ausführung[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (temporäre Datei): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL beinhaltet mehr als ein Ziel" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Es wurden keine Ziele angegeben und keine „make“-Steuerdatei gefunden" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Keine Ziele" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Aktualisieren der Ziele...\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "Warnung: Mit der Uhr stimmt etwas nicht. \n" " Der Bauauftrag könnte unvollständig sein." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Aufruf: %s [Optionen] [Ziele] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1287,7 +1287,7 @@ msgstr "" "\n" "Diese Programm wurde für %s gebaut\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1296,32 +1296,32 @@ msgstr "" "\n" "Diese Programm wurde für %s (%s) gebaut\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Fehlermeldungen (auf Englisch) an senden.\n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "Die Option „%s%s“ verlangt eine nicht-leere Zeichenkette als Argument" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "Die Option „-%c“ verlangt eine positive ganze Zahl als Argument" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sGebaut für %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sGebaut für %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Spanish \n" @@ -160,8 +160,8 @@ msgstr "# %s: podría no estar establecido.\n" # Propongo dejarlo en " no se pudo abrir ". sv # Ok. Es consistente con otras traducciones. mm #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (llave %s, mtime %d): no se pudo abrir.\n" # En el K & R aparece inode traducido como nodo-i. ¿qué te parece? sv @@ -181,8 +181,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (dispositivo %ld, nodo-i %ld): no se pudo abrir.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (llave %s, mtime %d): " #: dir.c:1127 @@ -1448,55 +1448,55 @@ msgstr "" "El makefile '%s' podría entrar en bucle; por lo tanto, no se reconstruye.\n" # Lo mismo. sv -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Fallo al reconstruir el makefile '%s'." # Lo mismo. sv -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "No se encontró el makefile incluído '%s'." # Lo mismo. sv -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "No se encontró el makefile '%s'" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "No se pudo regresar al directorio original." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Re-ejecutando[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (archivo temporal)" -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL contien más de un objetivo" # Sugerencia: "No se especificó ningún objetivo ... " sv # Ok. Me gusta. mm -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "No se especificó ningún objetivo y no se encontró ningún makefile" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "No hay objetivos" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Actualizando los objetivos finales....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "atención: Se ha detectado una desviación en el reloj. La construcción podría " @@ -1507,12 +1507,12 @@ msgstr "" # "target" es "objetivo", no "objetivos". Fíjate que lleva puntos # suspensivos, permitiendo así varios objetivos. sv # Ok. mm -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Modo de empleo: %s [opciones] [objetivo] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1521,7 +1521,7 @@ msgstr "" "\n" "Este programa fue construido para %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1530,36 +1530,36 @@ msgstr "" "\n" "Este programa construido para %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Informe sobre los errores a \n" # Me comería el "de" de "requiere de" sv # Ok. mm -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "la opción '%s%s' requiere un argumento no-vacío de tipo cadena" # Me comería el "de" de "requiere de" sv # Ok. mm -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "la opción '-%c' requiere un argumento positivo y entero" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sEste programa fue construido para %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sEste programa fue construido para %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.3\n" +"X-Generator: Poedit 1.8.7\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ar.c:46 @@ -63,7 +63,7 @@ msgid "unable to open library '%s' to lookup member status %d" msgstr "kirjastoa ”%s” ei voi avata jäsenen ”%s” etsimiseksi" #: arscan.c:965 -#, fuzzy, c-format +#, c-format msgid "Member '%s'%s: %ld bytes at %ld (%ld).\n" msgstr "Jäsen ”%s”%s: %ld tavua kohdassa %ld (%ld).\n" @@ -138,8 +138,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: tilaa ei voitu lukea.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (avain %s, maika %d): ei voitu avata.\n" #: dir.c:1090 @@ -153,8 +153,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (laite %ld, i-solmu %ld): ei voitu avata.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (avain %s, maika %d: " #: dir.c:1127 @@ -415,7 +415,7 @@ msgstr "Siivotaan väliaikainen komentotiedosto %s\n" #: function.c:2215 function.c:2240 msgid "file: missing filename" -msgstr "" +msgstr "tiedosto: tiedostonimi puuttuu" #: function.c:2219 function.c:2250 #, c-format @@ -428,18 +428,18 @@ msgid "write: %s: %s" msgstr "write: %s: %s" #: function.c:2230 function.c:2267 -#, fuzzy, c-format +#, c-format msgid "close: %s: %s" -msgstr "open: %s: %s" +msgstr "close: %s: %s" #: function.c:2243 msgid "file: too many arguments" -msgstr "" +msgstr "tiedosto: liian monta argumenttia" #: function.c:2262 -#, fuzzy, c-format +#, c-format msgid "read: %s: %s" -msgstr "write: %s: %s" +msgstr "read: %s: %s" #: function.c:2275 #, fuzzy, c-format @@ -543,7 +543,7 @@ msgstr "%s: valitsin ”-W %s” ei salli argumenttia\n" #: guile.c:58 #, c-format msgid "guile: Expanding '%s'\n" -msgstr "" +msgstr "guile: Lavennetaan ”%s”\n" #: guile.c:74 #, c-format @@ -641,9 +641,9 @@ msgid "" msgstr "" #: job.c:510 -#, fuzzy, c-format +#, c-format msgid "%s[%s: %s] Error %d%s" -msgstr "%s[%s] Virhe %d%s" +msgstr "%s[%s: %s] Virhe %d%s" #: job.c:599 msgid "*** Waiting for unfinished jobs...." @@ -765,14 +765,14 @@ msgid "make reaped child pid %s, still waiting for pid %s\n" msgstr "" #: job.c:2275 -#, fuzzy, c-format +#, c-format msgid "%s: %s: Command not found\n" -msgstr "%s: Komentoa ei löytynyt" +msgstr "%s: %s: Komentoa ei löytynyt\n" #: job.c:2277 -#, fuzzy, c-format +#, c-format msgid "%s[%u]: %s: Command not found\n" -msgstr "%s: Komentoa ei löytynyt" +msgstr "%s[%u]: %s: Komentoa ei löytynyt\n" #: job.c:2337 #, c-format @@ -798,6 +798,8 @@ msgid "" "Batch file contents:\n" "\t@echo off\n" msgstr "" +"Komentojonotiedoston sisältö:\n" +"\t@echo off\n" #: job.c:3219 #, c-format @@ -805,6 +807,8 @@ msgid "" "Batch file contents:%s\n" "\t%s\n" msgstr "" +"Komentojonotiedoston sisältö:%s\n" +"\t%s\n" #: job.c:3327 #, c-format @@ -1070,9 +1074,9 @@ msgid "unknown output-sync type '%s'" msgstr "" #: main.c:861 -#, fuzzy, c-format +#, c-format msgid "%s: Interrupt/Exception caught (code = 0x%lx, addr = 0x%p)\n" -msgstr "%s: Keskeytys/poikkeus siepattu (koodi = 0x%x, osoite = 0x%x)\n" +msgstr "%s: Keskeytys/poikkeus siepattu (koodi = 0x%lx, osoite = 0x%p)\n" #: main.c:868 #, fuzzy, c-format @@ -1090,14 +1094,14 @@ msgstr "" "Poikkeusosoite = %x\n" #: main.c:876 -#, fuzzy, c-format +#, c-format msgid "Access violation: write operation at address 0x%p\n" -msgstr "Suojausvirhe: kirjoitusoperaatio osoitteeseen %x\n" +msgstr "Suojausvirhe: kirjoitusoperaatio osoitteeseen 0x%p\n" #: main.c:877 -#, fuzzy, c-format +#, c-format msgid "Access violation: read operation at address 0x%p\n" -msgstr "Suojausvirhe: lukuoperaatio osoitteeseen %x\n" +msgstr "Suojausvirhe: lukuoperaatio osoitteeseen 0x%p\n" #: main.c:953 main.c:968 #, fuzzy, c-format @@ -1166,62 +1170,62 @@ msgstr "" "Ei uudelleentuoteta makefile-tiedostoa ”%s” – vältetään mahdollinen ikuinen " "silmukka.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Makefile-tiedoston ”%s” uudelleentuottaminen epäonnistui." -#: main.c:2303 -#, fuzzy, c-format +#: main.c:2299 +#, c-format msgid "Included makefile '%s' was not found." msgstr "Sisällytettyä makefile-tiedostoa ”%s” ei löytynyt." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Makefile-tiedostoa ”%s” ei löytynyt" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Ei voitu siirtyä takaisin alkuperäiseen hakemistoon." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Uudelleenkäynnistetään[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (väliaikaistiedosto): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL sisältää yli yhden kohteen" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Kohteita ei ole annettu, eikä makefileä löytynyt" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Ei kohteita" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "varoitus: Havaittu väärä kellonaika. Käännösversio saattaa olla " "epätäydellinen." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Käyttö: %s [valitsimet] [kohde] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1230,7 +1234,7 @@ msgstr "" "\n" "Tämä ohjelma on käännetty järjestelmälle %s.\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1239,37 +1243,33 @@ msgstr "" "\n" "Tämä ohjelma on käännetty järjestelmälle %s (%s).\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "" "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen .\n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "valitsin ”%s%s” vaatii ei-tyhjän merkkijonoargumentin" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "valitsin ”-%c” vaatii positiivisen kokonaislukuargumentin" -#: main.c:3331 -#, fuzzy, c-format +#: main.c:3332 +#, c-format msgid "%sBuilt for %s\n" -msgstr "" -"\n" -"%sTämä ohjelma on käännetty järjestelmälle %s.\n" +msgstr "%sTämä ohjelma on käännetty järjestelmälle %s\n" -#: main.c:3333 -#, fuzzy, c-format +#: main.c:3334 +#, c-format msgid "%sBuilt for %s (%s)\n" -msgstr "" -"\n" -"%sTämä ohjelma on käännetty järjestelmälle %s (%s).\n" +msgstr "%sTämä ohjelma on käännetty järjestelmälle %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: French \n" @@ -148,8 +148,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: « stat » impossible.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (clé %s, mtime %d) : ouverture impossible.\n" #: dir.c:1090 @@ -163,8 +163,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (périphérique %ld, inode %ld) : ouverture impossible.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (périphérique %s, mtime %d) : " #: dir.c:1127 @@ -1200,62 +1200,62 @@ msgstr "Mise msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Le makefile « %s » pourrait boucler ; on ne recommence pas.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Échec de refabrication du makefile « %s »." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Le makefile inclus « %s » est introuvable." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Le makefile « %s » est introuvable" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Impossible de revenir dans le répertoire d'origine." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Réexécution[%u] :" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (fichier temporaire) :" -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL contient plus d'une cible" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Pas de cible spécifiée et aucun makefile n'a été trouvé" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Pas de cible" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Mise à jour des objectifs cibles....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "AVERTISSEMENT : décalage d'horloge détecté. La construction peut être " "incomplète." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Utilisation : %s [options] [cible] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1264,7 +1264,7 @@ msgstr "" "\n" "Ce programme est construit pour %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1273,32 +1273,32 @@ msgstr "" "\n" "Ce programme est construit pour %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Signaler les anomalies à .\n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "l'option « %s%s » a besoin d'une chaîne non vide comme argument" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "l'option « -%c » prend en argument un entier positif" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sConstruit pour %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sConstruit pour %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Irish \n" @@ -140,8 +140,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: níorbh fhéidir é a stat.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (eochair %s, am-m %d): ní féidir é a oscailt.\n" #: dir.c:1090 @@ -155,8 +155,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (gléas %ld, i-nód %ld): níorbh fhéidir é a oscailt.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (eochair %s, am-m %d): " #: dir.c:1127 @@ -1182,60 +1182,60 @@ msgstr "Makefileanna msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "is féidir go lúbfar an Makefile `%s'; ní athdhéanfar é.\n" -#: main.c:2283 +#: main.c:2279 #, fuzzy, c-format msgid "Failed to remake makefile '%s'." msgstr "Theip ar athdhéanamh an makefile `%s'." -#: main.c:2303 +#: main.c:2299 #, fuzzy, c-format msgid "Included makefile '%s' was not found." msgstr "Níor aimsíodh an makefile `%s' san áireamh." -#: main.c:2308 +#: main.c:2304 #, fuzzy, c-format msgid "Makefile '%s' was not found" msgstr "Níor aimsíodh an makefile `%s'" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Níorbh fhéidir an chomhadlann oibre a athrú ar ais." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Á rith arís[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (comhad sealadach): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr "tá níos mó ná aon sprioc amháin i .DEFAULT_GOAL" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Níor sonraíodh aon sprioc agus níor aimsíodh aon makefile" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Níl aon sprioc ann" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Cinn sprice á nuashonrú....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "rabhadh: Clog ar sceabha. Is féidir go bhfuil an tógáil neamhiomlán." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Úsáid: %s [roghanna] [sprioc] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1244,7 +1244,7 @@ msgstr "" "\n" "Tógadh an clár seo le haghaidh %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1253,36 +1253,36 @@ msgstr "" "\n" "Tógadh an clár seo le haghaidh %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Seol tuairiscí fabhtanna chuig \n" -#: main.c:2869 +#: main.c:2870 #, fuzzy, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "caithfidh tú teaghrán nach folamh a thabhairt mar argóint le `-%c'" -#: main.c:2933 +#: main.c:2934 #, fuzzy, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "caithfidh tú slánuimhir dheimhneach a thabhairt mar argóint le `-%c'" -#: main.c:3331 +#: main.c:3332 #, fuzzy, c-format msgid "%sBuilt for %s\n" msgstr "" "\n" "%sTógadh an clár seo le haghaidh %s\n" -#: main.c:3333 +#: main.c:3334 #, fuzzy, c-format msgid "%sBuilt for %s (%s)\n" msgstr "" "\n" "%sTógadh an clár seo le haghaidh %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Galician \n" @@ -144,8 +144,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: non foi posíbel facer a operación de stat.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (clave %s, mtime %d): non foi posíbel abrir.\n" #: dir.c:1090 @@ -159,8 +159,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (dispositivo %ld, inodo %ld): non foi posíbel abrir.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (clave %s, mtime %d): " #: dir.c:1127 @@ -1172,62 +1172,62 @@ msgstr "Actualizando os ficheiros de make....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "O ficheiro de make «%s» podería causar un bucle; non se refai.\n" -#: main.c:2283 +#: main.c:2279 #, fuzzy, c-format msgid "Failed to remake makefile '%s'." msgstr "Produciuse un erro ao refacer o ficheiro de make «%s»." -#: main.c:2303 +#: main.c:2299 #, fuzzy, c-format msgid "Included makefile '%s' was not found." msgstr "Non se atopou o ficheiro de make incluído «%s»." -#: main.c:2308 +#: main.c:2304 #, fuzzy, c-format msgid "Makefile '%s' was not found" msgstr "Non se atopou o ficheiro de make «%s»" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Non foi posíbel volver ao directorio orixinal." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Re-executando[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (ficheiro temporal)" -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr "" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Non se especificaron obxectivos e non se atopou un ficheiro de make" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Non hai obxectivos" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Actualizando os obxectivos meta....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "aviso: Detectáronse inconsistencias de reloxo. A operación pode quedar " "incompleta." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Uso: %s [opcións] [obxectivo] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1236,7 +1236,7 @@ msgstr "" "\n" "Este programa compilou para %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1245,34 +1245,34 @@ msgstr "" "\n" "Este programa compilou para %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "" "Envíe informes de fallo no programa a .\n" "Envíe informes de fallo na tradución a .\n" -#: main.c:2869 +#: main.c:2870 #, fuzzy, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "a opción «%s%s» require un argumento de cadea non baleira" -#: main.c:2933 +#: main.c:2934 #, fuzzy, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "a opción «-%c» require un argumento integral positivo" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sCompilado para %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sCompilado para %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Hebrew \n" @@ -139,8 +139,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: could not be stat'd.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (key %s, mtime %d): could not be opened.\n" #: dir.c:1090 @@ -154,8 +154,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (device %ld, inode %ld): could not be opened.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (key %s, mtime %d): " #: dir.c:1127 @@ -1140,101 +1140,101 @@ msgstr "...makefile msgid "Makefile '%s' might loop; not remaking it.\n" msgstr ".ùãçî åøöééìî òðîð ;úéôåñðéà äàìåì øåöéì ìåìò `%s' Makefile\n" -#: main.c:2283 +#: main.c:2279 #, fuzzy, c-format msgid "Failed to remake makefile '%s'." msgstr ".`%s' makefile ìù ùãçî-äøéöéá äì÷ú" -#: main.c:2303 +#: main.c:2299 #, fuzzy, c-format msgid "Included makefile '%s' was not found." msgstr ".àöîð àì `%s' ììëåî makefile" -#: main.c:2308 +#: main.c:2304 #, fuzzy, c-format msgid "Makefile '%s' was not found" msgstr "àöîð àì `%s' Makefile" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr ".úéøå÷îä äé÷éúì øåæçì ïúéð àì" -#: main.c:2384 +#: main.c:2380 #, fuzzy, c-format msgid "Re-executing[%u]:" msgstr "Re-executing:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (temporary file): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr "" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "makefile éöá÷ åàöîð àìå úåøèî ïåéö ïéà" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "úåøèî ïéà" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "...ãòé úåøèî ïëãòî\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr ".äîìù àì úåéäì äìåìò äéðáä .ïåòù úùéìâ äúìâúð :úåøéäæ" -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "%s [íéðééôàî] [äøèî] ... :ùåîéù ïôåà\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" "This program built for %s\n" msgstr "" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" "This program built for %s (%s)\n" msgstr "" -#: main.c:2783 +#: main.c:2784 #, fuzzy, c-format msgid "Report bugs to \n" msgstr "" "\n" ".-ì äì÷ú éçååéã çåìùì àð\n" -#: main.c:2869 +#: main.c:2870 #, fuzzy, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "éáåéçå íìù èðîåâøà áééçî `-%c' ïééôàî" -#: main.c:2933 +#: main.c:2934 #, fuzzy, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "éáåéçå íìù èðîåâøà áééçî `-%c' ïééôàî" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later %s) ãéúòá åðéä ïåøçà éåðéù ïîæ :äøäæà ***" -#: remake.c:1443 +#: remake.c:1444 #, fuzzy, c-format msgid "Warning: File '%s' has modification time %s s in the future" msgstr "*** `%s' õáå÷ øåáò (%s > %s) ãéúòá åðéä ïåøçà éåðéù ïîæ :äøäæà ***" -#: remake.c:1646 +#: remake.c:1647 #, fuzzy, c-format msgid ".LIBPATTERNS element '%s' is not a pattern" msgstr "úéðáú åðéà .LIBPATTERNS ìù `%s' èðîìà" diff --git a/po/hr.gmo b/po/hr.gmo index af2c519..a761ba2 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index 5403a16..68a082d 100644 --- a/po/hr.po +++ b/po/hr.po @@ -25,10 +25,10 @@ # Božidar Putanec , 2016. msgid "" msgstr "" -"Project-Id-Version: make 4.1.90\n" +"Project-Id-Version: make 4.2\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2016-05-22 09:27-0400\n" -"PO-Revision-Date: 2016-05-10 12:55-0700\n" +"POT-Creation-Date: 2016-06-10 19:03-0400\n" +"PO-Revision-Date: 2016-05-22 22:37-0700\n" "Last-Translator: Božidar Putanec \n" "Language-Team: Croatian \n" "Language: hr\n" @@ -37,10 +37,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.8.7.1\n" -"X-Poedit-SourceCharset: UTF-8\n" -"X-Poedit-Basepath: ../../Downloads/make-4.1.90\n" -"X-Poedit-Bookmarks: 45,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" +"X-Generator: Lokalize 2.0\n" #: ar.c:46 #, c-format @@ -165,10 +162,11 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: nemoguće ga je ‘stat’ (očitati mu status).\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "" -"# %s (ključ %s, vrijeme zadnje izmjene (mtime) %d): nije moguće otvoriti.\n" +"# %s (ključ %s, mtime (vrijeme zadnje izmjene) %ull): nije se mogao " +"otvoriti.\n" # inode > index in a table of contents or an inode in a Unix-like file system > ičvor #: dir.c:1090 @@ -183,9 +181,9 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (uređaj %ld, inode %ld): nije moguće otvoriti.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " -msgstr "# %s (ključ %s, vrijeme zadnje izmjene (mtime) %d): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " +msgstr "# %s (ključ %s, mtime (vrijeme zadnje izmjene) %ull): " #: dir.c:1127 #, c-format @@ -504,14 +502,14 @@ msgid "Function name too long: %s" msgstr "Naziv funkcije je predugačak: %s" #: function.c:2657 -#, fuzzy, c-format +#, c-format msgid "Invalid minimum argument count (%u) for function %s" -msgstr "Neispravan minimalni broj argumenata (%d) za funkciju %s" +msgstr "Neispravan minimalni broj argumenata (%u) za funkciju %s" #: function.c:2660 -#, fuzzy, c-format +#, c-format msgid "Invalid maximum argument count (%u) for function %s" -msgstr "Neispravan maksimalni broj argumenata (%d) za funkciju %s" +msgstr "Neispravan maksimalni broj argumenata (%u) za funkciju %s" #: getopt.c:659 #, c-format @@ -1219,62 +1217,62 @@ msgstr "Ažuriram ‘makefiles’....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "‘Makefile’ ‘%s’ bi mogao ući u petlju; neće se prerađivati.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Neuspjeh prerade datoteke ‘makefile’ ‘%s’." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Uključena datoteka ‘makefile’ ‘%s’ nije pronađena." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Datoteka ‘makefile’ ‘%s’ nije pronađena" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Ne mogu se vratiti u početni direktorij." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Ponovno izvrÅ¡avanje[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (privremena datoteka): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL sadrži viÅ¡e od jednog cilja" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Nijedan cilj nije naveden i nijedna ‘makefile’ datoteka nije pronađena" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Nema ciljeva" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Ciljevi (targets) za željeni rezultat (goal) se ažuriraju ....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "upozorenje: Otkriven je problem sa satom. Izrada možda nije kompletno " "dovrÅ¡ena." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Uporaba: %s [opcije] [cilj] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1283,7 +1281,7 @@ msgstr "" "\n" "Ovaj program je napravljen za %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1292,34 +1290,34 @@ msgstr "" "\n" "Ovaj program je napravljen za %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "" "GreÅ¡ke (bugs) na engleskom javite na \n" "PogreÅ¡ke u prijevodu i vaÅ¡e prijedloge javite na \n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "opcija ‘%s%s’ zahtijeva kao argument niz koji nije prazan" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "opcija ‘-%c’ zahtijeva za argument pozitivan prirodni broj" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sNapravljen za %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sNapravljen za %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "\n" -#: main.c:3365 +#: main.c:3366 #, c-format msgid "" "\n" @@ -1343,7 +1341,7 @@ msgstr "" "\n" "# ‘Make’ baza podataka, ispisana na %s" -#: main.c:3375 +#: main.c:3376 #, c-format msgid "" "\n" @@ -1644,62 +1642,62 @@ msgstr "" msgid "warning: NUL character seen; rest of line ignored" msgstr "upozorenje: pročitan je NUL znak; ostatak retka se zanemaruje" -#: remake.c:225 +#: remake.c:226 #, c-format msgid "Nothing to be done for '%s'." msgstr "NiÅ¡ta za napraviti za ‘%s’." -#: remake.c:226 +#: remake.c:227 #, c-format msgid "'%s' is up to date." msgstr "‘%s’ je ažuriran." -#: remake.c:322 +#: remake.c:323 #, c-format msgid "Pruning file '%s'.\n" msgstr "Pročišćavanje datoteke ‘%s’.\n" -#: remake.c:405 +#: remake.c:406 #, c-format msgid "%sNo rule to make target '%s', needed by '%s'%s" msgstr "%sNema pravila za izradu cilja ‘%s’, potrebnog za ‘%s’%s" -#: remake.c:415 +#: remake.c:416 #, c-format msgid "%sNo rule to make target '%s'%s" msgstr "%sNema pravila za izradu cilja ‘%s’%s" -#: remake.c:441 +#: remake.c:442 #, c-format msgid "Considering target file '%s'.\n" msgstr "Razmatranje ciljne datoteke ‘%s’.\n" -#: remake.c:448 +#: remake.c:449 #, c-format msgid "Recently tried and failed to update file '%s'.\n" msgstr "Nedavni pokuÅ¡aj ažuriranja datoteke ‘%s’ nije uspio.\n" -#: remake.c:460 +#: remake.c:461 #, c-format msgid "File '%s' was considered already.\n" msgstr "Datoteka ‘%s’ je već bila razmatrana.\n" -#: remake.c:470 +#: remake.c:471 #, c-format msgid "Still updating file '%s'.\n" msgstr "Datoteka ‘%s’ se joÅ¡ uvijek ažurira.\n" -#: remake.c:473 +#: remake.c:474 #, c-format msgid "Finished updating file '%s'.\n" msgstr "Ažuriranje datoteke ‘%s’ je zavrÅ¡eno.\n" -#: remake.c:502 +#: remake.c:503 #, c-format msgid "File '%s' does not exist.\n" msgstr "Datoteka ‘%s’ ne postoji.\n" -#: remake.c:510 +#: remake.c:511 #, c-format msgid "" "*** Warning: .LOW_RESOLUTION_TIME file '%s' has a high resolution time stamp" @@ -1707,49 +1705,49 @@ msgstr "" "*** Upozorenje: .LOW_RESOLUTION_TIME datoteka ‘%s’ ima vremensku oznaku " "visoke točnosti" -#: remake.c:523 remake.c:1055 +#: remake.c:524 remake.c:1056 #, c-format msgid "Found an implicit rule for '%s'.\n" msgstr "Pronađeno je implicitno pravilo za ‘%s’.\n" -#: remake.c:525 remake.c:1057 +#: remake.c:526 remake.c:1058 #, c-format msgid "No implicit rule found for '%s'.\n" msgstr "Nijedno implicitno pravilo nije pronađeno za ‘%s’.\n" -#: remake.c:531 +#: remake.c:532 #, c-format msgid "Using default recipe for '%s'.\n" msgstr "Rabi se standardni recept za ‘%s’.\n" -#: remake.c:565 remake.c:1104 +#: remake.c:566 remake.c:1105 #, c-format msgid "Circular %s <- %s dependency dropped." msgstr "Kružna ovisnost %s <- %s je odbačena." -#: remake.c:690 +#: remake.c:691 #, c-format msgid "Finished prerequisites of target file '%s'.\n" msgstr "ZavrÅ¡eni su preduvjeti za ciljnu datoteku ‘%s’.\n" -#: remake.c:696 +#: remake.c:697 #, c-format msgid "The prerequisites of '%s' are being made.\n" msgstr "Preduvjeti za ‘%s’ se izrađuju.\n" -#: remake.c:710 +#: remake.c:711 #, c-format msgid "Giving up on target file '%s'.\n" msgstr "Odustajem od ciljne datoteke ‘%s’.\n" -#: remake.c:715 +#: remake.c:716 #, c-format msgid "Target '%s' not remade because of errors." msgstr "Cilj ‘%s’ nije prerađen (ponovno izrađen) zbog greÅ¡aka." # Nisam siguran da sam ovo ispravno shvatio. # bp: impose a specific ordering on the rules to be invoked without forcing the target to be updated if one of those rules is executed -#: remake.c:767 +#: remake.c:768 #, c-format msgid "Prerequisite '%s' is order-only for target '%s'.\n" msgstr "" @@ -1761,97 +1759,97 @@ msgstr "" " (remake) recepte, kad god se izmjeni vremenska oznaka na bilo kojem " "objektu).\n" -#: remake.c:772 +#: remake.c:773 #, c-format msgid "Prerequisite '%s' of target '%s' does not exist.\n" msgstr "Preduvjet ‘%s’ za cilj ‘%s’ ne postoji.\n" -#: remake.c:777 +#: remake.c:778 #, c-format msgid "Prerequisite '%s' is newer than target '%s'.\n" msgstr "Preduvjet ‘%s’ je noviji (mlađi) nego od od njega ovisan cilj ‘%s’.\n" -#: remake.c:780 +#: remake.c:781 #, c-format msgid "Prerequisite '%s' is older than target '%s'.\n" msgstr "Preduvjet ‘%s’ je stariji nego od od njega ovisan cilj ‘%s’.\n" -#: remake.c:798 +#: remake.c:799 #, c-format msgid "Target '%s' is double-colon and has no prerequisites.\n" msgstr "Cilj ‘%s’ je s dvotočkom i nema preduvjeta.\n" -#: remake.c:805 +#: remake.c:806 #, c-format msgid "No recipe for '%s' and no prerequisites actually changed.\n" msgstr "" "Nema recepta za ‘%s’ i nijedan od preduvjeta zapravo nije promijenjen.\n" -#: remake.c:810 +#: remake.c:811 #, c-format msgid "Making '%s' due to always-make flag.\n" msgstr "‘%s’ se zbog zastavice ‘always-make’ ponovno izrađuje.\n" -#: remake.c:818 +#: remake.c:819 #, c-format msgid "No need to remake target '%s'" msgstr "Nema potrebe preraditi cilj ‘%s’" -#: remake.c:820 +#: remake.c:821 #, c-format msgid "; using VPATH name '%s'" msgstr "; rabi se naziv ‘%s’ za VPATH" -#: remake.c:840 +#: remake.c:841 #, c-format msgid "Must remake target '%s'.\n" msgstr "Cilj ‘%s’ se mora preraditi.\n" -#: remake.c:846 +#: remake.c:847 #, c-format msgid " Ignoring VPATH name '%s'.\n" msgstr " Zanemaruje se naziv ‘%s’ za VPATH.\n" -#: remake.c:855 +#: remake.c:856 #, c-format msgid "Recipe of '%s' is being run.\n" msgstr "Recept za ‘%s’ se upravo primjenjuje.\n" -#: remake.c:862 +#: remake.c:863 #, c-format msgid "Failed to remake target file '%s'.\n" msgstr "Prerada (remake) ciljne datoteke ‘%s’ nije uspjela.\n" -#: remake.c:865 +#: remake.c:866 #, c-format msgid "Successfully remade target file '%s'.\n" msgstr "Ciljna datoteka ‘%s’ je uspjeÅ¡no prerađena .\n" -#: remake.c:868 +#: remake.c:869 #, c-format msgid "Target file '%s' needs to be remade under -q.\n" msgstr "" "Ciljnu datoteku ‘%s’ treba ponovno preraditi (remake) s opcijom ‘-q’.\n" -#: remake.c:1063 +#: remake.c:1064 #, c-format msgid "Using default commands for '%s'.\n" msgstr "Rabe se standardne naredbe za ‘%s’.\n" -#: remake.c:1429 +#: remake.c:1430 #, c-format msgid "Warning: File '%s' has modification time in the future" msgstr "" "Upozorenje: Vremenska oznaka modifikacije datoteke ‘%s’ je u budućnosti" -#: remake.c:1443 +#: remake.c:1444 #, c-format msgid "Warning: File '%s' has modification time %s s in the future" msgstr "" "Upozorenje: Vremenska oznaka modifikacije datoteke ‘%s’ je za %s s u " "budućnosti" -#: remake.c:1646 +#: remake.c:1647 #, c-format msgid ".LIBPATTERNS element '%s' is not a pattern" msgstr ".LIBPATTERNS član ‘%s’ nije uzorak" diff --git a/po/id.gmo b/po/id.gmo index fabe186..eb153a1 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index debe65b..f8c2cb1 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU make 4.0\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2016-05-22 09:27-0400\n" +"POT-Creation-Date: 2016-06-10 19:03-0400\n" "PO-Revision-Date: 2014-07-30 18:30+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -135,8 +135,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: tidak dapat melihat statistik.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (kunci %s, mtime %d): tidak dapat dibuka.\n" #: dir.c:1090 @@ -150,8 +150,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (perangkat %ld, inode %ld): tidak dapat dibuka.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (kunci %s, mtime %d): " #: dir.c:1127 @@ -1157,61 +1157,61 @@ msgstr "Memperbarui makefiles....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Makefile '%s' mungkin berupa loop; tidak membuat lagi.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Gagal membuat lagi makefile '%s'." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Makefile yang dimasukan '%s' tidak ditemukan." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Makefile '%s' tidak ditemukan" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Tidak dapat kembali ke direktori asal." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Menjalankan kembali[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (berkas sementara): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL berisi lebih dari satu target" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Target tidak dispesifikasikan dan tidak ditemukan makefile" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Tidak ada targets" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Memperbarui tujuan target....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "Peringatan: Clock skew terdeteksi. Pembuatan anda mungkin tidak sempurna" -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Penggunaan: %s [opsi] [target] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1220,7 +1220,7 @@ msgstr "" "\n" "Program ini dibuat untuk %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1229,32 +1229,32 @@ msgstr "" "\n" "Program ini dibuat untuk %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Laporkan bugs kepada \n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "opsi '%s%s' membutuhkan sebuah argument string yang tidak kosong" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "opsi '-%c' membutuhkan sebuah argument `string' yang tidak kosong" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sAplikasi ini dibuat untuk %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sAplikasi ini dibuat untuk %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Italian \n" @@ -140,8 +140,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: impossibile eseguire stat.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (key %s, mtime %d) non può essere aperto.\n" #: dir.c:1090 @@ -155,8 +155,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (device %ld, inode %ld) non può essere aperto.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (key %s, mtime %d): " #: dir.c:1127 @@ -1187,62 +1187,62 @@ msgstr "" "Il makefile \"%s\" potrebbe entrare in un ciclo all'infinito; make non " "rieseguito.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Riesecuzione del makefile \"%s\" non riuscita." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Il makefile \"%s\" incluso non è stato trovato." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Il makefile \"%s\" non è stato trovato" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Impossibile ritornare alla directory originale." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Riesecuzione[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (file temporaneo): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL contiene più di un obiettivo" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Nessun obiettivo specificato e nessun makefile trovato" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Nessun obiettivo" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Aggiornamento degli obiettivi....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "attenzione: rilevato un tempo alterato. La creazione potrebbe essere " "incompleta." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Uso: %s [opzioni] [obiettivo] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1251,7 +1251,7 @@ msgstr "" "\n" "Questo programma è stato compilato per %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1260,32 +1260,32 @@ msgstr "" "\n" "Questo programma è stato compilato per %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Segnalare i bug a \n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "l'opzione \"%s%s\" richiede un argomento stringa non vuoto" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "l'opzione \"-%c\" richiede un argomento intero positivo" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sCompilato per %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sCompilato per %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later , 2001. @@ -8,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: make 4.1.90\n" +"Project-Id-Version: make 4.2\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2016-05-22 09:27-0400\n" -"PO-Revision-Date: 2016-04-25 18:18+0900\n" +"POT-Creation-Date: 2016-06-10 19:03-0400\n" +"PO-Revision-Date: 2016-05-24 22:45+0900\n" "Last-Translator: Takeshi Hamasaki \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -140,9 +140,9 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: 状態を調べられませんでした.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" -msgstr "# %s (key %s, mtime %d): 開けませんでした.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" +msgstr "# %s (key %s, mtime %ull): 開けませんでした.\n" #: dir.c:1090 #, c-format @@ -155,9 +155,9 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (device %ld, inode %ld): 開けませんでした.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " -msgstr "# %s (key %s, mtime %d): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " +msgstr "# %s (key %s, mtime %ull): " #: dir.c:1127 #, c-format @@ -471,14 +471,14 @@ msgid "Function name too long: %s" msgstr "関数名が長すぎます: %s" #: function.c:2657 -#, fuzzy, c-format +#, c-format msgid "Invalid minimum argument count (%u) for function %s" -msgstr "引数個数指定(最小値;%d)が無効です: 関数 %s" +msgstr "引数個数指定(最小値;%u)が無効です: 関数 %s" #: function.c:2660 -#, fuzzy, c-format +#, c-format msgid "Invalid maximum argument count (%u) for function %s" -msgstr "引数個数指定(最大値;%d)が無効です: 関数 %s" +msgstr "引数個数指定(最大値;%u)が無効です: 関数 %s" #: getopt.c:659 #, c-format @@ -1152,60 +1152,60 @@ msgstr "makefile の更新中....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "makefile '%s' 自己再帰のおそれあり ― 再make しません.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "makefile '%s' の再makeに失敗しました." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "インクルードされる makefile '%s' が見つかりませんでした." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "makefile '%s' が見つかりませんでした" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "元のディレクトリに戻れませんでした." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "再実行します[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (一時ファイル): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL が二つ以上のターゲットを含んでいます" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "ターゲットが指定されておらず, makefile も見つかりません" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "ターゲットがありません" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "最終ターゲットを更新中....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "警告: 時刻のずれを検出. 不完全なビルド結果になるかもしれません." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "使い方: %s [オプション] [ターゲット] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1214,7 +1214,7 @@ msgstr "" "\n" "このプログラムは %s 用にビルドされました\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1223,32 +1223,32 @@ msgstr "" "\n" "このプログラムは %s (%s) 用にビルドされました\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "バグレポートは まで.\n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "'%s%s' オプションは空でない文字列引数を要求します" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "'-%c' オプションは正の整数引数を要求します" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sこのプログラムは %s 用にビルドされました\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sこのプログラムは %s (%s) 用にビルドされました\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Korean \n" "Language: ko\n" @@ -146,9 +146,9 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: stat을 할 수 없었습니다.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" -msgstr "# %s (키 %s, 변경시각 %d): 열 수 없습니다.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" +msgstr "# %s (키 %s, 변경시각 %ull): 열 수 없습니다.\n" #: dir.c:1090 #, c-format @@ -161,9 +161,9 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (장치 %ld, 아이노드 %ld): 열 수 없습니다.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " -msgstr "# %s (키 %s, 변경시각 %d): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " +msgstr "# %s (키 %s, 변경시각 %ull): " #: dir.c:1127 #, c-format @@ -480,14 +480,14 @@ msgid "Function name too long: %s" msgstr "함수 이름이 너무 깁니다: %s" #: function.c:2657 -#, fuzzy, c-format +#, c-format msgid "Invalid minimum argument count (%u) for function %s" -msgstr "함수 `%2$s'에 최소 인자 갯수(%1$d)가 잘못되었습니다" +msgstr "함수 `%2$s'에 최소 인자 갯수(%1$u)가 잘못되었습니다" #: function.c:2660 -#, fuzzy, c-format +#, c-format msgid "Invalid maximum argument count (%u) for function %s" -msgstr "함수 `%2$s'에 최대 인자 갯수(%1$d)가 잘못되었습니다" +msgstr "함수 `%2$s'에 최대 인자 갯수(%1$u)가 잘못되었습니다" #: getopt.c:659 #, c-format @@ -1162,61 +1162,61 @@ msgstr "메이크파일을 업데이트하고 있습니다....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "메이크파일 '%s'은(는) 반복할 수 있으므로, 다시 만들지 않습니다.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "'%s' 메이크파일을 다시 만드는데 실패." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "포함된 메이크파일 '%s'을(를) 찾지 못했습니다." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "메이크파일 '%s'을(를) 찾지 못했습니다" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "원래 디렉터리로 돌아갈 수 없습니다." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "재실행[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (임시 파일): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL 안에 타겟이 여러 개 들어 있습니다" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "타겟이 지정되지 않았고 메이크파일이 없습니다" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "타겟 없음" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "최종 타겟을 갱신합니다....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "경고: 시계가 잘못되었음이 발견되었습니다. 빌드가 불완전할 수 있습니다." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "사용법: %s [옵션] [타겟] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1225,7 +1225,7 @@ msgstr "" "\n" "이 프로그램은 %s에서 사용하도록 빌드되었습니다\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1234,32 +1234,32 @@ msgstr "" "\n" "이 프로그램은 %s(%s)에서 사용하도록 빌드되었습니다\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "문제점을 로 알려 주십시오.\n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "'%s%s' 옵션은 비어 있지 않은 문자열 인수가 필요합니다" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "'-%c' 옵션은 0보다 큰 정수 인수가 필요합니다" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%s%s 빌드\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%s%s(%s) 빌드\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Lithuanian \n" @@ -139,8 +139,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: negalėjo bÅ«ti stat'intas.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (key %s, mtime %d): nepavyko atverti.\n" #: dir.c:1090 @@ -154,8 +154,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (key %s, mtime %d): nepavyko atverti.\n" #: dir.c:1127 @@ -1109,60 +1109,60 @@ msgstr "Atnaujinami „make“ failai....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "" -#: main.c:2283 +#: main.c:2279 #, fuzzy, c-format msgid "Failed to remake makefile '%s'." msgstr "Nereikia atnaujinti taikinio „%s“" -#: main.c:2303 +#: main.c:2299 #, fuzzy, c-format msgid "Included makefile '%s' was not found." msgstr "„Make“ failas „%s“ nerastas" -#: main.c:2308 +#: main.c:2304 #, fuzzy, c-format msgid "Makefile '%s' was not found" msgstr "„Make“ failas „%s“ nerastas" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Nepavyko grįžti į pirminį aplanką." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "" -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr "" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Nenurodyta tikslų ir nerasta „make“ failų" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Nėra tikslų" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Atnaujinami tikslai...\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Naudojimas: %s [argumentai] [tikslas] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1171,7 +1171,7 @@ msgstr "" "\n" "Å i programa sukompiliuota %s sistemai\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1180,36 +1180,36 @@ msgstr "" "\n" "Å i programa sukompiliuota %s (%s) sistemai\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "PraneÅ¡kite apie klaidas adresu \n" -#: main.c:2869 +#: main.c:2870 #, fuzzy, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "parametrui „-%c“ reikia netuščio argumento" -#: main.c:2933 +#: main.c:2934 #, fuzzy, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "parametrui „-%c“ reikia teigiamo sveiko argumento" -#: main.c:3331 +#: main.c:3332 #, fuzzy, c-format msgid "%sBuilt for %s\n" msgstr "" "\n" "%sÅ i programa sukompiliuota %s sistemai\n" -#: main.c:3333 +#: main.c:3334 #, fuzzy, c-format msgid "%sBuilt for %s (%s)\n" msgstr "" "\n" "%sÅ i programa sukompiliuota %s (%s) sistemai\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: LANGUAGE \n" @@ -134,8 +134,7 @@ msgid "# %s: could not be stat'd.\n" msgstr "" #: dir.c:1085 -#, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "" #: dir.c:1090 @@ -149,8 +148,7 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "" #: dir.c:1122 -#, c-format -msgid "# %s (key %s, mtime %ull): " +msgid "# %s (key %s, mtime %I64u): " msgstr "" #: dir.c:1127 @@ -1087,99 +1085,99 @@ msgstr "" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "" -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "" -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "" -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "" -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr "" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" "This program built for %s\n" msgstr "" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" "This program built for %s (%s)\n" msgstr "" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later , 2005, 2006, 2007, 2010, 2013, 2014, 2016. msgid "" msgstr "" -"Project-Id-Version: make-4.1.90\n" +"Project-Id-Version: make-4.2\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2016-05-22 09:27-0400\n" -"PO-Revision-Date: 2016-04-26 11:11+0200\n" +"POT-Creation-Date: 2016-06-10 19:03-0400\n" +"PO-Revision-Date: 2016-05-27 10:23+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -142,9 +142,9 @@ msgid "# %s: could not be stat'd.\n" msgstr "# kan status van %s niet opvragen.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" -msgstr "# %s (sleutel %s, wijzigingstijd %d): kan niet worden geopend.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" +msgstr "# %s (sleutel %s, wijzigingstijd %ull): kan niet worden geopend.\n" #: dir.c:1090 #, c-format @@ -157,9 +157,9 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (apparaat %ld, inode %ld): kan niet worden geopend.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " -msgstr "# %s (sleutel %s, wijzigingstijd %d): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " +msgstr "# %s (sleutel %s, wijzigingstijd %ull): " #: dir.c:1127 #, c-format @@ -474,14 +474,14 @@ msgid "Function name too long: %s" msgstr "Functienaam is te lang: %s" #: function.c:2657 -#, fuzzy, c-format +#, c-format msgid "Invalid minimum argument count (%u) for function %s" -msgstr "Ongeldig minimumaantal argumenten (%d) voor functie '%s'" +msgstr "Ongeldig minimumaantal argumenten (%u) voor functie %s" #: function.c:2660 -#, fuzzy, c-format +#, c-format msgid "Invalid maximum argument count (%u) for function %s" -msgstr "Ongeldig maximumaantal argumenten (%d) voor functie '%s'" +msgstr "Ongeldig maximumaantal argumenten (%u) voor functie %s" #: getopt.c:659 #, c-format @@ -1174,62 +1174,62 @@ msgstr "Bijwerken van Makefiles...\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Makefile '%s' bevat mogelijk een lus; wordt niet opnieuw gemaakt.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Opnieuw maken van Makefile '%s' is mislukt." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Ingesloten Makefile '%s' is niet gevonden." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Makefile '%s' is niet gevonden." -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Kan niet terugkeren naar oorspronkelijke map." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Opnieuw uitvoeren[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "verwijderen (van tijdelijk bestand): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL bevat meer dan één doel" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Geen doelen opgegeven en geen Makefile gevonden" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Geen doelen" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Bijwerken van doelen...\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "Waarschuwing: Klokafwijking geconstateerd. Het maken is mogelijk " "onvolledig gebeurd." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Gebruik: %s [OPTIES] [DOEL]...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1238,7 +1238,7 @@ msgstr "" "\n" "Dit programma is gecompileerd voor %s.\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1247,34 +1247,34 @@ msgstr "" "\n" "Dit programma is gecompileerd voor %s (%s).\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "" "Rapporteer programmafouten aan ,\n" "meld gebreken in de vertaling aan .\n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "de optie '%s%sc' vereist een niet-lege tekenreeks als argument" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "de optie '-%c' vereist een positief geheel getal als argument" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sDit programma is gecompileerd voor %s.\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sDit programma is gecompileerd voor %s (%s).\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Polish \n" "Language: pl\n" @@ -138,9 +138,9 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: stat() zwraca błąd.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" -msgstr "# %s (klucz %s, czas modyfikacji %d): otwarcie było niemożliwe.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" +msgstr "# %s (klucz %s, czas modyfikacji %ull): otwarcie było niemożliwe.\n" #: dir.c:1090 #, c-format @@ -153,9 +153,9 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (urządzenie %ld, i-węzeł %ld): otwarcie było niemożliwe.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " -msgstr "# %s (klucz %s, czas modyfikacji %d): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " +msgstr "# %s (klucz %s, czas modyfikacji %ull): " #: dir.c:1127 #, c-format @@ -472,14 +472,14 @@ msgid "Function name too long: %s" msgstr "Zbyt długa nazwa funkcji: %s" #: function.c:2657 -#, fuzzy, c-format +#, c-format msgid "Invalid minimum argument count (%u) for function %s" -msgstr "Błędna minimalna liczba argumentów (%d) dla funkcji %s" +msgstr "Błędna minimalna liczba argumentów (%u) dla funkcji %s" #: function.c:2660 -#, fuzzy, c-format +#, c-format msgid "Invalid maximum argument count (%u) for function %s" -msgstr "Błędna maksymalna liczba argumentów (%d) dla funkcji %s" +msgstr "Błędna maksymalna liczba argumentów (%u) dla funkcji %s" #: getopt.c:659 #, c-format @@ -1162,60 +1162,60 @@ msgstr "Uaktualnianie plików makefile....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Plik makefile '%s' może się zapętlić; bez ponownego przetwarzania.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Nie udało się ponownie przetworzyć pliku makefile '%s'." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Nie znaleziono włączanego pliku makefile '%s'." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Nie znaleziono pliku makefile '%s'" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Niemożliwy powrót do katalogu startowego." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Ponowne uruchamianie[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (plik tymczasowy): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL zawiera więcej niż jeden cel" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Nie podano obiektów i nie znaleziono makefile" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Brak obiektów" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Uaktualnianie obiektów docelowych....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "uwaga: Wykryto przestawienie zegara. Budowanie może być niekompletne." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Składnia: %s [opcje] [obiekt] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1224,7 +1224,7 @@ msgstr "" "\n" "Ten program został zbudowany dla %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1233,32 +1233,32 @@ msgstr "" "\n" "Ten program został zbudowany dla %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Błędy proszę zgłaszać na adres \n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "opcja '%s%s' wymaga niepustego łańcucha jako argumentu" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "opcja '-%c' wymaga argumentu będącego liczbą całkowitą dodatnią" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sTen program został zbudowany dla systemu %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sTen program został zbudowany dla systemu %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Brazilian Portuguese \n" msgstr "Informe os problemas para .\n" -#: main.c:2869 +#: main.c:2870 #, fuzzy, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "a opção `%s%s' requer um argumento não vazio" -#: main.c:2933 +#: main.c:2934 #, fuzzy, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "a opção `-%c' requer um argumento inteiro positivo" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sCompilado para %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sCompilado para %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later , 2009, 2010, 2013, 2014, 2016. msgid "" msgstr "" -"Project-Id-Version: make 4.1.90\n" +"Project-Id-Version: make 4.2\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2016-05-22 09:27-0400\n" -"PO-Revision-Date: 2016-04-25 19:04+0300\n" +"POT-Creation-Date: 2016-06-10 19:03-0400\n" +"PO-Revision-Date: 2016-05-23 20:04+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -145,9 +145,9 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: невозможно получить сведения вызовом stat.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" -msgstr "# %s (ключ %s, время модификации %d): невозможно открыть.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" +msgstr "# %s (ключ %s, mtime %ull): невозможно открыть.\n" #: dir.c:1090 #, c-format @@ -160,9 +160,9 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (устройство %ld, inode %ld): невозможно открыть.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " -msgstr "# %s (ключ %s, время модификации %d): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " +msgstr "# %s (ключ %s, mtime %ull): " #: dir.c:1127 #, c-format @@ -480,14 +480,14 @@ msgid "Function name too long: %s" msgstr "Слишком длинное имя функции: %s" #: function.c:2657 -#, fuzzy, c-format +#, c-format msgid "Invalid minimum argument count (%u) for function %s" -msgstr "Некорректное минимальное число аргументов (всего %d) функции %s" +msgstr "Некорректное минимальное число аргументов (всего %u) функции %s" #: function.c:2660 -#, fuzzy, c-format +#, c-format msgid "Invalid maximum argument count (%u) for function %s" -msgstr "Некорректное максимальное число аргументов (всего %d) функции %s" +msgstr "Некорректное максимальное число аргументов (всего %u) функции %s" # Сообщения getopt исключены, т.к. они относятся к уже # устаревшей версии этой библиотеки, и исчезнут в следующей версии make @@ -1174,60 +1174,60 @@ msgstr "Обновление make-файлов....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Make-файл «%s», возможно, зациклен, он не будет пересобираться.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Попытка пересобрать make-файл «%s» завершилась неудачно." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Включаемый make-файл «%s» не найден." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Make-файл «%s» не найден" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Невозможно перейти в первоначальный каталог." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Повторное выполнение[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (временный файл)" -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL содержит более одной цели" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Не заданы цели и не найден make-файл" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Нет целей" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Обновление целей результата...\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "предупреждение: Неправильный ход часов. Сборка может быть неполной." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Использование: %s [КЛЮЧ]... [ЦЕЛЬ]...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1236,7 +1236,7 @@ msgstr "" "\n" "Эта программа собрана для %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1245,32 +1245,32 @@ msgstr "" "\n" "Эта программа собрана для %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Сообщайте об ошибках по адресу \n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "для ключа «%s%s» нужно указать аргументом непустую строку" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "ключ «-%c» должен использоваться с целым положительным аргументом" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sЭта программа собрана для %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sЭта программа собрана для %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later , 2007. # Göran Uddeborg , 2011, 2013, 2014, 2016. # -# $Id: make.po,v 1.19 2016-04-24 20:34:25+02 göran Exp $ +# $Id: make.po,v 1.21 2016-05-22 22:46:49+02 göran Exp $ msgid "" msgstr "" -"Project-Id-Version: make 4.1.90\n" +"Project-Id-Version: make 4.2\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2016-05-22 09:27-0400\n" -"PO-Revision-Date: 2016-04-24 20:34+0200\n" +"POT-Creation-Date: 2016-06-10 19:03-0400\n" +"PO-Revision-Date: 2016-05-22 22:45+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -140,9 +140,9 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: kunde inte ta status.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" -msgstr "# %s (nyckel %s, mtid %d): kunde inte öppnas.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" +msgstr "# %s (nyckel %s, mtid %ull): kunde inte öppnas.\n" #: dir.c:1090 #, c-format @@ -155,9 +155,9 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (enhet %ld, inod %ld): kunde inte öppnas.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " -msgstr "# %s (nyckel %s, mtid %d): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " +msgstr "# %s (nyckel %s, mtid %ull): " #: dir.c:1127 #, c-format @@ -474,14 +474,14 @@ msgid "Function name too long: %s" msgstr "Funktionsnamnet är för lÃ¥ngt: %s" #: function.c:2657 -#, fuzzy, c-format +#, c-format msgid "Invalid minimum argument count (%u) for function %s" -msgstr "Felaktigt minsta antal argument (%d) till funktionen ”%s”" +msgstr "Felaktigt minsta antal argument (%u) till funktionen ”%s”" #: function.c:2660 -#, fuzzy, c-format +#, c-format msgid "Invalid maximum argument count (%u) for function %s" -msgstr "Felaktigt största antal argument (%d) till funktionen ”%s”" +msgstr "Felaktigt största antal argument (%u) till funktionen ”%s”" #: getopt.c:659 #, c-format @@ -1156,61 +1156,61 @@ msgstr "Uppdaterar makefiler...\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Makefilen ”%s” kan loopa; Ã¥terskapas inte.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Misslyckades med att Ã¥terskapa makefilen ”%s”." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Den inkluderade makefilen ”%s” fanns inte." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Makefilen ”%s” fanns inte" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Kunde inte Ã¥tergÃ¥ till ursprungskatalogen." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Utför pÃ¥ nytt[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "avlänka (temporärfil): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL innehÃ¥ller fler än ett mÃ¥l" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Inga mÃ¥l angavs och ingen makefil hittades" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Inga mÃ¥l" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Uppdaterar slutmÃ¥l...\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "varning: Klockförskjutning upptäckt. Bygget kan ha blivit ofullständigt." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Användning: %s [flaggor] [mÃ¥l] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1219,7 +1219,7 @@ msgstr "" "\n" "Detta program byggdes för %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1228,34 +1228,34 @@ msgstr "" "\n" "Detta program byggdes för %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "" "Anmäl fel till .\n" "Skicka synpunkter pÃ¥ översättningen till .\n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "flaggan ”%s%s” kräver ett strängargument som inte är tomt" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "flaggan ”-%c” kräver ett positivt heltal som argument" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sByggt för %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sByggt för %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Turkish \n" @@ -137,8 +137,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: durumlanamadı.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (anahtar (key) %s, değişiklik tarihi (mtime) %d): açılamadı.\n" #: dir.c:1090 @@ -152,8 +152,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (aygıt %ld, i-düğüm %ld): açılamadı.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (anahtar (key) %s, değişiklik tarihi (mtime) %d):" #: dir.c:1127 @@ -1165,60 +1165,60 @@ msgstr "makefile'ları güncelliyor...\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "`%s' make dosyası çevrime girdi; yeniden derlenemez.\n" -#: main.c:2283 +#: main.c:2279 #, fuzzy, c-format msgid "Failed to remake makefile '%s'." msgstr "`%s' make dosyası yeniden derlenemiyor." -#: main.c:2303 +#: main.c:2299 #, fuzzy, c-format msgid "Included makefile '%s' was not found." msgstr "İçerilen make dosyası `%s' bulunamadı." -#: main.c:2308 +#: main.c:2304 #, fuzzy, c-format msgid "Makefile '%s' was not found" msgstr "`%s' make dosyası bulunamadı" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Geriye, özgün dizine geçilemiyor." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Yeniden çalıştırılıyor[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (geçici dosya): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL bir hedeften fazlasını içeriyor" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Hedefler belirtilmediğinden make dosyası yok" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Hedef yok" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Amaçlanan hedefler güncelleniyor...\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "uyarı: Clock skew saptandı. Derleme tamamlanamayabilir." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Kullanım: %s [seçenekler] [hedef] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1227,7 +1227,7 @@ msgstr "" "\n" "Bu program %s için kurgulanmış\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1236,38 +1236,38 @@ msgstr "" "\n" "Bu program %s için kurgulanmış (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "" "Yazılım hatalarını adresine,\n" "çeviri hatalarını adresine bildiriniz.\n" -#: main.c:2869 +#: main.c:2870 #, fuzzy, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "`-%c' seçeneği bir boş olmayan dizge argüman gerektirir" -#: main.c:2933 +#: main.c:2934 #, fuzzy, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "`-%c' seçeneği bir pozitif tümleyici bağımsız değişkenle kullanılır" -#: main.c:3331 +#: main.c:3332 #, fuzzy, c-format msgid "%sBuilt for %s\n" msgstr "" "\n" "%sBu program %s için derlenmiş\n" -#: main.c:3333 +#: main.c:3334 #, fuzzy, c-format msgid "%sBuilt for %s (%s)\n" msgstr "" "\n" "%sBu program %s için derlenmiş (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later , 2012, 2013, 2014, 2016. msgid "" msgstr "" -"Project-Id-Version: make 4.1.90\n" +"Project-Id-Version: make 4.2\n" "Report-Msgid-Bugs-To: bug-make@gnu.org\n" -"POT-Creation-Date: 2016-05-22 09:27-0400\n" -"PO-Revision-Date: 2016-04-24 14:36+0300\n" +"POT-Creation-Date: 2016-06-10 19:03-0400\n" +"PO-Revision-Date: 2016-05-22 21:55+0300\n" "Last-Translator: Volodymyr M. Lisivka \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -140,9 +140,9 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: неможливо отримати інформацію (stat).\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" -msgstr "# %s (ключ %s, час зміни %d): не вдалося відкрити.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" +msgstr "# %s (ключ %s, час зміни %ull): не вдалося відкрити.\n" #: dir.c:1090 #, c-format @@ -155,9 +155,9 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (пристрій %ld, івузол %ld): не вдалося відкрити.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " -msgstr "# %s (ключ %s, час модифікації %d): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " +msgstr "# %s (ключ %s, час модифікації %ull): " #: dir.c:1127 #, c-format @@ -476,14 +476,14 @@ msgid "Function name too long: %s" msgstr "Назва функції є задовгою: %s" #: function.c:2657 -#, fuzzy, c-format +#, c-format msgid "Invalid minimum argument count (%u) for function %s" -msgstr "Некоректна мінімальна кількість аргументів (%d) функції %s" +msgstr "Некоректна мінімальна кількість аргументів (%u) функції %s" #: function.c:2660 -#, fuzzy, c-format +#, c-format msgid "Invalid maximum argument count (%u) for function %s" -msgstr "Некоректна максимальна кількість аргументів (%d) функції %s" +msgstr "Некоректна максимальна кількість аргументів (%u) функції %s" #: getopt.c:659 #, c-format @@ -1169,62 +1169,62 @@ msgstr "Оновлення make-файлів...\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Make-файл \"%s\", можливо, зациклений, він не перезбиратиметься.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Спроба перезібрати make-файл \"%s\" безуспішна." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Make-файл \"%s\", який включається, не було знайдено." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Make-файл \"%s\" не було знайдено" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Неможливо перейти у первісний каталог." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Повторне виконання[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (тимчасовий файл): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL містить декілька записів мети" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Не задані цілі і не знайдений make-файл" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Нема цілей" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Оновлення цілей мети...\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "попередження: виявлено відхилення показів годинника. Збирання може бути " "неповним." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Використання: %s [КЛЮЧІ]... [ЦІЛЬ]...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1233,7 +1233,7 @@ msgstr "" "\n" "Цю програму зібрано для %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1242,32 +1242,32 @@ msgstr "" "\n" "Цю програму зібрано для %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "Повідомлюйте про помилки до \n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "разом з «%s%s» мало бути вказано непорожній рядковий аргумент" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "ключ \"-%c\" повинен використовуватися з цілим додатним аргументом" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sЗібрано для %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sЗібрано для %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -143,9 +143,9 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s: không thể lấy thống kê.\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" -msgstr "# %s (khóa %s, mtime %d): không thể mở.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" +msgstr "# %s (khóa %s, mtime %ull): không thể mở.\n" #: dir.c:1090 #, c-format @@ -158,9 +158,9 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (thiết bị %ld, nút thông tin %ld): không thể mở.\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " -msgstr "# %s (khóa %s, mtime %d): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " +msgstr "# %s (khóa %s, mtime %ull): " #: dir.c:1127 #, c-format @@ -477,14 +477,14 @@ msgid "Function name too long: %s" msgstr "Tên hàm quá dài: %s" #: function.c:2657 -#, fuzzy, c-format +#, c-format msgid "Invalid minimum argument count (%u) for function %s" -msgstr "Số lượng đối số tối thiểu (%d) là không hợp lệ cho hàm “%s”" +msgstr "Số lượng đối số tối thiểu (%u) là không hợp lệ cho hàm “%s”" #: function.c:2660 -#, fuzzy, c-format +#, c-format msgid "Invalid maximum argument count (%u) for function %s" -msgstr "Số lượng đối số tối đa (%d) là không hợp lệ cho hàm “%s”" +msgstr "Số lượng đối số tối đa (%u) là không hợp lệ cho hàm “%s”" #: getopt.c:659 #, c-format @@ -1148,61 +1148,61 @@ msgstr "Cập nhật makefile…\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Makefile “%s” bị lặp; không tạo lại nó.\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "Gặp lỗi khi làm lại makefile “%s”." -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "Không tìm thấy makefile bao gồm “%s”." -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "Không tìm thấy makefile “%s”." -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "Không thể chuyển về thư mục gốc." -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "Thá»±c hiện lại[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "unlink (bỏ liên kết tập tin tạm): " -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL chứa nhiều đích" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "Chưa chỉ định đích, và không tìm thấy makefile" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "Không có đích" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "Đang cập nhật đích mong muốn…\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "" "cảnh báo: Phát hiện lệch giờ. Bản dịch cá»§a bạn có thể không hoàn thiện." -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "Cách dùng: %s [các_tùy_chọn] [đích] …\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1211,7 +1211,7 @@ msgstr "" "\n" "Chương trình này đã được dịch cho %s\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1220,34 +1220,34 @@ msgstr "" "\n" "Chương trình này đã được dịch cho %s (%s)\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "" "Hãy thông báo lỗi cho \n" "Hãy thông báo lỗi dịch cho .\n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "tùy chọn “%s%s” cần một đối số là chuỗi khác rỗng" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "tùy chọn “-%c” cần một đối số số nguyên dương" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%sĐược biên dịch cho %s\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%sĐược biên dịch cho %s (%s)\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later \n" "Language-Team: Chinese (simplified) \n" @@ -140,8 +140,8 @@ msgid "# %s: could not be stat'd.\n" msgstr "# %s:无法对其进行 stat 操作。\n" #: dir.c:1085 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): could not be opened.\n" +#, fuzzy +msgid "# %s (key %s, mtime %I64u): could not be opened.\n" msgstr "# %s (关键字 %s,修改时间 %d):无法打开。\n" #: dir.c:1090 @@ -155,8 +155,8 @@ msgid "# %s (device %ld, inode %ld): could not be opened.\n" msgstr "# %s (设备 %ld,i-节点 %ld):无法打开。\n" #: dir.c:1122 -#, fuzzy, c-format -msgid "# %s (key %s, mtime %ull): " +#, fuzzy +msgid "# %s (key %s, mtime %I64u): " msgstr "# %s (关键字 %s,修改时间 %d):" #: dir.c:1127 @@ -1131,60 +1131,60 @@ msgstr "正在更新 makefile....\n" msgid "Makefile '%s' might loop; not remaking it.\n" msgstr "Makefile “%s”可能循环;不会重新执行它。\n" -#: main.c:2283 +#: main.c:2279 #, c-format msgid "Failed to remake makefile '%s'." msgstr "重新执行 makefile“%s”失败。" -#: main.c:2303 +#: main.c:2299 #, c-format msgid "Included makefile '%s' was not found." msgstr "找不到被引入的 makefile“%s”。" -#: main.c:2308 +#: main.c:2304 #, c-format msgid "Makefile '%s' was not found" msgstr "找不到 makefile “%s”。" -#: main.c:2376 +#: main.c:2372 msgid "Couldn't change back to original directory." msgstr "无法回到原始目录。" -#: main.c:2384 +#: main.c:2380 #, c-format msgid "Re-executing[%u]:" msgstr "重新执行[%u]:" -#: main.c:2491 +#: main.c:2492 msgid "unlink (temporary file): " msgstr "删除 (临时文件):" -#: main.c:2524 +#: main.c:2525 msgid ".DEFAULT_GOAL contains more than one target" msgstr ".DEFAULT_GOAL 包含多余一个目标" -#: main.c:2547 +#: main.c:2548 msgid "No targets specified and no makefile found" msgstr "没有指明目标并且找不到 makefile" -#: main.c:2549 +#: main.c:2550 msgid "No targets" msgstr "无目标" -#: main.c:2554 +#: main.c:2555 msgid "Updating goal targets....\n" msgstr "更新目标....\n" -#: main.c:2578 +#: main.c:2579 msgid "warning: Clock skew detected. Your build may be incomplete." msgstr "警告:检测到时钟错误。您的构建版本可能是不完整的。" -#: main.c:2772 +#: main.c:2773 #, c-format msgid "Usage: %s [options] [target] ...\n" msgstr "用法:%s [选项] [目标] ...\n" -#: main.c:2778 +#: main.c:2779 #, c-format msgid "" "\n" @@ -1193,7 +1193,7 @@ msgstr "" "\n" "该程序为 %s 编译\n" -#: main.c:2780 +#: main.c:2781 #, c-format msgid "" "\n" @@ -1202,32 +1202,32 @@ msgstr "" "\n" "该程序为 %s (%s) 编译\n" -#: main.c:2783 +#: main.c:2784 #, c-format msgid "Report bugs to \n" msgstr "报告错误到 \n" -#: main.c:2869 +#: main.c:2870 #, c-format msgid "the '%s%s' option requires a non-empty string argument" msgstr "“%s%s”选项需要非空字符串参数" -#: main.c:2933 +#: main.c:2934 #, c-format msgid "the '-%c' option requires a positive integer argument" msgstr "“-%c”选项需要正整数参数" -#: main.c:3331 +#: main.c:3332 #, c-format msgid "%sBuilt for %s\n" msgstr "%s为 %s 编译\n" -#: main.c:3333 +#: main.c:3334 #, c-format msgid "%sBuilt for %s (%s)\n" msgstr "%s为 %s (%s) 编译\n" -#: main.c:3344 +#: main.c:3345 #, c-format msgid "" "%sLicense GPLv3+: GNU GPL version 3 or later changed = ((file_mtime (d->file) != mtime) || (mtime == NONEXISTENT_MTIME)); @@ -650,7 +651,7 @@ update_file_1 (struct file *file, unsigned int depth) /* We may have already considered this file, when we didn't know we'd need to update it. Force update_file() to consider it and not prune it. */ - d->file->considered = !considered; + d->file->considered = 0; new = update_file (d->file, depth); if (new > dep_status) @@ -1087,7 +1088,7 @@ check_dep (struct file *file, unsigned int depth, /* If the target was waiting for a dependency it has to be reconsidered, as that dependency might have finished. */ if (file->command_state == cs_deps_running) - file->considered = !considered; + file->considered = 0; set_command_state (file, cs_not_started); } diff --git a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon index 80ddb31..58f126f 100644 --- a/tests/scripts/features/double_colon +++ b/tests/scripts/features/double_colon @@ -197,6 +197,21 @@ all:: 3 ', '-rs -j2 1 2 root', "all_one\nall_two\nroot\n"); +# SV 47995 : Parallel double-colon rules with FORCE + +run_make_test(' +all:: ; @echo one + +all:: joe ; @echo four + +joe: FORCE ; touch joe-is-forced + +FORCE: +', + '-j5', "one\ntouch joe-is-forced\nfour\n"); + +unlink('joe-is-forced'); + # This tells the test driver that the perl test script executed properly. 1; diff --git a/tests/scripts/targets/DELETE_ON_ERROR b/tests/scripts/targets/DELETE_ON_ERROR index db97093..f0d9f9b 100644 --- a/tests/scripts/targets/DELETE_ON_ERROR +++ b/tests/scripts/targets/DELETE_ON_ERROR @@ -6,17 +6,17 @@ $details = ""; run_make_test(' .DELETE_ON_ERROR: -all: ; false > $@ +all: ; exit 1 > $@ ', - '', "false > all\n#MAKE#: *** [#MAKEFILE#:3: all] Error 1\n#MAKE#: *** Deleting file 'all'", 512); + '', "exit 1 > all\n#MAKE#: *** [#MAKEFILE#:3: all] Error 1\n#MAKE#: *** Deleting file 'all'", 512); run_make_test(' .DELETE_ON_ERROR: all: foo.x ; %.x : %.q ; echo > $@ -%.q : ; false > $@ +%.q : ; exit 1 > $@ ', - '', "false > foo.q\n#MAKE#: *** [#MAKEFILE#:5: foo.q] Error 1\n#MAKE#: *** Deleting file 'foo.q'", 512); + '', "exit 1 > foo.q\n#MAKE#: *** [#MAKEFILE#:5: foo.q] Error 1\n#MAKE#: *** Deleting file 'foo.q'", 512); # This tells the test driver that the perl test script executed properly. 1; diff --git a/w32/Makefile.am b/w32/Makefile.am index b0b4734..5527f77 100644 --- a/w32/Makefile.am +++ b/w32/Makefile.am @@ -22,4 +22,5 @@ noinst_LIBRARIES = libw32.a libw32_a_SOURCES = subproc/misc.c subproc/sub_proc.c subproc/w32err.c \ compat/posixfcn.c pathstuff.c w32os.c -libw32_a_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/subproc -I$(top_srcdir) +libw32_a_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/subproc -I$(top_srcdir) \ + -I$(top_srcdir)/glob diff --git a/w32/Makefile.in b/w32/Makefile.in index 60a0948..0c81384 100644 --- a/w32/Makefile.in +++ b/w32/Makefile.in @@ -335,7 +335,9 @@ noinst_LIBRARIES = libw32.a libw32_a_SOURCES = subproc/misc.c subproc/sub_proc.c subproc/w32err.c \ compat/posixfcn.c pathstuff.c w32os.c -libw32_a_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/subproc -I$(top_srcdir) +libw32_a_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/subproc -I$(top_srcdir) \ + -I$(top_srcdir)/glob + all: all-am .SUFFIXES: diff --git a/w32/pathstuff.c b/w32/pathstuff.c index 2c612f7..9bd55e6 100644 --- a/w32/pathstuff.c +++ b/w32/pathstuff.c @@ -32,7 +32,7 @@ convert_vpath_to_windows32(char *Path, char to_delim) * contain blanks get trounced here. Use 8.3 format as a workaround. */ for (etok = Path; etok && *etok; etok++) - if (isblank ((unsigned char) *etok)) + if (ISBLANK ((unsigned char) *etok)) *etok = to_delim; return (convert_Path_to_windows32(Path, to_delim));