Merge lp:~logan/ubuntu/saucy/mlocate/0.26-1ubuntu1 into lp:ubuntu/saucy/mlocate
- Saucy (13.10)
- 0.26-1ubuntu1
- Merge into saucy
Proposed by
Logan Rosen
Status: | Merged |
---|---|
Merge reported by: | Sebastien Bacher |
Merged at revision: | not available |
Proposed branch: | lp:~logan/ubuntu/saucy/mlocate/0.26-1ubuntu1 |
Merge into: | lp:ubuntu/saucy/mlocate |
Diff against target: |
15793 lines (+3356/-2541) 74 files modified
.hgignore (+0/-1) .hgtags (+2/-0) .tx/config (+8/-0) COPYING (+20/-21) ChangeLog (+55/-0) INSTALL (+7/-2) Makefile.am (+10/-5) Makefile.in (+185/-107) NEWS (+9/-0) aclocal.m4 (+44/-24) admin/compile (+216/-16) admin/config.sub (+1/-10) admin/depcomp (+134/-56) admin/install-sh (+18/-11) admin/missing (+4/-49) configure (+24/-19) configure.ac (+4/-3) debian/changelog (+21/-0) debian/mlocate.cron.daily (+1/-16) debian/mlocate.postinst (+3/-0) debian/mlocate.postrm (+1/-7) debian/updatedb.conf (+1/-1) doc/locate.1.in (+7/-2) gnulib/lib/Makefile.in (+35/-8) po/ar.po (+37/-36) po/as.po (+38/-37) po/ast.po (+38/-37) po/bg.po (+109/-101) po/bs.po (+42/-40) po/ca.po (+41/-39) po/cs.po (+40/-38) po/da.po (+41/-39) po/de.po (+37/-36) po/el.po (+93/-82) po/en_GB.po (+38/-37) po/es.po (+53/-51) po/et.po (+68/-62) po/fa.po (+42/-40) po/fi.po (+69/-65) po/fr.po (+42/-38) po/gu.po (+36/-35) po/hu.po (+37/-36) po/it.po (+41/-39) po/ja.po (+37/-36) po/ko.po (+42/-40) po/lv.po (+42/-40) po/mlocate.pot (+36/-35) po/ms.po (+36/-35) po/nds.po (+36/-35) po/nl.po (+38/-37) po/pl.po (+38/-38) po/pt.po (+37/-36) po/pt_BR.po (+42/-38) po/ru.po (+58/-56) po/sr.po (+37/-36) po/sr@latin.po (+37/-36) po/sv.po (+38/-37) po/ta.po (+37/-36) po/tr.po (+37/-36) po/uk.po (+37/-36) po/zh_CN.po (+48/-47) po/zh_TW.po (+42/-41) src/bind-mount.c (+16/-14) src/bind-mount.h (+5/-2) src/locate.c (+20/-3) src/updatedb.c (+42/-13) tests/bind-mount-helper.c (+63/-0) tests/bind-mount.at (+24/-0) tests/config.at (+1/-1) tests/locate.at (+28/-0) tests/package.m4 (+2/-2) tests/testsuite (+644/-526) tests/testsuite.at (+3/-2) tests/updatedb.at (+1/-1) |
To merge this branch: | bzr merge lp:~logan/ubuntu/saucy/mlocate/0.26-1ubuntu1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+169559@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote : | # |
Revision history for this message
Sebastien Bacher (seb128) wrote : | # |
(setting as merged since I don't have access to rejected as a status)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.hgignore' |
2 | --- .hgignore 2009-11-03 22:43:19 +0000 |
3 | +++ .hgignore 2013-06-14 23:40:37 +0000 |
4 | @@ -14,7 +14,6 @@ |
5 | ^po/en@boldquot\.header$ |
6 | ^po/en@quot\.header$ |
7 | ^po/insert-header\.sin$ |
8 | -^po/mlocate\.pot$ |
9 | ^po/quot\.sed$ |
10 | ^po/remove-potcdate\.sin$ |
11 | ^ABOUT-NLS$ |
12 | |
13 | === modified file '.hgtags' |
14 | --- .hgtags 2010-09-25 08:15:12 +0000 |
15 | +++ .hgtags 2013-06-14 23:40:37 +0000 |
16 | @@ -32,3 +32,5 @@ |
17 | 356095beac47bdc0d86b08cee6849a81a26dd984 mlocate-0.22.4 |
18 | e6dea0b7f04efd843297a16cd9003a7f0da86cfa mlocate-0.23 |
19 | cca990af506fa38aff011cf2baae45c573a20e2b mlocate-0.23.1 |
20 | +71587f6c6b793c7d4a7d85788dad705da24460f7 mlocate-0.24 |
21 | +69f1424b5ccbc84e1a396ce10aedd862c9388e17 mlocate-0.25 |
22 | |
23 | === added directory '.tx' |
24 | === added file '.tx/config' |
25 | --- .tx/config 1970-01-01 00:00:00 +0000 |
26 | +++ .tx/config 2013-06-14 23:40:37 +0000 |
27 | @@ -0,0 +1,8 @@ |
28 | +[main] |
29 | +host = https://www.transifex.net |
30 | + |
31 | +[mlocate.default] |
32 | +file_filter = po/<lang>.po |
33 | +source_file = po/mlocate.pot |
34 | +source_lang = en |
35 | + |
36 | |
37 | === modified file 'COPYING' |
38 | --- COPYING 2007-11-25 16:08:47 +0000 |
39 | +++ COPYING 2013-06-14 23:40:37 +0000 |
40 | @@ -1,12 +1,12 @@ |
41 | - GNU GENERAL PUBLIC LICENSE |
42 | - Version 2, June 1991 |
43 | + GNU GENERAL PUBLIC LICENSE |
44 | + Version 2, June 1991 |
45 | |
46 | - Copyright (C) 1989, 1991 Free Software Foundation, Inc. |
47 | - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
48 | + Copyright (C) 1989, 1991 Free Software Foundation, Inc., |
49 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
50 | Everyone is permitted to copy and distribute verbatim copies |
51 | of this license document, but changing it is not allowed. |
52 | |
53 | - Preamble |
54 | + Preamble |
55 | |
56 | The licenses for most software are designed to take away your |
57 | freedom to share and change it. By contrast, the GNU General Public |
58 | @@ -15,7 +15,7 @@ |
59 | General Public License applies to most of the Free Software |
60 | Foundation's software and to any other program whose authors commit to |
61 | using it. (Some other Free Software Foundation software is covered by |
62 | -the GNU Library General Public License instead.) You can apply it to |
63 | +the GNU Lesser General Public License instead.) You can apply it to |
64 | your programs, too. |
65 | |
66 | When we speak of free software, we are referring to freedom, not |
67 | @@ -55,8 +55,8 @@ |
68 | |
69 | The precise terms and conditions for copying, distribution and |
70 | modification follow. |
71 | - |
72 | |
73 | - GNU GENERAL PUBLIC LICENSE |
74 | + |
75 | + GNU GENERAL PUBLIC LICENSE |
76 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |
77 | |
78 | 0. This License applies to any program or other work which contains |
79 | @@ -110,7 +110,7 @@ |
80 | License. (Exception: if the Program itself is interactive but |
81 | does not normally print such an announcement, your work based on |
82 | the Program is not required to print an announcement.) |
83 | - |
84 | |
85 | + |
86 | These requirements apply to the modified work as a whole. If |
87 | identifiable sections of that work are not derived from the Program, |
88 | and can be reasonably considered independent and separate works in |
89 | @@ -168,7 +168,7 @@ |
90 | access to copy the source code from the same place counts as |
91 | distribution of the source code, even though third parties are not |
92 | compelled to copy the source along with the object code. |
93 | - |
94 | |
95 | + |
96 | 4. You may not copy, modify, sublicense, or distribute the Program |
97 | except as expressly provided under this License. Any attempt |
98 | otherwise to copy, modify, sublicense or distribute the Program is |
99 | @@ -225,7 +225,7 @@ |
100 | |
101 | This section is intended to make thoroughly clear what is believed to |
102 | be a consequence of the rest of this License. |
103 | - |
104 | |
105 | + |
106 | 8. If the distribution and/or use of the Program is restricted in |
107 | certain countries either by patents or by copyrighted interfaces, the |
108 | original copyright holder who places the Program under this License |
109 | @@ -255,7 +255,7 @@ |
110 | of preserving the free status of all derivatives of our free software and |
111 | of promoting the sharing and reuse of software generally. |
112 | |
113 | - NO WARRANTY |
114 | + NO WARRANTY |
115 | |
116 | 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY |
117 | FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN |
118 | @@ -277,9 +277,9 @@ |
119 | PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE |
120 | POSSIBILITY OF SUCH DAMAGES. |
121 | |
122 | - END OF TERMS AND CONDITIONS |
123 | - |
124 | |
125 | - How to Apply These Terms to Your New Programs |
126 | + END OF TERMS AND CONDITIONS |
127 | + |
128 | + How to Apply These Terms to Your New Programs |
129 | |
130 | If you develop a new program, and you want it to be of the greatest |
131 | possible use to the public, the best way to achieve this is to make it |
132 | @@ -303,17 +303,16 @@ |
133 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
134 | GNU General Public License for more details. |
135 | |
136 | - You should have received a copy of the GNU General Public License |
137 | - along with this program; if not, write to the Free Software |
138 | - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
139 | - |
140 | + You should have received a copy of the GNU General Public License along |
141 | + with this program; if not, write to the Free Software Foundation, Inc., |
142 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
143 | |
144 | Also add information on how to contact you by electronic and paper mail. |
145 | |
146 | If the program is interactive, make it output a short notice like this |
147 | when it starts in an interactive mode: |
148 | |
149 | - Gnomovision version 69, Copyright (C) year name of author |
150 | + Gnomovision version 69, Copyright (C) year name of author |
151 | Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
152 | This is free software, and you are welcome to redistribute it |
153 | under certain conditions; type `show c' for details. |
154 | @@ -336,5 +335,5 @@ |
155 | This General Public License does not permit incorporating your program into |
156 | proprietary programs. If your program is a subroutine library, you may |
157 | consider it more useful to permit linking proprietary applications with the |
158 | -library. If this is what you want to do, use the GNU Library General |
159 | +library. If this is what you want to do, use the GNU Lesser General |
160 | Public License instead of this License. |
161 | |
162 | === modified file 'ChangeLog' |
163 | --- ChangeLog 2012-07-27 05:16:18 +0000 |
164 | +++ ChangeLog 2013-06-14 23:40:37 +0000 |
165 | @@ -1,5 +1,60 @@ |
166 | +2012-09-22 Miloslav Trmač <mitr@redhat.com> |
167 | + |
168 | + * configure.ac: Relase 0.26. |
169 | + * NEWS: Update. |
170 | + * po/*: Update. |
171 | + |
172 | + * src/locate.c (conf_match_all_patterns): New variable. |
173 | + (string_matches_pattern): Implement conf_match_all_patterns. |
174 | + (help): Document -A. |
175 | + (parse_options): Set conf_match_all_patterns based on -A, --all. |
176 | + Based on a patch by Carlos J. G. Duarte <carlos.j.g.duarte@gmail.com>. |
177 | + * tests/locate.at (locate: -A): Test -A. |
178 | + * doc/locate.1.in: Document -A. |
179 | + |
180 | +2012-06-25 Miloslav Trmač <mitr@redhat.com> |
181 | + |
182 | + * Makefile.am (installcheck-local): Make sure the test suite is |
183 | + up-to-date before running it. |
184 | + |
185 | +2012-06-03 Miloslav Trmač <mitr@redhat.com> |
186 | + |
187 | + * tests/bind-mount.at (bind-mount: Empty mountinfo): Fix the test |
188 | + when run in (make installcheck). |
189 | + |
190 | +2012-03-23 Miloslav Trmač <mitr@redhat.com> |
191 | + |
192 | + * src/bind-mount.c (MOUNTINFO_PATH): Move to bind-mount.h. |
193 | + (mountinfo_path): New variable. All users changed to use the variable. |
194 | + (bind_mount_init): New parameter mountinfo. Initialize mountinfo_path. |
195 | + * src/bind-mount.h (MOUNTINFO_PATH): Moved from bind-mount.c. |
196 | + (bind_mount_init): Update declaration. |
197 | + * src/updatedb.c (main): Update for changed bind_mount_init (). |
198 | + * tests/bind-mount.at |
199 | + * tests/bind-mount-helper.c: New files. |
200 | + * tests/testsuite.at: Include bind-mount.at. |
201 | + * configure.ac: Add tests to PATH. |
202 | + * Makefile.am (check_PROGRAMS, tests_bind_mount_helper_LDADD): New |
203 | + definitions. |
204 | + (TESTFILES): Add tests/bind-mount.at. |
205 | + (src_updatedb_SOURCES): Move src/bind-mount.c src/bind-mount.h ... |
206 | + (src_liblib_a_SOURCES): ... here. |
207 | + |
208 | + * src/updatedb.c (time_is_current): Use "struct time" as input. Add |
209 | + >3 seconds margin to account for low timestamp precision on FAT and for |
210 | + Linux kernel races. |
211 | + (scan): Check whether the timestamp needs invalidating even if the |
212 | + nanosecond field is non-zero. |
213 | + * tests/config.at (config: -v): Wait longer than the timestamp |
214 | + margin in time_is_current (). |
215 | + |
216 | + * tests/updatedb.at (updatedb: Concurrent modification): Use `wait' |
217 | + instead of `sleep', removing a race and making the test suite faster. |
218 | + |
219 | 2012-03-03 Miloslav Trmač <mitr@redhat.com> |
220 | |
221 | + * COPYING: Update (new FSF address, s/Library GPL/Lesser GPL/). |
222 | + |
223 | * configure.ac: Release 0.25. |
224 | * NEWS: Update. |
225 | * po/*: Update. |
226 | |
227 | === modified file 'INSTALL' |
228 | --- INSTALL 2010-09-25 08:15:12 +0000 |
229 | +++ INSTALL 2013-06-14 23:40:37 +0000 |
230 | @@ -1,8 +1,8 @@ |
231 | Installation Instructions |
232 | ************************* |
233 | |
234 | -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, |
235 | -2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
236 | +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, |
237 | +Inc. |
238 | |
239 | Copying and distribution of this file, with or without modification, |
240 | are permitted in any medium without royalty provided the copyright |
241 | @@ -226,6 +226,11 @@ |
242 | |
243 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. |
244 | |
245 | + HP-UX `make' updates targets which have the same time stamps as |
246 | +their prerequisites, which makes it generally unusable when shipped |
247 | +generated files such as `configure' are involved. Use GNU `make' |
248 | +instead. |
249 | + |
250 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot |
251 | parse its `<wchar.h>' header file. The option `-nodtk' can be used as |
252 | a workaround. If GNU CC is not installed, it is therefore recommended |
253 | |
254 | === modified file 'Makefile.am' |
255 | --- Makefile.am 2012-07-27 05:15:55 +0000 |
256 | +++ Makefile.am 2013-06-14 23:40:37 +0000 |
257 | @@ -37,23 +37,28 @@ |
258 | |
259 | noinst_LIBRARIES = src/liblib.a |
260 | |
261 | +check_PROGRAMS = tests/bind-mount-helper |
262 | + |
263 | ## Rules |
264 | CLEANFILES = $(man_MANS) |
265 | DISTCLEANFILES = atconfig |
266 | EXTRA_DIST = doc/locate.1.in doc/updatedb.conf.5.in doc/updatedb.8.in \ |
267 | tests/testsuite tests/package.m4 tests/testsuite.at $(TESTFILES) |
268 | -TESTFILES = tests/config.at tests/locate.at tests/updatedb.at |
269 | +TESTFILES = tests/bind-mount.at tests/config.at tests/locate.at \ |
270 | + tests/updatedb.at |
271 | |
272 | -src_liblib_a_SOURCES = src/db.h src/lib.c src/lib.h |
273 | +src_liblib_a_SOURCES = src/bind-mount.c src/bind-mount.h src/db.h \ |
274 | + src/lib.c src/lib.h |
275 | |
276 | src_locate_CPPFLAGS = $(AM_CPPFLAGS) $(COMMON_CPPFLAGS) |
277 | src_locate_LDADD = src/liblib.a gnulib/lib/libgnu.a $(LIBINTL) |
278 | |
279 | -src_updatedb_SOURCES = src/bind-mount.c src/bind-mount.h src/conf.c src/conf.h \ |
280 | - src/updatedb.c |
281 | +src_updatedb_SOURCES = src/conf.c src/conf.h src/updatedb.c |
282 | src_updatedb_CPPFLAGS = $(AM_CPPFLAGS) $(COMMON_CPPFLAGS) $(CONF_CPPFLAGS) |
283 | src_updatedb_LDADD = src/liblib.a gnulib/lib/libgnu.a $(LIBINTL) |
284 | |
285 | +tests_bind_mount_helper_LDADD = src/liblib.a gnulib/lib/libgnu.a $(LIBINTL) |
286 | + |
287 | doc/locate.1: $(srcdir)/doc/locate.1.in Makefile |
288 | $(MKDIR_P) doc |
289 | sed 's,@dbfile@,$(dbfile),g' < $(srcdir)/doc/locate.1.in > $@ |
290 | @@ -75,7 +80,7 @@ |
291 | check-local: atconfig $(top_srcdir)/tests/testsuite |
292 | $(SHELL) $(top_srcdir)/tests/testsuite |
293 | |
294 | -installcheck-local: |
295 | +installcheck-local: atconfig $(top_srcdir)/tests/testsuite |
296 | $(SHELL) $(top_srcdir)/tests/testsuite AUTOTEST_PATH=$(bindir) |
297 | |
298 | install-exec-local: |
299 | |
300 | === modified file 'Makefile.in' |
301 | --- Makefile.in 2012-07-27 05:16:18 +0000 |
302 | +++ Makefile.in 2013-06-14 23:40:37 +0000 |
303 | @@ -1,9 +1,9 @@ |
304 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
305 | +# Makefile.in generated by automake 1.11.6 from Makefile.am. |
306 | # @configure_input@ |
307 | |
308 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
309 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
310 | -# Inc. |
311 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
312 | +# Foundation, Inc. |
313 | # This Makefile.in is free software; the Free Software Foundation |
314 | # gives unlimited permission to copy and/or distribute it, |
315 | # with or without modifications, as long as this notice is preserved. |
316 | @@ -33,6 +33,23 @@ |
317 | |
318 | |
319 | VPATH = @srcdir@ |
320 | +am__make_dryrun = \ |
321 | + { \ |
322 | + am__dry=no; \ |
323 | + case $$MAKEFLAGS in \ |
324 | + *\\[\ \ ]*) \ |
325 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
326 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
327 | + *) \ |
328 | + for am__flg in $$MAKEFLAGS; do \ |
329 | + case $$am__flg in \ |
330 | + *=*|--*) ;; \ |
331 | + *n*) am__dry=yes; break;; \ |
332 | + esac; \ |
333 | + done;; \ |
334 | + esac; \ |
335 | + test $$am__dry = yes; \ |
336 | + } |
337 | pkgdatadir = $(datadir)/@PACKAGE@ |
338 | pkgincludedir = $(includedir)/@PACKAGE@ |
339 | pkglibdir = $(libdir)/@PACKAGE@ |
340 | @@ -52,6 +69,7 @@ |
341 | build_triplet = @build@ |
342 | host_triplet = @host@ |
343 | bin_PROGRAMS = src/locate$(EXEEXT) src/updatedb$(EXEEXT) |
344 | +check_PROGRAMS = tests/bind-mount-helper$(EXEEXT) |
345 | subdir = . |
346 | DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ |
347 | $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
348 | @@ -124,7 +142,7 @@ |
349 | src_liblib_a_AR = $(AR) $(ARFLAGS) |
350 | src_liblib_a_LIBADD = |
351 | am__dirstamp = $(am__leading_dot)dirstamp |
352 | -am_src_liblib_a_OBJECTS = src/lib.$(OBJEXT) |
353 | +am_src_liblib_a_OBJECTS = src/bind-mount.$(OBJEXT) src/lib.$(OBJEXT) |
354 | src_liblib_a_OBJECTS = $(am_src_liblib_a_OBJECTS) |
355 | am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ |
356 | "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" |
357 | @@ -134,12 +152,15 @@ |
358 | am__DEPENDENCIES_1 = |
359 | src_locate_DEPENDENCIES = src/liblib.a gnulib/lib/libgnu.a \ |
360 | $(am__DEPENDENCIES_1) |
361 | -am_src_updatedb_OBJECTS = src/src_updatedb-bind-mount.$(OBJEXT) \ |
362 | - src/src_updatedb-conf.$(OBJEXT) \ |
363 | +am_src_updatedb_OBJECTS = src/src_updatedb-conf.$(OBJEXT) \ |
364 | src/src_updatedb-updatedb.$(OBJEXT) |
365 | src_updatedb_OBJECTS = $(am_src_updatedb_OBJECTS) |
366 | src_updatedb_DEPENDENCIES = src/liblib.a gnulib/lib/libgnu.a \ |
367 | $(am__DEPENDENCIES_1) |
368 | +tests_bind_mount_helper_SOURCES = tests/bind-mount-helper.c |
369 | +tests_bind_mount_helper_OBJECTS = tests/bind-mount-helper.$(OBJEXT) |
370 | +tests_bind_mount_helper_DEPENDENCIES = src/liblib.a \ |
371 | + gnulib/lib/libgnu.a $(am__DEPENDENCIES_1) |
372 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src |
373 | depcomp = $(SHELL) $(top_srcdir)/admin/depcomp |
374 | am__depfiles_maybe = depfiles |
375 | @@ -148,9 +169,10 @@ |
376 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
377 | CCLD = $(CC) |
378 | LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
379 | -SOURCES = $(src_liblib_a_SOURCES) src/locate.c $(src_updatedb_SOURCES) |
380 | +SOURCES = $(src_liblib_a_SOURCES) src/locate.c $(src_updatedb_SOURCES) \ |
381 | + tests/bind-mount-helper.c |
382 | DIST_SOURCES = $(src_liblib_a_SOURCES) src/locate.c \ |
383 | - $(src_updatedb_SOURCES) |
384 | + $(src_updatedb_SOURCES) tests/bind-mount-helper.c |
385 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
386 | html-recursive info-recursive install-data-recursive \ |
387 | install-dvi-recursive install-exec-recursive \ |
388 | @@ -158,6 +180,11 @@ |
389 | install-pdf-recursive install-ps-recursive install-recursive \ |
390 | installcheck-recursive installdirs-recursive pdf-recursive \ |
391 | ps-recursive uninstall-recursive |
392 | +am__can_run_installinfo = \ |
393 | + case $$AM_UPDATE_INFO_DIR in \ |
394 | + n|no|NO) false;; \ |
395 | + *) (install-info --version) >/dev/null 2>&1;; \ |
396 | + esac |
397 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
398 | am__vpath_adj = case $$p in \ |
399 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
400 | @@ -179,6 +206,12 @@ |
401 | am__base_list = \ |
402 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
403 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
404 | +am__uninstall_files_from_dir = { \ |
405 | + test -z "$$files" \ |
406 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
407 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
408 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
409 | + } |
410 | man1dir = $(mandir)/man1 |
411 | man5dir = $(mandir)/man5 |
412 | man8dir = $(mandir)/man8 |
413 | @@ -196,9 +229,11 @@ |
414 | distdir = $(PACKAGE)-$(VERSION) |
415 | top_distdir = $(distdir) |
416 | am__remove_distdir = \ |
417 | - { test ! -d "$(distdir)" \ |
418 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
419 | - && rm -fr "$(distdir)"; }; } |
420 | + if test -d "$(distdir)"; then \ |
421 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
422 | + && rm -rf "$(distdir)" \ |
423 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
424 | + else :; fi |
425 | am__relativize = \ |
426 | dir0=`pwd`; \ |
427 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
428 | @@ -227,6 +262,8 @@ |
429 | GZIP_ENV = --best |
430 | DIST_ARCHIVES = $(distdir).tar.xz |
431 | distuninstallcheck_listfiles = find . -type f -print |
432 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
433 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
434 | distcleancheck_listfiles = find . -type f -print |
435 | ACLOCAL = @ACLOCAL@ |
436 | ALLOCA = @ALLOCA@ |
437 | @@ -495,20 +532,23 @@ |
438 | EXTRA_DIST = doc/locate.1.in doc/updatedb.conf.5.in doc/updatedb.8.in \ |
439 | tests/testsuite tests/package.m4 tests/testsuite.at $(TESTFILES) |
440 | |
441 | -TESTFILES = tests/config.at tests/locate.at tests/updatedb.at |
442 | -src_liblib_a_SOURCES = src/db.h src/lib.c src/lib.h |
443 | +TESTFILES = tests/bind-mount.at tests/config.at tests/locate.at \ |
444 | + tests/updatedb.at |
445 | + |
446 | +src_liblib_a_SOURCES = src/bind-mount.c src/bind-mount.h src/db.h \ |
447 | + src/lib.c src/lib.h |
448 | + |
449 | src_locate_CPPFLAGS = $(AM_CPPFLAGS) $(COMMON_CPPFLAGS) |
450 | src_locate_LDADD = src/liblib.a gnulib/lib/libgnu.a $(LIBINTL) |
451 | -src_updatedb_SOURCES = src/bind-mount.c src/bind-mount.h src/conf.c src/conf.h \ |
452 | - src/updatedb.c |
453 | - |
454 | +src_updatedb_SOURCES = src/conf.c src/conf.h src/updatedb.c |
455 | src_updatedb_CPPFLAGS = $(AM_CPPFLAGS) $(COMMON_CPPFLAGS) $(CONF_CPPFLAGS) |
456 | src_updatedb_LDADD = src/liblib.a gnulib/lib/libgnu.a $(LIBINTL) |
457 | +tests_bind_mount_helper_LDADD = src/liblib.a gnulib/lib/libgnu.a $(LIBINTL) |
458 | all: all-recursive |
459 | |
460 | .SUFFIXES: |
461 | .SUFFIXES: .c .o .obj |
462 | -am--refresh: |
463 | +am--refresh: Makefile |
464 | @: |
465 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
466 | @for dep in $?; do \ |
467 | @@ -544,10 +584,8 @@ |
468 | $(am__aclocal_m4_deps): |
469 | |
470 | src/config.h: src/stamp-h1 |
471 | - @if test ! -f $@; then \ |
472 | - rm -f src/stamp-h1; \ |
473 | - $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; \ |
474 | - else :; fi |
475 | + @if test ! -f $@; then rm -f src/stamp-h1; else :; fi |
476 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1; else :; fi |
477 | |
478 | src/stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status |
479 | @rm -f src/stamp-h1 |
480 | @@ -568,15 +606,20 @@ |
481 | src/$(DEPDIR)/$(am__dirstamp): |
482 | @$(MKDIR_P) src/$(DEPDIR) |
483 | @: > src/$(DEPDIR)/$(am__dirstamp) |
484 | +src/bind-mount.$(OBJEXT): src/$(am__dirstamp) \ |
485 | + src/$(DEPDIR)/$(am__dirstamp) |
486 | src/lib.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) |
487 | -src/liblib.a: $(src_liblib_a_OBJECTS) $(src_liblib_a_DEPENDENCIES) src/$(am__dirstamp) |
488 | +src/liblib.a: $(src_liblib_a_OBJECTS) $(src_liblib_a_DEPENDENCIES) $(EXTRA_src_liblib_a_DEPENDENCIES) src/$(am__dirstamp) |
489 | -rm -f src/liblib.a |
490 | $(src_liblib_a_AR) src/liblib.a $(src_liblib_a_OBJECTS) $(src_liblib_a_LIBADD) |
491 | $(RANLIB) src/liblib.a |
492 | install-binPROGRAMS: $(bin_PROGRAMS) |
493 | @$(NORMAL_INSTALL) |
494 | - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
495 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
496 | + if test -n "$$list"; then \ |
497 | + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
498 | + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
499 | + fi; \ |
500 | for p in $$list; do echo "$$p $$p"; done | \ |
501 | sed 's/$(EXEEXT)$$//' | \ |
502 | while read p p1; do if test -f $$p; \ |
503 | @@ -610,37 +653,51 @@ |
504 | |
505 | clean-binPROGRAMS: |
506 | -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) |
507 | + |
508 | +clean-checkPROGRAMS: |
509 | + -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) |
510 | src/src_locate-locate.$(OBJEXT): src/$(am__dirstamp) \ |
511 | src/$(DEPDIR)/$(am__dirstamp) |
512 | -src/locate$(EXEEXT): $(src_locate_OBJECTS) $(src_locate_DEPENDENCIES) src/$(am__dirstamp) |
513 | +src/locate$(EXEEXT): $(src_locate_OBJECTS) $(src_locate_DEPENDENCIES) $(EXTRA_src_locate_DEPENDENCIES) src/$(am__dirstamp) |
514 | @rm -f src/locate$(EXEEXT) |
515 | $(LINK) $(src_locate_OBJECTS) $(src_locate_LDADD) $(LIBS) |
516 | -src/src_updatedb-bind-mount.$(OBJEXT): src/$(am__dirstamp) \ |
517 | - src/$(DEPDIR)/$(am__dirstamp) |
518 | src/src_updatedb-conf.$(OBJEXT): src/$(am__dirstamp) \ |
519 | src/$(DEPDIR)/$(am__dirstamp) |
520 | src/src_updatedb-updatedb.$(OBJEXT): src/$(am__dirstamp) \ |
521 | src/$(DEPDIR)/$(am__dirstamp) |
522 | -src/updatedb$(EXEEXT): $(src_updatedb_OBJECTS) $(src_updatedb_DEPENDENCIES) src/$(am__dirstamp) |
523 | +src/updatedb$(EXEEXT): $(src_updatedb_OBJECTS) $(src_updatedb_DEPENDENCIES) $(EXTRA_src_updatedb_DEPENDENCIES) src/$(am__dirstamp) |
524 | @rm -f src/updatedb$(EXEEXT) |
525 | $(LINK) $(src_updatedb_OBJECTS) $(src_updatedb_LDADD) $(LIBS) |
526 | +tests/$(am__dirstamp): |
527 | + @$(MKDIR_P) tests |
528 | + @: > tests/$(am__dirstamp) |
529 | +tests/$(DEPDIR)/$(am__dirstamp): |
530 | + @$(MKDIR_P) tests/$(DEPDIR) |
531 | + @: > tests/$(DEPDIR)/$(am__dirstamp) |
532 | +tests/bind-mount-helper.$(OBJEXT): tests/$(am__dirstamp) \ |
533 | + tests/$(DEPDIR)/$(am__dirstamp) |
534 | +tests/bind-mount-helper$(EXEEXT): $(tests_bind_mount_helper_OBJECTS) $(tests_bind_mount_helper_DEPENDENCIES) $(EXTRA_tests_bind_mount_helper_DEPENDENCIES) tests/$(am__dirstamp) |
535 | + @rm -f tests/bind-mount-helper$(EXEEXT) |
536 | + $(LINK) $(tests_bind_mount_helper_OBJECTS) $(tests_bind_mount_helper_LDADD) $(LIBS) |
537 | |
538 | mostlyclean-compile: |
539 | -rm -f *.$(OBJEXT) |
540 | + -rm -f src/bind-mount.$(OBJEXT) |
541 | -rm -f src/lib.$(OBJEXT) |
542 | -rm -f src/src_locate-locate.$(OBJEXT) |
543 | - -rm -f src/src_updatedb-bind-mount.$(OBJEXT) |
544 | -rm -f src/src_updatedb-conf.$(OBJEXT) |
545 | -rm -f src/src_updatedb-updatedb.$(OBJEXT) |
546 | + -rm -f tests/bind-mount-helper.$(OBJEXT) |
547 | |
548 | distclean-compile: |
549 | -rm -f *.tab.c |
550 | |
551 | +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/bind-mount.Po@am__quote@ |
552 | @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lib.Po@am__quote@ |
553 | @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_locate-locate.Po@am__quote@ |
554 | -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_updatedb-bind-mount.Po@am__quote@ |
555 | @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_updatedb-conf.Po@am__quote@ |
556 | @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_updatedb-updatedb.Po@am__quote@ |
557 | +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/bind-mount-helper.Po@am__quote@ |
558 | |
559 | .c.o: |
560 | @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ |
561 | @@ -672,20 +729,6 @@ |
562 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
563 | @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_locate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_locate-locate.obj `if test -f 'src/locate.c'; then $(CYGPATH_W) 'src/locate.c'; else $(CYGPATH_W) '$(srcdir)/src/locate.c'; fi` |
564 | |
565 | -src/src_updatedb-bind-mount.o: src/bind-mount.c |
566 | -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_updatedb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_updatedb-bind-mount.o -MD -MP -MF src/$(DEPDIR)/src_updatedb-bind-mount.Tpo -c -o src/src_updatedb-bind-mount.o `test -f 'src/bind-mount.c' || echo '$(srcdir)/'`src/bind-mount.c |
567 | -@am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/src_updatedb-bind-mount.Tpo src/$(DEPDIR)/src_updatedb-bind-mount.Po |
568 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/bind-mount.c' object='src/src_updatedb-bind-mount.o' libtool=no @AMDEPBACKSLASH@ |
569 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
570 | -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_updatedb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_updatedb-bind-mount.o `test -f 'src/bind-mount.c' || echo '$(srcdir)/'`src/bind-mount.c |
571 | - |
572 | -src/src_updatedb-bind-mount.obj: src/bind-mount.c |
573 | -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_updatedb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_updatedb-bind-mount.obj -MD -MP -MF src/$(DEPDIR)/src_updatedb-bind-mount.Tpo -c -o src/src_updatedb-bind-mount.obj `if test -f 'src/bind-mount.c'; then $(CYGPATH_W) 'src/bind-mount.c'; else $(CYGPATH_W) '$(srcdir)/src/bind-mount.c'; fi` |
574 | -@am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/src_updatedb-bind-mount.Tpo src/$(DEPDIR)/src_updatedb-bind-mount.Po |
575 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/bind-mount.c' object='src/src_updatedb-bind-mount.obj' libtool=no @AMDEPBACKSLASH@ |
576 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
577 | -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_updatedb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_updatedb-bind-mount.obj `if test -f 'src/bind-mount.c'; then $(CYGPATH_W) 'src/bind-mount.c'; else $(CYGPATH_W) '$(srcdir)/src/bind-mount.c'; fi` |
578 | - |
579 | src/src_updatedb-conf.o: src/conf.c |
580 | @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_updatedb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_updatedb-conf.o -MD -MP -MF src/$(DEPDIR)/src_updatedb-conf.Tpo -c -o src/src_updatedb-conf.o `test -f 'src/conf.c' || echo '$(srcdir)/'`src/conf.c |
581 | @am__fastdepCC_TRUE@ $(am__mv) src/$(DEPDIR)/src_updatedb-conf.Tpo src/$(DEPDIR)/src_updatedb-conf.Po |
582 | @@ -715,11 +758,18 @@ |
583 | @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_updatedb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_updatedb-updatedb.obj `if test -f 'src/updatedb.c'; then $(CYGPATH_W) 'src/updatedb.c'; else $(CYGPATH_W) '$(srcdir)/src/updatedb.c'; fi` |
584 | install-man1: $(dist_man_MANS) $(man_MANS) |
585 | @$(NORMAL_INSTALL) |
586 | - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" |
587 | - @list=''; test -n "$(man1dir)" || exit 0; \ |
588 | - { for i in $$list; do echo "$$i"; done; \ |
589 | - l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
590 | - sed -n '/\.1[a-z]*$$/p'; \ |
591 | + @list1=''; \ |
592 | + list2='$(dist_man_MANS) $(man_MANS)'; \ |
593 | + test -n "$(man1dir)" \ |
594 | + && test -n "`echo $$list1$$list2`" \ |
595 | + || exit 0; \ |
596 | + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ |
597 | + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ |
598 | + { for i in $$list1; do echo "$$i"; done; \ |
599 | + if test -n "$$list2"; then \ |
600 | + for i in $$list2; do echo "$$i"; done \ |
601 | + | sed -n '/\.1[a-z]*$$/p'; \ |
602 | + fi; \ |
603 | } | while read p; do \ |
604 | if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
605 | echo "$$d$$p"; echo "$$p"; \ |
606 | @@ -748,16 +798,21 @@ |
607 | sed -n '/\.1[a-z]*$$/p'; \ |
608 | } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ |
609 | -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ |
610 | - test -z "$$files" || { \ |
611 | - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ |
612 | - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } |
613 | + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) |
614 | install-man5: $(dist_man_MANS) $(man_MANS) |
615 | @$(NORMAL_INSTALL) |
616 | - test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" |
617 | - @list=''; test -n "$(man5dir)" || exit 0; \ |
618 | - { for i in $$list; do echo "$$i"; done; \ |
619 | - l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
620 | - sed -n '/\.5[a-z]*$$/p'; \ |
621 | + @list1=''; \ |
622 | + list2='$(dist_man_MANS) $(man_MANS)'; \ |
623 | + test -n "$(man5dir)" \ |
624 | + && test -n "`echo $$list1$$list2`" \ |
625 | + || exit 0; \ |
626 | + echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \ |
627 | + $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \ |
628 | + { for i in $$list1; do echo "$$i"; done; \ |
629 | + if test -n "$$list2"; then \ |
630 | + for i in $$list2; do echo "$$i"; done \ |
631 | + | sed -n '/\.5[a-z]*$$/p'; \ |
632 | + fi; \ |
633 | } | while read p; do \ |
634 | if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
635 | echo "$$d$$p"; echo "$$p"; \ |
636 | @@ -786,16 +841,21 @@ |
637 | sed -n '/\.5[a-z]*$$/p'; \ |
638 | } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ |
639 | -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ |
640 | - test -z "$$files" || { \ |
641 | - echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \ |
642 | - cd "$(DESTDIR)$(man5dir)" && rm -f $$files; } |
643 | + dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) |
644 | install-man8: $(dist_man_MANS) $(man_MANS) |
645 | @$(NORMAL_INSTALL) |
646 | - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" |
647 | - @list=''; test -n "$(man8dir)" || exit 0; \ |
648 | - { for i in $$list; do echo "$$i"; done; \ |
649 | - l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
650 | - sed -n '/\.8[a-z]*$$/p'; \ |
651 | + @list1=''; \ |
652 | + list2='$(dist_man_MANS) $(man_MANS)'; \ |
653 | + test -n "$(man8dir)" \ |
654 | + && test -n "`echo $$list1$$list2`" \ |
655 | + || exit 0; \ |
656 | + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ |
657 | + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ |
658 | + { for i in $$list1; do echo "$$i"; done; \ |
659 | + if test -n "$$list2"; then \ |
660 | + for i in $$list2; do echo "$$i"; done \ |
661 | + | sed -n '/\.8[a-z]*$$/p'; \ |
662 | + fi; \ |
663 | } | while read p; do \ |
664 | if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
665 | echo "$$d$$p"; echo "$$p"; \ |
666 | @@ -824,9 +884,7 @@ |
667 | sed -n '/\.8[a-z]*$$/p'; \ |
668 | } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ |
669 | -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ |
670 | - test -z "$$files" || { \ |
671 | - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ |
672 | - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } |
673 | + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) |
674 | |
675 | # This directory's subdirectories are mostly independent; you can cd |
676 | # into them and run `make' without going through this Makefile. |
677 | @@ -1010,13 +1068,10 @@ |
678 | done |
679 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
680 | if test "$$subdir" = .; then :; else \ |
681 | - test -d "$(distdir)/$$subdir" \ |
682 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
683 | - || exit 1; \ |
684 | - fi; \ |
685 | - done |
686 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
687 | - if test "$$subdir" = .; then :; else \ |
688 | + $(am__make_dryrun) \ |
689 | + || test -d "$(distdir)/$$subdir" \ |
690 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
691 | + || exit 1; \ |
692 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
693 | $(am__relativize); \ |
694 | new_distdir=$$reldir; \ |
695 | @@ -1048,14 +1103,18 @@ |
696 | $(am__remove_distdir) |
697 | |
698 | dist-bzip2: distdir |
699 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
700 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
701 | + $(am__remove_distdir) |
702 | + |
703 | +dist-lzip: distdir |
704 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
705 | $(am__remove_distdir) |
706 | |
707 | dist-lzma: distdir |
708 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
709 | $(am__remove_distdir) |
710 | dist-xz: distdir |
711 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
712 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
713 | $(am__remove_distdir) |
714 | |
715 | dist-tarZ: distdir |
716 | @@ -1072,7 +1131,7 @@ |
717 | $(am__remove_distdir) |
718 | |
719 | dist dist-all: distdir |
720 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
721 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
722 | $(am__remove_distdir) |
723 | |
724 | # This target untars the dist file and tries a VPATH configuration. Then |
725 | @@ -1086,6 +1145,8 @@ |
726 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
727 | *.tar.lzma*) \ |
728 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
729 | + *.tar.lz*) \ |
730 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
731 | *.tar.xz*) \ |
732 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
733 | *.tar.Z*) \ |
734 | @@ -1095,7 +1156,7 @@ |
735 | *.zip*) \ |
736 | unzip $(distdir).zip ;;\ |
737 | esac |
738 | - chmod -R a-w $(distdir); chmod a+w $(distdir) |
739 | + chmod -R a-w $(distdir); chmod u+w $(distdir) |
740 | mkdir $(distdir)/_build |
741 | mkdir $(distdir)/_inst |
742 | chmod a-w $(distdir) |
743 | @@ -1105,6 +1166,7 @@ |
744 | && am__cwd=`pwd` \ |
745 | && $(am__cd) $(distdir)/_build \ |
746 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
747 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
748 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
749 | && $(MAKE) $(AM_MAKEFLAGS) \ |
750 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
751 | @@ -1133,8 +1195,16 @@ |
752 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
753 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
754 | distuninstallcheck: |
755 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
756 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
757 | + @test -n '$(distuninstallcheck_dir)' || { \ |
758 | + echo 'ERROR: trying to run $@ with an empty' \ |
759 | + '$$(distuninstallcheck_dir)' >&2; \ |
760 | + exit 1; \ |
761 | + }; \ |
762 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
763 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
764 | + exit 1; \ |
765 | + }; \ |
766 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
767 | || { echo "ERROR: files left after uninstall:" ; \ |
768 | if test -n "$(DESTDIR)"; then \ |
769 | echo " (check DESTDIR support)"; \ |
770 | @@ -1151,6 +1221,7 @@ |
771 | $(distcleancheck_listfiles) ; \ |
772 | exit 1; } >&2 |
773 | check-am: all-am |
774 | + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) |
775 | $(MAKE) $(AM_MAKEFLAGS) check-local |
776 | check: check-recursive |
777 | all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) |
778 | @@ -1169,10 +1240,15 @@ |
779 | |
780 | installcheck: installcheck-recursive |
781 | install-strip: |
782 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
783 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
784 | - `test -z '$(STRIP)' || \ |
785 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
786 | + if test -z '$(STRIP)'; then \ |
787 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
788 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
789 | + install; \ |
790 | + else \ |
791 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
792 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
793 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
794 | + fi |
795 | mostlyclean-generic: |
796 | |
797 | clean-generic: |
798 | @@ -1183,6 +1259,8 @@ |
799 | -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
800 | -rm -f src/$(DEPDIR)/$(am__dirstamp) |
801 | -rm -f src/$(am__dirstamp) |
802 | + -rm -f tests/$(DEPDIR)/$(am__dirstamp) |
803 | + -rm -f tests/$(am__dirstamp) |
804 | -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) |
805 | |
806 | maintainer-clean-generic: |
807 | @@ -1190,12 +1268,12 @@ |
808 | @echo "it deletes files that may require special tools to rebuild." |
809 | clean: clean-recursive |
810 | |
811 | -clean-am: clean-binPROGRAMS clean-generic clean-local \ |
812 | - clean-noinstLIBRARIES mostlyclean-am |
813 | +clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ |
814 | + clean-local clean-noinstLIBRARIES mostlyclean-am |
815 | |
816 | distclean: distclean-recursive |
817 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
818 | - -rm -rf src/$(DEPDIR) |
819 | + -rm -rf src/$(DEPDIR) tests/$(DEPDIR) |
820 | -rm -f Makefile |
821 | distclean-am: clean-am distclean-compile distclean-generic \ |
822 | distclean-hdr distclean-tags |
823 | @@ -1244,7 +1322,7 @@ |
824 | maintainer-clean: maintainer-clean-recursive |
825 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
826 | -rm -rf $(top_srcdir)/autom4te.cache |
827 | - -rm -rf src/$(DEPDIR) |
828 | + -rm -rf src/$(DEPDIR) tests/$(DEPDIR) |
829 | -rm -f Makefile |
830 | maintainer-clean-am: distclean-am maintainer-clean-generic |
831 | |
832 | @@ -1270,24 +1348,24 @@ |
833 | |
834 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
835 | all all-am am--refresh check check-am check-local clean \ |
836 | - clean-binPROGRAMS clean-generic clean-local \ |
837 | - clean-noinstLIBRARIES ctags ctags-recursive dist dist-all \ |
838 | - dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \ |
839 | - dist-zip distcheck distclean distclean-compile \ |
840 | - distclean-generic distclean-hdr distclean-tags distcleancheck \ |
841 | - distdir distuninstallcheck dvi dvi-am html html-am info \ |
842 | - info-am install install-am install-binPROGRAMS install-data \ |
843 | - install-data-am install-dvi install-dvi-am install-exec \ |
844 | - install-exec-am install-exec-hook install-exec-local \ |
845 | - install-html install-html-am install-info install-info-am \ |
846 | - install-man install-man1 install-man5 install-man8 install-pdf \ |
847 | - install-pdf-am install-ps install-ps-am install-strip \ |
848 | - installcheck installcheck-am installcheck-local installdirs \ |
849 | - installdirs-am maintainer-clean maintainer-clean-generic \ |
850 | - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ |
851 | - ps ps-am tags tags-recursive uninstall uninstall-am \ |
852 | - uninstall-binPROGRAMS uninstall-man uninstall-man1 \ |
853 | - uninstall-man5 uninstall-man8 |
854 | + clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ |
855 | + clean-local clean-noinstLIBRARIES ctags ctags-recursive dist \ |
856 | + dist-all dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar \ |
857 | + dist-tarZ dist-xz dist-zip distcheck distclean \ |
858 | + distclean-compile distclean-generic distclean-hdr \ |
859 | + distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
860 | + dvi-am html html-am info info-am install install-am \ |
861 | + install-binPROGRAMS install-data install-data-am install-dvi \ |
862 | + install-dvi-am install-exec install-exec-am install-exec-hook \ |
863 | + install-exec-local install-html install-html-am install-info \ |
864 | + install-info-am install-man install-man1 install-man5 \ |
865 | + install-man8 install-pdf install-pdf-am install-ps \ |
866 | + install-ps-am install-strip installcheck installcheck-am \ |
867 | + installcheck-local installdirs installdirs-am maintainer-clean \ |
868 | + maintainer-clean-generic mostlyclean mostlyclean-compile \ |
869 | + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ |
870 | + uninstall uninstall-am uninstall-binPROGRAMS uninstall-man \ |
871 | + uninstall-man1 uninstall-man5 uninstall-man8 |
872 | |
873 | |
874 | doc/locate.1: $(srcdir)/doc/locate.1.in Makefile |
875 | @@ -1311,7 +1389,7 @@ |
876 | check-local: atconfig $(top_srcdir)/tests/testsuite |
877 | $(SHELL) $(top_srcdir)/tests/testsuite |
878 | |
879 | -installcheck-local: |
880 | +installcheck-local: atconfig $(top_srcdir)/tests/testsuite |
881 | $(SHELL) $(top_srcdir)/tests/testsuite AUTOTEST_PATH=$(bindir) |
882 | |
883 | install-exec-local: |
884 | |
885 | === modified file 'NEWS' |
886 | --- NEWS 2012-07-27 05:16:18 +0000 |
887 | +++ NEWS 2013-06-14 23:40:37 +0000 |
888 | @@ -1,3 +1,12 @@ |
889 | +Changes in version 0.26: |
890 | +- New option -A, --all, that requires all patterns to match. |
891 | + Based on a patch by Carlos J. G. Duarte <carlos.j.g.duarte@gmail.com>. |
892 | +- Add a >3-second margin when checking whether a directory is being |
893 | + currently modified, to account for low timestamp precision on FAT and for |
894 | + Linux kernel races. |
895 | +- Make the test suite more reliable and a little faster. |
896 | +- Updated translations. |
897 | + |
898 | Changes in version 0.25: |
899 | - Handle zero-length file names (a kernel bug) more gracefully. |
900 | - Avoid PATH_MAX to hopefully support Hurd better. |
901 | |
902 | === modified file 'aclocal.m4' |
903 | --- aclocal.m4 2012-07-27 05:16:18 +0000 |
904 | +++ aclocal.m4 2013-06-14 23:40:37 +0000 |
905 | @@ -1,7 +1,8 @@ |
906 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
907 | +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- |
908 | |
909 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
910 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
911 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
912 | +# Inc. |
913 | # This file is free software; the Free Software Foundation |
914 | # gives unlimited permission to copy and/or distribute it, |
915 | # with or without modifications, as long as this notice is preserved. |
916 | @@ -19,12 +20,15 @@ |
917 | If you have problems, you may need to regenerate the build system entirely. |
918 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
919 | |
920 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
921 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
922 | +# Foundation, Inc. |
923 | # |
924 | # This file is free software; the Free Software Foundation |
925 | # gives unlimited permission to copy and/or distribute it, |
926 | # with or without modifications, as long as this notice is preserved. |
927 | |
928 | +# serial 1 |
929 | + |
930 | # AM_AUTOMAKE_VERSION(VERSION) |
931 | # ---------------------------- |
932 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
933 | @@ -34,7 +38,7 @@ |
934 | [am__api_version='1.11' |
935 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
936 | dnl require some minimum version. Point them to the right macro. |
937 | -m4_if([$1], [1.11.1], [], |
938 | +m4_if([$1], [1.11.6], [], |
939 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
940 | ]) |
941 | |
942 | @@ -50,19 +54,21 @@ |
943 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
944 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
945 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
946 | -[AM_AUTOMAKE_VERSION([1.11.1])dnl |
947 | +[AM_AUTOMAKE_VERSION([1.11.6])dnl |
948 | m4_ifndef([AC_AUTOCONF_VERSION], |
949 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
950 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
951 | |
952 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
953 | |
954 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
955 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
956 | # |
957 | # This file is free software; the Free Software Foundation |
958 | # gives unlimited permission to copy and/or distribute it, |
959 | # with or without modifications, as long as this notice is preserved. |
960 | |
961 | +# serial 1 |
962 | + |
963 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
964 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
965 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
966 | @@ -144,14 +150,14 @@ |
967 | Usually this means the macro was only invoked conditionally.]]) |
968 | fi])]) |
969 | |
970 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
971 | -# Free Software Foundation, Inc. |
972 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
973 | +# 2010, 2011 Free Software Foundation, Inc. |
974 | # |
975 | # This file is free software; the Free Software Foundation |
976 | # gives unlimited permission to copy and/or distribute it, |
977 | # with or without modifications, as long as this notice is preserved. |
978 | |
979 | -# serial 10 |
980 | +# serial 12 |
981 | |
982 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
983 | # written in clear, in which case automake, when reading aclocal.m4, |
984 | @@ -191,6 +197,7 @@ |
985 | # instance it was reported that on HP-UX the gcc test will end up |
986 | # making a dummy file named `D' -- because `-MD' means `put the output |
987 | # in D'. |
988 | + rm -rf conftest.dir |
989 | mkdir conftest.dir |
990 | # Copy depcomp to subdir because otherwise we won't find it if we're |
991 | # using a relative directory. |
992 | @@ -255,7 +262,7 @@ |
993 | break |
994 | fi |
995 | ;; |
996 | - msvisualcpp | msvcmsys) |
997 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
998 | # This compiler won't grok `-c -o', but also, the minuso test has |
999 | # not run yet. These depmodes are late enough in the game, and |
1000 | # so weak that their functioning should not be impacted. |
1001 | @@ -320,10 +327,13 @@ |
1002 | if test "x$enable_dependency_tracking" != xno; then |
1003 | am_depcomp="$ac_aux_dir/depcomp" |
1004 | AMDEPBACKSLASH='\' |
1005 | + am__nodep='_no' |
1006 | fi |
1007 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
1008 | AC_SUBST([AMDEPBACKSLASH])dnl |
1009 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
1010 | +AC_SUBST([am__nodep])dnl |
1011 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
1012 | ]) |
1013 | |
1014 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
1015 | @@ -545,12 +555,15 @@ |
1016 | done |
1017 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
1018 | |
1019 | -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
1020 | +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
1021 | +# Inc. |
1022 | # |
1023 | # This file is free software; the Free Software Foundation |
1024 | # gives unlimited permission to copy and/or distribute it, |
1025 | # with or without modifications, as long as this notice is preserved. |
1026 | |
1027 | +# serial 1 |
1028 | + |
1029 | # AM_PROG_INSTALL_SH |
1030 | # ------------------ |
1031 | # Define $install_sh. |
1032 | @@ -717,12 +730,15 @@ |
1033 | fi |
1034 | ]) |
1035 | |
1036 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
1037 | +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
1038 | +# Inc. |
1039 | # |
1040 | # This file is free software; the Free Software Foundation |
1041 | # gives unlimited permission to copy and/or distribute it, |
1042 | # with or without modifications, as long as this notice is preserved. |
1043 | |
1044 | +# serial 1 |
1045 | + |
1046 | # AM_PROG_MKDIR_P |
1047 | # --------------- |
1048 | # Check for `mkdir -p'. |
1049 | @@ -745,13 +761,14 @@ |
1050 | |
1051 | # Helper functions for option handling. -*- Autoconf -*- |
1052 | |
1053 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
1054 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
1055 | +# Foundation, Inc. |
1056 | # |
1057 | # This file is free software; the Free Software Foundation |
1058 | # gives unlimited permission to copy and/or distribute it, |
1059 | # with or without modifications, as long as this notice is preserved. |
1060 | |
1061 | -# serial 4 |
1062 | +# serial 5 |
1063 | |
1064 | # _AM_MANGLE_OPTION(NAME) |
1065 | # ----------------------- |
1066 | @@ -759,13 +776,13 @@ |
1067 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
1068 | |
1069 | # _AM_SET_OPTION(NAME) |
1070 | -# ------------------------------ |
1071 | +# -------------------- |
1072 | # Set option NAME. Presently that only means defining a flag for this option. |
1073 | AC_DEFUN([_AM_SET_OPTION], |
1074 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
1075 | |
1076 | # _AM_SET_OPTIONS(OPTIONS) |
1077 | -# ---------------------------------- |
1078 | +# ------------------------ |
1079 | # OPTIONS is a space-separated list of Automake options. |
1080 | AC_DEFUN([_AM_SET_OPTIONS], |
1081 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
1082 | @@ -841,12 +858,14 @@ |
1083 | fi |
1084 | AC_MSG_RESULT(yes)]) |
1085 | |
1086 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
1087 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
1088 | # |
1089 | # This file is free software; the Free Software Foundation |
1090 | # gives unlimited permission to copy and/or distribute it, |
1091 | # with or without modifications, as long as this notice is preserved. |
1092 | |
1093 | +# serial 1 |
1094 | + |
1095 | # AM_PROG_INSTALL_STRIP |
1096 | # --------------------- |
1097 | # One issue with vendor `install' (even GNU) is that you can't |
1098 | @@ -869,13 +888,13 @@ |
1099 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1100 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1101 | |
1102 | -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
1103 | +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
1104 | # |
1105 | # This file is free software; the Free Software Foundation |
1106 | # gives unlimited permission to copy and/or distribute it, |
1107 | # with or without modifications, as long as this notice is preserved. |
1108 | |
1109 | -# serial 2 |
1110 | +# serial 3 |
1111 | |
1112 | # _AM_SUBST_NOTMAKE(VARIABLE) |
1113 | # --------------------------- |
1114 | @@ -884,13 +903,13 @@ |
1115 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
1116 | |
1117 | # AM_SUBST_NOTMAKE(VARIABLE) |
1118 | -# --------------------------- |
1119 | +# -------------------------- |
1120 | # Public sister of _AM_SUBST_NOTMAKE. |
1121 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
1122 | |
1123 | # Check how to create a tarball. -*- Autoconf -*- |
1124 | |
1125 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
1126 | +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
1127 | # |
1128 | # This file is free software; the Free Software Foundation |
1129 | # gives unlimited permission to copy and/or distribute it, |
1130 | @@ -912,10 +931,11 @@ |
1131 | # a tarball read from stdin. |
1132 | # $(am__untar) < result.tar |
1133 | AC_DEFUN([_AM_PROG_TAR], |
1134 | -[# Always define AMTAR for backward compatibility. |
1135 | -AM_MISSING_PROG([AMTAR], [tar]) |
1136 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
1137 | +# in the wild :-( We should find a proper way to deprecate it ... |
1138 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
1139 | m4_if([$1], [v7], |
1140 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
1141 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1142 | [m4_case([$1], [ustar],, [pax],, |
1143 | [m4_fatal([Unknown tar format])]) |
1144 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
1145 | |
1146 | === modified file 'admin/compile' |
1147 | --- admin/compile 2010-09-25 08:15:12 +0000 |
1148 | +++ admin/compile 2013-06-14 23:40:37 +0000 |
1149 | @@ -1,10 +1,10 @@ |
1150 | #! /bin/sh |
1151 | -# Wrapper for compilers which do not understand `-c -o'. |
1152 | - |
1153 | -scriptversion=2009-10-06.20; # UTC |
1154 | - |
1155 | -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software |
1156 | -# Foundation, Inc. |
1157 | +# Wrapper for compilers which do not understand '-c -o'. |
1158 | + |
1159 | +scriptversion=2012-03-05.13; # UTC |
1160 | + |
1161 | +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free |
1162 | +# Software Foundation, Inc. |
1163 | # Written by Tom Tromey <tromey@cygnus.com>. |
1164 | # |
1165 | # This program is free software; you can redistribute it and/or modify |
1166 | @@ -29,21 +29,219 @@ |
1167 | # bugs to <bug-automake@gnu.org> or send patches to |
1168 | # <automake-patches@gnu.org>. |
1169 | |
1170 | +nl=' |
1171 | +' |
1172 | + |
1173 | +# We need space, tab and new line, in precisely that order. Quoting is |
1174 | +# there to prevent tools from complaining about whitespace usage. |
1175 | +IFS=" "" $nl" |
1176 | + |
1177 | +file_conv= |
1178 | + |
1179 | +# func_file_conv build_file lazy |
1180 | +# Convert a $build file to $host form and store it in $file |
1181 | +# Currently only supports Windows hosts. If the determined conversion |
1182 | +# type is listed in (the comma separated) LAZY, no conversion will |
1183 | +# take place. |
1184 | +func_file_conv () |
1185 | +{ |
1186 | + file=$1 |
1187 | + case $file in |
1188 | + / | /[!/]*) # absolute file, and not a UNC file |
1189 | + if test -z "$file_conv"; then |
1190 | + # lazily determine how to convert abs files |
1191 | + case `uname -s` in |
1192 | + MINGW*) |
1193 | + file_conv=mingw |
1194 | + ;; |
1195 | + CYGWIN*) |
1196 | + file_conv=cygwin |
1197 | + ;; |
1198 | + *) |
1199 | + file_conv=wine |
1200 | + ;; |
1201 | + esac |
1202 | + fi |
1203 | + case $file_conv/,$2, in |
1204 | + *,$file_conv,*) |
1205 | + ;; |
1206 | + mingw/*) |
1207 | + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` |
1208 | + ;; |
1209 | + cygwin/*) |
1210 | + file=`cygpath -m "$file" || echo "$file"` |
1211 | + ;; |
1212 | + wine/*) |
1213 | + file=`winepath -w "$file" || echo "$file"` |
1214 | + ;; |
1215 | + esac |
1216 | + ;; |
1217 | + esac |
1218 | +} |
1219 | + |
1220 | +# func_cl_dashL linkdir |
1221 | +# Make cl look for libraries in LINKDIR |
1222 | +func_cl_dashL () |
1223 | +{ |
1224 | + func_file_conv "$1" |
1225 | + if test -z "$lib_path"; then |
1226 | + lib_path=$file |
1227 | + else |
1228 | + lib_path="$lib_path;$file" |
1229 | + fi |
1230 | + linker_opts="$linker_opts -LIBPATH:$file" |
1231 | +} |
1232 | + |
1233 | +# func_cl_dashl library |
1234 | +# Do a library search-path lookup for cl |
1235 | +func_cl_dashl () |
1236 | +{ |
1237 | + lib=$1 |
1238 | + found=no |
1239 | + save_IFS=$IFS |
1240 | + IFS=';' |
1241 | + for dir in $lib_path $LIB |
1242 | + do |
1243 | + IFS=$save_IFS |
1244 | + if $shared && test -f "$dir/$lib.dll.lib"; then |
1245 | + found=yes |
1246 | + lib=$dir/$lib.dll.lib |
1247 | + break |
1248 | + fi |
1249 | + if test -f "$dir/$lib.lib"; then |
1250 | + found=yes |
1251 | + lib=$dir/$lib.lib |
1252 | + break |
1253 | + fi |
1254 | + done |
1255 | + IFS=$save_IFS |
1256 | + |
1257 | + if test "$found" != yes; then |
1258 | + lib=$lib.lib |
1259 | + fi |
1260 | +} |
1261 | + |
1262 | +# func_cl_wrapper cl arg... |
1263 | +# Adjust compile command to suit cl |
1264 | +func_cl_wrapper () |
1265 | +{ |
1266 | + # Assume a capable shell |
1267 | + lib_path= |
1268 | + shared=: |
1269 | + linker_opts= |
1270 | + for arg |
1271 | + do |
1272 | + if test -n "$eat"; then |
1273 | + eat= |
1274 | + else |
1275 | + case $1 in |
1276 | + -o) |
1277 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
1278 | + eat=1 |
1279 | + case $2 in |
1280 | + *.o | *.[oO][bB][jJ]) |
1281 | + func_file_conv "$2" |
1282 | + set x "$@" -Fo"$file" |
1283 | + shift |
1284 | + ;; |
1285 | + *) |
1286 | + func_file_conv "$2" |
1287 | + set x "$@" -Fe"$file" |
1288 | + shift |
1289 | + ;; |
1290 | + esac |
1291 | + ;; |
1292 | + -I) |
1293 | + eat=1 |
1294 | + func_file_conv "$2" mingw |
1295 | + set x "$@" -I"$file" |
1296 | + shift |
1297 | + ;; |
1298 | + -I*) |
1299 | + func_file_conv "${1#-I}" mingw |
1300 | + set x "$@" -I"$file" |
1301 | + shift |
1302 | + ;; |
1303 | + -l) |
1304 | + eat=1 |
1305 | + func_cl_dashl "$2" |
1306 | + set x "$@" "$lib" |
1307 | + shift |
1308 | + ;; |
1309 | + -l*) |
1310 | + func_cl_dashl "${1#-l}" |
1311 | + set x "$@" "$lib" |
1312 | + shift |
1313 | + ;; |
1314 | + -L) |
1315 | + eat=1 |
1316 | + func_cl_dashL "$2" |
1317 | + ;; |
1318 | + -L*) |
1319 | + func_cl_dashL "${1#-L}" |
1320 | + ;; |
1321 | + -static) |
1322 | + shared=false |
1323 | + ;; |
1324 | + -Wl,*) |
1325 | + arg=${1#-Wl,} |
1326 | + save_ifs="$IFS"; IFS=',' |
1327 | + for flag in $arg; do |
1328 | + IFS="$save_ifs" |
1329 | + linker_opts="$linker_opts $flag" |
1330 | + done |
1331 | + IFS="$save_ifs" |
1332 | + ;; |
1333 | + -Xlinker) |
1334 | + eat=1 |
1335 | + linker_opts="$linker_opts $2" |
1336 | + ;; |
1337 | + -*) |
1338 | + set x "$@" "$1" |
1339 | + shift |
1340 | + ;; |
1341 | + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) |
1342 | + func_file_conv "$1" |
1343 | + set x "$@" -Tp"$file" |
1344 | + shift |
1345 | + ;; |
1346 | + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) |
1347 | + func_file_conv "$1" mingw |
1348 | + set x "$@" "$file" |
1349 | + shift |
1350 | + ;; |
1351 | + *) |
1352 | + set x "$@" "$1" |
1353 | + shift |
1354 | + ;; |
1355 | + esac |
1356 | + fi |
1357 | + shift |
1358 | + done |
1359 | + if test -n "$linker_opts"; then |
1360 | + linker_opts="-link$linker_opts" |
1361 | + fi |
1362 | + exec "$@" $linker_opts |
1363 | + exit 1 |
1364 | +} |
1365 | + |
1366 | +eat= |
1367 | + |
1368 | case $1 in |
1369 | '') |
1370 | - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 |
1371 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1372 | exit 1; |
1373 | ;; |
1374 | -h | --h*) |
1375 | cat <<\EOF |
1376 | Usage: compile [--help] [--version] PROGRAM [ARGS] |
1377 | |
1378 | -Wrapper for compilers which do not understand `-c -o'. |
1379 | -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining |
1380 | +Wrapper for compilers which do not understand '-c -o'. |
1381 | +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining |
1382 | arguments, and rename the output as expected. |
1383 | |
1384 | If you are trying to build a whole package this is not the |
1385 | -right script to run: please start by reading the file `INSTALL'. |
1386 | +right script to run: please start by reading the file 'INSTALL'. |
1387 | |
1388 | Report bugs to <bug-automake@gnu.org>. |
1389 | EOF |
1390 | @@ -53,11 +251,13 @@ |
1391 | echo "compile $scriptversion" |
1392 | exit $? |
1393 | ;; |
1394 | + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) |
1395 | + func_cl_wrapper "$@" # Doesn't return... |
1396 | + ;; |
1397 | esac |
1398 | |
1399 | ofile= |
1400 | cfile= |
1401 | -eat= |
1402 | |
1403 | for arg |
1404 | do |
1405 | @@ -66,8 +266,8 @@ |
1406 | else |
1407 | case $1 in |
1408 | -o) |
1409 | - # configure might choose to run compile as `compile cc -o foo foo.c'. |
1410 | - # So we strip `-o arg' only if arg is an object. |
1411 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
1412 | + # So we strip '-o arg' only if arg is an object. |
1413 | eat=1 |
1414 | case $2 in |
1415 | *.o | *.obj) |
1416 | @@ -94,10 +294,10 @@ |
1417 | done |
1418 | |
1419 | if test -z "$ofile" || test -z "$cfile"; then |
1420 | - # If no `-o' option was seen then we might have been invoked from a |
1421 | + # If no '-o' option was seen then we might have been invoked from a |
1422 | # pattern rule where we don't need one. That is ok -- this is a |
1423 | # normal compilation that the losing compiler can handle. If no |
1424 | - # `.c' file was seen then we are probably linking. That is also |
1425 | + # '.c' file was seen then we are probably linking. That is also |
1426 | # ok. |
1427 | exec "$@" |
1428 | fi |
1429 | @@ -106,7 +306,7 @@ |
1430 | cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` |
1431 | |
1432 | # Create the lock directory. |
1433 | -# Note: use `[/\\:.-]' here to ensure that we don't use the same name |
1434 | +# Note: use '[/\\:.-]' here to ensure that we don't use the same name |
1435 | # that we are using for the .o file. Also, base the name on the expected |
1436 | # object file name, since that is what matters with a parallel build. |
1437 | lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d |
1438 | |
1439 | === modified file 'admin/config.sub' |
1440 | --- admin/config.sub 2013-02-08 16:46:51 +0000 |
1441 | +++ admin/config.sub 2013-06-14 23:40:37 +0000 |
1442 | @@ -4,7 +4,7 @@ |
1443 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1444 | # 2011, 2012 Free Software Foundation, Inc. |
1445 | |
1446 | -timestamp='2012-04-18' |
1447 | +timestamp='2012-02-10' |
1448 | |
1449 | # This file is (in principle) common to ALL GNU software. |
1450 | # The presence of a machine in this file suggests that SOME GNU software |
1451 | @@ -225,12 +225,6 @@ |
1452 | -isc*) |
1453 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1454 | ;; |
1455 | - -lynx*178) |
1456 | - os=-lynxos178 |
1457 | - ;; |
1458 | - -lynx*5) |
1459 | - os=-lynxos5 |
1460 | - ;; |
1461 | -lynx*) |
1462 | os=-lynxos |
1463 | ;; |
1464 | @@ -1543,9 +1537,6 @@ |
1465 | c4x-* | tic4x-*) |
1466 | os=-coff |
1467 | ;; |
1468 | - hexagon-*) |
1469 | - os=-elf |
1470 | - ;; |
1471 | tic54x-*) |
1472 | os=-coff |
1473 | ;; |
1474 | |
1475 | === modified file 'admin/depcomp' |
1476 | --- admin/depcomp 2009-11-03 22:43:19 +0000 |
1477 | +++ admin/depcomp 2013-06-14 23:40:37 +0000 |
1478 | @@ -1,10 +1,10 @@ |
1479 | #! /bin/sh |
1480 | # depcomp - compile a program generating dependencies as side-effects |
1481 | |
1482 | -scriptversion=2009-04-28.21; # UTC |
1483 | +scriptversion=2012-03-27.16; # UTC |
1484 | |
1485 | -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free |
1486 | -# Software Foundation, Inc. |
1487 | +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, |
1488 | +# 2011, 2012 Free Software Foundation, Inc. |
1489 | |
1490 | # This program is free software; you can redistribute it and/or modify |
1491 | # it under the terms of the GNU General Public License as published by |
1492 | @@ -28,7 +28,7 @@ |
1493 | |
1494 | case $1 in |
1495 | '') |
1496 | - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 |
1497 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1498 | exit 1; |
1499 | ;; |
1500 | -h | --h*) |
1501 | @@ -40,11 +40,11 @@ |
1502 | |
1503 | Environment variables: |
1504 | depmode Dependency tracking mode. |
1505 | - source Source file read by `PROGRAMS ARGS'. |
1506 | - object Object file output by `PROGRAMS ARGS'. |
1507 | + source Source file read by 'PROGRAMS ARGS'. |
1508 | + object Object file output by 'PROGRAMS ARGS'. |
1509 | DEPDIR directory where to store dependencies. |
1510 | depfile Dependency file to output. |
1511 | - tmpdepfile Temporary file to use when outputing dependencies. |
1512 | + tmpdepfile Temporary file to use when outputting dependencies. |
1513 | libtool Whether libtool is used (yes/no). |
1514 | |
1515 | Report bugs to <bug-automake@gnu.org>. |
1516 | @@ -57,6 +57,12 @@ |
1517 | ;; |
1518 | esac |
1519 | |
1520 | +# A tabulation character. |
1521 | +tab=' ' |
1522 | +# A newline character. |
1523 | +nl=' |
1524 | +' |
1525 | + |
1526 | if test -z "$depmode" || test -z "$source" || test -z "$object"; then |
1527 | echo "depcomp: Variables source, object and depmode must be set" 1>&2 |
1528 | exit 1 |
1529 | @@ -90,10 +96,24 @@ |
1530 | # This is just like msvisualcpp but w/o cygpath translation. |
1531 | # Just convert the backslash-escaped backslashes to single forward |
1532 | # slashes to satisfy depend.m4 |
1533 | - cygpath_u="sed s,\\\\\\\\,/,g" |
1534 | + cygpath_u='sed s,\\\\,/,g' |
1535 | depmode=msvisualcpp |
1536 | fi |
1537 | |
1538 | +if test "$depmode" = msvc7msys; then |
1539 | + # This is just like msvc7 but w/o cygpath translation. |
1540 | + # Just convert the backslash-escaped backslashes to single forward |
1541 | + # slashes to satisfy depend.m4 |
1542 | + cygpath_u='sed s,\\\\,/,g' |
1543 | + depmode=msvc7 |
1544 | +fi |
1545 | + |
1546 | +if test "$depmode" = xlc; then |
1547 | + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. |
1548 | + gccflag=-qmakedep=gcc,-MF |
1549 | + depmode=gcc |
1550 | +fi |
1551 | + |
1552 | case "$depmode" in |
1553 | gcc3) |
1554 | ## gcc 3 implements dependency tracking that does exactly what |
1555 | @@ -148,20 +168,21 @@ |
1556 | ## The second -e expression handles DOS-style file names with drive letters. |
1557 | sed -e 's/^[^:]*: / /' \ |
1558 | -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" |
1559 | -## This next piece of magic avoids the `deleted header file' problem. |
1560 | +## This next piece of magic avoids the "deleted header file" problem. |
1561 | ## The problem is that when a header file which appears in a .P file |
1562 | ## is deleted, the dependency causes make to die (because there is |
1563 | ## typically no way to rebuild the header). We avoid this by adding |
1564 | ## dummy dependencies for each header file. Too bad gcc doesn't do |
1565 | ## this for us directly. |
1566 | - tr ' ' ' |
1567 | -' < "$tmpdepfile" | |
1568 | -## Some versions of gcc put a space before the `:'. On the theory |
1569 | + tr ' ' "$nl" < "$tmpdepfile" | |
1570 | +## Some versions of gcc put a space before the ':'. On the theory |
1571 | ## that the space means something, we add a space to the output as |
1572 | -## well. |
1573 | +## well. hp depmode also adds that space, but also prefixes the VPATH |
1574 | +## to the object. Take care to not repeat it in the output. |
1575 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
1576 | ## correctly. Breaking it into two sed invocations is a workaround. |
1577 | - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
1578 | + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
1579 | + | sed -e 's/$/ :/' >> "$depfile" |
1580 | rm -f "$tmpdepfile" |
1581 | ;; |
1582 | |
1583 | @@ -193,18 +214,15 @@ |
1584 | # clever and replace this with sed code, as IRIX sed won't handle |
1585 | # lines with more than a fixed number of characters (4096 in |
1586 | # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; |
1587 | - # the IRIX cc adds comments like `#:fec' to the end of the |
1588 | + # the IRIX cc adds comments like '#:fec' to the end of the |
1589 | # dependency line. |
1590 | - tr ' ' ' |
1591 | -' < "$tmpdepfile" \ |
1592 | + tr ' ' "$nl" < "$tmpdepfile" \ |
1593 | | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ |
1594 | - tr ' |
1595 | -' ' ' >> "$depfile" |
1596 | + tr "$nl" ' ' >> "$depfile" |
1597 | echo >> "$depfile" |
1598 | |
1599 | # The second pass generates a dummy entry for each header file. |
1600 | - tr ' ' ' |
1601 | -' < "$tmpdepfile" \ |
1602 | + tr ' ' "$nl" < "$tmpdepfile" \ |
1603 | | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ |
1604 | >> "$depfile" |
1605 | else |
1606 | @@ -216,10 +234,17 @@ |
1607 | rm -f "$tmpdepfile" |
1608 | ;; |
1609 | |
1610 | +xlc) |
1611 | + # This case exists only to let depend.m4 do its work. It works by |
1612 | + # looking at the text of this script. This case will never be run, |
1613 | + # since it is checked for above. |
1614 | + exit 1 |
1615 | + ;; |
1616 | + |
1617 | aix) |
1618 | # The C for AIX Compiler uses -M and outputs the dependencies |
1619 | # in a .u file. In older versions, this file always lives in the |
1620 | - # current directory. Also, the AIX compiler puts `$object:' at the |
1621 | + # current directory. Also, the AIX compiler puts '$object:' at the |
1622 | # start of each line; $object doesn't have directory information. |
1623 | # Version 6 uses the directory in both cases. |
1624 | dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
1625 | @@ -249,12 +274,11 @@ |
1626 | test -f "$tmpdepfile" && break |
1627 | done |
1628 | if test -f "$tmpdepfile"; then |
1629 | - # Each line is of the form `foo.o: dependent.h'. |
1630 | + # Each line is of the form 'foo.o: dependent.h'. |
1631 | # Do two passes, one to just change these to |
1632 | - # `$object: dependent.h' and one to simply `dependent.h:'. |
1633 | + # '$object: dependent.h' and one to simply 'dependent.h:'. |
1634 | sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
1635 | - # That's a tab and a space in the []. |
1636 | - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
1637 | + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
1638 | else |
1639 | # The sourcefile does not contain any dependencies, so just |
1640 | # store a dummy comment line, to avoid errors with the Makefile |
1641 | @@ -265,23 +289,26 @@ |
1642 | ;; |
1643 | |
1644 | icc) |
1645 | - # Intel's C compiler understands `-MD -MF file'. However on |
1646 | - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c |
1647 | + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. |
1648 | + # However on |
1649 | + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c |
1650 | # ICC 7.0 will fill foo.d with something like |
1651 | # foo.o: sub/foo.c |
1652 | # foo.o: sub/foo.h |
1653 | - # which is wrong. We want: |
1654 | + # which is wrong. We want |
1655 | # sub/foo.o: sub/foo.c |
1656 | # sub/foo.o: sub/foo.h |
1657 | # sub/foo.c: |
1658 | # sub/foo.h: |
1659 | # ICC 7.1 will output |
1660 | # foo.o: sub/foo.c sub/foo.h |
1661 | - # and will wrap long lines using \ : |
1662 | + # and will wrap long lines using '\': |
1663 | # foo.o: sub/foo.c ... \ |
1664 | # sub/foo.h ... \ |
1665 | # ... |
1666 | - |
1667 | + # tcc 0.9.26 (FIXME still under development at the moment of writing) |
1668 | + # will emit a similar output, but also prepend the continuation lines |
1669 | + # with horizontal tabulation characters. |
1670 | "$@" -MD -MF "$tmpdepfile" |
1671 | stat=$? |
1672 | if test $stat -eq 0; then : |
1673 | @@ -290,15 +317,21 @@ |
1674 | exit $stat |
1675 | fi |
1676 | rm -f "$depfile" |
1677 | - # Each line is of the form `foo.o: dependent.h', |
1678 | - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. |
1679 | + # Each line is of the form 'foo.o: dependent.h', |
1680 | + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. |
1681 | # Do two passes, one to just change these to |
1682 | - # `$object: dependent.h' and one to simply `dependent.h:'. |
1683 | - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" |
1684 | - # Some versions of the HPUX 10.20 sed can't process this invocation |
1685 | - # correctly. Breaking it into two sed invocations is a workaround. |
1686 | - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | |
1687 | - sed -e 's/$/ :/' >> "$depfile" |
1688 | + # '$object: dependent.h' and one to simply 'dependent.h:'. |
1689 | + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ |
1690 | + < "$tmpdepfile" > "$depfile" |
1691 | + sed ' |
1692 | + s/[ '"$tab"'][ '"$tab"']*/ /g |
1693 | + s/^ *// |
1694 | + s/ *\\*$// |
1695 | + s/^[^:]*: *// |
1696 | + /^$/d |
1697 | + /:$/d |
1698 | + s/$/ :/ |
1699 | + ' < "$tmpdepfile" >> "$depfile" |
1700 | rm -f "$tmpdepfile" |
1701 | ;; |
1702 | |
1703 | @@ -334,7 +367,7 @@ |
1704 | done |
1705 | if test -f "$tmpdepfile"; then |
1706 | sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" |
1707 | - # Add `dependent.h:' lines. |
1708 | + # Add 'dependent.h:' lines. |
1709 | sed -ne '2,${ |
1710 | s/^ *// |
1711 | s/ \\*$// |
1712 | @@ -349,9 +382,9 @@ |
1713 | |
1714 | tru64) |
1715 | # The Tru64 compiler uses -MD to generate dependencies as a side |
1716 | - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. |
1717 | + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. |
1718 | # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put |
1719 | - # dependencies in `foo.d' instead, so we check for that too. |
1720 | + # dependencies in 'foo.d' instead, so we check for that too. |
1721 | # Subdirectories are respected. |
1722 | dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
1723 | test "x$dir" = "x$object" && dir= |
1724 | @@ -397,14 +430,59 @@ |
1725 | done |
1726 | if test -f "$tmpdepfile"; then |
1727 | sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
1728 | - # That's a tab and a space in the []. |
1729 | - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
1730 | + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
1731 | else |
1732 | echo "#dummy" > "$depfile" |
1733 | fi |
1734 | rm -f "$tmpdepfile" |
1735 | ;; |
1736 | |
1737 | +msvc7) |
1738 | + if test "$libtool" = yes; then |
1739 | + showIncludes=-Wc,-showIncludes |
1740 | + else |
1741 | + showIncludes=-showIncludes |
1742 | + fi |
1743 | + "$@" $showIncludes > "$tmpdepfile" |
1744 | + stat=$? |
1745 | + grep -v '^Note: including file: ' "$tmpdepfile" |
1746 | + if test "$stat" = 0; then : |
1747 | + else |
1748 | + rm -f "$tmpdepfile" |
1749 | + exit $stat |
1750 | + fi |
1751 | + rm -f "$depfile" |
1752 | + echo "$object : \\" > "$depfile" |
1753 | + # The first sed program below extracts the file names and escapes |
1754 | + # backslashes for cygpath. The second sed program outputs the file |
1755 | + # name when reading, but also accumulates all include files in the |
1756 | + # hold buffer in order to output them again at the end. This only |
1757 | + # works with sed implementations that can handle large buffers. |
1758 | + sed < "$tmpdepfile" -n ' |
1759 | +/^Note: including file: *\(.*\)/ { |
1760 | + s//\1/ |
1761 | + s/\\/\\\\/g |
1762 | + p |
1763 | +}' | $cygpath_u | sort -u | sed -n ' |
1764 | +s/ /\\ /g |
1765 | +s/\(.*\)/'"$tab"'\1 \\/p |
1766 | +s/.\(.*\) \\/\1:/ |
1767 | +H |
1768 | +$ { |
1769 | + s/.*/'"$tab"'/ |
1770 | + G |
1771 | + p |
1772 | +}' >> "$depfile" |
1773 | + rm -f "$tmpdepfile" |
1774 | + ;; |
1775 | + |
1776 | +msvc7msys) |
1777 | + # This case exists only to let depend.m4 do its work. It works by |
1778 | + # looking at the text of this script. This case will never be run, |
1779 | + # since it is checked for above. |
1780 | + exit 1 |
1781 | + ;; |
1782 | + |
1783 | #nosideeffect) |
1784 | # This comment above is used by automake to tell side-effect |
1785 | # dependency tracking mechanisms from slower ones. |
1786 | @@ -422,7 +500,7 @@ |
1787 | shift |
1788 | fi |
1789 | |
1790 | - # Remove `-o $object'. |
1791 | + # Remove '-o $object'. |
1792 | IFS=" " |
1793 | for arg |
1794 | do |
1795 | @@ -442,15 +520,14 @@ |
1796 | done |
1797 | |
1798 | test -z "$dashmflag" && dashmflag=-M |
1799 | - # Require at least two characters before searching for `:' |
1800 | + # Require at least two characters before searching for ':' |
1801 | # in the target name. This is to cope with DOS-style filenames: |
1802 | - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. |
1803 | + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. |
1804 | "$@" $dashmflag | |
1805 | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" |
1806 | + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" |
1807 | rm -f "$depfile" |
1808 | cat < "$tmpdepfile" > "$depfile" |
1809 | - tr ' ' ' |
1810 | -' < "$tmpdepfile" | \ |
1811 | + tr ' ' "$nl" < "$tmpdepfile" | \ |
1812 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
1813 | ## correctly. Breaking it into two sed invocations is a workaround. |
1814 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
1815 | @@ -503,9 +580,10 @@ |
1816 | touch "$tmpdepfile" |
1817 | ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" |
1818 | rm -f "$depfile" |
1819 | - cat < "$tmpdepfile" > "$depfile" |
1820 | - sed '1,2d' "$tmpdepfile" | tr ' ' ' |
1821 | -' | \ |
1822 | + # makedepend may prepend the VPATH from the source file name to the object. |
1823 | + # No need to regex-escape $object, excess matching of '.' is harmless. |
1824 | + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" |
1825 | + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ |
1826 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
1827 | ## correctly. Breaking it into two sed invocations is a workaround. |
1828 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
1829 | @@ -525,7 +603,7 @@ |
1830 | shift |
1831 | fi |
1832 | |
1833 | - # Remove `-o $object'. |
1834 | + # Remove '-o $object'. |
1835 | IFS=" " |
1836 | for arg |
1837 | do |
1838 | @@ -594,8 +672,8 @@ |
1839 | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" |
1840 | rm -f "$depfile" |
1841 | echo "$object : \\" > "$depfile" |
1842 | - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" |
1843 | - echo " " >> "$depfile" |
1844 | + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" |
1845 | + echo "$tab" >> "$depfile" |
1846 | sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" |
1847 | rm -f "$tmpdepfile" |
1848 | ;; |
1849 | |
1850 | === modified file 'admin/install-sh' |
1851 | --- admin/install-sh 2009-11-03 22:43:19 +0000 |
1852 | +++ admin/install-sh 2013-06-14 23:40:37 +0000 |
1853 | @@ -1,7 +1,7 @@ |
1854 | #!/bin/sh |
1855 | # install - install a program, script, or datafile |
1856 | |
1857 | -scriptversion=2009-04-28.21; # UTC |
1858 | +scriptversion=2011-01-19.21; # UTC |
1859 | |
1860 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
1861 | # later released in X11R6 (xc/config/util/install.sh) with the |
1862 | @@ -156,6 +156,10 @@ |
1863 | -s) stripcmd=$stripprog;; |
1864 | |
1865 | -t) dst_arg=$2 |
1866 | + # Protect names problematic for `test' and other utilities. |
1867 | + case $dst_arg in |
1868 | + -* | [=\(\)!]) dst_arg=./$dst_arg;; |
1869 | + esac |
1870 | shift;; |
1871 | |
1872 | -T) no_target_directory=true;; |
1873 | @@ -186,6 +190,10 @@ |
1874 | fi |
1875 | shift # arg |
1876 | dst_arg=$arg |
1877 | + # Protect names problematic for `test' and other utilities. |
1878 | + case $dst_arg in |
1879 | + -* | [=\(\)!]) dst_arg=./$dst_arg;; |
1880 | + esac |
1881 | done |
1882 | fi |
1883 | |
1884 | @@ -200,7 +208,11 @@ |
1885 | fi |
1886 | |
1887 | if test -z "$dir_arg"; then |
1888 | - trap '(exit $?); exit' 1 2 13 15 |
1889 | + do_exit='(exit $ret); exit $ret' |
1890 | + trap "ret=129; $do_exit" 1 |
1891 | + trap "ret=130; $do_exit" 2 |
1892 | + trap "ret=141; $do_exit" 13 |
1893 | + trap "ret=143; $do_exit" 15 |
1894 | |
1895 | # Set umask so as not to create temps with too-generous modes. |
1896 | # However, 'strip' requires both read and write access to temps. |
1897 | @@ -228,9 +240,9 @@ |
1898 | |
1899 | for src |
1900 | do |
1901 | - # Protect names starting with `-'. |
1902 | + # Protect names problematic for `test' and other utilities. |
1903 | case $src in |
1904 | - -*) src=./$src;; |
1905 | + -* | [=\(\)!]) src=./$src;; |
1906 | esac |
1907 | |
1908 | if test -n "$dir_arg"; then |
1909 | @@ -252,12 +264,7 @@ |
1910 | echo "$0: no destination specified." >&2 |
1911 | exit 1 |
1912 | fi |
1913 | - |
1914 | dst=$dst_arg |
1915 | - # Protect names starting with `-'. |
1916 | - case $dst in |
1917 | - -*) dst=./$dst;; |
1918 | - esac |
1919 | |
1920 | # If destination is a directory, append the input filename; won't work |
1921 | # if double slashes aren't ignored. |
1922 | @@ -385,7 +392,7 @@ |
1923 | |
1924 | case $dstdir in |
1925 | /*) prefix='/';; |
1926 | - -*) prefix='./';; |
1927 | + [-=\(\)!]*) prefix='./';; |
1928 | *) prefix='';; |
1929 | esac |
1930 | |
1931 | @@ -403,7 +410,7 @@ |
1932 | |
1933 | for d |
1934 | do |
1935 | - test -z "$d" && continue |
1936 | + test X"$d" = X && continue |
1937 | |
1938 | prefix=$prefix$d |
1939 | if test -d "$prefix"; then |
1940 | |
1941 | === modified file 'admin/missing' |
1942 | --- admin/missing 2009-11-03 22:43:19 +0000 |
1943 | +++ admin/missing 2013-06-14 23:40:37 +0000 |
1944 | @@ -1,10 +1,10 @@ |
1945 | #! /bin/sh |
1946 | # Common stub for a few missing GNU programs while installing. |
1947 | |
1948 | -scriptversion=2009-04-28.21; # UTC |
1949 | +scriptversion=2012-01-06.13; # UTC |
1950 | |
1951 | # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, |
1952 | -# 2008, 2009 Free Software Foundation, Inc. |
1953 | +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. |
1954 | # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
1955 | |
1956 | # This program is free software; you can redistribute it and/or modify |
1957 | @@ -84,7 +84,6 @@ |
1958 | help2man touch the output file |
1959 | lex create \`lex.yy.c', if possible, from existing .c |
1960 | makeinfo touch the output file |
1961 | - tar try tar, gnutar, gtar, then tar without non-portable flags |
1962 | yacc create \`y.tab.[ch]', if possible, from existing .[ch] |
1963 | |
1964 | Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and |
1965 | @@ -122,15 +121,6 @@ |
1966 | # Not GNU programs, they don't have --version. |
1967 | ;; |
1968 | |
1969 | - tar*) |
1970 | - if test -n "$run"; then |
1971 | - echo 1>&2 "ERROR: \`tar' requires --run" |
1972 | - exit 1 |
1973 | - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then |
1974 | - exit 1 |
1975 | - fi |
1976 | - ;; |
1977 | - |
1978 | *) |
1979 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then |
1980 | # We have it, but it failed. |
1981 | @@ -226,7 +216,7 @@ |
1982 | \`Bison' from any GNU archive site." |
1983 | rm -f y.tab.c y.tab.h |
1984 | if test $# -ne 1; then |
1985 | - eval LASTARG="\${$#}" |
1986 | + eval LASTARG=\${$#} |
1987 | case $LASTARG in |
1988 | *.y) |
1989 | SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` |
1990 | @@ -256,7 +246,7 @@ |
1991 | \`Flex' from any GNU archive site." |
1992 | rm -f lex.yy.c |
1993 | if test $# -ne 1; then |
1994 | - eval LASTARG="\${$#}" |
1995 | + eval LASTARG=\${$#} |
1996 | case $LASTARG in |
1997 | *.l) |
1998 | SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` |
1999 | @@ -318,41 +308,6 @@ |
2000 | touch $file |
2001 | ;; |
2002 | |
2003 | - tar*) |
2004 | - shift |
2005 | - |
2006 | - # We have already tried tar in the generic part. |
2007 | - # Look for gnutar/gtar before invocation to avoid ugly error |
2008 | - # messages. |
2009 | - if (gnutar --version > /dev/null 2>&1); then |
2010 | - gnutar "$@" && exit 0 |
2011 | - fi |
2012 | - if (gtar --version > /dev/null 2>&1); then |
2013 | - gtar "$@" && exit 0 |
2014 | - fi |
2015 | - firstarg="$1" |
2016 | - if shift; then |
2017 | - case $firstarg in |
2018 | - *o*) |
2019 | - firstarg=`echo "$firstarg" | sed s/o//` |
2020 | - tar "$firstarg" "$@" && exit 0 |
2021 | - ;; |
2022 | - esac |
2023 | - case $firstarg in |
2024 | - *h*) |
2025 | - firstarg=`echo "$firstarg" | sed s/h//` |
2026 | - tar "$firstarg" "$@" && exit 0 |
2027 | - ;; |
2028 | - esac |
2029 | - fi |
2030 | - |
2031 | - echo 1>&2 "\ |
2032 | -WARNING: I can't seem to be able to run \`tar' with the given arguments. |
2033 | - You may want to install GNU tar or Free paxutils, or check the |
2034 | - command line arguments." |
2035 | - exit 1 |
2036 | - ;; |
2037 | - |
2038 | *) |
2039 | echo 1>&2 "\ |
2040 | WARNING: \`$1' is needed, and is $msg. |
2041 | |
2042 | === modified file 'configure' |
2043 | --- configure 2012-07-27 05:16:18 +0000 |
2044 | +++ configure 2013-06-14 23:40:37 +0000 |
2045 | @@ -1,6 +1,6 @@ |
2046 | #! /bin/sh |
2047 | # Guess values for system-dependent variables and create Makefiles. |
2048 | -# Generated by GNU Autoconf 2.68 for mlocate 0.25. |
2049 | +# Generated by GNU Autoconf 2.68 for mlocate 0.26. |
2050 | # |
2051 | # Report bugs to <mitr@redhat.com>. |
2052 | # |
2053 | @@ -13,7 +13,8 @@ |
2054 | # This configure script is free software; the Free Software Foundation |
2055 | # gives unlimited permission to copy, distribute and modify it. |
2056 | # |
2057 | -# Copyright (C) 2005, 2006, 2007, 2009, 2010 Red Hat, Inc. All rights reserved. |
2058 | +# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2012 Red Hat, Inc. All rights |
2059 | +# reserved. |
2060 | # This copyrighted material is made available to anyone wishing to use, modify, |
2061 | # copy, or redistribute it subject to the terms and conditions of the GNU General |
2062 | # Public License v.2. |
2063 | @@ -575,8 +576,8 @@ |
2064 | # Identity of this package. |
2065 | PACKAGE_NAME='mlocate' |
2066 | PACKAGE_TARNAME='mlocate' |
2067 | -PACKAGE_VERSION='0.25' |
2068 | -PACKAGE_STRING='mlocate 0.25' |
2069 | +PACKAGE_VERSION='0.26' |
2070 | +PACKAGE_STRING='mlocate 0.26' |
2071 | PACKAGE_BUGREPORT='mitr@redhat.com' |
2072 | PACKAGE_URL='https://fedorahosted.org/mlocate/' |
2073 | |
2074 | @@ -793,6 +794,7 @@ |
2075 | am__fastdepCC_FALSE |
2076 | am__fastdepCC_TRUE |
2077 | CCDEPMODE |
2078 | +am__nodep |
2079 | AMDEPBACKSLASH |
2080 | AMDEP_FALSE |
2081 | AMDEP_TRUE |
2082 | @@ -1430,7 +1432,7 @@ |
2083 | # Omit some internal or obsolete options to make the list less imposing. |
2084 | # This message is too long to be a string in the A/UX 3.1 sh. |
2085 | cat <<_ACEOF |
2086 | -\`configure' configures mlocate 0.25 to adapt to many kinds of systems. |
2087 | +\`configure' configures mlocate 0.26 to adapt to many kinds of systems. |
2088 | |
2089 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2090 | |
2091 | @@ -1500,7 +1502,7 @@ |
2092 | |
2093 | if test -n "$ac_init_help"; then |
2094 | case $ac_init_help in |
2095 | - short | recursive ) echo "Configuration of mlocate 0.25:";; |
2096 | + short | recursive ) echo "Configuration of mlocate 0.26:";; |
2097 | esac |
2098 | cat <<\_ACEOF |
2099 | |
2100 | @@ -1601,14 +1603,15 @@ |
2101 | test -n "$ac_init_help" && exit $ac_status |
2102 | if $ac_init_version; then |
2103 | cat <<\_ACEOF |
2104 | -mlocate configure 0.25 |
2105 | +mlocate configure 0.26 |
2106 | generated by GNU Autoconf 2.68 |
2107 | |
2108 | Copyright (C) 2010 Free Software Foundation, Inc. |
2109 | This configure script is free software; the Free Software Foundation |
2110 | gives unlimited permission to copy, distribute and modify it. |
2111 | |
2112 | -Copyright (C) 2005, 2006, 2007, 2009, 2010 Red Hat, Inc. All rights reserved. |
2113 | +Copyright (C) 2005, 2006, 2007, 2009, 2010, 2012 Red Hat, Inc. All rights |
2114 | +reserved. |
2115 | This copyrighted material is made available to anyone wishing to use, modify, |
2116 | copy, or redistribute it subject to the terms and conditions of the GNU General |
2117 | Public License v.2. |
2118 | @@ -2320,7 +2323,7 @@ |
2119 | This file contains any messages produced by compilers while |
2120 | running configure, to aid debugging if configure makes a mistake. |
2121 | |
2122 | -It was created by mlocate $as_me 0.25, which was |
2123 | +It was created by mlocate $as_me 0.26, which was |
2124 | generated by GNU Autoconf 2.68. Invocation command line was |
2125 | |
2126 | $ $0 $@ |
2127 | @@ -3167,7 +3170,7 @@ |
2128 | |
2129 | # Define the identity of the package. |
2130 | PACKAGE='mlocate' |
2131 | - VERSION='0.25' |
2132 | + VERSION='0.26' |
2133 | |
2134 | |
2135 | # Some tools Automake needs. |
2136 | @@ -3188,11 +3191,11 @@ |
2137 | |
2138 | # We need awk for the "check" target. The system "awk" is bad on |
2139 | # some platforms. |
2140 | -# Always define AMTAR for backward compatibility. |
2141 | - |
2142 | -AMTAR=${AMTAR-"${am_missing_run}tar"} |
2143 | - |
2144 | -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' |
2145 | +# Always define AMTAR for backward compatibility. Yes, it's still used |
2146 | +# in the wild :-( We should find a proper way to deprecate it ... |
2147 | +AMTAR='$${TAR-tar}' |
2148 | + |
2149 | +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
2150 | |
2151 | |
2152 | |
2153 | @@ -4041,6 +4044,7 @@ |
2154 | if test "x$enable_dependency_tracking" != xno; then |
2155 | am_depcomp="$ac_aux_dir/depcomp" |
2156 | AMDEPBACKSLASH='\' |
2157 | + am__nodep='_no' |
2158 | fi |
2159 | if test "x$enable_dependency_tracking" != xno; then |
2160 | AMDEP_TRUE= |
2161 | @@ -4065,6 +4069,7 @@ |
2162 | # instance it was reported that on HP-UX the gcc test will end up |
2163 | # making a dummy file named `D' -- because `-MD' means `put the output |
2164 | # in D'. |
2165 | + rm -rf conftest.dir |
2166 | mkdir conftest.dir |
2167 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2168 | # using a relative directory. |
2169 | @@ -4124,7 +4129,7 @@ |
2170 | break |
2171 | fi |
2172 | ;; |
2173 | - msvisualcpp | msvcmsys) |
2174 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2175 | # This compiler won't grok `-c -o', but also, the minuso test has |
2176 | # not run yet. These depmodes are late enough in the game, and |
2177 | # so weak that their functioning should not be impacted. |
2178 | @@ -11197,7 +11202,7 @@ |
2179 | # report actual input values of CONFIG_FILES etc. instead of their |
2180 | # values after options handling. |
2181 | ac_log=" |
2182 | -This file was extended by mlocate $as_me 0.25, which was |
2183 | +This file was extended by mlocate $as_me 0.26, which was |
2184 | generated by GNU Autoconf 2.68. Invocation command line was |
2185 | |
2186 | CONFIG_FILES = $CONFIG_FILES |
2187 | @@ -11264,7 +11269,7 @@ |
2188 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2189 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2190 | ac_cs_version="\\ |
2191 | -mlocate config.status 0.25 |
2192 | +mlocate config.status 0.26 |
2193 | configured by $0, generated by GNU Autoconf 2.68, |
2194 | with options \\"\$ac_cs_config\\" |
2195 | |
2196 | @@ -12021,7 +12026,7 @@ |
2197 | # Backward compatibility with Autotest <= 2.59b: |
2198 | at_top_builddir=\$at_top_build_prefix |
2199 | |
2200 | -AUTOTEST_PATH='src' |
2201 | +AUTOTEST_PATH='src:tests' |
2202 | |
2203 | SHELL=\${CONFIG_SHELL-'$SHELL'} |
2204 | ATEOF |
2205 | |
2206 | === modified file 'configure.ac' |
2207 | --- configure.ac 2012-07-27 05:16:18 +0000 |
2208 | +++ configure.ac 2013-06-14 23:40:37 +0000 |
2209 | @@ -1,8 +1,9 @@ |
2210 | # Process this file with autoconf to produce a configure script. |
2211 | -AC_INIT([mlocate], [0.25], [mitr@redhat.com], , |
2212 | +AC_INIT([mlocate], [0.26], [mitr@redhat.com], , |
2213 | [https://fedorahosted.org/mlocate/]) |
2214 | AC_COPYRIGHT( |
2215 | -[Copyright (C) 2005, 2006, 2007, 2009, 2010 Red Hat, Inc. All rights reserved. |
2216 | +[Copyright (C) 2005, 2006, 2007, 2009, 2010, 2012 Red Hat, Inc. All rights |
2217 | +reserved. |
2218 | This copyrighted material is made available to anyone wishing to use, modify, |
2219 | copy, or redistribute it subject to the terms and conditions of the GNU General |
2220 | Public License v.2. |
2221 | @@ -20,7 +21,7 @@ |
2222 | AC_CONFIG_HEADERS([src/config.h]) |
2223 | AC_CONFIG_SRCDIR([src/locate.c]) |
2224 | AC_CONFIG_AUX_DIR([admin]) |
2225 | -AC_CONFIG_TESTDIR([.], [src]) |
2226 | +AC_CONFIG_TESTDIR([.], [src:tests]) |
2227 | AM_INIT_AUTOMAKE([no-dist-gzip dist-xz no-define subdir-objects -Wall]) |
2228 | |
2229 | # Checks for programs. |
2230 | |
2231 | === modified file 'debian/changelog' |
2232 | --- debian/changelog 2013-02-08 16:46:51 +0000 |
2233 | +++ debian/changelog 2013-06-14 23:40:37 +0000 |
2234 | @@ -1,3 +1,24 @@ |
2235 | +mlocate (0.26-1ubuntu1) saucy; urgency=low |
2236 | + |
2237 | + * Merge from Debian unstable. Remaining changes: |
2238 | + - debian/updatedb.conf: |
2239 | + + Add ecryptfs, fusesmb, and devtmpfs to PRUNEFS. |
2240 | + + Add /home/.ecryptfs to PRUNEPATHS. |
2241 | + |
2242 | + -- Logan Rosen <logan@ubuntu.com> Fri, 14 Jun 2013 19:31:24 -0400 |
2243 | + |
2244 | +mlocate (0.26-1) unstable; urgency=low |
2245 | + |
2246 | + * New upstream release. Closes: #669368 |
2247 | + - Stops using PATH_MAX. Closes: #610209 |
2248 | + * The filesystem type for Lustre is lustre, not lustre_lite. Update |
2249 | + updatedb.conf accordingly. Closes: #660781 |
2250 | + * Fix up locking in cron.daily. Closes: #611096 |
2251 | + * rm -rf /var/lib/mlocate on purge, don't just take out single files. |
2252 | + Closes: #542616 |
2253 | + |
2254 | + -- Tollef Fog Heen <tfheen@debian.org> Thu, 13 Jun 2013 08:34:09 +0200 |
2255 | + |
2256 | mlocate (0.25-0ubuntu2) raring; urgency=low |
2257 | |
2258 | * Update config.guess and config.sub from autotools-dev 20120608.1. |
2259 | |
2260 | === modified file 'debian/mlocate.cron.daily' |
2261 | --- debian/mlocate.cron.daily 2009-10-03 08:59:31 +0000 |
2262 | +++ debian/mlocate.cron.daily 2013-06-14 23:40:37 +0000 |
2263 | @@ -12,25 +12,10 @@ |
2264 | fi |
2265 | fi |
2266 | |
2267 | -## |
2268 | - |
2269 | -LOCKFILE="/var/lib/mlocate/daily.lock" |
2270 | - |
2271 | -trap "rm -f $LOCKFILE" EXIT |
2272 | - |
2273 | -if [ -e "$LOCKFILE" ]; then |
2274 | - echo >&2 "Warning: $LOCKFILE present, not running updatedb." |
2275 | - exit 1 |
2276 | -else |
2277 | - touch "$LOCKFILE" |
2278 | -fi |
2279 | - |
2280 | -## |
2281 | - |
2282 | # See ionice(1) |
2283 | if [ -x /usr/bin/ionice ] && |
2284 | /usr/bin/ionice -c3 true 2>/dev/null; then |
2285 | IONICE="/usr/bin/ionice -c3" |
2286 | fi |
2287 | |
2288 | -$IONICE /usr/bin/updatedb.mlocate |
2289 | +flock --nonblock /run/mlocate.daily.lock $IONICE /usr/bin/updatedb.mlocate |
2290 | |
2291 | === modified file 'debian/mlocate.postinst' |
2292 | --- debian/mlocate.postinst 2007-11-25 16:08:47 +0000 |
2293 | +++ debian/mlocate.postinst 2013-06-14 23:40:37 +0000 |
2294 | @@ -18,4 +18,7 @@ |
2295 | fi |
2296 | fi |
2297 | |
2298 | +# Obsolete file, this can be dropped post-jessie. |
2299 | +rm -f /var/lib/mlocate/daily.lock |
2300 | + |
2301 | #DEBHELPER# |
2302 | |
2303 | === modified file 'debian/mlocate.postrm' |
2304 | --- debian/mlocate.postrm 2010-09-25 08:15:12 +0000 |
2305 | +++ debian/mlocate.postrm 2013-06-14 23:40:37 +0000 |
2306 | @@ -2,14 +2,8 @@ |
2307 | |
2308 | set -e |
2309 | |
2310 | -VARDIR="/var/lib/mlocate" |
2311 | - |
2312 | if [ "$1" = "purge" ]; then |
2313 | - if [ -d "$VARDIR" ]; then |
2314 | - rm -f "$VARDIR/mlocate.db" |
2315 | - rmdir --ignore-fail-on-non-empty "$VARDIR" |
2316 | - fi |
2317 | - |
2318 | + rm -rf "/var/lib/mlocate" |
2319 | dpkg-statoverride --remove /usr/bin/mlocate || test $? -eq 2 |
2320 | fi |
2321 | |
2322 | |
2323 | === modified file 'debian/updatedb.conf' |
2324 | --- debian/updatedb.conf 2011-08-17 14:07:51 +0000 |
2325 | +++ debian/updatedb.conf 2013-06-14 23:40:37 +0000 |
2326 | @@ -1,4 +1,4 @@ |
2327 | PRUNE_BIND_MOUNTS="yes" |
2328 | # PRUNENAMES=".git .bzr .hg .svn" |
2329 | PRUNEPATHS="/tmp /var/spool /media /home/.ecryptfs" |
2330 | -PRUNEFS="NFS nfs nfs4 rpc_pipefs afs binfmt_misc proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs shfs sysfs cifs lustre_lite tmpfs usbfs udf fuse.glusterfs fuse.sshfs curlftpfs ecryptfs fusesmb devtmpfs" |
2331 | +PRUNEFS="NFS nfs nfs4 rpc_pipefs afs binfmt_misc proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs shfs sysfs cifs lustre tmpfs usbfs udf fuse.glusterfs fuse.sshfs curlftpfs ecryptfs fusesmb devtmpfs" |
2332 | |
2333 | === modified file 'doc/locate.1.in' |
2334 | --- doc/locate.1.in 2012-07-27 05:16:18 +0000 |
2335 | +++ doc/locate.1.in 2013-06-14 23:40:37 +0000 |
2336 | @@ -1,6 +1,6 @@ |
2337 | .\" A man page for locate(1). -*- nroff -*- |
2338 | .\" |
2339 | -.\" Copyright (C) 2011 Red Hat, Inc. All rights reserved. |
2340 | +.\" Copyright (C) 2012 Red Hat, Inc. All rights reserved. |
2341 | .\" |
2342 | .\" This copyrighted material is made available to anyone wishing to use, |
2343 | .\" modify, copy, or redistribute it subject to the terms and conditions of the |
2344 | @@ -16,7 +16,7 @@ |
2345 | .\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
2346 | .\" |
2347 | .\" Author: Miloslav Trmac <mitr@redhat.com> |
2348 | -.TH locate 1 "Aug 2011" mlocate |
2349 | +.TH locate 1 "Sep 2012" mlocate |
2350 | |
2351 | .SH NAME |
2352 | locate \- find files by name |
2353 | @@ -69,6 +69,11 @@ |
2354 | |
2355 | .SH OPTIONS |
2356 | .TP |
2357 | +\fB\-A\fR, \fB\-\-all\fR |
2358 | +Print only entries that match all \fIPATTERN\fRs |
2359 | +instead of requiring only one of them to match. |
2360 | + |
2361 | +.TP |
2362 | \fB\-b\fR, \fB\-\-basename\fR |
2363 | Match only the base name against the specified patterns. |
2364 | This is the opposite of \fB\-\-wholename\fR. |
2365 | |
2366 | === modified file 'gnulib/lib/Makefile.in' |
2367 | --- gnulib/lib/Makefile.in 2010-10-12 16:34:36 +0000 |
2368 | +++ gnulib/lib/Makefile.in 2013-06-14 23:40:37 +0000 |
2369 | @@ -1,9 +1,9 @@ |
2370 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
2371 | +# Makefile.in generated by automake 1.11.6 from Makefile.am. |
2372 | # @configure_input@ |
2373 | |
2374 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
2375 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
2376 | -# Inc. |
2377 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
2378 | +# Foundation, Inc. |
2379 | # This Makefile.in is free software; the Free Software Foundation |
2380 | # gives unlimited permission to copy and/or distribute it, |
2381 | # with or without modifications, as long as this notice is preserved. |
2382 | @@ -29,6 +29,23 @@ |
2383 | |
2384 | |
2385 | VPATH = @srcdir@ |
2386 | +am__make_dryrun = \ |
2387 | + { \ |
2388 | + am__dry=no; \ |
2389 | + case $$MAKEFLAGS in \ |
2390 | + *\\[\ \ ]*) \ |
2391 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
2392 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
2393 | + *) \ |
2394 | + for am__flg in $$MAKEFLAGS; do \ |
2395 | + case $$am__flg in \ |
2396 | + *=*|--*) ;; \ |
2397 | + *n*) am__dry=yes; break;; \ |
2398 | + esac; \ |
2399 | + done;; \ |
2400 | + esac; \ |
2401 | + test $$am__dry = yes; \ |
2402 | + } |
2403 | pkgdatadir = $(datadir)/@PACKAGE@ |
2404 | pkgincludedir = $(includedir)/@PACKAGE@ |
2405 | pkglibdir = $(libdir)/@PACKAGE@ |
2406 | @@ -129,6 +146,11 @@ |
2407 | LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
2408 | SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) |
2409 | DIST_SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) |
2410 | +am__can_run_installinfo = \ |
2411 | + case $$AM_UPDATE_INFO_DIR in \ |
2412 | + n|no|NO) false;; \ |
2413 | + *) (install-info --version) >/dev/null 2>&1;; \ |
2414 | + esac |
2415 | HEADERS = $(noinst_HEADERS) |
2416 | ETAGS = etags |
2417 | CTAGS = ctags |
2418 | @@ -474,7 +496,7 @@ |
2419 | @: > uniwidth/$(DEPDIR)/$(am__dirstamp) |
2420 | uniwidth/width.$(OBJEXT): uniwidth/$(am__dirstamp) \ |
2421 | uniwidth/$(DEPDIR)/$(am__dirstamp) |
2422 | -libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) |
2423 | +libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) $(EXTRA_libgnu_a_DEPENDENCIES) |
2424 | -rm -f libgnu.a |
2425 | $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) |
2426 | $(RANLIB) libgnu.a |
2427 | @@ -639,10 +661,15 @@ |
2428 | |
2429 | installcheck: installcheck-am |
2430 | install-strip: |
2431 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
2432 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
2433 | - `test -z '$(STRIP)' || \ |
2434 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
2435 | + if test -z '$(STRIP)'; then \ |
2436 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
2437 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
2438 | + install; \ |
2439 | + else \ |
2440 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
2441 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
2442 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
2443 | + fi |
2444 | mostlyclean-generic: |
2445 | -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) |
2446 | |
2447 | |
2448 | === modified file 'po/ar.gmo' |
2449 | Binary files po/ar.gmo 2012-07-27 05:15:55 +0000 and po/ar.gmo 2013-06-14 23:40:37 +0000 differ |
2450 | === modified file 'po/ar.po' |
2451 | --- po/ar.po 2012-07-27 05:15:55 +0000 |
2452 | +++ po/ar.po 2013-06-14 23:40:37 +0000 |
2453 | @@ -9,7 +9,7 @@ |
2454 | msgstr "" |
2455 | "Project-Id-Version: mlocate\n" |
2456 | "Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n" |
2457 | -"POT-Creation-Date: 2012-03-03 06:10+0100\n" |
2458 | +"POT-Creation-Date: 2012-09-22 04:14+0200\n" |
2459 | "PO-Revision-Date: 2012-02-14 08:16+0000\n" |
2460 | "Last-Translator: Miloslav Trmač <mitr@volny.cz>\n" |
2461 | "Language-Team: Arabic <trans-ar@lists.fedoraproject.org>\n" |
2462 | @@ -18,7 +18,7 @@ |
2463 | "Content-Type: text/plain; charset=UTF-8\n" |
2464 | "Content-Transfer-Encoding: 8bit\n" |
2465 | "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " |
2466 | -"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" |
2467 | +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" |
2468 | |
2469 | #: src/conf.c:241 |
2470 | msgid "warning: Line number overflow" |
2471 | @@ -28,7 +28,7 @@ |
2472 | msgid "missing closing `\"'" |
2473 | msgstr "علامة تنصيص الإغلاق مفقودة `\"'" |
2474 | |
2475 | -#: src/conf.c:309 src/locate.c:968 src/updatedb.c:892 |
2476 | +#: src/conf.c:309 src/locate.c:985 src/updatedb.c:921 |
2477 | #, c-format |
2478 | msgid "can not open `%s'" |
2479 | msgstr "غير قادر على فتح `%s'" |
2480 | @@ -118,7 +118,7 @@ |
2481 | "قراءة قيمة التهيئة الافتراضية من\n" |
2482 | "`%s'.\n" |
2483 | |
2484 | -#: src/conf.c:464 src/locate.c:642 |
2485 | +#: src/conf.c:464 src/locate.c:654 |
2486 | #, c-format |
2487 | msgid "" |
2488 | "\n" |
2489 | @@ -132,22 +132,22 @@ |
2490 | msgstr "لا يمكن الحصول على المسار الحالي المعمول عليه" |
2491 | |
2492 | #: src/conf.c:540 src/conf.c:551 src/conf.c:561 src/conf.c:571 |
2493 | -#: src/locate.c:697 src/locate.c:706 src/locate.c:732 src/locate.c:790 |
2494 | +#: src/locate.c:714 src/locate.c:723 src/locate.c:749 src/locate.c:807 |
2495 | #, c-format |
2496 | msgid "--%s would override earlier command-line argument" |
2497 | msgstr "--%s سوف يتجاوز مدخل سطر الأوامر السابق" |
2498 | |
2499 | -#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:769 |
2500 | +#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:786 |
2501 | #, c-format |
2502 | msgid "invalid value `%s' of --%s" |
2503 | msgstr "قيمة خاطئة`%s' of --%s" |
2504 | |
2505 | -#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:763 |
2506 | +#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:780 |
2507 | #, c-format |
2508 | msgid "--%s specified twice" |
2509 | msgstr "--%s محددة مرتين" |
2510 | |
2511 | -#: src/conf.c:590 src/locate.c:722 |
2512 | +#: src/conf.c:590 src/locate.c:739 |
2513 | msgid "" |
2514 | "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n" |
2515 | "This software is distributed under the GPL v.2.\n" |
2516 | @@ -188,12 +188,12 @@ |
2517 | msgid "I/O error seeking in `%s'" |
2518 | msgstr "بحث خاطئ في وحدة الإدخال والإخراج`%s'" |
2519 | |
2520 | -#: src/locate.c:335 |
2521 | +#: src/locate.c:338 |
2522 | #, c-format |
2523 | msgid "Database %s:\n" |
2524 | msgstr "قاعدة بيانات %s:\n" |
2525 | |
2526 | -#: src/locate.c:338 |
2527 | +#: src/locate.c:341 |
2528 | #, c-format |
2529 | msgid "\t%'ju directory\n" |
2530 | msgid_plural "\t%'ju directories\n" |
2531 | @@ -204,7 +204,7 @@ |
2532 | msgstr[4] "\t%'ju المجلدات\n" |
2533 | msgstr[5] "\t%'ju المجلدات\n" |
2534 | |
2535 | -#: src/locate.c:340 |
2536 | +#: src/locate.c:343 |
2537 | #, c-format |
2538 | msgid "\t%'ju file\n" |
2539 | msgid_plural "\t%'ju files\n" |
2540 | @@ -215,7 +215,7 @@ |
2541 | msgstr[4] "\t%'ju الملف\n" |
2542 | msgstr[5] "\t%'ju الملف\n" |
2543 | |
2544 | -#: src/locate.c:342 |
2545 | +#: src/locate.c:345 |
2546 | #, c-format |
2547 | msgid "\t%'ju byte in file names\n" |
2548 | msgid_plural "\t%'ju bytes in file names\n" |
2549 | @@ -226,7 +226,7 @@ |
2550 | msgstr[4] "\t%'ju بايت في اسم الملف\n" |
2551 | msgstr[5] "\t%'ju بايت في اسم الملف\n" |
2552 | |
2553 | -#: src/locate.c:344 |
2554 | +#: src/locate.c:347 |
2555 | #, c-format |
2556 | msgid "\t%'ju byte used to store database\n" |
2557 | msgid_plural "\t%'ju bytes used to store database\n" |
2558 | @@ -237,22 +237,23 @@ |
2559 | msgstr[4] "\t%'ju البايت مستخدم لتخزين قاعدة البيانات\n" |
2560 | msgstr[5] "\t%'ju البايت مستخدم لتخزين قاعدة البيانات\n" |
2561 | |
2562 | -#: src/locate.c:473 |
2563 | +#: src/locate.c:483 |
2564 | #, c-format |
2565 | msgid "invalid empty directory name in `%s'" |
2566 | msgstr "اسم مجلد فارغ غير صالح `%s'" |
2567 | |
2568 | -#: src/locate.c:500 |
2569 | +#: src/locate.c:510 |
2570 | #, c-format |
2571 | msgid "file name length %zu in `%s' is too large" |
2572 | msgstr "طول الاسم %zu in `%s' طويل جداً" |
2573 | |
2574 | -#: src/locate.c:607 |
2575 | -#, c-format |
2576 | +#: src/locate.c:617 |
2577 | +#, fuzzy, c-format |
2578 | msgid "" |
2579 | "Usage: locate [OPTION]... [PATTERN]...\n" |
2580 | "Search for entries in a mlocate database.\n" |
2581 | "\n" |
2582 | +" -A, --all only print entries that match all patterns\n" |
2583 | " -b, --basename match only the base name of path names\n" |
2584 | " -c, --count only print number of found entries\n" |
2585 | " -d, --database DBPATH use DBPATH instead of default database (which is\n" |
2586 | @@ -307,92 +308,92 @@ |
2587 | " -V, --version طباعة معلومات حول النسخة\n" |
2588 | " -w, --wholename مطابقة اسم المسار بالكامل(الافتراضي)\n" |
2589 | |
2590 | -#: src/locate.c:806 |
2591 | +#: src/locate.c:823 |
2592 | #, c-format |
2593 | msgid "non-option arguments are not allowed with --%s" |
2594 | msgstr "الوسائط الغير مختارة لا يسمح لها مع --%s" |
2595 | |
2596 | -#: src/locate.c:819 |
2597 | +#: src/locate.c:836 |
2598 | msgid "no pattern to search for specified" |
2599 | msgstr "لا يوجد نمط للبحث بشكل محدد" |
2600 | |
2601 | -#: src/locate.c:846 |
2602 | +#: src/locate.c:863 |
2603 | #, c-format |
2604 | msgid "invalid regexp `%s': %s" |
2605 | msgstr "غير مسموح regexp `%s': %s" |
2606 | |
2607 | -#: src/locate.c:932 |
2608 | +#: src/locate.c:949 |
2609 | msgid "can not drop privileges" |
2610 | msgstr "لا يمكن حذف الامتيازات" |
2611 | |
2612 | -#: src/locate.c:947 |
2613 | +#: src/locate.c:964 |
2614 | msgid "can not read two databases from standard input" |
2615 | msgstr "لا يمكن قراءة قاعدتي بيانات من الإدخال القياسي" |
2616 | |
2617 | -#: src/locate.c:959 src/locate.c:974 src/updatedb.c:980 |
2618 | +#: src/locate.c:976 src/locate.c:991 src/updatedb.c:1009 |
2619 | #, c-format |
2620 | msgid "can not stat () `%s'" |
2621 | msgstr "لا يمكن stat () `%s'" |
2622 | |
2623 | -#: src/locate.c:1034 src/updatedb.c:1004 |
2624 | +#: src/locate.c:1051 src/updatedb.c:1033 |
2625 | msgid "I/O error while writing to standard output" |
2626 | msgstr "خطأ في المدخلات والمخرجات بجميع الكتابة في المخرجات الأساسية" |
2627 | |
2628 | -#: src/updatedb.c:556 src/updatedb.c:663 |
2629 | +#: src/updatedb.c:580 src/updatedb.c:687 |
2630 | #, c-format |
2631 | msgid "file name length %zu is too large" |
2632 | msgstr "طول الاسم %zu طويل جداً" |
2633 | |
2634 | -#: src/updatedb.c:655 |
2635 | +#: src/updatedb.c:679 |
2636 | #, c-format |
2637 | msgid "file system error: zero-length file name in directory %s" |
2638 | msgstr "" |
2639 | |
2640 | -#: src/updatedb.c:886 |
2641 | +#: src/updatedb.c:915 |
2642 | #, c-format |
2643 | msgid "can not open a temporary file for `%s'" |
2644 | msgstr "لا يمكن فتح الملف المؤقت لـ `%s'" |
2645 | |
2646 | -#: src/updatedb.c:899 |
2647 | +#: src/updatedb.c:928 |
2648 | msgid "configuration is too large" |
2649 | msgstr "التهيئة كبيرة جداً" |
2650 | |
2651 | -#: src/updatedb.c:920 |
2652 | +#: src/updatedb.c:949 |
2653 | #, c-format |
2654 | msgid "can not find group `%s'" |
2655 | msgstr "لا يستطيع إيجاد مجموعة`%s'" |
2656 | |
2657 | -#: src/updatedb.c:923 |
2658 | +#: src/updatedb.c:952 |
2659 | #, c-format |
2660 | msgid "can not change group of file `%s' to `%s'" |
2661 | msgstr "لا يستطيع تغيير ملف مجموعة `%s' to `%s'" |
2662 | |
2663 | -#: src/updatedb.c:937 |
2664 | +#: src/updatedb.c:966 |
2665 | #, c-format |
2666 | msgid "can not change permissions of file `%s'" |
2667 | msgstr "لا تستطيع تغيير الصلاحيات للملف `%s'" |
2668 | |
2669 | -#: src/updatedb.c:968 |
2670 | +#: src/updatedb.c:997 |
2671 | #, c-format |
2672 | msgid "`%s' is locked (probably by an earlier updatedb)" |
2673 | msgstr "`%s' مغلق (احتمال بيواسطة التحديث الحالي)" |
2674 | |
2675 | -#: src/updatedb.c:970 |
2676 | +#: src/updatedb.c:999 |
2677 | #, c-format |
2678 | msgid "can not lock `%s'" |
2679 | msgstr "لا تستطيع قفل`%s'" |
2680 | |
2681 | -#: src/updatedb.c:977 |
2682 | +#: src/updatedb.c:1006 |
2683 | #, c-format |
2684 | msgid "can not change directory to `%s'" |
2685 | msgstr "لا تستطيع تغيير المجلد لـ `%s'" |
2686 | |
2687 | -#: src/updatedb.c:986 |
2688 | +#: src/updatedb.c:1015 |
2689 | #, c-format |
2690 | msgid "I/O error while writing to `%s'" |
2691 | msgstr "حدث خطأ في وسيلة الإدخال والإخراج أثناء الكتابة في `%s'" |
2692 | |
2693 | -#: src/updatedb.c:990 |
2694 | +#: src/updatedb.c:1019 |
2695 | #, c-format |
2696 | msgid "error replacing `%s'" |
2697 | msgstr "خطأ استبدال%s'" |
2698 | |
2699 | === modified file 'po/as.gmo' |
2700 | Binary files po/as.gmo 2012-07-27 05:15:55 +0000 and po/as.gmo 2013-06-14 23:40:37 +0000 differ |
2701 | === modified file 'po/as.po' |
2702 | --- po/as.po 2012-07-27 05:15:55 +0000 |
2703 | +++ po/as.po 2013-06-14 23:40:37 +0000 |
2704 | @@ -9,16 +9,16 @@ |
2705 | msgstr "" |
2706 | "Project-Id-Version: mlocate\n" |
2707 | "Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n" |
2708 | -"POT-Creation-Date: 2012-03-03 06:10+0100\n" |
2709 | +"POT-Creation-Date: 2012-09-22 04:14+0200\n" |
2710 | "PO-Revision-Date: 2012-02-15 12:54+0000\n" |
2711 | "Last-Translator: ngoswami <ngoswami@redhat.com>\n" |
2712 | -"Language-Team: Assamese (http://www.transifex.net/projects/p/fedora/language/" |
2713 | +"Language-Team: Assamese (http://www.transifex.com/projects/p/fedora/language/" |
2714 | "as/)\n" |
2715 | "Language: as\n" |
2716 | "MIME-Version: 1.0\n" |
2717 | "Content-Type: text/plain; charset=UTF-8\n" |
2718 | "Content-Transfer-Encoding: 8bit\n" |
2719 | -"Plural-Forms: nplurals=2; plural=(n != 1)\n" |
2720 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
2721 | |
2722 | #: src/conf.c:241 |
2723 | msgid "warning: Line number overflow" |
2724 | @@ -28,7 +28,7 @@ |
2725 | msgid "missing closing `\"'" |
2726 | msgstr "বন্ধ কৰা `\"' সন্ধানহীন" |
2727 | |
2728 | -#: src/conf.c:309 src/locate.c:968 src/updatedb.c:892 |
2729 | +#: src/conf.c:309 src/locate.c:985 src/updatedb.c:921 |
2730 | #, c-format |
2731 | msgid "can not open `%s'" |
2732 | msgstr "`%s' খুলিব নোৱাৰি" |
2733 | @@ -119,7 +119,7 @@ |
2734 | "মানসমূহ পঢ়িবলে সংৰূপ অবিকল্পিতসমূহ\n" |
2735 | "`%s'.\n" |
2736 | |
2737 | -#: src/conf.c:464 src/locate.c:642 |
2738 | +#: src/conf.c:464 src/locate.c:654 |
2739 | #, c-format |
2740 | msgid "" |
2741 | "\n" |
2742 | @@ -133,22 +133,22 @@ |
2743 | msgstr "বৰ্তমান কাৰ্যৰত ডাইৰেকটৰি পোৱা নগল" |
2744 | |
2745 | #: src/conf.c:540 src/conf.c:551 src/conf.c:561 src/conf.c:571 |
2746 | -#: src/locate.c:697 src/locate.c:706 src/locate.c:732 src/locate.c:790 |
2747 | +#: src/locate.c:714 src/locate.c:723 src/locate.c:749 src/locate.c:807 |
2748 | #, c-format |
2749 | msgid "--%s would override earlier command-line argument" |
2750 | msgstr "--%s -এ পুৰ্বৰ কমান্ড-লাইন তৰ্ক পুনৰ লিখি দিব" |
2751 | |
2752 | -#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:769 |
2753 | +#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:786 |
2754 | #, c-format |
2755 | msgid "invalid value `%s' of --%s" |
2756 | msgstr "--%s -ৰ অবৈধ মান `%s'" |
2757 | |
2758 | -#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:763 |
2759 | +#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:780 |
2760 | #, c-format |
2761 | msgid "--%s specified twice" |
2762 | msgstr "--%s দুবাৰ ধাৰ্য্য কৰা হৈছে" |
2763 | |
2764 | -#: src/conf.c:590 src/locate.c:722 |
2765 | +#: src/conf.c:590 src/locate.c:739 |
2766 | msgid "" |
2767 | "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n" |
2768 | "This software is distributed under the GPL v.2.\n" |
2769 | @@ -189,55 +189,56 @@ |
2770 | msgid "I/O error seeking in `%s'" |
2771 | msgstr "`%s' বিচাৰোতে এটা I/O ত্ৰুটি" |
2772 | |
2773 | -#: src/locate.c:335 |
2774 | +#: src/locate.c:338 |
2775 | #, c-format |
2776 | msgid "Database %s:\n" |
2777 | msgstr "ডাটাবেইচ %s:\n" |
2778 | |
2779 | -#: src/locate.c:338 |
2780 | +#: src/locate.c:341 |
2781 | #, c-format |
2782 | msgid "\t%'ju directory\n" |
2783 | msgid_plural "\t%'ju directories\n" |
2784 | msgstr[0] "\t%'ju ডাইৰেকটৰি\n" |
2785 | msgstr[1] "\t%'ju ডাইৰেকটৰিসমূহ\n" |
2786 | |
2787 | -#: src/locate.c:340 |
2788 | +#: src/locate.c:343 |
2789 | #, c-format |
2790 | msgid "\t%'ju file\n" |
2791 | msgid_plural "\t%'ju files\n" |
2792 | msgstr[0] "\t%'ju নথিপত্ৰ\n" |
2793 | msgstr[1] "\t%'ju নথিপত্ৰসমূহ\n" |
2794 | |
2795 | -#: src/locate.c:342 |
2796 | +#: src/locate.c:345 |
2797 | #, c-format |
2798 | msgid "\t%'ju byte in file names\n" |
2799 | msgid_plural "\t%'ju bytes in file names\n" |
2800 | msgstr[0] "\t নথিপত্ৰৰ নামসমূহত %'ju বাইট\n" |
2801 | msgstr[1] "\tনথিপত্ৰৰ নামসমূহত %'ju বাইটসমূহ\n" |
2802 | |
2803 | -#: src/locate.c:344 |
2804 | +#: src/locate.c:347 |
2805 | #, c-format |
2806 | msgid "\t%'ju byte used to store database\n" |
2807 | msgid_plural "\t%'ju bytes used to store database\n" |
2808 | msgstr[0] "\tডাটাবেইচ সঞ্চয় কৰিবলে ব্যৱহৃত %'ju বাইট\n" |
2809 | msgstr[1] "\tডাটাবেইচ সঞ্চয় কৰিবলে ব্যৱহৃত %'ju বাইটসমূহ\n" |
2810 | |
2811 | -#: src/locate.c:473 |
2812 | +#: src/locate.c:483 |
2813 | #, c-format |
2814 | msgid "invalid empty directory name in `%s'" |
2815 | msgstr "`%s' -ত অবৈধ ৰিক্ত ডাইৰেকটৰি নাম" |
2816 | |
2817 | -#: src/locate.c:500 |
2818 | +#: src/locate.c:510 |
2819 | #, c-format |
2820 | msgid "file name length %zu in `%s' is too large" |
2821 | msgstr "নথিপত্ৰ নামৰ দৈৰ্ঘ %zu `%s' -ৰ বাবে অতি ডাঙৰ" |
2822 | |
2823 | -#: src/locate.c:607 |
2824 | -#, c-format |
2825 | +#: src/locate.c:617 |
2826 | +#, fuzzy, c-format |
2827 | msgid "" |
2828 | "Usage: locate [OPTION]... [PATTERN]...\n" |
2829 | "Search for entries in a mlocate database.\n" |
2830 | "\n" |
2831 | +" -A, --all only print entries that match all patterns\n" |
2832 | " -b, --basename match only the base name of path names\n" |
2833 | " -c, --count only print number of found entries\n" |
2834 | " -d, --database DBPATH use DBPATH instead of default database (which is\n" |
2835 | @@ -291,92 +292,92 @@ |
2836 | " -V, --version সংস্কৰণ তথ্য প্ৰিন্ট কৰক\n" |
2837 | " -w, --wholename সমপূৰ্ণ পথৰ নাম মিলাই চাওক (অবিকল্পিত)\n" |
2838 | |
2839 | -#: src/locate.c:806 |
2840 | +#: src/locate.c:823 |
2841 | #, c-format |
2842 | msgid "non-option arguments are not allowed with --%s" |
2843 | msgstr "--%s -ৰ সৈতে বিকল্প নোহোৱা তৰ্কসমূহৰ অনুমতি আছে" |
2844 | |
2845 | -#: src/locate.c:819 |
2846 | +#: src/locate.c:836 |
2847 | msgid "no pattern to search for specified" |
2848 | msgstr "ধাৰ্য্য কৰাৰ কাৰণে বিচাৰিবলে কোনো বিন্যাস নাই" |
2849 | |
2850 | -#: src/locate.c:846 |
2851 | +#: src/locate.c:863 |
2852 | #, c-format |
2853 | msgid "invalid regexp `%s': %s" |
2854 | msgstr "অবৈধ regexp `%s': %s" |
2855 | |
2856 | -#: src/locate.c:932 |
2857 | +#: src/locate.c:949 |
2858 | msgid "can not drop privileges" |
2859 | msgstr "সুবিধাসমূহ এৰিব নোৱাৰি" |
2860 | |
2861 | -#: src/locate.c:947 |
2862 | +#: src/locate.c:964 |
2863 | msgid "can not read two databases from standard input" |
2864 | msgstr "প্ৰামানিক ইনপুটৰ পৰা দুটা ডাটাবেইচ পঢ়িব নোৱাৰি" |
2865 | |
2866 | -#: src/locate.c:959 src/locate.c:974 src/updatedb.c:980 |
2867 | +#: src/locate.c:976 src/locate.c:991 src/updatedb.c:1009 |
2868 | #, c-format |
2869 | msgid "can not stat () `%s'" |
2870 | msgstr "stat () `%s' কৰিব নোৱাৰি" |
2871 | |
2872 | -#: src/locate.c:1034 src/updatedb.c:1004 |
2873 | +#: src/locate.c:1051 src/updatedb.c:1033 |
2874 | msgid "I/O error while writing to standard output" |
2875 | msgstr "প্ৰামানিক ইনপুটলে লিখতে I/O ত্ৰুটি" |
2876 | |
2877 | -#: src/updatedb.c:556 src/updatedb.c:663 |
2878 | +#: src/updatedb.c:580 src/updatedb.c:687 |
2879 | #, c-format |
2880 | msgid "file name length %zu is too large" |
2881 | msgstr "নথিপত্ৰ নাম দৈৰ্ঘ %zu অতি ডাঙৰ" |
2882 | |
2883 | -#: src/updatedb.c:655 |
2884 | +#: src/updatedb.c:679 |
2885 | #, c-format |
2886 | msgid "file system error: zero-length file name in directory %s" |
2887 | msgstr "নথিপত্ৰ প্ৰনালী ত্ৰুটি: ডাইৰেকটৰি %s ত শূন্য-দৈৰ্ঘ্য নথিপত্ৰ নাম" |
2888 | |
2889 | -#: src/updatedb.c:886 |
2890 | +#: src/updatedb.c:915 |
2891 | #, c-format |
2892 | msgid "can not open a temporary file for `%s'" |
2893 | msgstr "`%s' -ৰ বাবে এটা অস্থায়ী নথিপত্ৰ খুলিব নোৱাৰি" |
2894 | |
2895 | -#: src/updatedb.c:899 |
2896 | +#: src/updatedb.c:928 |
2897 | msgid "configuration is too large" |
2898 | msgstr "সংৰূপ অতি ডাঙৰ" |
2899 | |
2900 | -#: src/updatedb.c:920 |
2901 | +#: src/updatedb.c:949 |
2902 | #, c-format |
2903 | msgid "can not find group `%s'" |
2904 | msgstr "দল `%s' বিচাৰি পোৱা নাযায়" |
2905 | |
2906 | -#: src/updatedb.c:923 |
2907 | +#: src/updatedb.c:952 |
2908 | #, c-format |
2909 | msgid "can not change group of file `%s' to `%s'" |
2910 | msgstr "নথিপত্ৰ `%s' -ৰ দল `%s' লে সলাব নোৱাৰি" |
2911 | |
2912 | -#: src/updatedb.c:937 |
2913 | +#: src/updatedb.c:966 |
2914 | #, c-format |
2915 | msgid "can not change permissions of file `%s'" |
2916 | msgstr "নথিপত্ৰ `%s' -ৰ অনুমতিসমূহ সলাব নোৱাৰি" |
2917 | |
2918 | -#: src/updatedb.c:968 |
2919 | +#: src/updatedb.c:997 |
2920 | #, c-format |
2921 | msgid "`%s' is locked (probably by an earlier updatedb)" |
2922 | msgstr "`%s' লক্ড (সম্ভবত এটা পুৰ্বৰ updatedb দ্বাৰা)" |
2923 | |
2924 | -#: src/updatedb.c:970 |
2925 | +#: src/updatedb.c:999 |
2926 | #, c-format |
2927 | msgid "can not lock `%s'" |
2928 | msgstr "`%s' লক কৰিব নোৱাৰি" |
2929 | |
2930 | -#: src/updatedb.c:977 |
2931 | +#: src/updatedb.c:1006 |
2932 | #, c-format |
2933 | msgid "can not change directory to `%s'" |
2934 | msgstr "ডাইৰেকটৰিক `%s' লে সলাব নোৱাৰি" |
2935 | |
2936 | -#: src/updatedb.c:986 |
2937 | +#: src/updatedb.c:1015 |
2938 | #, c-format |
2939 | msgid "I/O error while writing to `%s'" |
2940 | msgstr "`%s' -লে লিখোতে এটা I/O ত্ৰুটি" |
2941 | |
2942 | -#: src/updatedb.c:990 |
2943 | +#: src/updatedb.c:1019 |
2944 | #, c-format |
2945 | msgid "error replacing `%s'" |
2946 | msgstr "`%s' সলাওতে ত্ৰুটি" |
2947 | |
2948 | === modified file 'po/ast.gmo' |
2949 | Binary files po/ast.gmo 2012-07-27 05:15:55 +0000 and po/ast.gmo 2013-06-14 23:40:37 +0000 differ |
2950 | === modified file 'po/ast.po' |
2951 | --- po/ast.po 2012-07-27 05:15:55 +0000 |
2952 | +++ po/ast.po 2013-06-14 23:40:37 +0000 |
2953 | @@ -8,16 +8,16 @@ |
2954 | msgstr "" |
2955 | "Project-Id-Version: mlocate\n" |
2956 | "Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n" |
2957 | -"POT-Creation-Date: 2012-03-03 06:10+0100\n" |
2958 | +"POT-Creation-Date: 2012-09-22 04:14+0200\n" |
2959 | "PO-Revision-Date: 2012-02-14 08:16+0000\n" |
2960 | "Last-Translator: Miloslav Trmač <mitr@volny.cz>\n" |
2961 | -"Language-Team: Asturian (http://www.transifex.net/projects/p/fedora/language/" |
2962 | +"Language-Team: Asturian (http://www.transifex.com/projects/p/fedora/language/" |
2963 | "ast/)\n" |
2964 | "Language: ast\n" |
2965 | "MIME-Version: 1.0\n" |
2966 | "Content-Type: text/plain; charset=UTF-8\n" |
2967 | "Content-Transfer-Encoding: 8bit\n" |
2968 | -"Plural-Forms: nplurals=2; plural=(n != 1)\n" |
2969 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
2970 | |
2971 | #: src/conf.c:241 |
2972 | msgid "warning: Line number overflow" |
2973 | @@ -27,7 +27,7 @@ |
2974 | msgid "missing closing `\"'" |
2975 | msgstr "falta zarrar `\"'" |
2976 | |
2977 | -#: src/conf.c:309 src/locate.c:968 src/updatedb.c:892 |
2978 | +#: src/conf.c:309 src/locate.c:985 src/updatedb.c:921 |
2979 | #, c-format |
2980 | msgid "can not open `%s'" |
2981 | msgstr "nun pudo abrise `%s'" |
2982 | @@ -121,7 +121,7 @@ |
2983 | "Lleer los valores por defeutu de configuración dende\n" |
2984 | "`%s'.\n" |
2985 | |
2986 | -#: src/conf.c:464 src/locate.c:642 |
2987 | +#: src/conf.c:464 src/locate.c:654 |
2988 | #, c-format |
2989 | msgid "" |
2990 | "\n" |
2991 | @@ -135,22 +135,22 @@ |
2992 | msgstr "nun foi dable acceder al direutoriu actual de trabayu" |
2993 | |
2994 | #: src/conf.c:540 src/conf.c:551 src/conf.c:561 src/conf.c:571 |
2995 | -#: src/locate.c:697 src/locate.c:706 src/locate.c:732 src/locate.c:790 |
2996 | +#: src/locate.c:714 src/locate.c:723 src/locate.c:749 src/locate.c:807 |
2997 | #, c-format |
2998 | msgid "--%s would override earlier command-line argument" |
2999 | msgstr "--%s debería sobroescribir aína l'argumentu na llinia de comandos" |
3000 | |
3001 | -#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:769 |
3002 | +#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:786 |
3003 | #, c-format |
3004 | msgid "invalid value `%s' of --%s" |
3005 | msgstr "valor `%s' nun válidu pa --%s" |
3006 | |
3007 | -#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:763 |
3008 | +#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:780 |
3009 | #, c-format |
3010 | msgid "--%s specified twice" |
3011 | msgstr "--%s especificáu dos vegaes" |
3012 | |
3013 | -#: src/conf.c:590 src/locate.c:722 |
3014 | +#: src/conf.c:590 src/locate.c:739 |
3015 | msgid "" |
3016 | "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n" |
3017 | "This software is distributed under the GPL v.2.\n" |
3018 | @@ -190,55 +190,56 @@ |
3019 | msgid "I/O error seeking in `%s'" |
3020 | msgstr "fallu d'E/S al guetar en `%s'" |
3021 | |
3022 | -#: src/locate.c:335 |
3023 | +#: src/locate.c:338 |
3024 | #, c-format |
3025 | msgid "Database %s:\n" |
3026 | msgstr "Base de datos %s:\n" |
3027 | |
3028 | -#: src/locate.c:338 |
3029 | +#: src/locate.c:341 |
3030 | #, c-format |
3031 | msgid "\t%'ju directory\n" |
3032 | msgid_plural "\t%'ju directories\n" |
3033 | msgstr[0] "\t%'ju direutoriu\n" |
3034 | msgstr[1] "\t%'ju direutorios\n" |
3035 | |
3036 | -#: src/locate.c:340 |
3037 | +#: src/locate.c:343 |
3038 | #, c-format |
3039 | msgid "\t%'ju file\n" |
3040 | msgid_plural "\t%'ju files\n" |
3041 | msgstr[0] "\t%'ju ficheru\n" |
3042 | msgstr[1] "\t%'ju ficheros\n" |
3043 | |
3044 | -#: src/locate.c:342 |
3045 | +#: src/locate.c:345 |
3046 | #, c-format |
3047 | msgid "\t%'ju byte in file names\n" |
3048 | msgid_plural "\t%'ju bytes in file names\n" |
3049 | msgstr[0] "\t%'ju byte nos nomes de ficheru\n" |
3050 | msgstr[1] "\t%'ju bytes nos nomes de ficheru\n" |
3051 | |
3052 | -#: src/locate.c:344 |
3053 | +#: src/locate.c:347 |
3054 | #, c-format |
3055 | msgid "\t%'ju byte used to store database\n" |
3056 | msgid_plural "\t%'ju bytes used to store database\n" |
3057 | msgstr[0] "\t%'ju byte usáu p'atroxar la base de datos\n" |
3058 | msgstr[1] "\t%'ju bytes usaos p'atroxar la base de datos\n" |
3059 | |
3060 | -#: src/locate.c:473 |
3061 | +#: src/locate.c:483 |
3062 | #, c-format |
3063 | msgid "invalid empty directory name in `%s'" |
3064 | msgstr "nome de direutoriu ermu nun válidu en `%s'" |
3065 | |
3066 | -#: src/locate.c:500 |
3067 | +#: src/locate.c:510 |
3068 | #, c-format |
3069 | msgid "file name length %zu in `%s' is too large" |
3070 | msgstr "el tamañu del nome del ficheru %zu en `%s ye abondu llargu" |
3071 | |
3072 | -#: src/locate.c:607 |
3073 | -#, c-format |
3074 | +#: src/locate.c:617 |
3075 | +#, fuzzy, c-format |
3076 | msgid "" |
3077 | "Usage: locate [OPTION]... [PATTERN]...\n" |
3078 | "Search for entries in a mlocate database.\n" |
3079 | "\n" |
3080 | +" -A, --all only print entries that match all patterns\n" |
3081 | " -b, --basename match only the base name of path names\n" |
3082 | " -c, --count only print number of found entries\n" |
3083 | " -d, --database DBPATH use DBPATH instead of default database (which is\n" |
3084 | @@ -297,92 +298,92 @@ |
3085 | " -w, --wholename amuesa la direición completa del nome (por " |
3086 | "defeutu)\n" |
3087 | |
3088 | -#: src/locate.c:806 |
3089 | +#: src/locate.c:823 |
3090 | #, c-format |
3091 | msgid "non-option arguments are not allowed with --%s" |
3092 | msgstr "nun son permitíos argumentos ensin opción con --%s" |
3093 | |
3094 | -#: src/locate.c:819 |
3095 | +#: src/locate.c:836 |
3096 | msgid "no pattern to search for specified" |
3097 | msgstr "dengún patrón de gueta especificáu" |
3098 | |
3099 | -#: src/locate.c:846 |
3100 | +#: src/locate.c:863 |
3101 | #, c-format |
3102 | msgid "invalid regexp `%s': %s" |
3103 | msgstr "espresión regular non válida `%s': %s" |
3104 | |
3105 | -#: src/locate.c:932 |
3106 | +#: src/locate.c:949 |
3107 | msgid "can not drop privileges" |
3108 | msgstr "nun pudieron abandonase privilexos" |
3109 | |
3110 | -#: src/locate.c:947 |
3111 | +#: src/locate.c:964 |
3112 | msgid "can not read two databases from standard input" |
3113 | msgstr "nun pudieron lleese dos bases de datos cola entrada patrón" |
3114 | |
3115 | -#: src/locate.c:959 src/locate.c:974 src/updatedb.c:980 |
3116 | +#: src/locate.c:976 src/locate.c:991 src/updatedb.c:1009 |
3117 | #, c-format |
3118 | msgid "can not stat () `%s'" |
3119 | msgstr "nun pudo facese stat () `%s'" |
3120 | |
3121 | -#: src/locate.c:1034 src/updatedb.c:1004 |
3122 | +#: src/locate.c:1051 src/updatedb.c:1033 |
3123 | msgid "I/O error while writing to standard output" |
3124 | msgstr "fallu d'E/S al intentar escribir sobro la entrada patrón " |
3125 | |
3126 | -#: src/updatedb.c:556 src/updatedb.c:663 |
3127 | +#: src/updatedb.c:580 src/updatedb.c:687 |
3128 | #, c-format |
3129 | msgid "file name length %zu is too large" |
3130 | msgstr "el nome del ficheru %zu ye enforma llargu" |
3131 | |
3132 | -#: src/updatedb.c:655 |
3133 | +#: src/updatedb.c:679 |
3134 | #, c-format |
3135 | msgid "file system error: zero-length file name in directory %s" |
3136 | msgstr "" |
3137 | |
3138 | -#: src/updatedb.c:886 |
3139 | +#: src/updatedb.c:915 |
3140 | #, c-format |
3141 | msgid "can not open a temporary file for `%s'" |
3142 | msgstr "nun pudo abrise un ficheru temporal pa `%s'" |
3143 | |
3144 | -#: src/updatedb.c:899 |
3145 | +#: src/updatedb.c:928 |
3146 | msgid "configuration is too large" |
3147 | msgstr "la configuración ye mui estensa" |
3148 | |
3149 | -#: src/updatedb.c:920 |
3150 | +#: src/updatedb.c:949 |
3151 | #, c-format |
3152 | msgid "can not find group `%s'" |
3153 | msgstr "nun pudo alcontrase'l grupu `%s'" |
3154 | |
3155 | -#: src/updatedb.c:923 |
3156 | +#: src/updatedb.c:952 |
3157 | #, c-format |
3158 | msgid "can not change group of file `%s' to `%s'" |
3159 | msgstr "nun pudo camudase'l grupu del ficheru `%s' pa `%s'" |
3160 | |
3161 | -#: src/updatedb.c:937 |
3162 | +#: src/updatedb.c:966 |
3163 | #, c-format |
3164 | msgid "can not change permissions of file `%s'" |
3165 | msgstr "nun pudo camudase los permisos del ficheru `%s'" |
3166 | |
3167 | -#: src/updatedb.c:968 |
3168 | +#: src/updatedb.c:997 |
3169 | #, c-format |
3170 | msgid "`%s' is locked (probably by an earlier updatedb)" |
3171 | msgstr "`%s' ta bloquiáu (dablemente a causa d'un updatedb anterior)" |
3172 | |
3173 | -#: src/updatedb.c:970 |
3174 | +#: src/updatedb.c:999 |
3175 | #, c-format |
3176 | msgid "can not lock `%s'" |
3177 | msgstr "nun pudo bloquiase `%s'" |
3178 | |
3179 | -#: src/updatedb.c:977 |
3180 | +#: src/updatedb.c:1006 |
3181 | #, c-format |
3182 | msgid "can not change directory to `%s'" |
3183 | msgstr "nun pudo camudase'l direutoriu a `%s'" |
3184 | |
3185 | -#: src/updatedb.c:986 |
3186 | +#: src/updatedb.c:1015 |
3187 | #, c-format |
3188 | msgid "I/O error while writing to `%s'" |
3189 | msgstr "fallu d'E/S al escribir sobro `%s'" |
3190 | |
3191 | -#: src/updatedb.c:990 |
3192 | +#: src/updatedb.c:1019 |
3193 | #, c-format |
3194 | msgid "error replacing `%s'" |
3195 | msgstr "fallu al camudar `%s'" |
3196 | |
3197 | === modified file 'po/bg.gmo' |
3198 | Binary files po/bg.gmo 2012-07-27 05:16:18 +0000 and po/bg.gmo 2013-06-14 23:40:37 +0000 differ |
3199 | === modified file 'po/bg.po' |
3200 | --- po/bg.po 2012-07-27 05:16:18 +0000 |
3201 | +++ po/bg.po 2013-06-14 23:40:37 +0000 |
3202 | @@ -4,30 +4,30 @@ |
3203 | # |
3204 | # Translators: |
3205 | # mitr <mitr@volny.cz>, 2011. |
3206 | -# Valentin Laskov <laskov@festa.bg>, 2011. |
3207 | +# Valentin Laskov <laskov@festa.bg>, 2011, 2012. |
3208 | msgid "" |
3209 | msgstr "" |
3210 | "Project-Id-Version: mlocate\n" |
3211 | "Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n" |
3212 | -"POT-Creation-Date: 2012-03-03 06:10+0100\n" |
3213 | -"PO-Revision-Date: 2012-02-14 08:16+0000\n" |
3214 | -"Last-Translator: Miloslav Trmač <mitr@volny.cz>\n" |
3215 | +"POT-Creation-Date: 2012-09-22 04:14+0200\n" |
3216 | +"PO-Revision-Date: 2012-03-13 15:32+0000\n" |
3217 | +"Last-Translator: Valentin Laskov <laskov@festa.bg>\n" |
3218 | "Language-Team: Bulgarian <trans-bg@lists.fedoraproject.org>\n" |
3219 | "Language: bg\n" |
3220 | "MIME-Version: 1.0\n" |
3221 | "Content-Type: text/plain; charset=UTF-8\n" |
3222 | "Content-Transfer-Encoding: 8bit\n" |
3223 | -"Plural-Forms: nplurals=2; plural=(n != 1)\n" |
3224 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
3225 | |
3226 | #: src/conf.c:241 |
3227 | msgid "warning: Line number overflow" |
3228 | -msgstr "предупреждение: Препълване на номерата на редовете" |
3229 | +msgstr "внимание: Препълване на броя редове" |
3230 | |
3231 | #: src/conf.c:259 |
3232 | msgid "missing closing `\"'" |
3233 | msgstr "липсва затваряща `\"'" |
3234 | |
3235 | -#: src/conf.c:309 src/locate.c:968 src/updatedb.c:892 |
3236 | +#: src/conf.c:309 src/locate.c:985 src/updatedb.c:921 |
3237 | #, c-format |
3238 | msgid "can not open `%s'" |
3239 | msgstr "не може да бъде отворен `%s'" |
3240 | @@ -35,7 +35,7 @@ |
3241 | #: src/conf.c:353 |
3242 | #, c-format |
3243 | msgid "unknown variable `%s'" |
3244 | -msgstr "неизвестна променлива `%s'" |
3245 | +msgstr "непозната променлива `%s'" |
3246 | |
3247 | #: src/conf.c:358 |
3248 | msgid "variable name expected" |
3249 | @@ -94,59 +94,62 @@ |
3250 | "The configuration defaults to values read from\n" |
3251 | "`%s'.\n" |
3252 | msgstr "" |
3253 | -"Usage: updatedb [OPTION]...\n" |
3254 | -"Update a mlocate database.\n" |
3255 | +"Употреба: updatedb [OPTION]...\n" |
3256 | +"Обновява базата данни на mlocate.\n" |
3257 | "\n" |
3258 | -" -f, --add-prunefs FS omit also FS\n" |
3259 | -" -n, --add-prunenames NAMES omit also NAMES\n" |
3260 | -" -e, --add-prunepaths PATHS omit also PATHS\n" |
3261 | -" -U, --database-root PATH the subtree to store in database (default " |
3262 | -"\"/\")\n" |
3263 | -" -h, --help print this help\n" |
3264 | -" -o, --output FILE database to update (default\n" |
3265 | +" -f, --add-prunefs FS пропусни и FS\n" |
3266 | +" -n, --add-prunenames NAMES пропусни и NAMES\n" |
3267 | +" -e, --add-prunepaths PATHS пропусни и PATHS\n" |
3268 | +" -U, --database-root PATH поддървото за запис в базата данни (по " |
3269 | +"подразбиране \"/\")\n" |
3270 | +" -h, --help отпечатва този помощен текст\n" |
3271 | +" -o, --output FILE база данни за обновяване (по подразбиране\n" |
3272 | " `%s')\n" |
3273 | -" --prune-bind-mounts FLAG omit bind mounts (default \"no\")\n" |
3274 | -" --prunefs FS filesystems to omit from database\n" |
3275 | -" --prunenames NAMES directory names to omit from database\n" |
3276 | -" --prunepaths PATHS paths to omit from database\n" |
3277 | -" -l, --require-visibility FLAG check visibility before reporting files\n" |
3278 | -" (default \"yes\")\n" |
3279 | -" -v, --verbose print paths of files as they are found\n" |
3280 | -" -V, --version print version information\n" |
3281 | +" --prune-bind-mounts FLAG пропуска bind mounts (по подразбиране \"no" |
3282 | +"\")\n" |
3283 | +" --prunefs FS пропусни файловата система FS от БД\n" |
3284 | +" --prunenames NAMES пропусни директориите с имена NAMES от БД\n" |
3285 | +" --prunepaths PATHS пропусни пътищата от базата данни\n" |
3286 | +" -l, --require-visibility FLAG провери видимостта преди да докладваш " |
3287 | +"файлове\n" |
3288 | +" (по подразлиране \"yes\")\n" |
3289 | +" -v, --verbose отпечатвай пътищата на файловете така, " |
3290 | +"както са намерени\n" |
3291 | +" -V, --version отпечатай информация за версията\n" |
3292 | "\n" |
3293 | -"The configuration defaults to values read from\n" |
3294 | +"Подразбиращите се настройки са в\n" |
3295 | "`%s'.\n" |
3296 | |
3297 | -#: src/conf.c:464 src/locate.c:642 |
3298 | +#: src/conf.c:464 src/locate.c:654 |
3299 | #, c-format |
3300 | msgid "" |
3301 | "\n" |
3302 | "Report bugs to %s.\n" |
3303 | msgstr "" |
3304 | "\n" |
3305 | -"Съобщаване за грешки на %s.\n" |
3306 | +"Съобщавайте за грешки на %s.\n" |
3307 | |
3308 | #: src/conf.c:482 |
3309 | msgid "can not get current working directory" |
3310 | msgstr "не може да се определи текущата работна директория" |
3311 | |
3312 | #: src/conf.c:540 src/conf.c:551 src/conf.c:561 src/conf.c:571 |
3313 | -#: src/locate.c:697 src/locate.c:706 src/locate.c:732 src/locate.c:790 |
3314 | +#: src/locate.c:714 src/locate.c:723 src/locate.c:749 src/locate.c:807 |
3315 | #, c-format |
3316 | msgid "--%s would override earlier command-line argument" |
3317 | -msgstr "--%s·ще презапише предишен аргумент на командния ред" |
3318 | +msgstr "--%s·ще пренебрегне предишен аргумент на командния ред" |
3319 | |
3320 | -#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:769 |
3321 | +#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:786 |
3322 | #, c-format |
3323 | msgid "invalid value `%s' of --%s" |
3324 | msgstr "невалидна стойност·`%s'·за·--%s" |
3325 | |
3326 | -#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:763 |
3327 | +#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:780 |
3328 | #, c-format |
3329 | msgid "--%s specified twice" |
3330 | msgstr "--%s е зададен два пъти" |
3331 | |
3332 | -#: src/conf.c:590 src/locate.c:722 |
3333 | +#: src/conf.c:590 src/locate.c:739 |
3334 | msgid "" |
3335 | "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n" |
3336 | "This software is distributed under the GPL v.2.\n" |
3337 | @@ -170,12 +173,12 @@ |
3338 | #: src/lib.c:206 |
3339 | #, c-format |
3340 | msgid "`%s' has unknown version %u" |
3341 | -msgstr "`%s'·е с неизвестна версия·%u" |
3342 | +msgstr "`%s' е с неизвестна версия %u" |
3343 | |
3344 | #: src/lib.c:213 |
3345 | #, c-format |
3346 | msgid "`%s' has unknown visibility flag %u" |
3347 | -msgstr "`%s'·е с неизвестен флаг·%u" |
3348 | +msgstr "`%s' е с неизвестен флаг за видимост %u" |
3349 | |
3350 | #: src/lib.c:268 |
3351 | #, c-format |
3352 | @@ -187,55 +190,56 @@ |
3353 | msgid "I/O error seeking in `%s'" |
3354 | msgstr "Вх/Изх грешка при търсене в `%s'" |
3355 | |
3356 | -#: src/locate.c:335 |
3357 | +#: src/locate.c:338 |
3358 | #, c-format |
3359 | msgid "Database %s:\n" |
3360 | msgstr "База данни %s:\n" |
3361 | |
3362 | -#: src/locate.c:338 |
3363 | +#: src/locate.c:341 |
3364 | #, c-format |
3365 | msgid "\t%'ju directory\n" |
3366 | msgid_plural "\t%'ju directories\n" |
3367 | msgstr[0] "\t%'ju·директория\n" |
3368 | msgstr[1] "\t%'ju·директории\n" |
3369 | |
3370 | -#: src/locate.c:340 |
3371 | +#: src/locate.c:343 |
3372 | #, c-format |
3373 | msgid "\t%'ju file\n" |
3374 | msgid_plural "\t%'ju files\n" |
3375 | msgstr[0] "\t%'ju файл\n" |
3376 | msgstr[1] "\t%'ju файла\n" |
3377 | |
3378 | -#: src/locate.c:342 |
3379 | +#: src/locate.c:345 |
3380 | #, c-format |
3381 | msgid "\t%'ju byte in file names\n" |
3382 | msgid_plural "\t%'ju bytes in file names\n" |
3383 | -msgstr[0] "\t%'ju байт имена на файлове\n" |
3384 | -msgstr[1] "\t%'ju байта имена на файлове\n" |
3385 | +msgstr[0] "\t%'ju байт в имена на файлове\n" |
3386 | +msgstr[1] "\t%'ju байта в имена на файлове\n" |
3387 | |
3388 | -#: src/locate.c:344 |
3389 | +#: src/locate.c:347 |
3390 | #, c-format |
3391 | msgid "\t%'ju byte used to store database\n" |
3392 | msgid_plural "\t%'ju bytes used to store database\n" |
3393 | -msgstr[0] "\t%'ju байт използван за базата данни\n" |
3394 | -msgstr[1] "\t%'ju байта използвани за базата данни\n" |
3395 | +msgstr[0] "\t%'ju байт, използван за базата данни\n" |
3396 | +msgstr[1] "\t%'ju байта, използвани за базата данни\n" |
3397 | |
3398 | -#: src/locate.c:473 |
3399 | +#: src/locate.c:483 |
3400 | #, c-format |
3401 | msgid "invalid empty directory name in `%s'" |
3402 | -msgstr "невалидно име на празна директория `%s'" |
3403 | +msgstr "невалидно празно име на директория в `%s'" |
3404 | |
3405 | -#: src/locate.c:500 |
3406 | +#: src/locate.c:510 |
3407 | #, c-format |
3408 | msgid "file name length %zu in `%s' is too large" |
3409 | -msgstr "дължина %zu·на името на файл `%s'·е прекалено голяма" |
3410 | +msgstr "прекалено голяма дължина %zu на името на файл в `%s'" |
3411 | |
3412 | -#: src/locate.c:607 |
3413 | -#, c-format |
3414 | +#: src/locate.c:617 |
3415 | +#, fuzzy, c-format |
3416 | msgid "" |
3417 | "Usage: locate [OPTION]... [PATTERN]...\n" |
3418 | "Search for entries in a mlocate database.\n" |
3419 | "\n" |
3420 | +" -A, --all only print entries that match all patterns\n" |
3421 | " -b, --basename match only the base name of path names\n" |
3422 | " -c, --count only print number of found entries\n" |
3423 | " -d, --database DBPATH use DBPATH instead of default database (which is\n" |
3424 | @@ -261,120 +265,124 @@ |
3425 | " -V, --version print version information\n" |
3426 | " -w, --wholename match whole path name (default)\n" |
3427 | msgstr "" |
3428 | -"Usage: locate [OPTION]... [PATTERN]...\n" |
3429 | -"Search for entries in a mlocate database.\n" |
3430 | +"Употреба: locate [OPTION]... [PATTERN]...\n" |
3431 | +"Търси за съвпадащи записи в mlocate база данни.\n" |
3432 | "\n" |
3433 | -" -b, --basename match only the base name of path names\n" |
3434 | -" -c, --count only print number of found entries\n" |
3435 | -" -d, --database DBPATH use DBPATH instead of default database (which is\n" |
3436 | +" -b, --basename съвпадение на основното име само от пътя на файла\n" |
3437 | +" -c, --count само отпечатва броя намерени записи\n" |
3438 | +" -d, --database DBPATH ползва DBPATH вместо подразбиращата се база данни " |
3439 | +"(която е\n" |
3440 | " %s)\n" |
3441 | -" -e, --existing only print entries for currently existing files\n" |
3442 | -" -L, --follow follow trailing symbolic links when checking file\n" |
3443 | -" existence (default)\n" |
3444 | -" -h, --help print this help\n" |
3445 | -" -i, --ignore-case ignore case distinctions when matching patterns\n" |
3446 | -" -l, --limit, -n LIMIT limit output (or counting) to LIMIT entries\n" |
3447 | -" -m, --mmap ignored, for backward compatibility\n" |
3448 | -" -P, --nofollow, -H don't follow trailing symbolic links when checking " |
3449 | -"file\n" |
3450 | -" existence\n" |
3451 | -" -0, --null separate entries with NUL on output\n" |
3452 | -" -S, --statistics don't search for entries, print statistics about " |
3453 | -"each\n" |
3454 | -" used database\n" |
3455 | -" -q, --quiet report no error messages about reading databases\n" |
3456 | -" -r, --regexp REGEXP search for basic regexp REGEXP instead of patterns\n" |
3457 | -" --regex patterns are extended regexps\n" |
3458 | -" -s, --stdio ignored, for backward compatibility\n" |
3459 | -" -V, --version print version information\n" |
3460 | -" -w, --wholename match whole path name (default)\n" |
3461 | +" -e, --existing отпечатва записи само на съществуващи в момента " |
3462 | +"файлове\n" |
3463 | +" -L, --follow следвай символните връзки при проверка за " |
3464 | +"съществуването\n" |
3465 | +" на файловете (по подразбиране)\n" |
3466 | +" -h, --help отпечатва този помощен текст\n" |
3467 | +" -i, --ignore-case игнорирай разликата малки/ГОЛЕМИ букви при " |
3468 | +"съвпаденията\n" |
3469 | +" -l, --limit, -n LIMIT ограничи изхода (или броенето) до LIMIT записа\n" |
3470 | +" -m, --mmap игнорира се, за обратна съвместимост\n" |
3471 | +" -P, --nofollow, -H не следвай символните връзки при проверка за " |
3472 | +"съществуването\n" |
3473 | +" на файловете\n" |
3474 | +" -0, --null отделяй записите с NUL на изхода\n" |
3475 | +" -S, --statistics не търси записи, отпечатай статистика за всяка " |
3476 | +"използвана\n" |
3477 | +" база данни\n" |
3478 | +" -q, --quiet не съобщавай грешките при четенето на базите данни\n" |
3479 | +" -r, --regexp REGEXP търсене на основен regexp REGEXP вместо шаблон\n" |
3480 | +" --regex шаблоните са разширени regexp\n" |
3481 | +" -s, --stdio игнорира се, за обратна съвместимост\n" |
3482 | +" -V, --version отпечатва информация за версията\n" |
3483 | +" -w, --wholename съвпадение на пълния път и име (по подразбиране)\n" |
3484 | |
3485 | -#: src/locate.c:806 |
3486 | +#: src/locate.c:823 |
3487 | #, c-format |
3488 | msgid "non-option arguments are not allowed with --%s" |
3489 | -msgstr "допълнителни аргументи не са позволени след·--%s" |
3490 | +msgstr "аргументи не-опции не са позволени след·--%s" |
3491 | |
3492 | -#: src/locate.c:819 |
3493 | +#: src/locate.c:836 |
3494 | msgid "no pattern to search for specified" |
3495 | -msgstr "не е зададен образец за търсене" |
3496 | +msgstr "не е зададен шаблон за търсене" |
3497 | |
3498 | -#: src/locate.c:846 |
3499 | +#: src/locate.c:863 |
3500 | #, c-format |
3501 | msgid "invalid regexp `%s': %s" |
3502 | msgstr "невалиден регулярен израз `%s': %s" |
3503 | |
3504 | -#: src/locate.c:932 |
3505 | +#: src/locate.c:949 |
3506 | msgid "can not drop privileges" |
3507 | msgstr "неуспех при опит за работа с по-ниски привилегии" |
3508 | |
3509 | -#: src/locate.c:947 |
3510 | +#: src/locate.c:964 |
3511 | msgid "can not read two databases from standard input" |
3512 | msgstr "не е възможно да бъдат прочетени две бази данни от стандартния вход" |
3513 | |
3514 | -#: src/locate.c:959 src/locate.c:974 src/updatedb.c:980 |
3515 | +#: src/locate.c:976 src/locate.c:991 src/updatedb.c:1009 |
3516 | #, c-format |
3517 | msgid "can not stat () `%s'" |
3518 | msgstr "не може да се изпълни stat () за `%s'" |
3519 | |
3520 | -#: src/locate.c:1034 src/updatedb.c:1004 |
3521 | +#: src/locate.c:1051 src/updatedb.c:1033 |
3522 | msgid "I/O error while writing to standard output" |
3523 | msgstr "Вх/Изх грешка при запис на стандартния изход" |
3524 | |
3525 | -#: src/updatedb.c:556 src/updatedb.c:663 |
3526 | +#: src/updatedb.c:580 src/updatedb.c:687 |
3527 | #, c-format |
3528 | msgid "file name length %zu is too large" |
3529 | -msgstr "дължина %zu·на името на файл е прекалено голяма" |
3530 | +msgstr "дължина %zu на името на файл е прекалено голяма" |
3531 | |
3532 | -#: src/updatedb.c:655 |
3533 | +#: src/updatedb.c:679 |
3534 | #, c-format |
3535 | msgid "file system error: zero-length file name in directory %s" |
3536 | -msgstr "" |
3537 | +msgstr "грешка във файловата система: файл с нулева дължина в директория %s" |
3538 | |
3539 | -#: src/updatedb.c:886 |
3540 | +#: src/updatedb.c:915 |
3541 | #, c-format |
3542 | msgid "can not open a temporary file for `%s'" |
3543 | msgstr "не може да бъде отворен временен файл за `%s'" |
3544 | |
3545 | -#: src/updatedb.c:899 |
3546 | +#: src/updatedb.c:928 |
3547 | msgid "configuration is too large" |
3548 | msgstr "конфигурацията е прекалено голяма" |
3549 | |
3550 | -#: src/updatedb.c:920 |
3551 | +#: src/updatedb.c:949 |
3552 | #, c-format |
3553 | msgid "can not find group `%s'" |
3554 | msgstr "не може да бъде намерена група `%s'" |
3555 | |
3556 | -#: src/updatedb.c:923 |
3557 | +#: src/updatedb.c:952 |
3558 | #, c-format |
3559 | msgid "can not change group of file `%s' to `%s'" |
3560 | -msgstr "не може да бъде променена групата на файл `%s'·на·`%s'" |
3561 | +msgstr "не може да бъде променена групата на файл `%s' на `%s'" |
3562 | |
3563 | -#: src/updatedb.c:937 |
3564 | +#: src/updatedb.c:966 |
3565 | #, c-format |
3566 | msgid "can not change permissions of file `%s'" |
3567 | msgstr "не могат да бъдат променени позволенията на файл `%s'" |
3568 | |
3569 | -#: src/updatedb.c:968 |
3570 | +#: src/updatedb.c:997 |
3571 | #, c-format |
3572 | msgid "`%s' is locked (probably by an earlier updatedb)" |
3573 | msgstr "`%s' е заключен (вероятно от друг updatedb процес)" |
3574 | |
3575 | -#: src/updatedb.c:970 |
3576 | +#: src/updatedb.c:999 |
3577 | #, c-format |
3578 | msgid "can not lock `%s'" |
3579 | msgstr "не мога да заключа `%s'" |
3580 | |
3581 | -#: src/updatedb.c:977 |
3582 | +#: src/updatedb.c:1006 |
3583 | #, c-format |
3584 | msgid "can not change directory to `%s'" |
3585 | -msgstr "не може да бъде променена директорията на `%s'" |
3586 | +msgstr "не мога да променя директорията на `%s'" |
3587 | |
3588 | -#: src/updatedb.c:986 |
3589 | +#: src/updatedb.c:1015 |
3590 | #, c-format |
3591 | msgid "I/O error while writing to `%s'" |
3592 | -msgstr "Вх/Изх грешка при запис до `%s'" |
3593 | +msgstr "Вх/Изх грешка при запис в `%s'" |
3594 | |
3595 | -#: src/updatedb.c:990 |
3596 | +#: src/updatedb.c:1019 |
3597 | #, c-format |
3598 | msgid "error replacing `%s'" |
3599 | msgstr "грешка при заместване на `%s'" |
3600 | |
3601 | === modified file 'po/bs.gmo' |
3602 | Binary files po/bs.gmo 2012-07-27 05:15:55 +0000 and po/bs.gmo 2013-06-14 23:40:37 +0000 differ |
3603 | === modified file 'po/bs.po' |
3604 | --- po/bs.po 2012-07-27 05:15:55 +0000 |
3605 | +++ po/bs.po 2013-06-14 23:40:37 +0000 |
3606 | @@ -4,22 +4,23 @@ |
3607 | # |
3608 | # Translators: |
3609 | # Arnes <arnes99@gmail.com>, 2011. |
3610 | +# Edmon Begoli <ebegoli@gmail.com>, 2012. |
3611 | # mitr <mitr@volny.cz>, 2011. |
3612 | msgid "" |
3613 | msgstr "" |
3614 | "Project-Id-Version: mlocate\n" |
3615 | "Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n" |
3616 | -"POT-Creation-Date: 2012-03-03 06:10+0100\n" |
3617 | -"PO-Revision-Date: 2012-02-14 08:16+0000\n" |
3618 | -"Last-Translator: Miloslav Trmač <mitr@volny.cz>\n" |
3619 | -"Language-Team: Bosnian (http://www.transifex.net/projects/p/fedora/language/" |
3620 | +"POT-Creation-Date: 2012-09-22 04:14+0200\n" |
3621 | +"PO-Revision-Date: 2012-06-19 02:45+0000\n" |
3622 | +"Last-Translator: Edmon Begoli <ebegoli@gmail.com>\n" |
3623 | +"Language-Team: Bosnian (http://www.transifex.com/projects/p/fedora/language/" |
3624 | "bs/)\n" |
3625 | "Language: bs\n" |
3626 | "MIME-Version: 1.0\n" |
3627 | "Content-Type: text/plain; charset=UTF-8\n" |
3628 | "Content-Transfer-Encoding: 8bit\n" |
3629 | "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" |
3630 | -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" |
3631 | +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" |
3632 | |
3633 | #: src/conf.c:241 |
3634 | msgid "warning: Line number overflow" |
3635 | @@ -29,7 +30,7 @@ |
3636 | msgid "missing closing `\"'" |
3637 | msgstr "nedostaje završno „\"“" |
3638 | |
3639 | -#: src/conf.c:309 src/locate.c:968 src/updatedb.c:892 |
3640 | +#: src/conf.c:309 src/locate.c:985 src/updatedb.c:921 |
3641 | #, c-format |
3642 | msgid "can not open `%s'" |
3643 | msgstr "ne mogu da otvorim „%s“" |
3644 | @@ -128,7 +129,7 @@ |
3645 | "Podrazumjevane vrijednosti podešavanja pročitane iz\n" |
3646 | "„%s“.\n" |
3647 | |
3648 | -#: src/conf.c:464 src/locate.c:642 |
3649 | +#: src/conf.c:464 src/locate.c:654 |
3650 | #, c-format |
3651 | msgid "" |
3652 | "\n" |
3653 | @@ -142,22 +143,22 @@ |
3654 | msgstr "ne mogu da dobijem trenutni radni direktorij" |
3655 | |
3656 | #: src/conf.c:540 src/conf.c:551 src/conf.c:561 src/conf.c:571 |
3657 | -#: src/locate.c:697 src/locate.c:706 src/locate.c:732 src/locate.c:790 |
3658 | +#: src/locate.c:714 src/locate.c:723 src/locate.c:749 src/locate.c:807 |
3659 | #, c-format |
3660 | msgid "--%s would override earlier command-line argument" |
3661 | msgstr "--%s bi premostilo raniji argument komandne linije" |
3662 | |
3663 | -#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:769 |
3664 | +#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:786 |
3665 | #, c-format |
3666 | msgid "invalid value `%s' of --%s" |
3667 | msgstr "neispravna vrednost „%s“ za --%s" |
3668 | |
3669 | -#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:763 |
3670 | +#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:780 |
3671 | #, c-format |
3672 | msgid "--%s specified twice" |
3673 | msgstr "--%s definisano dva puta" |
3674 | |
3675 | -#: src/conf.c:590 src/locate.c:722 |
3676 | +#: src/conf.c:590 src/locate.c:739 |
3677 | msgid "" |
3678 | "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n" |
3679 | "This software is distributed under the GPL v.2.\n" |
3680 | @@ -198,12 +199,12 @@ |
3681 | msgid "I/O error seeking in `%s'" |
3682 | msgstr "U/I greška pri traženju u „%s“" |
3683 | |
3684 | -#: src/locate.c:335 |
3685 | +#: src/locate.c:338 |
3686 | #, c-format |
3687 | msgid "Database %s:\n" |
3688 | msgstr "Baza podataka %s:\n" |
3689 | |
3690 | -#: src/locate.c:338 |
3691 | +#: src/locate.c:341 |
3692 | #, c-format |
3693 | msgid "\t%'ju directory\n" |
3694 | msgid_plural "\t%'ju directories\n" |
3695 | @@ -214,7 +215,7 @@ |
3696 | msgstr[2] "" |
3697 | "<span class=\"whitespace other\" title=\"Tab\">»</span>%'ju directories\n" |
3698 | |
3699 | -#: src/locate.c:340 |
3700 | +#: src/locate.c:343 |
3701 | #, c-format |
3702 | msgid "\t%'ju file\n" |
3703 | msgid_plural "\t%'ju files\n" |
3704 | @@ -222,7 +223,7 @@ |
3705 | msgstr[1] "" |
3706 | msgstr[2] "" |
3707 | |
3708 | -#: src/locate.c:342 |
3709 | +#: src/locate.c:345 |
3710 | #, c-format |
3711 | msgid "\t%'ju byte in file names\n" |
3712 | msgid_plural "\t%'ju bytes in file names\n" |
3713 | @@ -230,7 +231,7 @@ |
3714 | msgstr[1] "" |
3715 | msgstr[2] "" |
3716 | |
3717 | -#: src/locate.c:344 |
3718 | +#: src/locate.c:347 |
3719 | #, c-format |
3720 | msgid "\t%'ju byte used to store database\n" |
3721 | msgid_plural "\t%'ju bytes used to store database\n" |
3722 | @@ -238,22 +239,23 @@ |
3723 | msgstr[1] "" |
3724 | msgstr[2] "" |
3725 | |
3726 | -#: src/locate.c:473 |
3727 | +#: src/locate.c:483 |
3728 | #, c-format |
3729 | msgid "invalid empty directory name in `%s'" |
3730 | msgstr "neispravan naziv praznog direktorija u „%s“" |
3731 | |
3732 | -#: src/locate.c:500 |
3733 | +#: src/locate.c:510 |
3734 | #, c-format |
3735 | msgid "file name length %zu in `%s' is too large" |
3736 | msgstr "dužina %zu naziva datoteke u „%s“ je prevelika" |
3737 | |
3738 | -#: src/locate.c:607 |
3739 | -#, c-format |
3740 | +#: src/locate.c:617 |
3741 | +#, fuzzy, c-format |
3742 | msgid "" |
3743 | "Usage: locate [OPTION]... [PATTERN]...\n" |
3744 | "Search for entries in a mlocate database.\n" |
3745 | "\n" |
3746 | +" -A, --all only print entries that match all patterns\n" |
3747 | " -b, --basename match only the base name of path names\n" |
3748 | " -c, --count only print number of found entries\n" |
3749 | " -d, --database DBPATH use DBPATH instead of default database (which is\n" |
3750 | @@ -312,92 +314,92 @@ |
3751 | " -V, --version odštampaj informacije o verziji\n" |
3752 | " -w, --wholename uporedi cijeli naziv putanje (podrazumevano)\n" |
3753 | |
3754 | -#: src/locate.c:806 |
3755 | +#: src/locate.c:823 |
3756 | #, c-format |
3757 | msgid "non-option arguments are not allowed with --%s" |
3758 | msgstr "argumenti koji nisu opcije nisu dozvoljeni sa --%s" |
3759 | |
3760 | -#: src/locate.c:819 |
3761 | +#: src/locate.c:836 |
3762 | msgid "no pattern to search for specified" |
3763 | msgstr "uzor za pretragu nije naveden" |
3764 | |
3765 | -#: src/locate.c:846 |
3766 | +#: src/locate.c:863 |
3767 | #, c-format |
3768 | msgid "invalid regexp `%s': %s" |
3769 | msgstr "neispravan regularni izraz „%s“: %s" |
3770 | |
3771 | -#: src/locate.c:932 |
3772 | +#: src/locate.c:949 |
3773 | msgid "can not drop privileges" |
3774 | msgstr "ne moze da ukloni privilegije" |
3775 | |
3776 | -#: src/locate.c:947 |
3777 | +#: src/locate.c:964 |
3778 | msgid "can not read two databases from standard input" |
3779 | msgstr "ne moze da pročita dvije baze podataka sa standardnog ulaza" |
3780 | |
3781 | -#: src/locate.c:959 src/locate.c:974 src/updatedb.c:980 |
3782 | +#: src/locate.c:976 src/locate.c:991 src/updatedb.c:1009 |
3783 | #, c-format |
3784 | msgid "can not stat () `%s'" |
3785 | msgstr "ne moze da izvrši funkciju stat () nad „%s“" |
3786 | |
3787 | -#: src/locate.c:1034 src/updatedb.c:1004 |
3788 | +#: src/locate.c:1051 src/updatedb.c:1033 |
3789 | msgid "I/O error while writing to standard output" |
3790 | msgstr "U/I greška pri čitanju sa standardnog izlaza" |
3791 | |
3792 | -#: src/updatedb.c:556 src/updatedb.c:663 |
3793 | +#: src/updatedb.c:580 src/updatedb.c:687 |
3794 | #, c-format |
3795 | msgid "file name length %zu is too large" |
3796 | msgstr "dužina %zu naziva datoteke je prevelika" |
3797 | |
3798 | -#: src/updatedb.c:655 |
3799 | +#: src/updatedb.c:679 |
3800 | #, c-format |
3801 | msgid "file system error: zero-length file name in directory %s" |
3802 | -msgstr "" |
3803 | +msgstr "greska u sistemskoj datoteci: prazna datoteka u direktoriju %s " |
3804 | |
3805 | -#: src/updatedb.c:886 |
3806 | +#: src/updatedb.c:915 |
3807 | #, c-format |
3808 | msgid "can not open a temporary file for `%s'" |
3809 | msgstr "ne moze da otvori privremenu datoteku za „%s“" |
3810 | |
3811 | -#: src/updatedb.c:899 |
3812 | +#: src/updatedb.c:928 |
3813 | msgid "configuration is too large" |
3814 | msgstr "podešavanje je preveliko" |
3815 | |
3816 | -#: src/updatedb.c:920 |
3817 | +#: src/updatedb.c:949 |
3818 | #, c-format |
3819 | msgid "can not find group `%s'" |
3820 | msgstr "ne moze da pronađe grupu „%s“" |
3821 | |
3822 | -#: src/updatedb.c:923 |
3823 | +#: src/updatedb.c:952 |
3824 | #, c-format |
3825 | msgid "can not change group of file `%s' to `%s'" |
3826 | msgstr "ne moze da promijeni grupu datoteke „%s“ u „%s“" |
3827 | |
3828 | -#: src/updatedb.c:937 |
3829 | +#: src/updatedb.c:966 |
3830 | #, c-format |
3831 | msgid "can not change permissions of file `%s'" |
3832 | msgstr "ne moze da promijeni dozvole datoteke „%s“" |
3833 | |
3834 | -#: src/updatedb.c:968 |
3835 | +#: src/updatedb.c:997 |
3836 | #, c-format |
3837 | msgid "`%s' is locked (probably by an earlier updatedb)" |
3838 | msgstr "„%s“ je zaključana (vjerovatno ranijom updatedb operacijom)" |
3839 | |
3840 | -#: src/updatedb.c:970 |
3841 | +#: src/updatedb.c:999 |
3842 | #, c-format |
3843 | msgid "can not lock `%s'" |
3844 | msgstr "ne mogu da zaključam „%s“" |
3845 | |
3846 | -#: src/updatedb.c:977 |
3847 | +#: src/updatedb.c:1006 |
3848 | #, c-format |
3849 | msgid "can not change directory to `%s'" |
3850 | msgstr "ne moze se promijeniti direktorij na „%s“" |
3851 | |
3852 | -#: src/updatedb.c:986 |
3853 | +#: src/updatedb.c:1015 |
3854 | #, c-format |
3855 | msgid "I/O error while writing to `%s'" |
3856 | msgstr "U/I greška pri pisanju u „%s“" |
3857 | |
3858 | -#: src/updatedb.c:990 |
3859 | +#: src/updatedb.c:1019 |
3860 | #, c-format |
3861 | msgid "error replacing `%s'" |
3862 | msgstr "greška pri zamjeni „%s“" |
3863 | |
3864 | === modified file 'po/ca.gmo' |
3865 | Binary files po/ca.gmo 2012-07-27 05:15:55 +0000 and po/ca.gmo 2013-06-14 23:40:37 +0000 differ |
3866 | === modified file 'po/ca.po' |
3867 | --- po/ca.po 2012-07-27 05:15:55 +0000 |
3868 | +++ po/ca.po 2013-06-14 23:40:37 +0000 |
3869 | @@ -3,20 +3,21 @@ |
3870 | # This file is distributed under the same license as the PACKAGE package. |
3871 | # |
3872 | # Translators: |
3873 | +# Bernabé Borrero <bernabeborrero@gmail.com>, 2012. |
3874 | # mitr <mitr@volny.cz>, 2011. |
3875 | msgid "" |
3876 | msgstr "" |
3877 | "Project-Id-Version: mlocate\n" |
3878 | "Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n" |
3879 | -"POT-Creation-Date: 2012-03-03 06:10+0100\n" |
3880 | -"PO-Revision-Date: 2012-02-14 08:16+0000\n" |
3881 | -"Last-Translator: Miloslav Trmač <mitr@volny.cz>\n" |
3882 | +"POT-Creation-Date: 2012-09-22 04:14+0200\n" |
3883 | +"PO-Revision-Date: 2012-04-06 11:57+0000\n" |
3884 | +"Last-Translator: Bernabé Borrero <bernabeborrero@gmail.com>\n" |
3885 | "Language-Team: Catalan <fedora@llistes.softcatala.org>\n" |
3886 | "Language: ca\n" |
3887 | "MIME-Version: 1.0\n" |
3888 | "Content-Type: text/plain; charset=UTF-8\n" |
3889 | "Content-Transfer-Encoding: 8bit\n" |
3890 | -"Plural-Forms: nplurals=2; plural=(n != 1)\n" |
3891 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
3892 | |
3893 | #: src/conf.c:241 |
3894 | msgid "warning: Line number overflow" |
3895 | @@ -26,7 +27,7 @@ |
3896 | msgid "missing closing `\"'" |
3897 | msgstr "falta el caràcter `\"' de tancament" |
3898 | |
3899 | -#: src/conf.c:309 src/locate.c:968 src/updatedb.c:892 |
3900 | +#: src/conf.c:309 src/locate.c:985 src/updatedb.c:921 |
3901 | #, c-format |
3902 | msgid "can not open `%s'" |
3903 | msgstr "no s'ha pogut obrir `%s'" |
3904 | @@ -120,7 +121,7 @@ |
3905 | "La configuració per defecte es llegeix des de\n" |
3906 | "`%s'.\n" |
3907 | |
3908 | -#: src/conf.c:464 src/locate.c:642 |
3909 | +#: src/conf.c:464 src/locate.c:654 |
3910 | #, c-format |
3911 | msgid "" |
3912 | "\n" |
3913 | @@ -134,22 +135,22 @@ |
3914 | msgstr "no s'ha pogut obtenir el directori de treball actual" |
3915 | |
3916 | #: src/conf.c:540 src/conf.c:551 src/conf.c:561 src/conf.c:571 |
3917 | -#: src/locate.c:697 src/locate.c:706 src/locate.c:732 src/locate.c:790 |
3918 | +#: src/locate.c:714 src/locate.c:723 src/locate.c:749 src/locate.c:807 |
3919 | #, c-format |
3920 | msgid "--%s would override earlier command-line argument" |
3921 | msgstr "--%s ignorarà els arguments passats prèviament per línia d'ordres" |
3922 | |
3923 | -#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:769 |
3924 | +#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:786 |
3925 | #, c-format |
3926 | msgid "invalid value `%s' of --%s" |
3927 | msgstr "valor `%s' invàlid de --%s" |
3928 | |
3929 | -#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:763 |
3930 | +#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:780 |
3931 | #, c-format |
3932 | msgid "--%s specified twice" |
3933 | msgstr "--%s s'ha especificat dos cops" |
3934 | |
3935 | -#: src/conf.c:590 src/locate.c:722 |
3936 | +#: src/conf.c:590 src/locate.c:739 |
3937 | msgid "" |
3938 | "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n" |
3939 | "This software is distributed under the GPL v.2.\n" |
3940 | @@ -191,55 +192,56 @@ |
3941 | msgid "I/O error seeking in `%s'" |
3942 | msgstr "error d'E/S mentre es cercava en `%s'" |
3943 | |
3944 | -#: src/locate.c:335 |
3945 | +#: src/locate.c:338 |
3946 | #, c-format |
3947 | msgid "Database %s:\n" |
3948 | msgstr "Base de dades %s:\n" |
3949 | |
3950 | -#: src/locate.c:338 |
3951 | +#: src/locate.c:341 |
3952 | #, c-format |
3953 | msgid "\t%'ju directory\n" |
3954 | msgid_plural "\t%'ju directories\n" |
3955 | msgstr[0] "\t%'ju directori\n" |
3956 | msgstr[1] "\t%'ju directoris\n" |
3957 | |
3958 | -#: src/locate.c:340 |
3959 | +#: src/locate.c:343 |
3960 | #, c-format |
3961 | msgid "\t%'ju file\n" |
3962 | msgid_plural "\t%'ju files\n" |
3963 | msgstr[0] "\t%'ju fitxer\n" |
3964 | msgstr[1] "\t%'ju fitxers\n" |
3965 | |
3966 | -#: src/locate.c:342 |
3967 | +#: src/locate.c:345 |
3968 | #, c-format |
3969 | msgid "\t%'ju byte in file names\n" |
3970 | msgid_plural "\t%'ju bytes in file names\n" |
3971 | msgstr[0] "\t%'ju byte en els noms de fitxers\n" |
3972 | msgstr[1] "\t%'ju bytes en els noms de fitxers\n" |
3973 | |
3974 | -#: src/locate.c:344 |
3975 | +#: src/locate.c:347 |
3976 | #, c-format |
3977 | msgid "\t%'ju byte used to store database\n" |
3978 | msgid_plural "\t%'ju bytes used to store database\n" |
3979 | msgstr[0] "\t%'ju byte usat per a emmagatzemar la base de dades\n" |
3980 | msgstr[1] "\t%'ju bytes usats per a emmagatzemar la base de dades\n" |
3981 | |
3982 | -#: src/locate.c:473 |
3983 | +#: src/locate.c:483 |
3984 | #, c-format |
3985 | msgid "invalid empty directory name in `%s'" |
3986 | msgstr "nom de directori buit invàlid a `%s'" |
3987 | |
3988 | -#: src/locate.c:500 |
3989 | +#: src/locate.c:510 |
3990 | #, c-format |
3991 | msgid "file name length %zu in `%s' is too large" |
3992 | msgstr "la longitud %zu del nom de fitxer a `%s' és massa llarga" |
3993 | |
3994 | -#: src/locate.c:607 |
3995 | -#, c-format |
3996 | +#: src/locate.c:617 |
3997 | +#, fuzzy, c-format |
3998 | msgid "" |
3999 | "Usage: locate [OPTION]... [PATTERN]...\n" |
4000 | "Search for entries in a mlocate database.\n" |
4001 | "\n" |
4002 | +" -A, --all only print entries that match all patterns\n" |
4003 | " -b, --basename match only the base name of path names\n" |
4004 | " -c, --count only print number of found entries\n" |
4005 | " -d, --database DBPATH use DBPATH instead of default database (which is\n" |
4006 | @@ -302,92 +304,92 @@ |
4007 | " -V, --version mostra informació sobre la versió\n" |
4008 | " -w, --wholename fes coincidir el camí complet (usat per defecte)\n" |
4009 | |
4010 | -#: src/locate.c:806 |
4011 | +#: src/locate.c:823 |
4012 | #, c-format |
4013 | msgid "non-option arguments are not allowed with --%s" |
4014 | msgstr "arguments sense opció no estan permesos amb --%s" |
4015 | |
4016 | -#: src/locate.c:819 |
4017 | +#: src/locate.c:836 |
4018 | msgid "no pattern to search for specified" |
4019 | msgstr "no s'ha especificat cap patró per la cerca especificada" |
4020 | |
4021 | -#: src/locate.c:846 |
4022 | +#: src/locate.c:863 |
4023 | #, c-format |
4024 | msgid "invalid regexp `%s': %s" |
4025 | msgstr "expressió regular invàlida `%s':%s" |
4026 | |
4027 | -#: src/locate.c:932 |
4028 | +#: src/locate.c:949 |
4029 | msgid "can not drop privileges" |
4030 | msgstr "no s'han pogut alliberar els privilegis" |
4031 | |
4032 | -#: src/locate.c:947 |
4033 | +#: src/locate.c:964 |
4034 | msgid "can not read two databases from standard input" |
4035 | msgstr "no es poden llegir dues bases de dades des de l'entrada estàndard" |
4036 | |
4037 | -#: src/locate.c:959 src/locate.c:974 src/updatedb.c:980 |
4038 | +#: src/locate.c:976 src/locate.c:991 src/updatedb.c:1009 |
4039 | #, c-format |
4040 | msgid "can not stat () `%s'" |
4041 | msgstr "ha fallat la crida stat() a %s" |
4042 | |
4043 | -#: src/locate.c:1034 src/updatedb.c:1004 |
4044 | +#: src/locate.c:1051 src/updatedb.c:1033 |
4045 | msgid "I/O error while writing to standard output" |
4046 | msgstr "error d'E/S quan s'escrivia a la sortida estàndard" |
4047 | |
4048 | -#: src/updatedb.c:556 src/updatedb.c:663 |
4049 | +#: src/updatedb.c:580 src/updatedb.c:687 |
4050 | #, c-format |
4051 | msgid "file name length %zu is too large" |
4052 | msgstr "la longitud %zu del nom de fitxer és massa llarga" |
4053 | |
4054 | -#: src/updatedb.c:655 |
4055 | +#: src/updatedb.c:679 |
4056 | #, c-format |
4057 | msgid "file system error: zero-length file name in directory %s" |
4058 | -msgstr "" |
4059 | +msgstr "error del sistema d'arxius: arxiu sense nom al directori %s" |
4060 | |
4061 | -#: src/updatedb.c:886 |
4062 | +#: src/updatedb.c:915 |
4063 | #, c-format |
4064 | msgid "can not open a temporary file for `%s'" |
4065 | msgstr "no es pot obrir un fitxer temporal per a `%s'" |
4066 | |
4067 | -#: src/updatedb.c:899 |
4068 | +#: src/updatedb.c:928 |
4069 | msgid "configuration is too large" |
4070 | msgstr "la configuració és massa gran" |
4071 | |
4072 | -#: src/updatedb.c:920 |
4073 | +#: src/updatedb.c:949 |
4074 | #, c-format |
4075 | msgid "can not find group `%s'" |
4076 | msgstr "no s'ha trobat el grup `%s'" |
4077 | |
4078 | -#: src/updatedb.c:923 |
4079 | +#: src/updatedb.c:952 |
4080 | #, c-format |
4081 | msgid "can not change group of file `%s' to `%s'" |
4082 | msgstr "no s'ha pogut canviar el grup del fitxer `%s' a `%s'" |
4083 | |
4084 | -#: src/updatedb.c:937 |
4085 | +#: src/updatedb.c:966 |
4086 | #, c-format |
4087 | msgid "can not change permissions of file `%s'" |
4088 | msgstr "no s'han pogut canviar els permisos del fitxer `%s'" |
4089 | |
4090 | -#: src/updatedb.c:968 |
4091 | +#: src/updatedb.c:997 |
4092 | #, c-format |
4093 | msgid "`%s' is locked (probably by an earlier updatedb)" |
4094 | msgstr "«%s» està blocat (probablement per un updatedb anterior)" |
4095 | |
4096 | -#: src/updatedb.c:970 |
4097 | +#: src/updatedb.c:999 |
4098 | #, c-format |
4099 | msgid "can not lock `%s'" |
4100 | msgstr "no s'ha pogut blocar `%s'" |
4101 | |
4102 | -#: src/updatedb.c:977 |
4103 | +#: src/updatedb.c:1006 |
4104 | #, c-format |
4105 | msgid "can not change directory to `%s'" |
4106 | msgstr "no s'ha pogut canviar el directori a `%s'" |
4107 | |
4108 | -#: src/updatedb.c:986 |
4109 | +#: src/updatedb.c:1015 |
4110 | #, c-format |
4111 | msgid "I/O error while writing to `%s'" |
4112 | msgstr "error d'E/S quan s'escrivia a `%s'" |
4113 | |
4114 | -#: src/updatedb.c:990 |
4115 | +#: src/updatedb.c:1019 |
4116 | #, c-format |
4117 | msgid "error replacing `%s'" |
4118 | msgstr "error en substituir `%s'" |
4119 | |
4120 | === modified file 'po/cs.gmo' |
4121 | Binary files po/cs.gmo 2012-07-27 05:16:18 +0000 and po/cs.gmo 2013-06-14 23:40:37 +0000 differ |
4122 | === modified file 'po/cs.po' |
4123 | --- po/cs.po 2012-07-27 05:16:18 +0000 |
4124 | +++ po/cs.po 2013-06-14 23:40:37 +0000 |
4125 | @@ -3,21 +3,21 @@ |
4126 | # This file is distributed under the same license as the PACKAGE package. |
4127 | # |
4128 | # Translators: |
4129 | -# mitr <mitr@volny.cz>, 2011. |
4130 | +# Miloslav Trmač <mitr@volny.cz>, 2011, 2012. |
4131 | msgid "" |
4132 | msgstr "" |
4133 | "Project-Id-Version: mlocate\n" |
4134 | "Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n" |
4135 | -"POT-Creation-Date: 2012-03-03 06:10+0100\n" |
4136 | -"PO-Revision-Date: 2012-03-03 05:54+0100\n" |
4137 | +"POT-Creation-Date: 2012-09-22 04:14+0200\n" |
4138 | +"PO-Revision-Date: 2012-09-22 04:10+0200\n" |
4139 | "Last-Translator: Miloslav Trmač <mitr@volny.cz>\n" |
4140 | -"Language-Team: Czech (http://www.transifex.net/projects/p/fedora/language/" |
4141 | +"Language-Team: Czech (http://www.transifex.com/projects/p/fedora/language/" |
4142 | "cs/)\n" |
4143 | "Language: cs\n" |
4144 | "MIME-Version: 1.0\n" |
4145 | "Content-Type: text/plain; charset=UTF-8\n" |
4146 | "Content-Transfer-Encoding: 8bit\n" |
4147 | -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" |
4148 | +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" |
4149 | |
4150 | #: src/conf.c:241 |
4151 | msgid "warning: Line number overflow" |
4152 | @@ -27,7 +27,7 @@ |
4153 | msgid "missing closing `\"'" |
4154 | msgstr "chybí uzavírající `\"'" |
4155 | |
4156 | -#: src/conf.c:309 src/locate.c:968 src/updatedb.c:892 |
4157 | +#: src/conf.c:309 src/locate.c:985 src/updatedb.c:921 |
4158 | #, c-format |
4159 | msgid "can not open `%s'" |
4160 | msgstr "nemohu otevřít `%s'" |
4161 | @@ -121,7 +121,7 @@ |
4162 | "Nastavení má implicitní hodnoty čtené\n" |
4163 | "z `%s'.\n" |
4164 | |
4165 | -#: src/conf.c:464 src/locate.c:642 |
4166 | +#: src/conf.c:464 src/locate.c:654 |
4167 | #, c-format |
4168 | msgid "" |
4169 | "\n" |
4170 | @@ -135,22 +135,22 @@ |
4171 | msgstr "nemohu zjistit současný pracovní adresář" |
4172 | |
4173 | #: src/conf.c:540 src/conf.c:551 src/conf.c:561 src/conf.c:571 |
4174 | -#: src/locate.c:697 src/locate.c:706 src/locate.c:732 src/locate.c:790 |
4175 | +#: src/locate.c:714 src/locate.c:723 src/locate.c:749 src/locate.c:807 |
4176 | #, c-format |
4177 | msgid "--%s would override earlier command-line argument" |
4178 | msgstr "--%s by nahradilo dřívejší parametr na příkazovém řádku" |
4179 | |
4180 | -#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:769 |
4181 | +#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:786 |
4182 | #, c-format |
4183 | msgid "invalid value `%s' of --%s" |
4184 | msgstr "neplatná hodnota `%s' přepínače --%s" |
4185 | |
4186 | -#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:763 |
4187 | +#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:780 |
4188 | #, c-format |
4189 | msgid "--%s specified twice" |
4190 | msgstr "--%s zadáno dvakrát" |
4191 | |
4192 | -#: src/conf.c:590 src/locate.c:722 |
4193 | +#: src/conf.c:590 src/locate.c:739 |
4194 | msgid "" |
4195 | "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n" |
4196 | "This software is distributed under the GPL v.2.\n" |
4197 | @@ -191,12 +191,12 @@ |
4198 | msgid "I/O error seeking in `%s'" |
4199 | msgstr "chyba I/O při posouvání v `%s'" |
4200 | |
4201 | -#: src/locate.c:335 |
4202 | +#: src/locate.c:338 |
4203 | #, c-format |
4204 | msgid "Database %s:\n" |
4205 | msgstr "Databáze %s:\n" |
4206 | |
4207 | -#: src/locate.c:338 |
4208 | +#: src/locate.c:341 |
4209 | #, c-format |
4210 | msgid "\t%'ju directory\n" |
4211 | msgid_plural "\t%'ju directories\n" |
4212 | @@ -204,7 +204,7 @@ |
4213 | msgstr[1] "\t%'ju adresáře\n" |
4214 | msgstr[2] "\t%'ju adresářů\n" |
4215 | |
4216 | -#: src/locate.c:340 |
4217 | +#: src/locate.c:343 |
4218 | #, c-format |
4219 | msgid "\t%'ju file\n" |
4220 | msgid_plural "\t%'ju files\n" |
4221 | @@ -212,7 +212,7 @@ |
4222 | msgstr[1] "\t%'ju soubory\n" |
4223 | msgstr[2] "\t%'ju souborů\n" |
4224 | |
4225 | -#: src/locate.c:342 |
4226 | +#: src/locate.c:345 |
4227 | #, c-format |
4228 | msgid "\t%'ju byte in file names\n" |
4229 | msgid_plural "\t%'ju bytes in file names\n" |
4230 | @@ -220,7 +220,7 @@ |
4231 | msgstr[1] "\t%'ju bajty v názvech souborů\n" |
4232 | msgstr[2] "\t%'ju bajtů v názvech souborů\n" |
4233 | |
4234 | -#: src/locate.c:344 |
4235 | +#: src/locate.c:347 |
4236 | #, c-format |
4237 | msgid "\t%'ju byte used to store database\n" |
4238 | msgid_plural "\t%'ju bytes used to store database\n" |
4239 | @@ -228,22 +228,23 @@ |
4240 | msgstr[1] "\t%'ju bajty použity pro uložení databáze\n" |
4241 | msgstr[2] "\t%'ju bajtů použito pro uložení databáze\n" |
4242 | |
4243 | -#: src/locate.c:473 |
4244 | +#: src/locate.c:483 |
4245 | #, c-format |
4246 | msgid "invalid empty directory name in `%s'" |
4247 | msgstr "neplatný prázdný název adresáře v `%s'" |
4248 | |
4249 | -#: src/locate.c:500 |
4250 | +#: src/locate.c:510 |
4251 | #, c-format |
4252 | msgid "file name length %zu in `%s' is too large" |
4253 | msgstr "délka názvu souboru %zu v `%s' je příliš velká" |
4254 | |
4255 | -#: src/locate.c:607 |
4256 | +#: src/locate.c:617 |
4257 | #, c-format |
4258 | msgid "" |
4259 | "Usage: locate [OPTION]... [PATTERN]...\n" |
4260 | "Search for entries in a mlocate database.\n" |
4261 | "\n" |
4262 | +" -A, --all only print entries that match all patterns\n" |
4263 | " -b, --basename match only the base name of path names\n" |
4264 | " -c, --count only print number of found entries\n" |
4265 | " -d, --database DBPATH use DBPATH instead of default database (which is\n" |
4266 | @@ -272,6 +273,7 @@ |
4267 | "Použití: locate [PŘEPÍNAČ]... [VZOR]...\n" |
4268 | "Hledat položky v databázi mlocate.\n" |
4269 | "\n" |
4270 | +" -A, --all vypsat jen položky, které odpovídají všem vzorům\n" |
4271 | " -b, --basename porovnávat v cestách k souborům jen názvy\n" |
4272 | " -c, --count vypsat jen počet nalezených položek\n" |
4273 | " -d, --database CESTADB používat CESTADB místo implicitní databáze (což " |
4274 | @@ -299,92 +301,92 @@ |
4275 | " -V, --version vypsat informace o verzi\n" |
4276 | " -w, --wholename porovnávat celé cesty k souborům (implicitní)\n" |
4277 | |
4278 | -#: src/locate.c:806 |
4279 | +#: src/locate.c:823 |
4280 | #, c-format |
4281 | msgid "non-option arguments are not allowed with --%s" |
4282 | msgstr "s --%s nejsou povoleny parametry jiné než přepínače" |
4283 | |
4284 | -#: src/locate.c:819 |
4285 | +#: src/locate.c:836 |
4286 | msgid "no pattern to search for specified" |
4287 | msgstr "nezadán žádný vzor, který hledat" |
4288 | |
4289 | -#: src/locate.c:846 |
4290 | +#: src/locate.c:863 |
4291 | #, c-format |
4292 | msgid "invalid regexp `%s': %s" |
4293 | msgstr "neplatná regexp `%s': %s" |
4294 | |
4295 | -#: src/locate.c:932 |
4296 | +#: src/locate.c:949 |
4297 | msgid "can not drop privileges" |
4298 | msgstr "nemohu se vzdát oprávnění" |
4299 | |
4300 | -#: src/locate.c:947 |
4301 | +#: src/locate.c:964 |
4302 | msgid "can not read two databases from standard input" |
4303 | msgstr "nemohu číst dvě databáze ze standardního vstupu" |
4304 | |
4305 | -#: src/locate.c:959 src/locate.c:974 src/updatedb.c:980 |
4306 | +#: src/locate.c:976 src/locate.c:991 src/updatedb.c:1009 |
4307 | #, c-format |
4308 | msgid "can not stat () `%s'" |
4309 | msgstr "nemohu stat () `%s'" |
4310 | |
4311 | -#: src/locate.c:1034 src/updatedb.c:1004 |
4312 | +#: src/locate.c:1051 src/updatedb.c:1033 |
4313 | msgid "I/O error while writing to standard output" |
4314 | msgstr "chyba I/O při zápisu na standardní výstup" |
4315 | |
4316 | -#: src/updatedb.c:556 src/updatedb.c:663 |
4317 | +#: src/updatedb.c:580 src/updatedb.c:687 |
4318 | #, c-format |
4319 | msgid "file name length %zu is too large" |
4320 | msgstr "délka názvu souboru %zu je příliš velká" |
4321 | |
4322 | -#: src/updatedb.c:655 |
4323 | +#: src/updatedb.c:679 |
4324 | #, c-format |
4325 | msgid "file system error: zero-length file name in directory %s" |
4326 | msgstr "chyba systému souborů: soubor s názvem nulové délky v adresáři %s" |
4327 | |
4328 | -#: src/updatedb.c:886 |
4329 | +#: src/updatedb.c:915 |
4330 | #, c-format |
4331 | msgid "can not open a temporary file for `%s'" |
4332 | msgstr "nemohu otevřít dočasný soubor pro `%s'" |
4333 | |
4334 | -#: src/updatedb.c:899 |
4335 | +#: src/updatedb.c:928 |
4336 | msgid "configuration is too large" |
4337 | msgstr "nastavení je příliš velké" |
4338 | |
4339 | -#: src/updatedb.c:920 |
4340 | +#: src/updatedb.c:949 |
4341 | #, c-format |
4342 | msgid "can not find group `%s'" |
4343 | msgstr "nemohu najít skupinu `%s'" |
4344 | |
4345 | -#: src/updatedb.c:923 |
4346 | +#: src/updatedb.c:952 |
4347 | #, c-format |
4348 | msgid "can not change group of file `%s' to `%s'" |
4349 | msgstr "nemohu změnit skupinu souboru `%s' na `%s'" |
4350 | |
4351 | -#: src/updatedb.c:937 |
4352 | +#: src/updatedb.c:966 |
4353 | #, c-format |
4354 | msgid "can not change permissions of file `%s'" |
4355 | msgstr "nemohu změnit oprávnění souboru `%s'" |
4356 | |
4357 | -#: src/updatedb.c:968 |
4358 | +#: src/updatedb.c:997 |
4359 | #, c-format |
4360 | msgid "`%s' is locked (probably by an earlier updatedb)" |
4361 | msgstr "`%s' je uzamčen (pravděpodobně dřívejším updatedb)" |
4362 | |
4363 | -#: src/updatedb.c:970 |
4364 | +#: src/updatedb.c:999 |
4365 | #, c-format |
4366 | msgid "can not lock `%s'" |
4367 | msgstr "nemohu zamknout `%s'" |
4368 | |
4369 | -#: src/updatedb.c:977 |
4370 | +#: src/updatedb.c:1006 |
4371 | #, c-format |
4372 | msgid "can not change directory to `%s'" |
4373 | msgstr "nemohu změnit adresář na `%s'" |
4374 | |
4375 | -#: src/updatedb.c:986 |
4376 | +#: src/updatedb.c:1015 |
4377 | #, c-format |
4378 | msgid "I/O error while writing to `%s'" |
4379 | msgstr "chyba I/O při zápisu do `%s'" |
4380 | |
4381 | -#: src/updatedb.c:990 |
4382 | +#: src/updatedb.c:1019 |
4383 | #, c-format |
4384 | msgid "error replacing `%s'" |
4385 | msgstr "chyba při nahrazování `%s'" |
4386 | |
4387 | === modified file 'po/da.gmo' |
4388 | Binary files po/da.gmo 2012-07-27 05:15:55 +0000 and po/da.gmo 2013-06-14 23:40:37 +0000 differ |
4389 | === modified file 'po/da.po' |
4390 | --- po/da.po 2012-07-27 05:15:55 +0000 |
4391 | +++ po/da.po 2013-06-14 23:40:37 +0000 |
4392 | @@ -3,20 +3,21 @@ |
4393 | # This file is distributed under the same license as the PACKAGE package. |
4394 | # |
4395 | # Translators: |
4396 | +# Kris Thomsen <lakristho@gmail.com>, 2012. |
4397 | # mitr <mitr@volny.cz>, 2011. |
4398 | msgid "" |
4399 | msgstr "" |
4400 | "Project-Id-Version: mlocate\n" |
4401 | "Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n" |
4402 | -"POT-Creation-Date: 2012-03-03 06:10+0100\n" |
4403 | -"PO-Revision-Date: 2012-02-14 08:16+0000\n" |
4404 | -"Last-Translator: Miloslav Trmač <mitr@volny.cz>\n" |
4405 | +"POT-Creation-Date: 2012-09-22 04:14+0200\n" |
4406 | +"PO-Revision-Date: 2012-03-14 09:35+0000\n" |
4407 | +"Last-Translator: Kris Thomsen <lakristho@gmail.com>\n" |
4408 | "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" |
4409 | "Language: da\n" |
4410 | "MIME-Version: 1.0\n" |
4411 | "Content-Type: text/plain; charset=UTF-8\n" |
4412 | "Content-Transfer-Encoding: 8bit\n" |
4413 | -"Plural-Forms: nplurals=2; plural=(n != 1)\n" |
4414 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
4415 | |
4416 | #: src/conf.c:241 |
4417 | msgid "warning: Line number overflow" |
4418 | @@ -26,7 +27,7 @@ |
4419 | msgid "missing closing `\"'" |
4420 | msgstr "mangler lukkende '\"'" |
4421 | |
4422 | -#: src/conf.c:309 src/locate.c:968 src/updatedb.c:892 |
4423 | +#: src/conf.c:309 src/locate.c:985 src/updatedb.c:921 |
4424 | #, c-format |
4425 | msgid "can not open `%s'" |
4426 | msgstr "kan ikke åbne \"%s\"" |
4427 | @@ -118,7 +119,7 @@ |
4428 | "Konfigurationen falder tilbage på værdier læst fra\n" |
4429 | "\"%s\".\n" |
4430 | |
4431 | -#: src/conf.c:464 src/locate.c:642 |
4432 | +#: src/conf.c:464 src/locate.c:654 |
4433 | #, c-format |
4434 | msgid "" |
4435 | "\n" |
4436 | @@ -132,22 +133,22 @@ |
4437 | msgstr "kan ikke hente nuværende arbejdsmappe" |
4438 | |
4439 | #: src/conf.c:540 src/conf.c:551 src/conf.c:561 src/conf.c:571 |
4440 | -#: src/locate.c:697 src/locate.c:706 src/locate.c:732 src/locate.c:790 |
4441 | +#: src/locate.c:714 src/locate.c:723 src/locate.c:749 src/locate.c:807 |
4442 | #, c-format |
4443 | msgid "--%s would override earlier command-line argument" |
4444 | msgstr "--%s vil overskrive tidligere kommandolinjeargument" |
4445 | |
4446 | -#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:769 |
4447 | +#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:786 |
4448 | #, c-format |
4449 | msgid "invalid value `%s' of --%s" |
4450 | msgstr "ugyldig værdi \"%s\" af --%s" |
4451 | |
4452 | -#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:763 |
4453 | +#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:780 |
4454 | #, c-format |
4455 | msgid "--%s specified twice" |
4456 | msgstr "--%s angivet to gange" |
4457 | |
4458 | -#: src/conf.c:590 src/locate.c:722 |
4459 | +#: src/conf.c:590 src/locate.c:739 |
4460 | msgid "" |
4461 | "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n" |
4462 | "This software is distributed under the GPL v.2.\n" |
4463 | @@ -188,55 +189,56 @@ |
4464 | msgid "I/O error seeking in `%s'" |
4465 | msgstr "I/O-fejl ved søgning i \"%s\"" |
4466 | |
4467 | -#: src/locate.c:335 |
4468 | +#: src/locate.c:338 |
4469 | #, c-format |
4470 | msgid "Database %s:\n" |
4471 | msgstr "Database %s:\n" |
4472 | |
4473 | -#: src/locate.c:338 |
4474 | +#: src/locate.c:341 |
4475 | #, c-format |
4476 | msgid "\t%'ju directory\n" |
4477 | msgid_plural "\t%'ju directories\n" |
4478 | msgstr[0] "\t%'ju mappe\n" |
4479 | msgstr[1] "\t%'ju mapper\n" |
4480 | |
4481 | -#: src/locate.c:340 |
4482 | +#: src/locate.c:343 |
4483 | #, c-format |
4484 | msgid "\t%'ju file\n" |
4485 | msgid_plural "\t%'ju files\n" |
4486 | msgstr[0] "\t%'ju fil\n" |
4487 | msgstr[1] "\t%'ju filer\n" |
4488 | |
4489 | -#: src/locate.c:342 |
4490 | +#: src/locate.c:345 |
4491 | #, c-format |
4492 | msgid "\t%'ju byte in file names\n" |
4493 | msgid_plural "\t%'ju bytes in file names\n" |
4494 | msgstr[0] "\t%'ju byte i filnavne\n" |
4495 | msgstr[1] "\t%'ju byte i filnavne\n" |
4496 | |
4497 | -#: src/locate.c:344 |
4498 | +#: src/locate.c:347 |
4499 | #, c-format |
4500 | msgid "\t%'ju byte used to store database\n" |
4501 | msgid_plural "\t%'ju bytes used to store database\n" |
4502 | msgstr[0] "\t%'ju byte brugt til at gemme database\n" |
4503 | msgstr[1] "\t%'ju byte brugt til at gemme database\n" |
4504 | |
4505 | -#: src/locate.c:473 |
4506 | +#: src/locate.c:483 |
4507 | #, c-format |
4508 | msgid "invalid empty directory name in `%s'" |
4509 | msgstr "ugyldig tomt mappenavn i \"%s\"" |
4510 | |
4511 | -#: src/locate.c:500 |
4512 | +#: src/locate.c:510 |
4513 | #, c-format |
4514 | msgid "file name length %zu in `%s' is too large" |
4515 | msgstr "længden på filnavn %zu i \"%s\" er for stor" |
4516 | |
4517 | -#: src/locate.c:607 |
4518 | -#, c-format |
4519 | +#: src/locate.c:617 |
4520 | +#, fuzzy, c-format |
4521 | msgid "" |
4522 | "Usage: locate [OPTION]... [PATTERN]...\n" |
4523 | "Search for entries in a mlocate database.\n" |
4524 | "\n" |
4525 | +" -A, --all only print entries that match all patterns\n" |
4526 | " -b, --basename match only the base name of path names\n" |
4527 | " -c, --count only print number of found entries\n" |
4528 | " -d, --database DBPATH use DBPATH instead of default database (which is\n" |
4529 | @@ -294,92 +296,92 @@ |
4530 | " -V, --version skriver versionsinformation\n" |
4531 | " -w, --wholename matcher hele stinavnet (standard)\n" |
4532 | |
4533 | -#: src/locate.c:806 |
4534 | +#: src/locate.c:823 |
4535 | #, c-format |
4536 | msgid "non-option arguments are not allowed with --%s" |
4537 | msgstr "ikke-tilvalgsargumenter er ikke tilladt med --%s" |
4538 | |
4539 | -#: src/locate.c:819 |
4540 | +#: src/locate.c:836 |
4541 | msgid "no pattern to search for specified" |
4542 | msgstr "intet mønster til søg efter angivet" |
4543 | |
4544 | -#: src/locate.c:846 |
4545 | +#: src/locate.c:863 |
4546 | #, c-format |
4547 | msgid "invalid regexp `%s': %s" |
4548 | msgstr "ugyldig regexp \"%s\": %s" |
4549 | |
4550 | -#: src/locate.c:932 |
4551 | +#: src/locate.c:949 |
4552 | msgid "can not drop privileges" |
4553 | msgstr "kan ikke slippe rettigheder" |
4554 | |
4555 | -#: src/locate.c:947 |
4556 | +#: src/locate.c:964 |
4557 | msgid "can not read two databases from standard input" |
4558 | msgstr "kan ikke læse to databaser fra standard input" |
4559 | |
4560 | -#: src/locate.c:959 src/locate.c:974 src/updatedb.c:980 |
4561 | +#: src/locate.c:976 src/locate.c:991 src/updatedb.c:1009 |
4562 | #, c-format |
4563 | msgid "can not stat () `%s'" |
4564 | msgstr "kan ikke stat () \"%s\"" |
4565 | |
4566 | -#: src/locate.c:1034 src/updatedb.c:1004 |
4567 | +#: src/locate.c:1051 src/updatedb.c:1033 |
4568 | msgid "I/O error while writing to standard output" |
4569 | msgstr "I/O-fejl under skrivning til standardoutput" |
4570 | |
4571 | -#: src/updatedb.c:556 src/updatedb.c:663 |
4572 | +#: src/updatedb.c:580 src/updatedb.c:687 |
4573 | #, c-format |
4574 | msgid "file name length %zu is too large" |
4575 | msgstr "længden på filnavn %zu er for stor" |
4576 | |
4577 | -#: src/updatedb.c:655 |
4578 | +#: src/updatedb.c:679 |
4579 | #, c-format |
4580 | msgid "file system error: zero-length file name in directory %s" |
4581 | -msgstr "" |
4582 | +msgstr "filsystemsfejl: nul-længde filnavn i mappe %s" |
4583 | |
4584 | -#: src/updatedb.c:886 |
4585 | +#: src/updatedb.c:915 |
4586 | #, c-format |
4587 | msgid "can not open a temporary file for `%s'" |
4588 | msgstr "kan ikke åbne en midlertidig fil for \"%s\"" |
4589 | |
4590 | -#: src/updatedb.c:899 |
4591 | +#: src/updatedb.c:928 |
4592 | msgid "configuration is too large" |
4593 | msgstr "konfiguration er for stor" |
4594 | |
4595 | -#: src/updatedb.c:920 |
4596 | +#: src/updatedb.c:949 |
4597 | #, c-format |
4598 | msgid "can not find group `%s'" |
4599 | msgstr "kan ikke finde gruppe \"%s\"" |
4600 | |
4601 | -#: src/updatedb.c:923 |
4602 | +#: src/updatedb.c:952 |
4603 | #, c-format |
4604 | msgid "can not change group of file `%s' to `%s'" |
4605 | msgstr "kan ikke ændre gruppe på fil \"%s\" til \"%s\"" |
4606 | |
4607 | -#: src/updatedb.c:937 |
4608 | +#: src/updatedb.c:966 |
4609 | #, c-format |
4610 | msgid "can not change permissions of file `%s'" |
4611 | msgstr "kan ikke ændre rettigheder på fil \"%s\"" |
4612 | |
4613 | -#: src/updatedb.c:968 |
4614 | +#: src/updatedb.c:997 |
4615 | #, c-format |
4616 | msgid "`%s' is locked (probably by an earlier updatedb)" |
4617 | msgstr "\"%s\" er låst (sandsynligvis af en tidligere updatedb)" |
4618 | |
4619 | -#: src/updatedb.c:970 |
4620 | +#: src/updatedb.c:999 |
4621 | #, c-format |
4622 | msgid "can not lock `%s'" |
4623 | msgstr "kan ikke låse \"%s\"" |
4624 | |
4625 | -#: src/updatedb.c:977 |
4626 | +#: src/updatedb.c:1006 |
4627 | #, c-format |
4628 | msgid "can not change directory to `%s'" |
4629 | msgstr "kan ikke ændre mappe til \"%s\"" |
4630 | |
4631 | -#: src/updatedb.c:986 |
4632 | +#: src/updatedb.c:1015 |
4633 | #, c-format |
4634 | msgid "I/O error while writing to `%s'" |
4635 | msgstr "I/O-fejl under skrivning til \"%s\"" |
4636 | |
4637 | -#: src/updatedb.c:990 |
4638 | +#: src/updatedb.c:1019 |
4639 | #, c-format |
4640 | msgid "error replacing `%s'" |
4641 | msgstr "kunne ikke erstatte \"%s\"" |
4642 | |
4643 | === modified file 'po/de.gmo' |
4644 | Binary files po/de.gmo 2012-07-27 05:16:18 +0000 and po/de.gmo 2013-06-14 23:40:37 +0000 differ |
4645 | === modified file 'po/de.po' |
4646 | --- po/de.po 2012-07-27 05:16:18 +0000 |
4647 | +++ po/de.po 2013-06-14 23:40:37 +0000 |
4648 | @@ -9,7 +9,7 @@ |
4649 | msgstr "" |
4650 | "Project-Id-Version: mlocate\n" |
4651 | "Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n" |
4652 | -"POT-Creation-Date: 2012-03-03 06:10+0100\n" |
4653 | +"POT-Creation-Date: 2012-09-22 04:14+0200\n" |
4654 | "PO-Revision-Date: 2012-02-21 07:45+0000\n" |
4655 | "Last-Translator: Roman Spirgi <bigant@fedoraproject.org>\n" |
4656 | "Language-Team: German <trans-de@lists.fedoraproject.org>\n" |
4657 | @@ -17,7 +17,7 @@ |
4658 | "MIME-Version: 1.0\n" |
4659 | "Content-Type: text/plain; charset=UTF-8\n" |
4660 | "Content-Transfer-Encoding: 8bit\n" |
4661 | -"Plural-Forms: nplurals=2; plural=(n != 1)\n" |
4662 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
4663 | |
4664 | #: src/conf.c:241 |
4665 | msgid "warning: Line number overflow" |
4666 | @@ -27,7 +27,7 @@ |
4667 | msgid "missing closing `\"'" |
4668 | msgstr "fehlendes schliessendes `\"'" |
4669 | |
4670 | -#: src/conf.c:309 src/locate.c:968 src/updatedb.c:892 |
4671 | +#: src/conf.c:309 src/locate.c:985 src/updatedb.c:921 |
4672 | #, c-format |
4673 | msgid "can not open `%s'" |
4674 | msgstr "kann `%s' nicht öffnen" |
4675 | @@ -118,7 +118,7 @@ |
4676 | "Die Konfigurationseinstellungen werden gelesen aus\n" |
4677 | "`%s'.\n" |
4678 | |
4679 | -#: src/conf.c:464 src/locate.c:642 |
4680 | +#: src/conf.c:464 src/locate.c:654 |
4681 | #, c-format |
4682 | msgid "" |
4683 | "\n" |
4684 | @@ -132,22 +132,22 @@ |
4685 | msgstr "kann aktuelles Arbeitsverzeichnis nicht bestimmen" |
4686 | |
4687 | #: src/conf.c:540 src/conf.c:551 src/conf.c:561 src/conf.c:571 |
4688 | -#: src/locate.c:697 src/locate.c:706 src/locate.c:732 src/locate.c:790 |
4689 | +#: src/locate.c:714 src/locate.c:723 src/locate.c:749 src/locate.c:807 |
4690 | #, c-format |
4691 | msgid "--%s would override earlier command-line argument" |
4692 | msgstr "--%s wird frühere Befehlszeilen-Argumente überschreiben" |
4693 | |
4694 | -#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:769 |
4695 | +#: src/conf.c:544 src/conf.c:584 src/conf.c:617 src/locate.c:786 |
4696 | #, c-format |
4697 | msgid "invalid value `%s' of --%s" |
4698 | msgstr "ungültiger Wert `%s' von --%s" |
4699 | |
4700 | -#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:763 |
4701 | +#: src/conf.c:580 src/conf.c:613 src/conf.c:628 src/locate.c:780 |
4702 | #, c-format |
4703 | msgid "--%s specified twice" |
4704 | msgstr "--%s zweimal angegeben" |
4705 | |
4706 | -#: src/conf.c:590 src/locate.c:722 |
4707 | +#: src/conf.c:590 src/locate.c:739 |
4708 | msgid "" |
4709 | "Copyright (C) 2007 Red Hat, Inc. All rights reserved.\n" |
4710 | "This software is distributed under the GPL v.2.\n" |
4711 | @@ -189,55 +189,56 @@ |
4712 | msgid "I/O error seeking in `%s'" |
4713 | msgstr "E/A-Fehler bei Suche in `%s'" |
4714 | |
4715 | -#: src/locate.c:335 |
4716 | +#: src/locate.c:338 |
4717 | #, c-format |
4718 | msgid "Database %s:\n" |
4719 | msgstr "Datenbank %s:\n" |
4720 | |
4721 | -#: src/locate.c:338 |
4722 | +#: src/locate.c:341 |
4723 | #, c-format |
4724 | msgid "\t%'ju directory\n" |
4725 | msgid_plural "\t%'ju directories\n" |
4726 | msgstr[0] "\t%'ju-Verzeichnis\n" |
4727 | msgstr[1] "\t%'ju-Verzeichnisse\n" |
4728 | |
4729 | -#: src/locate.c:340 |
4730 | +#: src/locate.c:343 |
4731 | #, c-format |
4732 | msgid "\t%'ju file\n" |
4733 | msgid_plural "\t%'ju files\n" |
4734 | msgstr[0] "\t%'ju-Datei\n" |
4735 | msgstr[1] "\t%'ju-Dateien\n" |
4736 | |
4737 | -#: src/locate.c:342 |
4738 | +#: src/locate.c:345 |
4739 | #, c-format |
4740 | msgid "\t%'ju byte in file names\n" |
4741 | msgid_plural "\t%'ju bytes in file names\n" |
4742 | msgstr[0] "\t%'ju-Byte in Dateinamen\n" |
4743 | msgstr[1] "\t%'ju-Bytes in Dateinamen\n" |
4744 | |
4745 | -#: src/locate.c:344 |
4746 | +#: src/locate.c:347 |
4747 | #, c-format |
4748 | msgid "\t%'ju byte used to store database\n" |
4749 | msgid_plural "\t%'ju bytes used to store database\n" |
4750 | msgstr[0] "\t%'ju-Byte benutzt zum Speichern der Datenbank\n" |
4751 | msgstr[1] "\t%'ju-Bytes benutzt zum Speichern der Datenbank\n" |
4752 | |
4753 | -#: src/locate.c:473 |
4754 | +#: src/locate.c:483 |
4755 | #, c-format |
4756 | msgid "invalid empty directory name in `%s'" |
4757 | msgstr "ungültiger leerer Verzeichnisname in `%s'" |
4758 | |
4759 | -#: src/locate.c:500 |
4760 | +#: src/locate.c:510 |
4761 | #, c-format |
4762 | msgid "file name length %zu in `%s' is too large" |
4763 | msgstr "Dateinamen-Länge %zu in `%s' ist zu lang" |
4764 | |
4765 | -#: src/locate.c:607 |
4766 | -#, c-format |
4767 | +#: src/locate.c:617 |
4768 | +#, fuzzy, c-format |
4769 | msgid "" |
4770 | "Usage: locate [OPTION]... [PATTERN]...\n" |
4771 | "Search for entries in a mlocate database.\n" |
4772 | "\n" |
4773 | +" -A, --all only print entries that match all patterns\n" |
4774 | " -b, --basename match only the base name of path names\n" |
4775 | " -c, --count only print number of found entries\n" |
4776 | " -d, --database DBPATH use DBPATH instead of default database (which is\n" |
4777 | @@ -296,92 +297,92 @@ |
4778 | " -V, --version zeigt Versionsinformationen\n" |
4779 | " -w, --wholename sucht im ganzen Pfad-Namen (Standard)\n" |
4780 | |
4781 | -#: src/locate.c:806 |
4782 | +#: src/locate.c:823 |
4783 | #, c-format |
4784 | msgid "non-option arguments are not allowed with --%s" |
4785 | msgstr "Argumente müssen bei --%s Optionen sein" |
4786 | |
4787 | -#: src/locate.c:819 |
4788 | +#: src/locate.c:836 |
4789 | msgid "no pattern to search for specified" |
4790 | msgstr "Kein Suchmuster angegeben" |
4791 | |
4792 | -#: src/locate.c:846 |
4793 | +#: src/locate.c:863 |
4794 | #, c-format |
4795 | msgid "invalid regexp `%s': %s" |
4796 | msgstr "ungültiger regulärer Ausdruck `%s': %s" |
4797 | |
4798 | -#: src/locate.c:932 |
4799 | +#: src/locate.c:949 |
4800 | msgid "can not drop privileges" |
4801 | msgstr "kann Zugriffsrechte nicht abgeben" |
4802 | |
4803 | -#: src/locate.c:947 |
4804 | +#: src/locate.c:964 |
4805 | msgid "can not read two databases from standard input" |
4806 | msgstr "kann nicht zwei Datenbanken von der Standard-Eingabe lesen" |
4807 | |
4808 | -#: src/locate.c:959 src/locate.c:974 src/updatedb.c:980 |
4809 | +#: src/locate.c:976 src/locate.c:991 src/updatedb.c:1009 |
4810 | #, c-format |
4811 | msgid "can not stat () `%s'" |
4812 | msgstr "kann stat () `%s' nicht durchführen" |
4813 | |
4814 | -#: src/locate.c:1034 src/updatedb.c:1004 |
4815 | +#: src/locate.c:1051 src/updatedb.c:1033 |
4816 | msgid "I/O error while writing to standard output" |
4817 | msgstr "E/A-Fehler während des Schreibens auf Standard-Ausgabe" |
4818 | |
4819 | -#: src/updatedb.c:556 src/updatedb.c:663 |
4820 | +#: src/updatedb.c:580 src/updatedb.c:687 |
4821 | #, c-format |
4822 | msgid "file name length %zu is too large" |
4823 | msgstr "Dateinamen-Länge %zu ist zu lange" |
4824 | |
4825 | -#: src/updatedb.c:655 |
4826 | +#: src/updatedb.c:679 |
4827 | #, c-format |
4828 | msgid "file system error: zero-length file name in directory %s" |
4829 | msgstr "Dateisystem-Fehler: Dateinamen mit Nulllänge im Verzeichnis %s" |
4830 | |
4831 | -#: src/updatedb.c:886 |
4832 | +#: src/updatedb.c:915 |
4833 | #, c-format |
4834 | msgid "can not open a temporary file for `%s'" |
4835 | msgstr "kann temporäre Datei für `%s' nicht öffnen" |
4836 | |
4837 | -#: src/updatedb.c:899 |
4838 | +#: src/updatedb.c:928 |
4839 | msgid "configuration is too large" |
4840 | msgstr "Konfiguration ist zu lang" |
4841 | |
4842 | -#: src/updatedb.c:920 |
4843 | +#: src/updatedb.c:949 |
4844 | #, c-format |
4845 | msgid "can not find group `%s'" |
4846 | msgstr "kann Gruppe `%s' nicht finden" |
4847 | |
4848 | -#: src/updatedb.c:923 |
4849 | +#: src/updatedb.c:952 |
4850 | #, c-format |
4851 | msgid "can not change group of file `%s' to `%s'" |
4852 | msgstr "kann Dateigruppe von `%s' zu `%s' nicht ändern" |
4853 | |
4854 | -#: src/updatedb.c:937 |
4855 | +#: src/updatedb.c:966 |
4856 | #, c-format |
4857 | msgid "can not change permissions of file `%s'" |
4858 | msgstr "kann Berechtigungen von Datei `%s' nicht ändern" |
4859 | |
4860 | -#: src/updatedb.c:968 |
4861 | +#: src/updatedb.c:997 |
4862 | #, c-format |
4863 | msgid "`%s' is locked (probably by an earlier updatedb)" |
4864 | msgstr "`%s' ist blockiert (wahrscheinlich durch ein früheres updatedb)" |
4865 | |
4866 | -#: src/updatedb.c:970 |
4867 | +#: src/updatedb.c:999 |
4868 | #, c-format |
4869 | msgid "can not lock `%s'" |
4870 | msgstr "kann `%s' nicht blockieren" |
4871 | |
4872 | -#: src/updatedb.c:977 |
4873 | +#: src/updatedb.c:1006 |
4874 | #, c-format |
4875 | msgid "can not change directory to `%s'" |
4876 | msgstr "kann Verzeichnis nicht auf `%s' ändern" |
4877 | |
4878 | -#: src/updatedb.c:986 |
4879 | +#: src/updatedb.c:1015 |
4880 | #, c-format |
4881 | msgid "I/O error while writing to `%s'" |
4882 | msgstr "E/A-Fehler während des Schreibens auf `%s'" |
4883 | |
4884 | -#: src/updatedb.c:990 |
4885 | +#: src/updatedb.c:1019 |
4886 | #, c-format |
4887 | msgid "error replacing `%s'" |
4888 | msgstr "Fehler beim Ersetzen von `%s'" |
4889 | |
4890 | === modified file 'po/el.gmo' |
4891 | Binary files po/el.gmo 2012-07-27 05:15:55 +0000 and po/el.gmo 2013-06-14 23:40:37 +0000 differ |
4892 | === modified file 'po/el.po' |
4893 | --- po/el.po 2012-07-27 05:15:55 +0000 |
4894 | +++ po/el.po 2013-06-14 23:40:37 +0000 |
4895 | @@ -3,20 +3,21 @@ |
4896 | # This file is distributed under the same license as the PACKAGE package. |
4897 | # |
4898 | # Translators: |
4899 | +# Giannis Konstantinidis, <giannisk@fedoraproject.org>, 2012. |
4900 | # mitr <mitr@volny.cz>, 2011. |
4901 | msgid "" |
4902 | msgstr "" |
4903 | "Project-Id-Version: mlocate\n" |
4904 | "Report-Msgid-Bugs-To: https://fedorahosted.org/mlocate/\n" |
4905 | -"POT-Creation-Date: 2012-03-03 06:10+0100\n" |
4906 | -"PO-Revision-Date: 2012-02-14 08:16+0000\n" |
4907 | -"Last-Translator: Miloslav Trmač <mitr@volny.cz>\n" |
4908 | +"POT-Creation-Date: 2012-09-22 04:14+0200\n" |
4909 | +"PO-Revision-Date: 2012-09-15 12:03+0000\n" |
4910 | +"Last-Translator: Giannis Konstantinidis <giankonstantinidis@gmail.com>\n" |
4911 | "Language-Team: Greek <trans-el@lists.fedoraproject.org>\n" |
4912 | "Language: el\n" |
4913 | "MIME-Version: 1.0\n" |
4914 | "Content-Type: text/plain; charset=UTF-8\n" |
4915 | "Content-Transfer-Encoding: 8bit\n" |
4916 | -"Plural-Forms: nplurals=2; plural=(n != 1)\n" |
4917 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
4918 | |
4919 | #: src/conf.c:241 |
4920 | msgid "warning: Line number overflow" |
4921 | @@ -24,48 +25,48 @@ |
4922 | |
4923 | #: src/conf.c:259 |
4924 | msgid "missing closing `\"'" |
4925 | -msgstr "" |
4926 | +msgstr "Απουσία του `\"' κλεισίματος" |
4927 | |
4928 | -#: src/conf.c:309 src/locate.c:968 src/updatedb.c:892 |
4929 | +#: src/conf.c:309 src/locate.c:985 src/updatedb.c:921 |
4930 | #, c-format |
4931 | msgid "can not open `%s'" |
4932 | -msgstr "" |
4933 | +msgstr "αδυναμία ανοίγματος του `%s'" |
4934 | |
4935 | #: src/conf.c:353 |
4936 | #, c-format |
4937 | msgid "unknown variable `%s'" |
4938 | -msgstr "" |
4939 | +msgstr "άγνωστη μεταβλητή `%s'" |
4940 | |
4941 | #: src/conf.c:358 |
4942 | msgid "variable name expected" |
4943 | -msgstr "" |
4944 | +msgstr "αναμενόμενο όνομα μεταβλητής" |
4945 | |
4946 | #: src/conf.c:364 |
4947 | #, c-format |
4948 | msgid "variable `%s' was already defined" |
4949 | -msgstr "" |
4950 | +msgstr "η μεταβλητή `%s' έχει ήδη καθοριστεί" |
4951 | |
4952 | #: src/conf.c:373 |
4953 | msgid "`=' expected after variable name" |
4954 | -msgstr "" |
4955 | +msgstr "αναμένεται το `=' μετά το όνομα μεταβλητής" |
4956 | |
4957 | #: src/conf.c:380 |
4958 | msgid "value in quotes expected after `='" |
4959 | -msgstr "" |
4960 | +msgstr "αναμένεται τιμή μέσα σε εισαγωγικά μετά το `='" |
4961 | |
4962 | #: src/conf.c:388 |
4963 | #, c-format |
4964 | msgid "invalid value `%s' of PRUNE_BIND_MOUNTS" |
4965 | -msgstr "" |
4966 | +msgstr "λανθασμένη τιμή `%s' του PRUNE_BIND_MOUNTS" |
4967 | |
4968 | #: src/conf.c:405 |
4969 | msgid "unexpected data after variable value" |
4970 | -msgstr "" |
4971 | +msgstr "ανυπολόγιστα δεδομένα ύστερα από την τιμή της μεταβλητής" |
4972 | |
4973 | #: src/conf.c:419 src/lib.c:266 |
4974 | #, c-format |
4975 | msgid "I/O error reading `%s'" |
4976 | -msgstr "" |
4977 | +msgstr "Σφάλμα I/O κατά την ανάγνωση του `%s'" |
4978 | |
4979 | #: src/conf.c:437 |
4980 | #, c-format |
4981 | @@ -94,119 +95,129 @@ |
4982 | "`%s'.\n" |
4983 | msgstr "" |
4984 | |
4985 | -#: src/conf.c:464 src/locate.c:642 |
4986 | +#: src/conf.c:464 src/locate.c:654 |
4987 | #, c-format |
4988 | msgid "" |
4989 | "\n" |
4990 | "Report bugs to %s.\n" |
4991 | msgstr "" |
4992 | +"\n" |
4993 | +"Αναφέρετε σφάλματα στο %s.\n" |
4994 | |
4995 | #: src/conf.c:482 |
4996 | msgid "can not get current working directory" |
4997 | -msgstr "" |
4998 | +msgstr "αδυναμία απόκτησης του τρέχοντος λειτουργικού καταλόγου" |
4999 | |
5000 | #: src/conf.c:540 src/conf.c:551 src/conf.c:561 src/conf.c:571 |
The diff has been truncated for viewing.
Thanks for the work, it seems like Colin did the merge meanwhile though (it would be useful to subscribe the last uploaded of the package to your sponsoring request for merges since that's usually the person in charge of the merge): /launchpad. net/ubuntu/ +source/ mlocate/ 0.26-1ubuntu1
https:/