Merge lp:~noskcaj/ubuntu/wily/easytag/merge into lp:ubuntu/wily/easytag

Proposed by Jackson Doak on 2015-06-04
Status: Needs review
Proposed branch: lp:~noskcaj/ubuntu/wily/easytag/merge
Merge into: lp:ubuntu/wily/easytag
Diff against target: 15376 lines (+11296/-1727)
87 files modified
ChangeLog (+580/-1)
Makefile.am (+4/-2)
Makefile.in (+54/-37)
NEWS (+29/-0)
aclocal.m4 (+50/-43)
build-aux/compile (+1/-1)
build-aux/config.guess (+8/-7)
build-aux/config.sub (+14/-5)
build-aux/depcomp (+1/-1)
build-aux/install-sh (+170/-196)
build-aux/missing (+1/-1)
build-aux/test-driver (+12/-3)
configure (+35/-34)
configure.ac (+2/-2)
data/easytag.appdata.xml.in (+3/-4)
debian/changelog (+22/-4)
debian/control (+1/-1)
debian/copyright (+0/-22)
debian/rules (+1/-1)
help/Makefile.am (+1/-1)
help/Makefile.in (+19/-7)
help/cs/cddb-search.page (+50/-0)
help/cs/cs.po (+1314/-0)
help/cs/file-rename.page (+50/-0)
help/cs/file-select.page (+22/-0)
help/cs/format-specifier.page (+174/-0)
help/cs/image-delete.page (+25/-0)
help/cs/image-export.page (+23/-0)
help/cs/image.page (+37/-0)
help/cs/index.page (+41/-0)
help/cs/introduction.page (+23/-0)
help/cs/keyboard-shortcuts.page (+69/-0)
help/cs/legal.xml (+4/-0)
help/cs/playlist-generate.page (+52/-0)
help/cs/problems-id3.page (+44/-0)
help/cs/problems-ogg-split.page (+45/-0)
help/cs/scanner.page (+58/-0)
help/cs/starting.page (+26/-0)
help/cs/tag-field.page (+42/-0)
help/cs/tag.page (+23/-0)
help/de/cddb-search.page (+62/-0)
help/de/de.po (+1278/-0)
help/de/file-rename.page (+62/-0)
help/de/file-select.page (+34/-0)
help/de/format-specifier.page (+187/-0)
help/de/image-delete.page (+37/-0)
help/de/image-export.page (+35/-0)
help/de/image.page (+49/-0)
help/de/index.page (+53/-0)
help/de/introduction.page (+35/-0)
help/de/keyboard-shortcuts.page (+81/-0)
help/de/legal.xml (+4/-0)
help/de/playlist-generate.page (+79/-0)
help/de/problems-id3.page (+56/-0)
help/de/problems-ogg-split.page (+57/-0)
help/de/scanner.page (+94/-0)
help/de/starting.page (+38/-0)
help/de/tag-field.page (+58/-0)
help/de/tag.page (+39/-0)
po/LINGUAS (+1/-0)
po/nb.po (+4889/-0)
src/about.c (+4/-5)
src/browser.c (+65/-75)
src/cddb.c (+250/-154)
src/easytag.c (+24/-10)
src/gio_wrapper.cc (+1/-2)
src/id3_tag.c (+9/-3)
src/id3lib/c_wrapper.cpp (+20/-26)
src/id3lib/id3_bugfix.h (+24/-37)
src/id3v24_tag.c (+4/-7)
src/libapetag/COPYING.LGPL (+0/-510)
src/libapetag/README.apetag (+1/-1)
src/libapetag/apetaglib.c (+17/-20)
src/libapetag/apetaglib.h (+17/-21)
src/libapetag/id3v2_read.c (+17/-21)
src/libapetag/id3v2_read.h (+17/-21)
src/libapetag/info_mac.c (+17/-20)
src/libapetag/info_mac.h (+17/-21)
src/libapetag/info_mpc.c (+18/-20)
src/libapetag/info_mpc.h (+17/-21)
src/libapetag/is_tag.c (+17/-20)
src/libapetag/is_tag.h (+17/-21)
src/mp4_tag.cc (+10/-1)
src/ogg_tag.c (+93/-134)
src/vcedit.c (+38/-20)
src/vcedit.h (+17/-8)
src/wavpack_tag.c (+207/-155)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/wily/easytag/merge
Reviewer Review Type Date Requested Status
Daniel Holbach 2015-06-04 Approve on 2015-06-05
Review via email: mp+261159@code.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Unmerged revisions

20. By Jackson Doak on 2015-06-04

* Merge from debian. Remaining changes:
  - Change appdata-tools b-dep to appstream-util
  - Recommend gnome-icon-theme-full on ubuntu systems.
  - Convert upstream translations into a patch to silence debuild errors.
* New upstream release.
* debian/rules:
  - Enable parallel build.
* Change libapetag license to GPL-2+.
* Use cgit Vcs-Browser URL.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2014-10-12 17:58:42 +0000
+++ ChangeLog 2015-06-04 21:51:20 +0000
@@ -1,6 +1,585 @@
1commit 820f916435fd1d8ec429922fdbc94c0470c57cbe
2Author: David King <amigadave@amigadave.com>
3Date: Fri Feb 6 18:43:06 2015 +0000
4
5 Update NEWS for 2.2.6 release
6
7M NEWS
8M SOURCES
9M configure.ac
10
11commit 484f4f7fc48daa0dcc9edef909a7c554723771f2
12Author: Christian Kirbach <christian.kirbach@gmail.com>
13Date: Sun Jan 11 23:43:12 2015 +0100
14
15 Added German help translation
16
17M help/Makefile.am
18A help/de/de.po
19
20commit 9244e1380bb63c00fdd205cd4d5e3c0fa0ccf660
21Author: David King <amigadave@amigadave.com>
22Date: Wed Jan 7 09:16:46 2015 +0000
23
24 Fix crash when saving FLAC tags
25
26 https://bugzilla.gnome.org/show_bug.cgi?id=742350
27
28M src/id3_tag.c
29
30commit 945d3c3d687e08afa5eb2b2ec608bf31b112a859
31Author: David King <amigadave@amigadave.com>
32Date: Sun Jan 4 22:24:36 2015 +0000
33
34 Update copyright year in about dialog
35
36M src/about.c
37
38commit f7013edd4117630a8db4a9d1a1e24443880e390d
39Author: Marek Černocký <marek@manet.cz>
40Date: Sun Jan 4 23:40:37 2015 +0100
41
42 Added the Czech language
43
44M help/Makefile.am
45
46commit 36482df8f197cc975715c8ba6763f14d7dd74868
47Author: Marek Černocký <marek@manet.cz>
48Date: Sun Jan 4 23:40:13 2015 +0100
49
50 The Czech translation
51
52A help/cs/cs.po
53
54commit 40b0223062200881b9cefc61b54a1d9b74c15b10
55Author: David King <amigadave@amigadave.com>
56Date: Sun Jan 4 14:26:40 2015 +0000
57
58 Relicense id3lib wrapper to GPLv2+
59
60 Invoke Section 3 of the LGPL, and apply the terms of the GPL to
61 all the
62 LGPL portions of id3lib code inside EasyTAG.
63
64M src/id3lib/c_wrapper.cpp
65M src/id3lib/id3_bugfix.h
66
67commit ac83ba5cf9ac50af37325cbba698e0d73a6c15ec
68Author: David King <amigadave@amigadave.com>
69Date: Sun Jan 4 12:07:19 2015 +0000
70
71 Check for a valid Vorbis comment image MIME type
72
73M src/ogg_tag.c
74
75commit 472de5711f501c0eb901619cfb34c41eaa3f3ae5
76Author: David King <amigadave@amigadave.com>
77Date: Sun Jan 4 11:34:44 2015 +0000
78
79 Do some validation of Vorbis artwork field lengths
80
81M src/ogg_tag.c
82
83commit 18a1d294b7112eb6bf7bc1b14cdef8a205dbbe99
84Author: David King <amigadave@amigadave.com>
85Date: Sun Jan 4 10:41:11 2015 +0000
86
87 Check for an invalid field when reading Vorbis art
88
89 When reading cover art from Vorbis comments, check that the
90 Base64-decoded data is at least long enough to hold the
91 METADATA_BLOCK_PICTURE fields. Mark any invalid files as modified, so
92 that the invalid field is removed upon saving.
93
94 https://retrace.fedoraproject.org/faf2/problems/516585/
95
96M src/ogg_tag.c
97
98commit 69c6af1eeaf8bcdea358c55e39d1cc34be7e7415
99Author: David King <amigadave@amigadave.com>
100Date: Thu Dec 18 17:43:32 2014 +0000
101
102 Simplify reading artwork description from Ogg tags
103
104M src/ogg_tag.c
105
106commit 660b3f93a64c64330517a5fc060df07760f6a5c7
107Author: David King <amigadave@amigadave.com>
108Date: Mon Dec 29 11:43:02 2014 +0000
109
110 Fix stripping disc number field from ID3v2.4 tags
111
112 As part of a change made in bug 726467, disc number handling for ID3
113 tags was modified to only allow digits and the '/' character in
114 the TPOS
115 field. A bogus check was added for ID3 tags, so that if saving a tag
116 with no content in the disc number field, the existing TPOS tag would
117 not be cleared.
118
119 Remove the erroneous check, as et_id3tag_get_tpos_from_file_tag()
120 safely
121 handles the disc number field being empty.
122
123 https://bugzilla.gnome.org/show_bug.cgi?id=742082
124
125M src/id3v24_tag.c
126
127commit ca1e78be6d58d15e89c5fa0f69352df717d3d713
128Author: David King <amigadave@amigadave.com>
129Date: Fri Dec 26 22:36:39 2014 +0000
130
131 Fix Ctrl-clicking to toggle file selection
132
133 In the selection changed handler, only change the current file
134 shown in
135 the file and tag areas if it is selected. When unselecting, do not
136 update the current file.
137
138 https://bugzilla.gnome.org/show_bug.cgi?id=741980
139
140M src/browser.c
141
142commit 38a95ae551138812f4d3763154fa6fe0310a3ac9
143Author: David King <amigadave@amigadave.com>
144Date: Wed Dec 24 12:58:12 2014 +0000
145
146 Fix double unref in et_rename_file() error path
147
148 https://retrace.fedoraproject.org/faf2/problems/558544/
149 https://retrace.fedoraproject.org/faf2/problems/552602/
150
151M src/easytag.c
152
153commit a7250d53e8d4e782043e14de6f35cb54982326da
154Author: David King <amigadave@amigadave.com>
155Date: Sun Dec 21 22:33:25 2014 +0000
156
157 Fix string leak when reading WavPack tags
158
159M src/wavpack_tag.c
160
161commit 5f4d7e2bd0eaf5498c873f5a7bfe2e3450084a11
162Author: David King <amigadave@amigadave.com>
163Date: Sun Dec 21 21:17:57 2014 +0000
164
165 Clear empty tag fields when saving WavPack tags
166
167 Refactor WavPack tag saving to use a new
168 et_wavpack_append_or_delete_tag_item() helper function. Call
169 WavpackDeleteTagItem() to delete a tag item if the item is empty.
170
171M src/wavpack_tag.c
172
173commit 39e5560e3e39764b4152e748898d8e4ef9405919
174Author: David King <amigadave@amigadave.com>
175Date: Sun Dec 21 19:30:33 2014 +0000
176
177 Support album artist in WavPack tags
178
179M src/wavpack_tag.c
180
181commit 7a850cf39135a075ef09540f4182787fad24941b
182Author: David King <amigadave@amigadave.com>
183Date: Thu Dec 18 17:41:21 2014 +0000
184
185 Use a stack-allocated buffer for WavPack tags
186
187M src/wavpack_tag.c
188
189commit 2688eddc69272d040490665a3283a2dba2d249ff
190Author: David King <amigadave@amigadave.com>
191Date: Sun Dec 21 10:36:33 2014 +0000
192
193 Add -Werror=return-type to compiler flags
194
195M configure.ac
196
197commit 27318621ace6eb3022bee0eaf536f75b6da75a95
198Author: David King <amigadave@amigadave.com>
199Date: Thu Dec 18 16:46:33 2014 +0000
200
201 Fix check for errors when writing WavPack tags
202
203M src/wavpack_tag.c
204
205commit 4eb3952856e08d39c1c3ad2f74748c41f4364a92
206Author: David King <amigadave@amigadave.com>
207Date: Thu Dec 18 16:35:37 2014 +0000
208
209 Add G_SLICE=debug-blocks to test environment
210
211M Makefile.am
212
213commit fcc390506d96e782a3e49c5b98fa270707583e68
214Author: David King <amigadave@amigadave.com>
215Date: Thu Dec 18 16:59:39 2014 +0000
216
217 Fix double free in CDDB dialog error path
218
219M src/cddb.c
220
221commit 2b5a98c28f1d02d79dc387b30968a1a7d2f2d379
222Author: David King <amigadave@amigadave.com>
223Date: Sun Dec 14 13:54:44 2014 +0000
224
225 Fix memory leak when loading a Speex file
226
227M src/vcedit.c
228
229commit a1dfbbd324751ce87e24e574ff48e45c34adcfa2
230Author: David King <amigadave@amigadave.com>
231Date: Sun Dec 14 13:54:24 2014 +0000
232
233 Fix a memory leak when saving an Ogg file
234
235M src/ogg_tag.c
236
237commit bc9948b180cba2d74884d401c2e42d686a8b8ac6
238Author: David King <amigadave@amigadave.com>
239Date: Thu Dec 11 22:11:02 2014 +0000
240
241 Fix memory leak in CDDB dialog error path
242
243M src/cddb.c
244
245commit 479936c70e2562f336a0305120593fd4f319d043
246Author: David King <amigadave@amigadave.com>
247Date: Tue Dec 9 23:01:02 2014 +0000
248
249 Relicense libapetag and vcedit.c to GPLv2+
250
251 Invoke Section 3 of the LGPL, and apply the terms of the GPL to
252 all the
253 LGPL portions of code inside EasyTAG, which include the APE tag
254 reading
255 code (libapetag) and the Vorbis comment parsing code (vcedit.c).
256
257M Makefile.am
258M data/easytag.appdata.xml.in
259D src/libapetag/COPYING.LGPL
260M src/libapetag/README.apetag
261M src/libapetag/apetaglib.c
262M src/libapetag/apetaglib.h
263M src/libapetag/id3v2_read.c
264M src/libapetag/id3v2_read.h
265M src/libapetag/info_mac.c
266M src/libapetag/info_mac.h
267M src/libapetag/info_mpc.c
268M src/libapetag/info_mpc.h
269M src/libapetag/is_tag.c
270M src/libapetag/is_tag.h
271M src/vcedit.c
272M src/vcedit.h
273
274commit 673013a878ee052f53d8dde4e751ebcf0e86878e
275Author: David King <amigadave@amigadave.com>
276Date: Sat Dec 6 19:19:12 2014 +0000
277
278 Fix menu actions for tag field case conversion
279
280 https://bugzilla.gnome.org/show_bug.cgi?id=741203
281
282M src/easytag.c
283
284commit 9cfc37a0bc2c7c6d307658405681cbeb88b78e89
285Author: David King <amigadave@amigadave.com>
286Date: Mon Nov 24 22:13:06 2014 +0000
287
288 Update NEWS for 2.2.5 release
289
290M NEWS
291M SOURCES
292M configure.ac
293
294commit 9323f1376ad512f03c91e12a00e8ad261453390e
295Author: David King <amigadave@amigadave.com>
296Date: Fri Oct 31 22:18:24 2014 +0000
297
298 Include name and summary in AppData
299
300M data/easytag.appdata.xml.in
301
302commit feb56e229d41a74637ea9fd865cd2f819199708b
303Author: David King <amigadave@amigadave.com>
304Date: Wed Nov 19 16:59:03 2014 +0000
305
306 Fix memory leaks in Save_File() error paths
307
308M src/easytag.c
309
310commit 2915fda969d0894eab24a8dcdda114f6b348bf4e
311Author: David King <amigadave@amigadave.com>
312Date: Fri Nov 14 22:19:35 2014 +0000
313
314 Make file list selection independent of direction
315
316 When selecting a range from a row which is below the current view, do
317 not scroll to the bottom of the selection, and instead ensure that the
318 row which was clicked most-recently is the one which is shown in
319 the tag
320 area.
321
322 https://bugzilla.gnome.org/show_bug.cgi?id=740134
323
324M src/browser.c
325
326commit a2b39c948f33a1faa3ac9303576937e18d54bea4
327Author: David King <amigadave@amigadave.com>
328Date: Sat Nov 8 10:02:40 2014 +0000
329
330 Switch log message to debug in Ogg image handling
331
332 Any images which cannot be converted to the specification-required PNG
333 on JPEG are left unchanged, so emitting a log message is less than
334 helpful.
335
336M src/ogg_tag.c
337
338commit 3a43e93dc44ab759e72f20fb09993dbfe7c93c57
339Author: David King <amigadave@amigadave.com>
340Date: Fri Nov 7 08:26:19 2014 +0000
341
342 Fix double unref when opening an invalid Ogg file
343
344M src/vcedit.c
345
346commit 53116d512425da5761e25282c5f444c2a785ba30
347Author: David King <amigadave@amigadave.com>
348Date: Fri Nov 7 08:18:14 2014 +0000
349
350 Refactor Ogg file ID3v2 skipping logic
351
352 Mark the Ogg file as modified while reading, if it has an ID3v2
353 tag, as
354 it will be removed while saving. Remove a double unref of the input
355 stream in an error path. Tidy up several obsolete seeks.
356
357M src/ogg_tag.c
358
359commit f7583f30bb4c8e5c99bac934a751437ea3808e00
360Author: David King <amigadave@amigadave.com>
361Date: Thu Nov 6 22:08:52 2014 +0000
362
363 Do not warn about ID3v2 tags when saving Ogg files
364
365 The Ogg tag writing code can handle ID3v2 tags without problems, and a
366 warning is already logged when reading the file, so warning again when
367 saving is not helpful.
368
369M src/ogg_tag.c
370
371commit d09827150d7d6d92cc8e2f7927fb6ee0aa149a34
372Author: David King <amigadave@amigadave.com>
373Date: Thu Nov 6 21:59:59 2014 +0000
374
375 Fix skipping over ID3v2 tags in Ogg files
376
377 According to the documentation for ogg_sync_pageout(), a return
378 value of
379 -1 means that bytes were skipped, and so it is fine to continue
380 reading.
381 Fixes writing to Ogg files where an ID3v2 tag is present.
382
383 https://bugzilla.gnome.org/show_bug.cgi?id=739748
384
385M src/vcedit.c
386
387commit 9a4019d63d2a6ea578bbef00a7d56780e34f2b2d
388Author: Piotr Drąg <piotrdrag@gmail.com>
389Date: Wed Nov 5 12:52:47 2014 +0100
390
391 Avoid a string change in the stable branch
392
393M src/cddb.c
394
395commit 1e7fee3ca3c43c95f419c6890271cc658b545667
396Author: David King <amigadave@amigadave.com>
397Date: Tue Nov 4 16:42:34 2014 +0000
398
399 Fix several CDDB response memory leaks
400
401M src/cddb.c
402
403commit 13f3d991ce4ee697622e7de440bfe38e933f9e92
404Author: David King <amigadave@amigadave.com>
405Date: Tue Nov 4 16:41:58 2014 +0000
406
407 Fix memory leak of a path in a browser error path
408
409M src/browser.c
410
411commit de66a6b2dcc53dee3b29e3ace78f94e7af3842fc
412Author: David King <amigadave@amigadave.com>
413Date: Mon Nov 3 23:58:28 2014 +0000
414
415 Fix leak of selected row list in CDDB dialog
416
417M src/cddb.c
418
419commit 67a92caa1d7f0cb8751fd96994bae3a58b53a9e1
420Author: David King <amigadave@amigadave.com>
421Date: Mon Nov 3 23:31:29 2014 +0000
422
423 Fix filename leak in browser DLM selection
424
425M src/browser.c
426
427commit 5201567287b9a9da263d9bd4be1fae8701f205d6
428Author: David King <amigadave@amigadave.com>
429Date: Mon Nov 3 23:00:52 2014 +0000
430
431 Fix more CDDB track number memory leaks
432
433M src/cddb.c
434
435commit 3d136d8761fcaed93081a216b654bd78ec58150e
436Author: David King <amigadave@amigadave.com>
437Date: Mon Nov 3 22:15:56 2014 +0000
438
439 Fix leaks of track number strings in CDDB dialog
440
441M src/cddb.c
442
443commit 6bd47d3b21c4335c18b903d279202009e99d11da
444Author: David King <amigadave@amigadave.com>
445Date: Mon Nov 3 22:14:20 2014 +0000
446
447 Fix a memory leak when searching albums via CDDB
448
449M src/cddb.c
450
451commit e3047946426a561c6cf6afef5dcc8de3e06a4e75
452Author: David King <amigadave@amigadave.com>
453Date: Mon Nov 3 18:43:38 2014 +0000
454
455 Fix incorrect track duration in CDDB results
456
457M src/cddb.c
458
459commit 47fb7819183eb4c01fbd8e8a9a43de1065ef6724
460Author: David King <amigadave@amigadave.com>
461Date: Fri Oct 31 18:12:37 2014 +0000
462
463 Use old-style BMPs for Windows installer images
464
465 NSIS expects the images in 24-bit format (no alpha channel),
466 and without
467 colourspace information.
468
469M data/nsis/easytag-header.bmp
470M data/nsis/easytag-sidebar.bmp
471
472commit 24131bbd41b7a21ca6af18b3f1e062c38ebb4af7
473Author: David King <amigadave@amigadave.com>
474Date: Fri Oct 24 23:59:25 2014 +0100
475
476 Fix GIOStream leak when checking for buggy id3lib
477
478M src/id3_tag.c
479
480commit c331b17b78a83e60a34384158b22d03f79a01b55
481Author: David King <amigadave@amigadave.com>
482Date: Mon Oct 20 23:19:15 2014 +0100
483
484 Clear empty fields in MP4 tags
485
486 The existing tag is loaded from the file and modified before being
487 written out. For "extra" fields, including cover art and album artist,
488 the existing tag field was preserved in the case that the
489 corresponding
490 tag field had been cleared from the UI. Fix this by explicitly
491 removing
492 the cleared tag field.
493
494M src/mp4_tag.cc
495
496commit 7b727b30e88d249f34a276f2766d2876654c37e0
497Author: David King <amigadave@amigadave.com>
498Date: Mon Oct 20 23:08:25 2014 +0100
499
500 Fix an invalid read when reading MP4 cover art
501
502M src/mp4_tag.cc
503
504commit d59245764862544925a9cfb4dbe1e1ea59ae535d
505Author: David King <amigadave@amigadave.com>
506Date: Mon Oct 20 22:55:36 2014 +0100
507
508 Fix memory leak in C++ GIOStream wrapper
509
510M src/gio_wrapper.cc
511
512commit 195e0cf176dee6a414b9b32e676c8178b54c8af8
513Author: David King <amigadave@amigadave.com>
514Date: Mon Oct 20 08:31:59 2014 +0100
515
516 Propagate double-click events on tree view headers
517
518 Receiving a double-click event on a tree view is not a good
519 indicator of
520 whether to change the selection, as the event could have occurred
521 on the
522 column headers, resulting in the header resizing and the selection
523 changing simultaneously. Avoid the problem by checking that the
524 double-click event is in the bin window, and ignoring (and
525 propagating)
526 it otherwise.
527
528 https://bugzilla.gnome.org/show_bug.cgi?id=738830
529
530M src/browser.c
531M src/cddb.c
532
533commit 8df083008262bf8abde3ca9beba2e122941a7668
534Author: David King <amigadave@amigadave.com>
535Date: Wed Oct 8 20:14:50 2014 +0100
536
537 Avoid a memory leak of the disc ID in error paths
538
539M src/cddb.c
540
541commit 2d5757973536672632f03479e34be4de9a19bfe0
542Author: David King <amigadave@amigadave.com>
543Date: Wed Oct 8 19:44:41 2014 +0100
544
545 Refactor some CDDB dialog code to use GString
546
547 Avoid a memory leak in error paths, and use GString to simplify
548 the code
549 a little.
550
551M src/cddb.c
552
553commit 6acef14540c698da483352ce8864be151f1dfda9
554Author: David King <amigadave@amigadave.com>
555Date: Wed Oct 8 19:31:18 2014 +0100
556
557 Fix two memory leaks in CDDB dialog
558
559 Store a pointer to the start of the GLists, so that the lists can be
560 freed later.
561
562M src/cddb.c
563
564commit 74ee1ff52cdc6078ace2278067ca32518f797c05
565Author: Kjartan Maraas <kmaraas@gnome.org>
566Date: Fri Oct 17 00:04:08 2014 +0200
567
568 Added nb
569
570M po/LINGUAS
571
572commit 4bed0c20e46abc6e5c2c93bbacb71b6fe1dc2c1a
573Author: Kjartan Maraas <kmaraas@gnome.org>
574Date: Fri Oct 17 00:03:52 2014 +0200
575
576 Added Norwegian bokmål translation from Åka Sikrom.
577
578A po/nb.po
579
1commit 21704fcd1996c87fc0a140f07c18db6dabf3a146580commit 21704fcd1996c87fc0a140f07c18db6dabf3a146
2Author: David King <amigadave@amigadave.com>581Author: David King <amigadave@amigadave.com>
3Date: Sat Sep 27 02:00:02 2014 +0100582Date: Sat Sep 27 02:00:02 2014 +0100
4583
5 Update NEWS for 2.2.4 release584 Update NEWS for 2.2.4 release
6585
7586
=== modified file 'Makefile.am'
--- Makefile.am 2014-05-09 18:37:42 +0000
+++ Makefile.am 2015-06-04 21:51:20 +0000
@@ -246,7 +246,6 @@
246 $(desktop_in_files) \246 $(desktop_in_files) \
247 $(easytag_headers) \247 $(easytag_headers) \
248 src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff \248 src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff \
249 src/libapetag/COPYING.LGPL \
250 src/libapetag/README.apetag \249 src/libapetag/README.apetag \
251 src/libapetag/id3v2_read.c \250 src/libapetag/id3v2_read.c \
252 src/libapetag/id3v2_read.h \251 src/libapetag/id3v2_read.h \
@@ -273,7 +272,10 @@
273 chmod +x $@272 chmod +x $@
274273
275# Not automake built-in TESTS_ENVIRONMENT!274# Not automake built-in TESTS_ENVIRONMENT!
276TEST_ENVIRONMENT = MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))275TEST_ENVIRONMENT = \
276 MALLOC_CHECK_=2 \
277 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) \
278 G_SLICE=debug-blocks
277279
278# test: run all tests.280# test: run all tests.
279test: $(check_PROGRAMS)281test: $(check_PROGRAMS)
280282
=== modified file 'Makefile.in'
--- Makefile.in 2014-05-09 18:37:42 +0000
+++ Makefile.in 2015-06-04 21:51:20 +0000
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.14.1 from Makefile.am.1# Makefile.in generated by automake 1.15 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
1717
1818
19VPATH = @srcdir@19VPATH = @srcdir@
20am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'20am__is_gnu_make = { \
21 if test -z '$(MAKELEVEL)'; then \
22 false; \
23 elif test -n '$(MAKE_HOST)'; then \
24 true; \
25 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
26 true; \
27 else \
28 false; \
29 fi; \
30}
21am__make_running_with_option = \31am__make_running_with_option = \
22 case $${target_option-} in \32 case $${target_option-} in \
23 ?) ;; \33 ?) ;; \
@@ -83,30 +93,20 @@
83bin_PROGRAMS = easytag$(EXEEXT)93bin_PROGRAMS = easytag$(EXEEXT)
84@EASYTAG_ENABLE_TESTS_TRUE@check_PROGRAMS = tests/test-scan$(EXEEXT)94@EASYTAG_ENABLE_TESTS_TRUE@check_PROGRAMS = tests/test-scan$(EXEEXT)
85subdir = .95subdir = .
86DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
87 $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
88 $(top_srcdir)/configure $(am__configure_deps) \
89 $(srcdir)/config.h.in $(top_srcdir)/doc/version.xml.in \
90 $(top_srcdir)/src/win32/easytag.rc.in $(dist_noinst_SCRIPTS) \
91 $(top_srcdir)/build-aux/depcomp $(dist_appicon128_DATA) \
92 $(dist_appicon16_DATA) $(dist_appicon22_DATA) \
93 $(dist_appicon24_DATA) $(dist_appicon256_DATA) \
94 $(dist_appicon32_DATA) $(dist_appicon48_DATA) \
95 $(dist_appicon64_DATA) $(dist_appiconscalable_DATA) \
96 $(dist_noinst_DATA) $(top_srcdir)/build-aux/test-driver \
97 COPYING THANKS TODO build-aux/compile build-aux/config.guess \
98 build-aux/config.sub build-aux/depcomp build-aux/install-sh \
99 build-aux/missing $(top_srcdir)/build-aux/compile \
100 $(top_srcdir)/build-aux/config.guess \
101 $(top_srcdir)/build-aux/config.sub \
102 $(top_srcdir)/build-aux/install-sh \
103 $(top_srcdir)/build-aux/missing
104ACLOCAL_M4 = $(top_srcdir)/aclocal.m496ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
105am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \97am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \
106 $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \98 $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \
107 $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac99 $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
108am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \100am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
109 $(ACLOCAL_M4)101 $(ACLOCAL_M4)
102DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
103 $(am__configure_deps) $(dist_noinst_SCRIPTS) \
104 $(dist_appicon128_DATA) $(dist_appicon16_DATA) \
105 $(dist_appicon22_DATA) $(dist_appicon24_DATA) \
106 $(dist_appicon256_DATA) $(dist_appicon32_DATA) \
107 $(dist_appicon48_DATA) $(dist_appicon64_DATA) \
108 $(dist_appiconscalable_DATA) $(dist_noinst_DATA) \
109 $(am__DIST_COMMON)
110am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \110am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
111 configure.lineno config.status.lineno111 configure.lineno config.status.lineno
112mkinstalldirs = $(install_sh) -d112mkinstalldirs = $(install_sh) -d
@@ -467,6 +467,19 @@
467TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \467TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
468 $(TEST_LOG_FLAGS)468 $(TEST_LOG_FLAGS)
469DIST_SUBDIRS = $(SUBDIRS)469DIST_SUBDIRS = $(SUBDIRS)
470am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
471 $(top_srcdir)/build-aux/compile \
472 $(top_srcdir)/build-aux/config.guess \
473 $(top_srcdir)/build-aux/config.sub \
474 $(top_srcdir)/build-aux/depcomp \
475 $(top_srcdir)/build-aux/install-sh \
476 $(top_srcdir)/build-aux/missing \
477 $(top_srcdir)/build-aux/test-driver \
478 $(top_srcdir)/doc/version.xml.in \
479 $(top_srcdir)/src/win32/easytag.rc.in AUTHORS COPYING \
480 ChangeLog INSTALL NEWS README THANKS TODO build-aux/compile \
481 build-aux/config.guess build-aux/config.sub build-aux/depcomp \
482 build-aux/install-sh build-aux/missing
470DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)483DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
471distdir = $(PACKAGE)-$(VERSION)484distdir = $(PACKAGE)-$(VERSION)
472top_distdir = $(distdir)485top_distdir = $(distdir)
@@ -513,7 +526,7 @@
513ALL_LINGUAS = @ALL_LINGUAS@526ALL_LINGUAS = @ALL_LINGUAS@
514AMTAR = @AMTAR@527AMTAR = @AMTAR@
515AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@528AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
516APPDATA_VALIDATE = @APPDATA_VALIDATE@529APPSTREAM_UTIL = @APPSTREAM_UTIL@
517AUTOCONF = @AUTOCONF@530AUTOCONF = @AUTOCONF@
518AUTOHEADER = @AUTOHEADER@531AUTOHEADER = @AUTOHEADER@
519AUTOMAKE = @AUTOMAKE@532AUTOMAKE = @AUTOMAKE@
@@ -848,7 +861,6 @@
848 $(desktop_in_files) \861 $(desktop_in_files) \
849 $(easytag_headers) \862 $(easytag_headers) \
850 src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff \863 src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff \
851 src/libapetag/COPYING.LGPL \
852 src/libapetag/README.apetag \864 src/libapetag/README.apetag \
853 src/libapetag/id3v2_read.c \865 src/libapetag/id3v2_read.c \
854 src/libapetag/id3v2_read.h \866 src/libapetag/id3v2_read.h \
@@ -870,7 +882,11 @@
870882
871883
872# Not automake built-in TESTS_ENVIRONMENT!884# Not automake built-in TESTS_ENVIRONMENT!
873@EASYTAG_ENABLE_TESTS_TRUE@TEST_ENVIRONMENT = MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))885@EASYTAG_ENABLE_TESTS_TRUE@TEST_ENVIRONMENT = \
886@EASYTAG_ENABLE_TESTS_TRUE@ MALLOC_CHECK_=2 \
887@EASYTAG_ENABLE_TESTS_TRUE@ MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) \
888@EASYTAG_ENABLE_TESTS_TRUE@ G_SLICE=debug-blocks
889
874@EASYTAG_ENABLE_TESTS_TRUE@tests_test_scan_CPPFLAGS = \890@EASYTAG_ENABLE_TESTS_TRUE@tests_test_scan_CPPFLAGS = \
875@EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src \891@EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_srcdir)/src \
876@EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_builddir) \892@EASYTAG_ENABLE_TESTS_TRUE@ -I$(top_builddir) \
@@ -927,7 +943,6 @@
927 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \943 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
928 $(am__cd) $(top_srcdir) && \944 $(am__cd) $(top_srcdir) && \
929 $(AUTOMAKE) --gnu Makefile945 $(AUTOMAKE) --gnu Makefile
930.PRECIOUS: Makefile
931Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status946Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
932 @case '$?' in \947 @case '$?' in \
933 *config.status*) \948 *config.status*) \
@@ -2232,7 +2247,7 @@
2232 if test -n "$$am__remaking_logs"; then \2247 if test -n "$$am__remaking_logs"; then \
2233 echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \2248 echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
2234 "recursion detected" >&2; \2249 "recursion detected" >&2; \
2235 else \2250 elif test -n "$$redo_logs"; then \
2236 am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \2251 am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
2237 fi; \2252 fi; \
2238 if $(am__make_dryrun); then :; else \2253 if $(am__make_dryrun); then :; else \
@@ -2461,16 +2476,16 @@
2461 $(am__post_remove_distdir)2476 $(am__post_remove_distdir)
24622477
2463dist-tarZ: distdir2478dist-tarZ: distdir
2479 @echo WARNING: "Support for distribution archives compressed with" \
2480 "legacy program 'compress' is deprecated." >&2
2481 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
2482 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
2483 $(am__post_remove_distdir)
2484
2485dist-shar: distdir
2464 @echo WARNING: "Support for shar distribution archives is" \2486 @echo WARNING: "Support for shar distribution archives is" \
2465 "deprecated." >&22487 "deprecated." >&2
2466 @echo WARNING: "It will be removed altogether in Automake 2.0" >&22488 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
2467 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
2468 $(am__post_remove_distdir)
2469
2470dist-shar: distdir
2471 @echo WARNING: "Support for distribution archives compressed with" \
2472 "legacy program 'compress' is deprecated." >&2
2473 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
2474 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz2489 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
2475 $(am__post_remove_distdir)2490 $(am__post_remove_distdir)
24762491
@@ -2505,17 +2520,17 @@
2505 esac2520 esac
2506 chmod -R a-w $(distdir)2521 chmod -R a-w $(distdir)
2507 chmod u+w $(distdir)2522 chmod u+w $(distdir)
2508 mkdir $(distdir)/_build $(distdir)/_inst2523 mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
2509 chmod a-w $(distdir)2524 chmod a-w $(distdir)
2510 test -d $(distdir)/_build || exit 0; \2525 test -d $(distdir)/_build || exit 0; \
2511 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \2526 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
2512 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \2527 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
2513 && am__cwd=`pwd` \2528 && am__cwd=`pwd` \
2514 && $(am__cd) $(distdir)/_build \2529 && $(am__cd) $(distdir)/_build/sub \
2515 && ../configure \2530 && ../../configure \
2516 $(AM_DISTCHECK_CONFIGURE_FLAGS) \2531 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
2517 $(DISTCHECK_CONFIGURE_FLAGS) \2532 $(DISTCHECK_CONFIGURE_FLAGS) \
2518 --srcdir=.. --prefix="$$dc_install_base" \2533 --srcdir=../.. --prefix="$$dc_install_base" \
2519 && $(MAKE) $(AM_MAKEFLAGS) \2534 && $(MAKE) $(AM_MAKEFLAGS) \
2520 && $(MAKE) $(AM_MAKEFLAGS) dvi \2535 && $(MAKE) $(AM_MAKEFLAGS) dvi \
2521 && $(MAKE) $(AM_MAKEFLAGS) check \2536 && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -2744,6 +2759,8 @@
2744 uninstall-dist_appiconscalableDATA uninstall-hook \2759 uninstall-dist_appiconscalableDATA uninstall-hook \
2745 uninstall-man uninstall-man12760 uninstall-man uninstall-man1
27462761
2762.PRECIOUS: Makefile
2763
27472764
2748@WINDOWS_HOST_TRUE@easytag_rc.$(OBJEXT): src/win32/easytag.rc src/win32/easytag.manifest data/icons/win32/easytag.ico2765@WINDOWS_HOST_TRUE@easytag_rc.$(OBJEXT): src/win32/easytag.rc src/win32/easytag.manifest data/icons/win32/easytag.ico
2749@WINDOWS_HOST_TRUE@ $(AM_V_GEN)$(WINDRES) -DICONDIR='\"$(ICONDIR)\"' \2766@WINDOWS_HOST_TRUE@ $(AM_V_GEN)$(WINDRES) -DICONDIR='\"$(ICONDIR)\"' \
27502767
=== modified file 'NEWS'
--- NEWS 2014-10-12 17:58:42 +0000
+++ NEWS 2015-06-04 21:51:20 +0000
@@ -1,3 +1,32 @@
12.2.6 - 2015-02-06 :
2====================
3
4 * Fix crash when saving FLAC tags
5 * Fix more CDDB search dialog memory leaks
6 * Fix memory leaks when loading and saving Speex and Ogg files
7 * Fix a crash when renaming files
8 * Fix Ctrl-clicking to toggle file selection
9 * Fix stripping the disc number from ID3v2.4 tags
10 * Support album artist fields in WavPack tags
11 * Improve validation of Vorbis artwork and MIME types
12 * Several improvements to WavPack tag support
13 * Relicense all code under the GNU GPL version 2 or later
14 * Fix menu items used for tag field case conversion
15 * Marek Černocký’s Czech translation
16 * Christian Kirbach’s German help translation
17
182.2.5 - 2014-11-24 :
19====================
20
21 * Fix many memory leaks in the CDDB search dialog
22 * Clear empty cover art and album artist fields in MP4 tags
23 * Fix a memory leak and invalid read in the MP4 tagging code
24 * Improve ID3v2 handling with Ogg files
25 * Improve file list selection handling
26 * Fix several memory leaks in the file browser
27 * Show updated images in the Windows installer
28 * Åka Sikrom’s Norwegian bokmål translation
29
12.2.4 - 2014-09-27 :302.2.4 - 2014-09-27 :
2====================31====================
332
433
=== modified file 'aclocal.m4'
--- aclocal.m4 2014-10-12 17:58:42 +0000
+++ aclocal.m4 2015-06-04 21:51:20 +0000
@@ -1,6 +1,6 @@
1# generated automatically by aclocal 1.14.1 -*- Autoconf -*-1# generated automatically by aclocal 1.15 -*- Autoconf -*-
22
3# Copyright (C) 1996-2013 Free Software Foundation, Inc.3# Copyright (C) 1996-2014 Free Software Foundation, Inc.
44
5# This file is free software; the Free Software Foundation5# This file is free software; the Free Software Foundation
6# gives unlimited permission to copy and/or distribute it,6# gives unlimited permission to copy and/or distribute it,
@@ -270,7 +270,7 @@
270270
271# appdata-xml.m4271# appdata-xml.m4
272#272#
273# serial 4273# serial 5
274274
275dnl APPDATA_XML275dnl APPDATA_XML
276dnl Installs and validates AppData XML files.276dnl Installs and validates AppData XML files.
@@ -285,7 +285,7 @@
285dnl285dnl
286dnl Adding files to appdata_XML does not distribute them automatically.286dnl Adding files to appdata_XML does not distribute them automatically.
287287
288AC_DEFUN([APPDATA_XML],288AU_DEFUN([APPDATA_XML],
289[289[
290 m4_pattern_allow([AM_V_GEN])290 m4_pattern_allow([AM_V_GEN])
291 AC_ARG_ENABLE([appdata-validate],291 AC_ARG_ENABLE([appdata-validate],
@@ -293,18 +293,18 @@
293 [Disable validating AppData XML files during check phase])])293 [Disable validating AppData XML files during check phase])])
294294
295 AS_IF([test "x$enable_appdata_validate" != "xno"],295 AS_IF([test "x$enable_appdata_validate" != "xno"],
296 [AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate])296 [AC_PATH_PROG([APPSTREAM_UTIL], [appstream-util])
297 AS_IF([test "x$APPDATA_VALIDATE" = "x"],297 AS_IF([test "x$APPSTREAM_UTIL" = "x"],
298 [have_appdata_validate=no],298 [have_appdata_validate=no],
299 [have_appdata_validate=yes299 [have_appdata_validate=yes
300 AC_SUBST([APPDATA_VALIDATE])])],300 AC_SUBST([APPSTREAM_UTIL])])],
301 [have_appdata_validate=no])301 [have_appdata_validate=no])
302302
303 AS_IF([test "x$have_appdata_validate" != "xno"],303 AS_IF([test "x$have_appdata_validate" != "xno"],
304 [appdata_validate=yes],304 [appdata_validate=yes],
305 [appdata_validate=no305 [appdata_validate=no
306 AS_IF([test "x$enable_appdata_validate" = "xyes"],306 AS_IF([test "x$enable_appdata_validate" = "xyes"],
307 [AC_MSG_ERROR([AppData validation was requested but appdata-validate was not found])])])307 [AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])])
308308
309 AC_SUBST([appdataxmldir], [${datadir}/appdata])309 AC_SUBST([appdataxmldir], [${datadir}/appdata])
310310
@@ -315,8 +315,8 @@
315315
316%.appdata.valid: %.appdata.xml316%.appdata.valid: %.appdata.xml
317 $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \317 $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \
318 if test -n "$(APPDATA_VALIDATE)"; \318 if test -n "$(APPSTREAM_UTIL)"; \
319 then $(APPDATA_VALIDATE) --nonet $${d}$<; fi \319 then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \
320 && touch [$]@320 && touch [$]@
321321
322check-am: $(appdata_XML:.appdata.xml=.appdata.valid)322check-am: $(appdata_XML:.appdata.xml=.appdata.valid)
@@ -344,7 +344,11 @@
344 rm -f $(appdata_XML:.appdata.xml=.appdata.valid)344 rm -f $(appdata_XML:.appdata.xml=.appdata.valid)
345'345'
346 _APPDATA_XML_SUBST(APPDATA_XML_RULES)346 _APPDATA_XML_SUBST(APPDATA_XML_RULES)
347])347],
348[Use the new APPSTREAM_XML macro instead of APPDATA_XML in configure.ac, and
349 replace @APPDATA_XML_RULES@ with @APPSTREAM_XML_RULES@, appdata_XML with
350 appstream_XML and --enable-appdata-validate with --enable-appstream-validate
351 in Makefile.am])
348352
349dnl _APPDATA_XML_SUBST(VARIABLE)353dnl _APPDATA_XML_SUBST(VARIABLE)
350dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST354dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
@@ -476,7 +480,7 @@
476EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))480EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
477481
478distdir: distdir-help-files482distdir: distdir-help-files
479distdir-help-files:483distdir-help-files: $(_HELP_LC_FILES)
480 @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \484 @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
481 $(MKDIR_P) "$(distdir)/$$lc"; \485 $(MKDIR_P) "$(distdir)/$$lc"; \
482 for file in $(HELP_FILES); do \486 for file in $(HELP_FILES); do \
@@ -505,7 +509,7 @@
505509
506.PHONY: install-help510.PHONY: install-help
507install-data-am: $(if $(HELP_ID),install-help)511install-data-am: $(if $(HELP_ID),install-help)
508install-help:512install-help: $(_HELP_LC_FILES)
509 @for lc in C $(_HELP_LINGUAS); do \513 @for lc in C $(_HELP_LINGUAS); do \
510 $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \514 $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
511 done515 done
@@ -569,7 +573,7 @@
569m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])573m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
570])574])
571575
572# Copyright (C) 2002-2013 Free Software Foundation, Inc.576# Copyright (C) 2002-2014 Free Software Foundation, Inc.
573#577#
574# This file is free software; the Free Software Foundation578# This file is free software; the Free Software Foundation
575# gives unlimited permission to copy and/or distribute it,579# gives unlimited permission to copy and/or distribute it,
@@ -581,10 +585,10 @@
581# generated from the m4 files accompanying Automake X.Y.585# generated from the m4 files accompanying Automake X.Y.
582# (This private macro should not be called outside this file.)586# (This private macro should not be called outside this file.)
583AC_DEFUN([AM_AUTOMAKE_VERSION],587AC_DEFUN([AM_AUTOMAKE_VERSION],
584[am__api_version='1.14'588[am__api_version='1.15'
585dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to589dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
586dnl require some minimum version. Point them to the right macro.590dnl require some minimum version. Point them to the right macro.
587m4_if([$1], [1.14.1], [],591m4_if([$1], [1.15], [],
588 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl592 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
589])593])
590594
@@ -600,14 +604,14 @@
600# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.604# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
601# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.605# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
602AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],606AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
603[AM_AUTOMAKE_VERSION([1.14.1])dnl607[AM_AUTOMAKE_VERSION([1.15])dnl
604m4_ifndef([AC_AUTOCONF_VERSION],608m4_ifndef([AC_AUTOCONF_VERSION],
605 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl609 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
606_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])610_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
607611
608# AM_AUX_DIR_EXPAND -*- Autoconf -*-612# AM_AUX_DIR_EXPAND -*- Autoconf -*-
609613
610# Copyright (C) 2001-2013 Free Software Foundation, Inc.614# Copyright (C) 2001-2014 Free Software Foundation, Inc.
611#615#
612# This file is free software; the Free Software Foundation616# This file is free software; the Free Software Foundation
613# gives unlimited permission to copy and/or distribute it,617# gives unlimited permission to copy and/or distribute it,
@@ -652,15 +656,14 @@
652# configured tree to be moved without reconfiguration.656# configured tree to be moved without reconfiguration.
653657
654AC_DEFUN([AM_AUX_DIR_EXPAND],658AC_DEFUN([AM_AUX_DIR_EXPAND],
655[dnl Rely on autoconf to set up CDPATH properly.659[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
656AC_PREREQ([2.50])dnl660# Expand $ac_aux_dir to an absolute path.
657# expand $ac_aux_dir to an absolute path661am_aux_dir=`cd "$ac_aux_dir" && pwd`
658am_aux_dir=`cd $ac_aux_dir && pwd`
659])662])
660663
661# AM_CONDITIONAL -*- Autoconf -*-664# AM_CONDITIONAL -*- Autoconf -*-
662665
663# Copyright (C) 1997-2013 Free Software Foundation, Inc.666# Copyright (C) 1997-2014 Free Software Foundation, Inc.
664#667#
665# This file is free software; the Free Software Foundation668# This file is free software; the Free Software Foundation
666# gives unlimited permission to copy and/or distribute it,669# gives unlimited permission to copy and/or distribute it,
@@ -691,7 +694,7 @@
691Usually this means the macro was only invoked conditionally.]])694Usually this means the macro was only invoked conditionally.]])
692fi])])695fi])])
693696
694# Copyright (C) 1999-2013 Free Software Foundation, Inc.697# Copyright (C) 1999-2014 Free Software Foundation, Inc.
695#698#
696# This file is free software; the Free Software Foundation699# This file is free software; the Free Software Foundation
697# gives unlimited permission to copy and/or distribute it,700# gives unlimited permission to copy and/or distribute it,
@@ -882,7 +885,7 @@
882885
883# Generate code to set up dependency tracking. -*- Autoconf -*-886# Generate code to set up dependency tracking. -*- Autoconf -*-
884887
885# Copyright (C) 1999-2013 Free Software Foundation, Inc.888# Copyright (C) 1999-2014 Free Software Foundation, Inc.
886#889#
887# This file is free software; the Free Software Foundation890# This file is free software; the Free Software Foundation
888# gives unlimited permission to copy and/or distribute it,891# gives unlimited permission to copy and/or distribute it,
@@ -958,7 +961,7 @@
958961
959# Do all the work for Automake. -*- Autoconf -*-962# Do all the work for Automake. -*- Autoconf -*-
960963
961# Copyright (C) 1996-2013 Free Software Foundation, Inc.964# Copyright (C) 1996-2014 Free Software Foundation, Inc.
962#965#
963# This file is free software; the Free Software Foundation966# This file is free software; the Free Software Foundation
964# gives unlimited permission to copy and/or distribute it,967# gives unlimited permission to copy and/or distribute it,
@@ -1048,8 +1051,8 @@
1048# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>1051# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
1049# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>1052# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
1050AC_SUBST([mkdir_p], ['$(MKDIR_P)'])1053AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
1051# We need awk for the "check" target. The system "awk" is bad on1054# We need awk for the "check" target (and possibly the TAP driver). The
1052# some platforms.1055# system "awk" is bad on some platforms.
1053AC_REQUIRE([AC_PROG_AWK])dnl1056AC_REQUIRE([AC_PROG_AWK])dnl
1054AC_REQUIRE([AC_PROG_MAKE_SET])dnl1057AC_REQUIRE([AC_PROG_MAKE_SET])dnl
1055AC_REQUIRE([AM_SET_LEADING_DOT])dnl1058AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -1122,7 +1125,11 @@
1122END1125END
1123 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])1126 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
1124 fi1127 fi
1125fi])1128fi
1129dnl The trailing newline in this macro's definition is deliberate, for
1130dnl backward compatibility and to allow trailing 'dnl'-style comments
1131dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
1132])
11261133
1127dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not1134dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1128dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further1135dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -1151,7 +1158,7 @@
1151done1158done
1152echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])1159echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
11531160
1154# Copyright (C) 2001-2013 Free Software Foundation, Inc.1161# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1155#1162#
1156# This file is free software; the Free Software Foundation1163# This file is free software; the Free Software Foundation
1157# gives unlimited permission to copy and/or distribute it,1164# gives unlimited permission to copy and/or distribute it,
@@ -1162,7 +1169,7 @@
1162# Define $install_sh.1169# Define $install_sh.
1163AC_DEFUN([AM_PROG_INSTALL_SH],1170AC_DEFUN([AM_PROG_INSTALL_SH],
1164[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl1171[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1165if test x"${install_sh}" != xset; then1172if test x"${install_sh+set}" != xset; then
1166 case $am_aux_dir in1173 case $am_aux_dir in
1167 *\ * | *\ *)1174 *\ * | *\ *)
1168 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;1175 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -1172,7 +1179,7 @@
1172fi1179fi
1173AC_SUBST([install_sh])])1180AC_SUBST([install_sh])])
11741181
1175# Copyright (C) 2003-2013 Free Software Foundation, Inc.1182# Copyright (C) 2003-2014 Free Software Foundation, Inc.
1176#1183#
1177# This file is free software; the Free Software Foundation1184# This file is free software; the Free Software Foundation
1178# gives unlimited permission to copy and/or distribute it,1185# gives unlimited permission to copy and/or distribute it,
@@ -1194,7 +1201,7 @@
1194# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-1201# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
1195# From Jim Meyering1202# From Jim Meyering
11961203
1197# Copyright (C) 1996-2013 Free Software Foundation, Inc.1204# Copyright (C) 1996-2014 Free Software Foundation, Inc.
1198#1205#
1199# This file is free software; the Free Software Foundation1206# This file is free software; the Free Software Foundation
1200# gives unlimited permission to copy and/or distribute it,1207# gives unlimited permission to copy and/or distribute it,
@@ -1229,7 +1236,7 @@
12291236
1230# Check to see how 'make' treats includes. -*- Autoconf -*-1237# Check to see how 'make' treats includes. -*- Autoconf -*-
12311238
1232# Copyright (C) 2001-2013 Free Software Foundation, Inc.1239# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1233#1240#
1234# This file is free software; the Free Software Foundation1241# This file is free software; the Free Software Foundation
1235# gives unlimited permission to copy and/or distribute it,1242# gives unlimited permission to copy and/or distribute it,
@@ -1279,7 +1286,7 @@
12791286
1280# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-1287# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
12811288
1282# Copyright (C) 1997-2013 Free Software Foundation, Inc.1289# Copyright (C) 1997-2014 Free Software Foundation, Inc.
1283#1290#
1284# This file is free software; the Free Software Foundation1291# This file is free software; the Free Software Foundation
1285# gives unlimited permission to copy and/or distribute it,1292# gives unlimited permission to copy and/or distribute it,
@@ -1318,7 +1325,7 @@
13181325
1319# Helper functions for option handling. -*- Autoconf -*-1326# Helper functions for option handling. -*- Autoconf -*-
13201327
1321# Copyright (C) 2001-2013 Free Software Foundation, Inc.1328# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1322#1329#
1323# This file is free software; the Free Software Foundation1330# This file is free software; the Free Software Foundation
1324# gives unlimited permission to copy and/or distribute it,1331# gives unlimited permission to copy and/or distribute it,
@@ -1347,7 +1354,7 @@
1347AC_DEFUN([_AM_IF_OPTION],1354AC_DEFUN([_AM_IF_OPTION],
1348[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])1355[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
13491356
1350# Copyright (C) 1999-2013 Free Software Foundation, Inc.1357# Copyright (C) 1999-2014 Free Software Foundation, Inc.
1351#1358#
1352# This file is free software; the Free Software Foundation1359# This file is free software; the Free Software Foundation
1353# gives unlimited permission to copy and/or distribute it,1360# gives unlimited permission to copy and/or distribute it,
@@ -1394,7 +1401,7 @@
1394# For backward compatibility.1401# For backward compatibility.
1395AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])1402AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
13961403
1397# Copyright (C) 2001-2013 Free Software Foundation, Inc.1404# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1398#1405#
1399# This file is free software; the Free Software Foundation1406# This file is free software; the Free Software Foundation
1400# gives unlimited permission to copy and/or distribute it,1407# gives unlimited permission to copy and/or distribute it,
@@ -1413,7 +1420,7 @@
14131420
1414# Check to make sure that the build environment is sane. -*- Autoconf -*-1421# Check to make sure that the build environment is sane. -*- Autoconf -*-
14151422
1416# Copyright (C) 1996-2013 Free Software Foundation, Inc.1423# Copyright (C) 1996-2014 Free Software Foundation, Inc.
1417#1424#
1418# This file is free software; the Free Software Foundation1425# This file is free software; the Free Software Foundation
1419# gives unlimited permission to copy and/or distribute it,1426# gives unlimited permission to copy and/or distribute it,
@@ -1494,7 +1501,7 @@
1494rm -f conftest.file1501rm -f conftest.file
1495])1502])
14961503
1497# Copyright (C) 2009-2013 Free Software Foundation, Inc.1504# Copyright (C) 2009-2014 Free Software Foundation, Inc.
1498#1505#
1499# This file is free software; the Free Software Foundation1506# This file is free software; the Free Software Foundation
1500# gives unlimited permission to copy and/or distribute it,1507# gives unlimited permission to copy and/or distribute it,
@@ -1554,7 +1561,7 @@
1554_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl1561_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1555])1562])
15561563
1557# Copyright (C) 2001-2013 Free Software Foundation, Inc.1564# Copyright (C) 2001-2014 Free Software Foundation, Inc.
1558#1565#
1559# This file is free software; the Free Software Foundation1566# This file is free software; the Free Software Foundation
1560# gives unlimited permission to copy and/or distribute it,1567# gives unlimited permission to copy and/or distribute it,
@@ -1582,7 +1589,7 @@
1582INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"1589INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1583AC_SUBST([INSTALL_STRIP_PROGRAM])])1590AC_SUBST([INSTALL_STRIP_PROGRAM])])
15841591
1585# Copyright (C) 2006-2013 Free Software Foundation, Inc.1592# Copyright (C) 2006-2014 Free Software Foundation, Inc.
1586#1593#
1587# This file is free software; the Free Software Foundation1594# This file is free software; the Free Software Foundation
1588# gives unlimited permission to copy and/or distribute it,1595# gives unlimited permission to copy and/or distribute it,
@@ -1601,7 +1608,7 @@
16011608
1602# Check how to create a tarball. -*- Autoconf -*-1609# Check how to create a tarball. -*- Autoconf -*-
16031610
1604# Copyright (C) 2004-2013 Free Software Foundation, Inc.1611# Copyright (C) 2004-2014 Free Software Foundation, Inc.
1605#1612#
1606# This file is free software; the Free Software Foundation1613# This file is free software; the Free Software Foundation
1607# gives unlimited permission to copy and/or distribute it,1614# gives unlimited permission to copy and/or distribute it,
16081615
=== modified file 'build-aux/compile'
--- build-aux/compile 2014-02-28 15:50:09 +0000
+++ build-aux/compile 2015-06-04 21:51:20 +0000
@@ -3,7 +3,7 @@
33
4scriptversion=2012-10-14.11; # UTC4scriptversion=2012-10-14.11; # UTC
55
6# Copyright (C) 1999-2013 Free Software Foundation, Inc.6# Copyright (C) 1999-2014 Free Software Foundation, Inc.
7# Written by Tom Tromey <tromey@cygnus.com>.7# Written by Tom Tromey <tromey@cygnus.com>.
8#8#
9# This program is free software; you can redistribute it and/or modify9# This program is free software; you can redistribute it and/or modify
1010
=== modified file 'build-aux/config.guess'
--- build-aux/config.guess 2014-10-12 17:58:42 +0000
+++ build-aux/config.guess 2015-06-04 21:51:20 +0000
@@ -1,8 +1,8 @@
1#! /bin/sh1#! /bin/sh
2# Attempt to guess a canonical system name.2# Attempt to guess a canonical system name.
3# Copyright 1992-2014 Free Software Foundation, Inc.3# Copyright 1992-2015 Free Software Foundation, Inc.
44
5timestamp='2014-03-23'5timestamp='2015-01-01'
66
7# This file is free software; you can redistribute it and/or modify it7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by8# under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@
24# program. This Exception is an additional permission under section 724# program. This Exception is an additional permission under section 7
25# of the GNU General Public License, version 3 ("GPLv3").25# of the GNU General Public License, version 3 ("GPLv3").
26#26#
27# Originally written by Per Bothner.27# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
28#28#
29# You can get the latest version of this script from:29# You can get the latest version of this script from:
30# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD30# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
31#31#
32# Please send patches with a ChangeLog entry to config-patches@gnu.org.32# Please send patches to <config-patches@gnu.org>.
3333
3434
35me=`echo "$0" | sed -e 's,.*/,,'`35me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@
50GNU config.guess ($timestamp)50GNU config.guess ($timestamp)
5151
52Originally written by Per Bothner.52Originally written by Per Bothner.
53Copyright 1992-2014 Free Software Foundation, Inc.53Copyright 1992-2015 Free Software Foundation, Inc.
5454
55This is free software; see the source for copying conditions. There is NO55This is free software; see the source for copying conditions. There is NO
56warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."56warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -579,8 +579,9 @@
579 else579 else
580 IBM_ARCH=powerpc580 IBM_ARCH=powerpc
581 fi581 fi
582 if [ -x /usr/bin/oslevel ] ; then582 if [ -x /usr/bin/lslpp ] ; then
583 IBM_REV=`/usr/bin/oslevel`583 IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
584 awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
584 else585 else
585 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}586 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
586 fi587 fi
587588
=== modified file 'build-aux/config.sub'
--- build-aux/config.sub 2014-10-12 17:58:42 +0000
+++ build-aux/config.sub 2015-06-04 21:51:20 +0000
@@ -1,8 +1,8 @@
1#! /bin/sh1#! /bin/sh
2# Configuration validation subroutine script.2# Configuration validation subroutine script.
3# Copyright 1992-2014 Free Software Foundation, Inc.3# Copyright 1992-2015 Free Software Foundation, Inc.
44
5timestamp='2014-07-28'5timestamp='2015-01-01'
66
7# This file is free software; you can redistribute it and/or modify it7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by8# under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
25# of the GNU General Public License, version 3 ("GPLv3").25# of the GNU General Public License, version 3 ("GPLv3").
2626
2727
28# Please send patches with a ChangeLog entry to config-patches@gnu.org.28# Please send patches to <config-patches@gnu.org>.
29#29#
30# Configuration subroutine to validate and canonicalize a configuration type.30# Configuration subroutine to validate and canonicalize a configuration type.
31# Supply the specified configuration type as an argument.31# Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@
68version="\68version="\
69GNU config.sub ($timestamp)69GNU config.sub ($timestamp)
7070
71Copyright 1992-2014 Free Software Foundation, Inc.71Copyright 1992-2015 Free Software Foundation, Inc.
7272
73This is free software; see the source for copying conditions. There is NO73This is free software; see the source for copying conditions. There is NO
74warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."74warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -260,7 +260,7 @@
260 | c4x | c8051 | clipper \260 | c4x | c8051 | clipper \
261 | d10v | d30v | dlx | dsp16xx \261 | d10v | d30v | dlx | dsp16xx \
262 | epiphany \262 | epiphany \
263 | fido | fr30 | frv \263 | fido | fr30 | frv | ft32 \
264 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \264 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
265 | hexagon \265 | hexagon \
266 | i370 | i860 | i960 | ia64 \266 | i370 | i860 | i960 | ia64 \
@@ -302,6 +302,7 @@
302 | pdp10 | pdp11 | pj | pjl \302 | pdp10 | pdp11 | pj | pjl \
303 | powerpc | powerpc64 | powerpc64le | powerpcle \303 | powerpc | powerpc64 | powerpc64le | powerpcle \
304 | pyramid \304 | pyramid \
305 | riscv32 | riscv64 \
305 | rl78 | rx \306 | rl78 | rx \
306 | score \307 | score \
307 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \308 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -312,6 +313,7 @@
312 | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \313 | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
313 | ubicom32 \314 | ubicom32 \
314 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \315 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
316 | visium \
315 | we32k \317 | we32k \
316 | x86 | xc16x | xstormy16 | xtensa \318 | x86 | xc16x | xstormy16 | xtensa \
317 | z8k | z80)319 | z8k | z80)
@@ -326,6 +328,9 @@
326 c6x)328 c6x)
327 basic_machine=tic6x-unknown329 basic_machine=tic6x-unknown
328 ;;330 ;;
331 leon|leon[3-9])
332 basic_machine=sparc-$basic_machine
333 ;;
329 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)334 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
330 basic_machine=$basic_machine-unknown335 basic_machine=$basic_machine-unknown
331 os=-none336 os=-none
@@ -436,6 +441,7 @@
436 | ubicom32-* \441 | ubicom32-* \
437 | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \442 | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
438 | vax-* \443 | vax-* \
444 | visium-* \
439 | we32k-* \445 | we32k-* \
440 | x86-* | x86_64-* | xc16x-* | xps100-* \446 | x86-* | x86_64-* | xc16x-* | xps100-* \
441 | xstormy16-* | xtensa*-* \447 | xstormy16-* | xtensa*-* \
@@ -773,6 +779,9 @@
773 basic_machine=m68k-isi779 basic_machine=m68k-isi
774 os=-sysv780 os=-sysv
775 ;;781 ;;
782 leon-*|leon[3-9]-*)
783 basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
784 ;;
776 m68knommu)785 m68knommu)
777 basic_machine=m68k-unknown786 basic_machine=m68k-unknown
778 os=-linux787 os=-linux
779788
=== modified file 'build-aux/depcomp'
--- build-aux/depcomp 2014-02-28 15:50:09 +0000
+++ build-aux/depcomp 2015-06-04 21:51:20 +0000
@@ -3,7 +3,7 @@
33
4scriptversion=2013-05-30.07; # UTC4scriptversion=2013-05-30.07; # UTC
55
6# Copyright (C) 1999-2013 Free Software Foundation, Inc.6# Copyright (C) 1999-2014 Free Software Foundation, Inc.
77
8# This program is free software; you can redistribute it and/or modify8# This program is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by9# it under the terms of the GNU General Public License as published by
1010
=== modified file 'build-aux/install-sh'
--- build-aux/install-sh 2014-02-28 15:50:09 +0000
+++ build-aux/install-sh 2015-06-04 21:51:20 +0000
@@ -1,7 +1,7 @@
1#!/bin/sh1#!/bin/sh
2# install - install a program, script, or datafile2# install - install a program, script, or datafile
33
4scriptversion=2011-11-20.07; # UTC4scriptversion=2013-12-25.23; # UTC
55
6# This originates from X11R5 (mit/util/scripts/install.sh), which was6# This originates from X11R5 (mit/util/scripts/install.sh), which was
7# later released in X11R6 (xc/config/util/install.sh) with the7# later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@
41# This script is compatible with the BSD install script, but was written41# This script is compatible with the BSD install script, but was written
42# from scratch.42# from scratch.
4343
44tab=' '
44nl='45nl='
45'46'
46IFS=" "" $nl"47IFS=" $tab$nl"
4748
48# set DOITPROG to echo to test this script49# Set DOITPROG to "echo" to test this script.
4950
50# Don't use :- since 4.3BSD and earlier shells don't like it.
51doit=${DOITPROG-}51doit=${DOITPROG-}
52if test -z "$doit"; then52doit_exec=${doit:-exec}
53 doit_exec=exec
54else
55 doit_exec=$doit
56fi
5753
58# Put in absolute file names if you don't have them in your path;54# Put in absolute file names if you don't have them in your path;
59# or use environment vars.55# or use environment vars.
@@ -68,17 +64,6 @@
68rmprog=${RMPROG-rm}64rmprog=${RMPROG-rm}
69stripprog=${STRIPPROG-strip}65stripprog=${STRIPPROG-strip}
7066
71posix_glob='?'
72initialize_posix_glob='
73 test "$posix_glob" != "?" || {
74 if (set -f) 2>/dev/null; then
75 posix_glob=
76 else
77 posix_glob=:
78 fi
79 }
80'
81
82posix_mkdir=67posix_mkdir=
8368
84# Desired mode of installed file.69# Desired mode of installed file.
@@ -97,7 +82,7 @@
97dst_arg=82dst_arg=
9883
99copy_on_change=false84copy_on_change=false
100no_target_directory=85is_target_a_directory=possibly
10186
102usage="\87usage="\
103Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE88Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@
137 -d) dir_arg=true;;122 -d) dir_arg=true;;
138123
139 -g) chgrpcmd="$chgrpprog $2"124 -g) chgrpcmd="$chgrpprog $2"
140 shift;;125 shift;;
141126
142 --help) echo "$usage"; exit $?;;127 --help) echo "$usage"; exit $?;;
143128
144 -m) mode=$2129 -m) mode=$2
145 case $mode in130 case $mode in
146 *' '* | *' '* | *'131 *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
147'* | *'*'* | *'?'* | *'['*)132 echo "$0: invalid mode: $mode" >&2
148 echo "$0: invalid mode: $mode" >&2133 exit 1;;
149 exit 1;;134 esac
150 esac135 shift;;
151 shift;;
152136
153 -o) chowncmd="$chownprog $2"137 -o) chowncmd="$chownprog $2"
154 shift;;138 shift;;
155139
156 -s) stripcmd=$stripprog;;140 -s) stripcmd=$stripprog;;
157141
158 -t) dst_arg=$2142 -t)
159 # Protect names problematic for 'test' and other utilities.143 is_target_a_directory=always
160 case $dst_arg in144 dst_arg=$2
161 -* | [=\(\)!]) dst_arg=./$dst_arg;;145 # Protect names problematic for 'test' and other utilities.
162 esac146 case $dst_arg in
163 shift;;147 -* | [=\(\)!]) dst_arg=./$dst_arg;;
148 esac
149 shift;;
164150
165 -T) no_target_directory=true;;151 -T) is_target_a_directory=never;;
166152
167 --version) echo "$0 $scriptversion"; exit $?;;153 --version) echo "$0 $scriptversion"; exit $?;;
168154
169 --) shift155 --) shift
170 break;;156 break;;
171157
172 -*) echo "$0: invalid option: $1" >&2158 -*) echo "$0: invalid option: $1" >&2
173 exit 1;;159 exit 1;;
174160
175 *) break;;161 *) break;;
176 esac162 esac
177 shift163 shift
178done164done
179165
166# We allow the use of options -d and -T together, by making -d
167# take the precedence; this is for compatibility with GNU install.
168
169if test -n "$dir_arg"; then
170 if test -n "$dst_arg"; then
171 echo "$0: target directory not allowed when installing a directory." >&2
172 exit 1
173 fi
174fi
175
180if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then176if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
181 # When -d is used, all remaining arguments are directories to create.177 # When -d is used, all remaining arguments are directories to create.
182 # When -t is used, the destination is already specified.178 # When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@
208fi204fi
209205
210if test -z "$dir_arg"; then206if test -z "$dir_arg"; then
207 if test $# -gt 1 || test "$is_target_a_directory" = always; then
208 if test ! -d "$dst_arg"; then
209 echo "$0: $dst_arg: Is not a directory." >&2
210 exit 1
211 fi
212 fi
213fi
214
215if test -z "$dir_arg"; then
211 do_exit='(exit $ret); exit $ret'216 do_exit='(exit $ret); exit $ret'
212 trap "ret=129; $do_exit" 1217 trap "ret=129; $do_exit" 1
213 trap "ret=130; $do_exit" 2218 trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@
223228
224 *[0-7])229 *[0-7])
225 if test -z "$stripcmd"; then230 if test -z "$stripcmd"; then
226 u_plus_rw=231 u_plus_rw=
227 else232 else
228 u_plus_rw='% 200'233 u_plus_rw='% 200'
229 fi234 fi
230 cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;235 cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
231 *)236 *)
232 if test -z "$stripcmd"; then237 if test -z "$stripcmd"; then
233 u_plus_rw=238 u_plus_rw=
234 else239 else
235 u_plus_rw=,u+rw240 u_plus_rw=,u+rw
236 fi241 fi
237 cp_umask=$mode$u_plus_rw;;242 cp_umask=$mode$u_plus_rw;;
238 esac243 esac
@@ -269,41 +274,15 @@
269 # If destination is a directory, append the input filename; won't work274 # If destination is a directory, append the input filename; won't work
270 # if double slashes aren't ignored.275 # if double slashes aren't ignored.
271 if test -d "$dst"; then276 if test -d "$dst"; then
272 if test -n "$no_target_directory"; then277 if test "$is_target_a_directory" = never; then
273 echo "$0: $dst_arg: Is a directory" >&2278 echo "$0: $dst_arg: Is a directory" >&2
274 exit 1279 exit 1
275 fi280 fi
276 dstdir=$dst281 dstdir=$dst
277 dst=$dstdir/`basename "$src"`282 dst=$dstdir/`basename "$src"`
278 dstdir_status=0283 dstdir_status=0
279 else284 else
280 # Prefer dirname, but fall back on a substitute if dirname fails.285 dstdir=`dirname "$dst"`
281 dstdir=`
282 (dirname "$dst") 2>/dev/null ||
283 expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
284 X"$dst" : 'X\(//\)[^/]' \| \
285 X"$dst" : 'X\(//\)$' \| \
286 X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
287 echo X"$dst" |
288 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
289 s//\1/
290 q
291 }
292 /^X\(\/\/\)[^/].*/{
293 s//\1/
294 q
295 }
296 /^X\(\/\/\)$/{
297 s//\1/
298 q
299 }
300 /^X\(\/\).*/{
301 s//\1/
302 q
303 }
304 s/.*/./; q'
305 `
306
307 test -d "$dstdir"286 test -d "$dstdir"
308 dstdir_status=$?287 dstdir_status=$?
309 fi288 fi
@@ -314,74 +293,74 @@
314 if test $dstdir_status != 0; then293 if test $dstdir_status != 0; then
315 case $posix_mkdir in294 case $posix_mkdir in
316 '')295 '')
317 # Create intermediate dirs using mode 755 as modified by the umask.296 # Create intermediate dirs using mode 755 as modified by the umask.
318 # This is like FreeBSD 'install' as of 1997-10-28.297 # This is like FreeBSD 'install' as of 1997-10-28.
319 umask=`umask`298 umask=`umask`
320 case $stripcmd.$umask in299 case $stripcmd.$umask in
321 # Optimize common cases.300 # Optimize common cases.
322 *[2367][2367]) mkdir_umask=$umask;;301 *[2367][2367]) mkdir_umask=$umask;;
323 .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;302 .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
324303
325 *[0-7])304 *[0-7])
326 mkdir_umask=`expr $umask + 22 \305 mkdir_umask=`expr $umask + 22 \
327 - $umask % 100 % 40 + $umask % 20 \306 - $umask % 100 % 40 + $umask % 20 \
328 - $umask % 10 % 4 + $umask % 2307 - $umask % 10 % 4 + $umask % 2
329 `;;308 `;;
330 *) mkdir_umask=$umask,go-w;;309 *) mkdir_umask=$umask,go-w;;
331 esac310 esac
332311
333 # With -d, create the new directory with the user-specified mode.312 # With -d, create the new directory with the user-specified mode.
334 # Otherwise, rely on $mkdir_umask.313 # Otherwise, rely on $mkdir_umask.
335 if test -n "$dir_arg"; then314 if test -n "$dir_arg"; then
336 mkdir_mode=-m$mode315 mkdir_mode=-m$mode
337 else316 else
338 mkdir_mode=317 mkdir_mode=
339 fi318 fi
340319
341 posix_mkdir=false320 posix_mkdir=false
342 case $umask in321 case $umask in
343 *[123567][0-7][0-7])322 *[123567][0-7][0-7])
344 # POSIX mkdir -p sets u+wx bits regardless of umask, which323 # POSIX mkdir -p sets u+wx bits regardless of umask, which
345 # is incompatible with FreeBSD 'install' when (umask & 300) != 0.324 # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
346 ;;325 ;;
347 *)326 *)
348 tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$327 tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
349 trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0328 trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
350329
351 if (umask $mkdir_umask &&330 if (umask $mkdir_umask &&
352 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1331 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
353 then332 then
354 if test -z "$dir_arg" || {333 if test -z "$dir_arg" || {
355 # Check for POSIX incompatibilities with -m.334 # Check for POSIX incompatibilities with -m.
356 # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or335 # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
357 # other-writable bit of parent directory when it shouldn't.336 # other-writable bit of parent directory when it shouldn't.
358 # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.337 # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
359 ls_ld_tmpdir=`ls -ld "$tmpdir"`338 ls_ld_tmpdir=`ls -ld "$tmpdir"`
360 case $ls_ld_tmpdir in339 case $ls_ld_tmpdir in
361 d????-?r-*) different_mode=700;;340 d????-?r-*) different_mode=700;;
362 d????-?--*) different_mode=755;;341 d????-?--*) different_mode=755;;
363 *) false;;342 *) false;;
364 esac &&343 esac &&
365 $mkdirprog -m$different_mode -p -- "$tmpdir" && {344 $mkdirprog -m$different_mode -p -- "$tmpdir" && {
366 ls_ld_tmpdir_1=`ls -ld "$tmpdir"`345 ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
367 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"346 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
368 }347 }
369 }348 }
370 then posix_mkdir=:349 then posix_mkdir=:
371 fi350 fi
372 rmdir "$tmpdir/d" "$tmpdir"351 rmdir "$tmpdir/d" "$tmpdir"
373 else352 else
374 # Remove any dirs left behind by ancient mkdir implementations.353 # Remove any dirs left behind by ancient mkdir implementations.
375 rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null354 rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
376 fi355 fi
377 trap '' 0;;356 trap '' 0;;
378 esac;;357 esac;;
379 esac358 esac
380359
381 if360 if
382 $posix_mkdir && (361 $posix_mkdir && (
383 umask $mkdir_umask &&362 umask $mkdir_umask &&
384 $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"363 $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
385 )364 )
386 then :365 then :
387 else366 else
@@ -391,53 +370,51 @@
391 # directory the slow way, step by step, checking for races as we go.370 # directory the slow way, step by step, checking for races as we go.
392371
393 case $dstdir in372 case $dstdir in
394 /*) prefix='/';;373 /*) prefix='/';;
395 [-=\(\)!]*) prefix='./';;374 [-=\(\)!]*) prefix='./';;
396 *) prefix='';;375 *) prefix='';;
397 esac376 esac
398377
399 eval "$initialize_posix_glob"
400
401 oIFS=$IFS378 oIFS=$IFS
402 IFS=/379 IFS=/
403 $posix_glob set -f380 set -f
404 set fnord $dstdir381 set fnord $dstdir
405 shift382 shift
406 $posix_glob set +f383 set +f
407 IFS=$oIFS384 IFS=$oIFS
408385
409 prefixes=386 prefixes=
410387
411 for d388 for d
412 do389 do
413 test X"$d" = X && continue390 test X"$d" = X && continue
414391
415 prefix=$prefix$d392 prefix=$prefix$d
416 if test -d "$prefix"; then393 if test -d "$prefix"; then
417 prefixes=394 prefixes=
418 else395 else
419 if $posix_mkdir; then396 if $posix_mkdir; then
420 (umask=$mkdir_umask &&397 (umask=$mkdir_umask &&
421 $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break398 $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
422 # Don't fail if two instances are running concurrently.399 # Don't fail if two instances are running concurrently.
423 test -d "$prefix" || exit 1400 test -d "$prefix" || exit 1
424 else401 else
425 case $prefix in402 case $prefix in
426 *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;403 *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
427 *) qprefix=$prefix;;404 *) qprefix=$prefix;;
428 esac405 esac
429 prefixes="$prefixes '$qprefix'"406 prefixes="$prefixes '$qprefix'"
430 fi407 fi
431 fi408 fi
432 prefix=$prefix/409 prefix=$prefix/
433 done410 done
434411
435 if test -n "$prefixes"; then412 if test -n "$prefixes"; then
436 # Don't fail if two instances are running concurrently.413 # Don't fail if two instances are running concurrently.
437 (umask $mkdir_umask &&414 (umask $mkdir_umask &&
438 eval "\$doit_exec \$mkdirprog $prefixes") ||415 eval "\$doit_exec \$mkdirprog $prefixes") ||
439 test -d "$dstdir" || exit 1416 test -d "$dstdir" || exit 1
440 obsolete_mkdir_used=true417 obsolete_mkdir_used=true
441 fi418 fi
442 fi419 fi
443 fi420 fi
@@ -472,15 +449,12 @@
472449
473 # If -C, don't bother to copy if it wouldn't change the file.450 # If -C, don't bother to copy if it wouldn't change the file.
474 if $copy_on_change &&451 if $copy_on_change &&
475 old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&452 old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
476 new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&453 new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
477454 set -f &&
478 eval "$initialize_posix_glob" &&
479 $posix_glob set -f &&
480 set X $old && old=:$2:$4:$5:$6 &&455 set X $old && old=:$2:$4:$5:$6 &&
481 set X $new && new=:$2:$4:$5:$6 &&456 set X $new && new=:$2:$4:$5:$6 &&
482 $posix_glob set +f &&457 set +f &&
483
484 test "$old" = "$new" &&458 test "$old" = "$new" &&
485 $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1459 $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
486 then460 then
@@ -493,24 +467,24 @@
493 # to itself, or perhaps because mv is so ancient that it does not467 # to itself, or perhaps because mv is so ancient that it does not
494 # support -f.468 # support -f.
495 {469 {
496 # Now remove or move aside any old file at destination location.470 # Now remove or move aside any old file at destination location.
497 # We try this two ways since rm can't unlink itself on some471 # We try this two ways since rm can't unlink itself on some
498 # systems and the destination file might be busy for other472 # systems and the destination file might be busy for other
499 # reasons. In this case, the final cleanup might fail but the new473 # reasons. In this case, the final cleanup might fail but the new
500 # file should still install successfully.474 # file should still install successfully.
501 {475 {
502 test ! -f "$dst" ||476 test ! -f "$dst" ||
503 $doit $rmcmd -f "$dst" 2>/dev/null ||477 $doit $rmcmd -f "$dst" 2>/dev/null ||
504 { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&478 { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
505 { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }479 { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
506 } ||480 } ||
507 { echo "$0: cannot unlink or rename $dst" >&2481 { echo "$0: cannot unlink or rename $dst" >&2
508 (exit 1); exit 1482 (exit 1); exit 1
509 }483 }
510 } &&484 } &&
511485
512 # Now rename the file to the real destination.486 # Now rename the file to the real destination.
513 $doit $mvcmd "$dsttmp" "$dst"487 $doit $mvcmd "$dsttmp" "$dst"
514 }488 }
515 fi || exit 1489 fi || exit 1
516490
517491
=== modified file 'build-aux/missing'
--- build-aux/missing 2014-05-09 18:37:42 +0000
+++ build-aux/missing 2015-06-04 21:51:20 +0000
@@ -3,7 +3,7 @@
33
4scriptversion=2013-10-28.13; # UTC4scriptversion=2013-10-28.13; # UTC
55
6# Copyright (C) 1996-2013 Free Software Foundation, Inc.6# Copyright (C) 1996-2014 Free Software Foundation, Inc.
7# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.7# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
88
9# This program is free software; you can redistribute it and/or modify9# This program is free software; you can redistribute it and/or modify
1010
=== modified file 'build-aux/test-driver'
--- build-aux/test-driver 2014-05-09 18:37:42 +0000
+++ build-aux/test-driver 2015-06-04 21:51:20 +0000
@@ -3,7 +3,7 @@
33
4scriptversion=2013-07-13.22; # UTC4scriptversion=2013-07-13.22; # UTC
55
6# Copyright (C) 2011-2013 Free Software Foundation, Inc.6# Copyright (C) 2011-2014 Free Software Foundation, Inc.
7#7#
8# This program is free software; you can redistribute it and/or modify8# This program is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by9# it under the terms of the GNU General Public License as published by
@@ -106,11 +106,14 @@
106# Test script is run here.106# Test script is run here.
107"$@" >$log_file 2>&1107"$@" >$log_file 2>&1
108estatus=$?108estatus=$?
109
109if test $enable_hard_errors = no && test $estatus -eq 99; then110if test $enable_hard_errors = no && test $estatus -eq 99; then
110 estatus=1111 tweaked_estatus=1
112else
113 tweaked_estatus=$estatus
111fi114fi
112115
113case $estatus:$expect_failure in116case $tweaked_estatus:$expect_failure in
114 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;117 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
115 0:*) col=$grn res=PASS recheck=no gcopy=no;;118 0:*) col=$grn res=PASS recheck=no gcopy=no;;
116 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;119 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
@@ -119,6 +122,12 @@
119 *:*) col=$red res=FAIL recheck=yes gcopy=yes;;122 *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
120esac123esac
121124
125# Report the test outcome and exit status in the logs, so that one can
126# know whether the test passed or failed simply by looking at the '.log'
127# file, without the need of also peaking into the corresponding '.trs'
128# file (automake bug#11814).
129echo "$res $test_name (exit status: $estatus)" >>$log_file
130
122# Report outcome to console.131# Report outcome to console.
123echo "${col}${res}${std}: $test_name"132echo "${col}${res}${std}: $test_name"
124133
125134
=== modified file 'configure'
--- configure 2014-10-12 17:58:42 +0000
+++ configure 2015-06-04 21:51:20 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.69 for EasyTAG 2.2.4.3# Generated by GNU Autoconf 2.69 for EasyTAG 2.2.6.
4#4#
5# Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=easytag>.5# Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=easytag>.
6#6#
@@ -581,8 +581,8 @@
581# Identity of this package.581# Identity of this package.
582PACKAGE_NAME='EasyTAG'582PACKAGE_NAME='EasyTAG'
583PACKAGE_TARNAME='easytag'583PACKAGE_TARNAME='easytag'
584PACKAGE_VERSION='2.2.4'584PACKAGE_VERSION='2.2.6'
585PACKAGE_STRING='EasyTAG 2.2.4'585PACKAGE_STRING='EasyTAG 2.2.6'
586PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=easytag'586PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=easytag'
587PACKAGE_URL='https://wiki.gnome.org/Apps/EasyTAG'587PACKAGE_URL='https://wiki.gnome.org/Apps/EasyTAG'
588588
@@ -679,7 +679,7 @@
679CXX679CXX
680APPDATA_XML_RULES680APPDATA_XML_RULES
681appdataxmldir681appdataxmldir
682APPDATA_VALIDATE682APPSTREAM_UTIL
683GETTEXT_PACKAGE683GETTEXT_PACKAGE
684DATADIRNAME684DATADIRNAME
685am__fastdepCC_FALSE685am__fastdepCC_FALSE
@@ -1386,7 +1386,7 @@
1386 # Omit some internal or obsolete options to make the list less imposing.1386 # Omit some internal or obsolete options to make the list less imposing.
1387 # This message is too long to be a string in the A/UX 3.1 sh.1387 # This message is too long to be a string in the A/UX 3.1 sh.
1388 cat <<_ACEOF1388 cat <<_ACEOF
1389\`configure' configures EasyTAG 2.2.4 to adapt to many kinds of systems.1389\`configure' configures EasyTAG 2.2.6 to adapt to many kinds of systems.
13901390
1391Usage: $0 [OPTION]... [VAR=VALUE]...1391Usage: $0 [OPTION]... [VAR=VALUE]...
13921392
@@ -1456,7 +1456,7 @@
14561456
1457if test -n "$ac_init_help"; then1457if test -n "$ac_init_help"; then
1458 case $ac_init_help in1458 case $ac_init_help in
1459 short | recursive ) echo "Configuration of EasyTAG 2.2.4:";;1459 short | recursive ) echo "Configuration of EasyTAG 2.2.6:";;
1460 esac1460 esac
1461 cat <<\_ACEOF1461 cat <<\_ACEOF
14621462
@@ -1591,7 +1591,7 @@
1591test -n "$ac_init_help" && exit $ac_status1591test -n "$ac_init_help" && exit $ac_status
1592if $ac_init_version; then1592if $ac_init_version; then
1593 cat <<\_ACEOF1593 cat <<\_ACEOF
1594EasyTAG configure 2.2.41594EasyTAG configure 2.2.6
1595generated by GNU Autoconf 2.691595generated by GNU Autoconf 2.69
15961596
1597Copyright (C) 2012 Free Software Foundation, Inc.1597Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1998,7 +1998,7 @@
1998This file contains any messages produced by compilers while1998This file contains any messages produced by compilers while
1999running configure, to aid debugging if configure makes a mistake.1999running configure, to aid debugging if configure makes a mistake.
20002000
2001It was created by EasyTAG $as_me 2.2.4, which was2001It was created by EasyTAG $as_me 2.2.6, which was
2002generated by GNU Autoconf 2.69. Invocation command line was2002generated by GNU Autoconf 2.69. Invocation command line was
20032003
2004 $ $0 $@2004 $ $0 $@
@@ -2381,7 +2381,7 @@
23812381
23822382
23832383
2384am__api_version='1.14'2384am__api_version='1.15'
23852385
2386# Find a good install program. We prefer a C program (faster),2386# Find a good install program. We prefer a C program (faster),
2387# so one script is as good as another. But avoid the broken or2387# so one script is as good as another. But avoid the broken or
@@ -2553,8 +2553,8 @@
2553ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'2553ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
2554program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`2554program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
25552555
2556# expand $ac_aux_dir to an absolute path2556# Expand $ac_aux_dir to an absolute path.
2557am_aux_dir=`cd $ac_aux_dir && pwd`2557am_aux_dir=`cd "$ac_aux_dir" && pwd`
25582558
2559if test x"${MISSING+set}" != xset; then2559if test x"${MISSING+set}" != xset; then
2560 case $am_aux_dir in2560 case $am_aux_dir in
@@ -2573,7 +2573,7 @@
2573$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}2573$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
2574fi2574fi
25752575
2576if test x"${install_sh}" != xset; then2576if test x"${install_sh+set}" != xset; then
2577 case $am_aux_dir in2577 case $am_aux_dir in
2578 *\ * | *\ *)2578 *\ * | *\ *)
2579 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;2579 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2867,7 +2867,7 @@
28672867
2868# Define the identity of the package.2868# Define the identity of the package.
2869 PACKAGE='easytag'2869 PACKAGE='easytag'
2870 VERSION='2.2.4'2870 VERSION='2.2.6'
28712871
28722872
2873# Some tools Automake needs.2873# Some tools Automake needs.
@@ -2892,8 +2892,8 @@
2892# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>2892# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
2893mkdir_p='$(MKDIR_P)'2893mkdir_p='$(MKDIR_P)'
28942894
2895# We need awk for the "check" target. The system "awk" is bad on2895# We need awk for the "check" target (and possibly the TAP driver). The
2896# some platforms.2896# system "awk" is bad on some platforms.
2897# Always define AMTAR for backward compatibility. Yes, it's still used2897# Always define AMTAR for backward compatibility. Yes, it's still used
2898# in the wild :-( We should find a proper way to deprecate it ...2898# in the wild :-( We should find a proper way to deprecate it ...
2899AMTAR='$${TAR-tar}'2899AMTAR='$${TAR-tar}'
@@ -2951,6 +2951,7 @@
2951 fi2951 fi
2952fi2952fi
29532953
2954
2954{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&52955{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
2955$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }2956$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
2956 # Check whether --enable-maintainer-mode was given.2957 # Check whether --enable-maintainer-mode was given.
@@ -4654,16 +4655,16 @@
46544655
46554656
4656 if test "x$enable_appdata_validate" != "xno"; then :4657 if test "x$enable_appdata_validate" != "xno"; then :
4657 # Extract the first word of "appdata-validate", so it can be a program name with args.4658 # Extract the first word of "appstream-util", so it can be a program name with args.
4658set dummy appdata-validate; ac_word=$24659set dummy appstream-util; ac_word=$2
4659{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&54660{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4660$as_echo_n "checking for $ac_word... " >&6; }4661$as_echo_n "checking for $ac_word... " >&6; }
4661if ${ac_cv_path_APPDATA_VALIDATE+:} false; then :4662if ${ac_cv_path_APPSTREAM_UTIL+:} false; then :
4662 $as_echo_n "(cached) " >&64663 $as_echo_n "(cached) " >&6
4663else4664else
4664 case $APPDATA_VALIDATE in4665 case $APPSTREAM_UTIL in
4665 [\\/]* | ?:[\\/]*)4666 [\\/]* | ?:[\\/]*)
4666 ac_cv_path_APPDATA_VALIDATE="$APPDATA_VALIDATE" # Let the user override the test with a path.4667 ac_cv_path_APPSTREAM_UTIL="$APPSTREAM_UTIL" # Let the user override the test with a path.
4667 ;;4668 ;;
4668 *)4669 *)
4669 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR4670 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4673,7 +4674,7 @@
4673 test -z "$as_dir" && as_dir=.4674 test -z "$as_dir" && as_dir=.
4674 for ac_exec_ext in '' $ac_executable_extensions; do4675 for ac_exec_ext in '' $ac_executable_extensions; do
4675 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then4676 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4676 ac_cv_path_APPDATA_VALIDATE="$as_dir/$ac_word$ac_exec_ext"4677 ac_cv_path_APPSTREAM_UTIL="$as_dir/$ac_word$ac_exec_ext"
4677 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&54678 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4678 break 24679 break 2
4679 fi4680 fi
@@ -4684,17 +4685,17 @@
4684 ;;4685 ;;
4685esac4686esac
4686fi4687fi
4687APPDATA_VALIDATE=$ac_cv_path_APPDATA_VALIDATE4688APPSTREAM_UTIL=$ac_cv_path_APPSTREAM_UTIL
4688if test -n "$APPDATA_VALIDATE"; then4689if test -n "$APPSTREAM_UTIL"; then
4689 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPDATA_VALIDATE" >&54690 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPSTREAM_UTIL" >&5
4690$as_echo "$APPDATA_VALIDATE" >&6; }4691$as_echo "$APPSTREAM_UTIL" >&6; }
4691else4692else
4692 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&54693 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4693$as_echo "no" >&6; }4694$as_echo "no" >&6; }
4694fi4695fi
46954696
46964697
4697 if test "x$APPDATA_VALIDATE" = "x"; then :4698 if test "x$APPSTREAM_UTIL" = "x"; then :
4698 have_appdata_validate=no4699 have_appdata_validate=no
4699else4700else
4700 have_appdata_validate=yes4701 have_appdata_validate=yes
@@ -4709,7 +4710,7 @@
4709else4710else
4710 appdata_validate=no4711 appdata_validate=no
4711 if test "x$enable_appdata_validate" = "xyes"; then :4712 if test "x$enable_appdata_validate" = "xyes"; then :
4712 as_fn_error $? "AppData validation was requested but appdata-validate was not found" "$LINENO" 54713 as_fn_error $? "AppData validation was requested but appstream-util was not found" "$LINENO" 5
4713fi4714fi
4714fi4715fi
47154716
@@ -4723,8 +4724,8 @@
47234724
4724%.appdata.valid: %.appdata.xml4725%.appdata.valid: %.appdata.xml
4725 $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \4726 $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \
4726 if test -n "$(APPDATA_VALIDATE)"; \4727 if test -n "$(APPSTREAM_UTIL)"; \
4727 then $(APPDATA_VALIDATE) --nonet $${d}$<; fi \4728 then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \
4728 && touch $@4729 && touch $@
47294730
4730check-am: $(appdata_XML:.appdata.xml=.appdata.valid)4731check-am: $(appdata_XML:.appdata.xml=.appdata.valid)
@@ -6739,7 +6740,7 @@
6739EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))6740EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
67406741
6741distdir: distdir-help-files6742distdir: distdir-help-files
6742distdir-help-files:6743distdir-help-files: $(_HELP_LC_FILES)
6743 @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \6744 @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
6744 $(MKDIR_P) "$(distdir)/$$lc"; \6745 $(MKDIR_P) "$(distdir)/$$lc"; \
6745 for file in $(HELP_FILES); do \6746 for file in $(HELP_FILES); do \
@@ -6768,7 +6769,7 @@
67686769
6769.PHONY: install-help6770.PHONY: install-help
6770install-data-am: $(if $(HELP_ID),install-help)6771install-data-am: $(if $(HELP_ID),install-help)
6771install-help:6772install-help: $(_HELP_LC_FILES)
6772 @for lc in C $(_HELP_LINGUAS); do \6773 @for lc in C $(_HELP_LINGUAS); do \
6773 $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \6774 $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
6774 done6775 done
@@ -7763,7 +7764,7 @@
7763fi7764fi
77647765
77657766
7766warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement"7767warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement -Werror=return-type"
77677768
7768realsave_CFLAGS="$CFLAGS"7769realsave_CFLAGS="$CFLAGS"
7769for option in $warning_flags; do7770for option in $warning_flags; do
@@ -9001,7 +9002,7 @@
9001# report actual input values of CONFIG_FILES etc. instead of their9002# report actual input values of CONFIG_FILES etc. instead of their
9002# values after options handling.9003# values after options handling.
9003ac_log="9004ac_log="
9004This file was extended by EasyTAG $as_me 2.2.4, which was9005This file was extended by EasyTAG $as_me 2.2.6, which was
9005generated by GNU Autoconf 2.69. Invocation command line was9006generated by GNU Autoconf 2.69. Invocation command line was
90069007
9007 CONFIG_FILES = $CONFIG_FILES9008 CONFIG_FILES = $CONFIG_FILES
@@ -9068,7 +9069,7 @@
9068cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=19069cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
9069ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"9070ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
9070ac_cs_version="\\9071ac_cs_version="\\
9071EasyTAG config.status 2.2.49072EasyTAG config.status 2.2.6
9072configured by $0, generated by GNU Autoconf 2.69,9073configured by $0, generated by GNU Autoconf 2.69,
9073 with options \\"\$ac_cs_config\\"9074 with options \\"\$ac_cs_config\\"
90749075
90759076
=== modified file 'configure.ac'
--- configure.ac 2014-10-12 17:58:42 +0000
+++ configure.ac 2015-06-04 21:51:20 +0000
@@ -4,7 +4,7 @@
44
5dnl To set also in config.h.mingw5dnl To set also in config.h.mingw
6dnl defines ($PACKAGE_NAME, $PACKAGE_VERSION, etc.)6dnl defines ($PACKAGE_NAME, $PACKAGE_VERSION, etc.)
7AC_INIT([EasyTAG], [2.2.4], [https://bugzilla.gnome.org/enter_bug.cgi?product=easytag], [easytag], [https://wiki.gnome.org/Apps/EasyTAG])7AC_INIT([EasyTAG], [2.2.6], [https://bugzilla.gnome.org/enter_bug.cgi?product=easytag], [easytag], [https://wiki.gnome.org/Apps/EasyTAG])
88
9AC_CONFIG_AUX_DIR([build-aux])9AC_CONFIG_AUX_DIR([build-aux])
10AC_CONFIG_HEADERS([config.h])10AC_CONFIG_HEADERS([config.h])
@@ -323,7 +323,7 @@
323 AC_MSG_RESULT([$have_ws2])])323 AC_MSG_RESULT([$have_ws2])])
324324
325dnl Check that the compiler accepts the given warning flags.325dnl Check that the compiler accepts the given warning flags.
326warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement"326warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement -Werror=return-type"
327327
328realsave_CFLAGS="$CFLAGS"328realsave_CFLAGS="$CFLAGS"
329for option in $warning_flags; do329for option in $warning_flags; do
330330
=== modified file 'data/easytag.appdata.xml.in'
--- data/easytag.appdata.xml.in 2014-10-12 17:58:42 +0000
+++ data/easytag.appdata.xml.in 2015-06-04 21:51:20 +0000
@@ -3,11 +3,10 @@
3<application>3<application>
4 <id type="desktop">easytag.desktop</id>4 <id type="desktop">easytag.desktop</id>
5 <metadata_license>CC0-1.0</metadata_license>5 <metadata_license>CC0-1.0</metadata_license>
6 <project_license>GPL-2.0+ and LGPL-2.1+</project_license>6 <project_license>GPL-2.0+</project_license>
7<!-- Both taken from the desktop file.7<!-- Name and summary taken from the desktop file. -->
8 <name>EasyTAG</name>8 <name>EasyTAG</name>
9 <summary></summary>9 <_summary>Edit sound file metadata</_summary>
10-->
11 <description>10 <description>
12 <_p>View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg11 <_p>View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg
13 Speex, Ogg Vorbis, MusePack, Monkey's Audio and WavPack files.</_p>12 Speex, Ogg Vorbis, MusePack, Monkey's Audio and WavPack files.</_p>
1413
=== modified file 'data/nsis/easytag-header.bmp'
15Binary files data/nsis/easytag-header.bmp 2014-02-28 15:50:09 +0000 and data/nsis/easytag-header.bmp 2015-06-04 21:51:20 +0000 differ14Binary files data/nsis/easytag-header.bmp 2014-02-28 15:50:09 +0000 and data/nsis/easytag-header.bmp 2015-06-04 21:51:20 +0000 differ
=== modified file 'data/nsis/easytag-sidebar.bmp'
16Binary files data/nsis/easytag-sidebar.bmp 2014-02-28 15:50:09 +0000 and data/nsis/easytag-sidebar.bmp 2015-06-04 21:51:20 +0000 differ15Binary files data/nsis/easytag-sidebar.bmp 2014-02-28 15:50:09 +0000 and data/nsis/easytag-sidebar.bmp 2015-06-04 21:51:20 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog 2015-02-14 08:09:52 +0000
+++ debian/changelog 2015-06-04 21:51:20 +0000
@@ -1,3 +1,25 @@
1easytag (2.2.6-1ubuntu1) wily; urgency=medium
2
3 * Merge from debian. Remaining changes:
4 - Change appdata-tools b-dep to appstream-util
5 - Recommend gnome-icon-theme-full on ubuntu systems.
6 - Convert upstream translations into a patch to silence debuild errors.
7
8 -- Jackson Doak <noskcaj@ubuntu.com> Fri, 05 Jun 2015 05:54:16 +1000
9
10easytag (2.2.6-1) unstable; urgency=medium
11
12 [ David King ]
13 * New upstream release.
14 * debian/rules:
15 - Enable parallel build.
16
17 [ James Cowgill ]
18 * Change libapetag license to GPL-2+.
19 * Use cgit Vcs-Browser URL.
20
21 -- James Cowgill <james410@cowgill.org.uk> Tue, 19 May 2015 17:33:07 +0100
22
1easytag (2.2.4-1ubuntu2) vivid; urgency=medium23easytag (2.2.4-1ubuntu2) vivid; urgency=medium
224
3 * Change appdata-tools b-dep to appstream-util25 * Change appdata-tools b-dep to appstream-util
@@ -788,7 +810,3 @@
788810
789 -- Adrian Bunk <bunk@fs.tum.de> Sun, 8 Oct 2000 20:40:42 +0200811 -- Adrian Bunk <bunk@fs.tum.de> Sun, 8 Oct 2000 20:40:42 +0200
790812
791Local variables:
792mode: debian-changelog
793End:
794
795813
=== modified file 'debian/control'
--- debian/control 2015-02-14 08:09:52 +0000
+++ debian/control 2015-06-04 21:51:20 +0000
@@ -33,7 +33,7 @@
33Standards-Version: 3.9.633Standards-Version: 3.9.6
34Homepage: https://wiki.gnome.org/Apps/EasyTAG34Homepage: https://wiki.gnome.org/Apps/EasyTAG
35Vcs-Git: git://anonscm.debian.org/pkg-multimedia/easytag.git35Vcs-Git: git://anonscm.debian.org/pkg-multimedia/easytag.git
36Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/easytag.git36Vcs-Browser: http://anonscm.debian.org/cgit/pkg-multimedia/easytag.git
3737
38Package: easytag38Package: easytag
39Architecture: any39Architecture: any
4040
=== modified file 'debian/copyright'
--- debian/copyright 2014-10-12 17:58:42 +0000
+++ debian/copyright 2015-06-04 21:51:20 +0000
@@ -9,10 +9,6 @@
9License: GPL-2+9License: GPL-2+
10Comment: the full list of contributers are available in the AUTHORS and THANKS files10Comment: the full list of contributers are available in the AUTHORS and THANKS files
1111
12Files: src/libapetag/*
13Copyright: 2002 Artur Polaczynski
14License: LGPL-2.1+
15
16Files: debian/*12Files: debian/*
17Copyright: 2000-2014 various Debian contributers13Copyright: 2000-2014 various Debian contributers
18License: GPL-2+14License: GPL-2+
@@ -38,21 +34,3 @@
38 On Debian systems, the full text of the GNU General Public34 On Debian systems, the full text of the GNU General Public
39 License version 2 can be found in the file35 License version 2 can be found in the file
40 `/usr/share/common-licenses/GPL-2'.36 `/usr/share/common-licenses/GPL-2'.
41
42License: LGPL-2.1+
43 This library is free software; you can redistribute it and/or
44 modify it under the terms of the GNU Lesser General Public
45 License as published by the Free Software Foundation; either
46 version 2.1 of the License, or (at your option) any later version.
47 .
48 This library is distributed in the hope that it will be useful,
49 but WITHOUT ANY WARRANTY; without even the implied warranty of
50 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
51 Lesser General Public License for more details.
52 .
53 You should have received a copy of the GNU Lesser General Public
54 License along with this library; if not, write to the Free Software
55 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
56 .
57 On Debian systems, the full text of the GNU Lesser General Public License
58 version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
5937
=== modified file 'debian/rules'
--- debian/rules 2014-06-01 22:02:49 +0000
+++ debian/rules 2015-06-04 21:51:20 +0000
@@ -4,7 +4,7 @@
4export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed4export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
55
6%:6%:
7 dh $@ --with=autoreconf7 dh $@ --parallel --with=autoreconf
88
9override_dh_auto_configure:9override_dh_auto_configure:
10 dh_auto_configure -- --disable-silent-rules10 dh_auto_configure -- --disable-silent-rules
1111
=== modified file 'help/Makefile.am'
--- help/Makefile.am 2014-10-12 17:58:42 +0000
+++ help/Makefile.am 2015-06-04 21:51:20 +0000
@@ -25,4 +25,4 @@
25HELP_MEDIA = \25HELP_MEDIA = \
26 media/icon.png26 media/icon.png
2727
28HELP_LINGUAS = el es28HELP_LINGUAS = cs de el es
2929
=== modified file 'help/Makefile.in'
--- help/Makefile.in 2014-10-12 17:58:42 +0000
+++ help/Makefile.in 2015-06-04 21:51:20 +0000
@@ -1,7 +1,7 @@
1# Makefile.in generated by automake 1.14.1 from Makefile.am.1# Makefile.in generated by automake 1.15 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
55
6# This Makefile.in is free software; the Free Software Foundation6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,7# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
1414
15@SET_MAKE@15@SET_MAKE@
16VPATH = @srcdir@16VPATH = @srcdir@
17am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'17am__is_gnu_make = { \
18 if test -z '$(MAKELEVEL)'; then \
19 false; \
20 elif test -n '$(MAKE_HOST)'; then \
21 true; \
22 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
23 true; \
24 else \
25 false; \
26 fi; \
27}
18am__make_running_with_option = \28am__make_running_with_option = \
19 case $${target_option-} in \29 case $${target_option-} in \
20 ?) ;; \30 ?) ;; \
@@ -78,13 +88,13 @@
78build_triplet = @build@88build_triplet = @build@
79host_triplet = @host@89host_triplet = @host@
80subdir = help90subdir = help
81DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
82ACLOCAL_M4 = $(top_srcdir)/aclocal.m491ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
83am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \92am__aclocal_m4_deps = $(top_srcdir)/m4/gtkdoc_jh_check_xml_catalog.m4 \
84 $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \93 $(top_srcdir)/m4/gtkdoc_jh_path_xml_catalog.m4 \
85 $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac94 $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
86am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \95am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
87 $(ACLOCAL_M4)96 $(ACLOCAL_M4)
97DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
88mkinstalldirs = $(install_sh) -d98mkinstalldirs = $(install_sh) -d
89CONFIG_HEADER = $(top_builddir)/config.h99CONFIG_HEADER = $(top_builddir)/config.h
90CONFIG_CLEAN_FILES =100CONFIG_CLEAN_FILES =
@@ -109,12 +119,13 @@
109 *) (install-info --version) >/dev/null 2>&1;; \119 *) (install-info --version) >/dev/null 2>&1;; \
110 esac120 esac
111am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)121am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
122am__DIST_COMMON = $(srcdir)/Makefile.in
112DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)123DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
113ACLOCAL = @ACLOCAL@124ACLOCAL = @ACLOCAL@
114ALL_LINGUAS = @ALL_LINGUAS@125ALL_LINGUAS = @ALL_LINGUAS@
115AMTAR = @AMTAR@126AMTAR = @AMTAR@
116AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@127AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
117APPDATA_VALIDATE = @APPDATA_VALIDATE@128APPSTREAM_UTIL = @APPSTREAM_UTIL@
118AUTOCONF = @AUTOCONF@129AUTOCONF = @AUTOCONF@
119AUTOHEADER = @AUTOHEADER@130AUTOHEADER = @AUTOHEADER@
120AUTOMAKE = @AUTOMAKE@131AUTOMAKE = @AUTOMAKE@
@@ -280,7 +291,7 @@
280HELP_MEDIA = \291HELP_MEDIA = \
281 media/icon.png292 media/icon.png
282293
283HELP_LINGUAS = el es294HELP_LINGUAS = cs de el es
284all: all-am295all: all-am
285296
286.SUFFIXES:297.SUFFIXES:
@@ -296,7 +307,6 @@
296 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \307 echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \
297 $(am__cd) $(top_srcdir) && \308 $(am__cd) $(top_srcdir) && \
298 $(AUTOMAKE) --gnu help/Makefile309 $(AUTOMAKE) --gnu help/Makefile
299.PRECIOUS: Makefile
300Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status310Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
301 @case '$?' in \311 @case '$?' in \
302 *config.status*) \312 *config.status*) \
@@ -464,6 +474,8 @@
464 maintainer-clean-generic mostlyclean mostlyclean-generic pdf \474 maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
465 pdf-am ps ps-am tags-am uninstall uninstall-am475 pdf-am ps ps-am tags-am uninstall uninstall-am
466476
477.PRECIOUS: Makefile
478
467@YELP_HELP_RULES@479@YELP_HELP_RULES@
468480
469# Tell versions [3.59,3.63) of GNU make to not export all variables.481# Tell versions [3.59,3.63) of GNU make to not export all variables.
470482
=== added directory 'help/cs'
=== added file 'help/cs/cddb-search.page'
--- help/cs/cddb-search.page 1970-01-01 00:00:00 +0000
+++ help/cs/cddb-search.page 2015-06-04 21:51:20 +0000
@@ -0,0 +1,50 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="guide" id="cddb-search" xml:lang="cs">
3
4 <info>
5 <link type="guide" style="2column" xref="index#main"/>
6 <revision pkgversion="2.1.9" date="2013-10-07" status="review"/>
7
8 <credit type="author">
9 <name>Ekaterina Gerasimova</name>
10 <email its:translate="no">kittykat3756@gmail.com</email>
11 </credit>
12
13 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
14
15 <desc>Jak štítky vyplnit informacemi z databáze CD</desc>
16 </info>
17
18 <title>Vyhledávání v CDDB</title>
19
20 <p>Pokud je vaše hudba uspořádána do alba, <app>EasyTAG</app> může vyhledat informace v on-line databázi pomocí protokolu <sys>CDDB</sys> a automaticky vyplnit některá pole štítku.</p>
21
22 <steps>
23 <item>
24 <p><link xref="file-select">Vyberte všechna pole</link> v albu, která chcete vyhledat. Pořadí souborů musí odpovídat pořadí skladeb na albu.</p>
25 </item>
26 <item>
27 <p>Vyberte <guiseq><gui style="menu">Různé</gui> <gui style="menuitem">Hledat v CDDB…</gui></guiseq></p>
28 </item>
29 <item>
30 <p>Zmáčkněte <gui style="button">Najít</gui> a vyčkejte na výsledky hledání.</p>
31 </item>
32 <item>
33 <!-- TODO Split Manual search into a tip? -->
34 <!-- TODO Search within the results. -->
35 <p>V seznamu výsledků vyberte album a napravo se ukáží informace o skladbách. Pokud se nejedná o album, které jste chtěli, zkuste v seznamu výsledků vybrat jiné.</p>
36 <p>Pokud nezískáte žádné výsledky, které by odpovídali vámi vybraným skladbám, zvolte <gui style="tab">Ruční hledání</gui> a zadejte do vyhledávacího pole název alba. Zmáčkněte <gui style="button">Najít</gui> a vyčkejte, než se hledání dokončí. Pak znovu zkontrolujte, jestli mezi výsledky uvidíte album, které odpovídá vámi vybraným skladbám.</p>
37 </item>
38 <item>
39 <p>Zvolte pole štítku, která se mají vyplnit, buď volbou <gui style="checkbox">Vše</gui> nebo kombinací <gui style="checkbox">Název souboru</gui>, <gui style="checkbox">Název</gui>, <gui style="checkbox">Umělec</gui>, <gui style="checkbox">Album</gui>, <gui style="checkbox">Rok</gui>, <gui style="checkbox">Číslo skladby</gui>, <gui style="checkbox">Počet skladeb</gui> a <gui style="checkbox">Žánr</gui>.</p>
40 </item>
41 <!-- TODO Run the scanner for each file -->
42 <!-- TODO Levenshtein matching -->
43 <item>
44 <p>Pro vyplnění štítků u vybraných souborů podle údajů ve výsledcích hledání zmáčkněte <gui style="button">Použít</gui>.</p>
45 </item>
46 </steps>
47
48 <p>Jestli chcete vyplnit štítky jen u některých souborů, můžete změnit svůj výběr i po dokončení hledání.</p>
49
50</page>
051
=== added file 'help/cs/cs.po'
--- help/cs/cs.po 1970-01-01 00:00:00 +0000
+++ help/cs/cs.po 2015-06-04 21:51:20 +0000
@@ -0,0 +1,1314 @@
1# Czech translation for easytag.
2# Copyright (C) 2014 easytag's COPYRIGHT HOLDER
3# This file is distributed under the same license as the easytag package.
4# Marek Černocký <marek@manet.cz>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: easytag easytag-2.2\n"
9"POT-Creation-Date: 2015-01-04 18:28+0000\n"
10"PO-Revision-Date: 2014-08-26 08:37+0200\n"
11"Last-Translator: Marek Černocký <marek@manet.cz>\n"
12"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
13"Language: cs\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18"X-Generator: Gtranslator 2.91.6\n"
19
20#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
21msgctxt "_"
22msgid "translator-credits"
23msgstr "Marek Černocký <marek@manet.cz>"
24
25#. (itstool) path: credit/name
26#: C/cddb-search.page:11 C/file-rename.page:10 C/file-select.page:11
27#: C/format-specifier.page:11 C/image-delete.page:13 C/image-export.page:13
28#: C/image.page:15 C/index.page:11 C/introduction.page:12
29#: C/keyboard-shortcuts.page:11 C/playlist-generate.page:11
30#: C/problems-ogg-split.page:17 C/scanner.page:11 C/starting.page:10
31#: C/tag-field.page:14 C/tag.page:13
32msgid "Ekaterina Gerasimova"
33msgstr "Ekaterina Gerasimova"
34
35#. (itstool) path: info/desc
36#: C/cddb-search.page:17
37msgid "Fill tags using information from a CD database"
38msgstr "Jak štítky vyplnit informacemi z databáze CD"
39
40#. (itstool) path: page/title
41#: C/cddb-search.page:20
42msgid "Search CDDB"
43msgstr "Vyhledávání v CDDB"
44
45#. (itstool) path: page/p
46#: C/cddb-search.page:22
47msgid ""
48"If your music is organized by album, <app>EasyTAG</app> can search online "
49"databases using the <sys>CDDB</sys> protocol and automatically fill in "
50"several tag fields."
51msgstr ""
52"Pokud je vaše hudba uspořádána do alba, <app>EasyTAG</app> může vyhledat "
53"informace v on-line databázi pomocí protokolu <sys>CDDB</sys> a automaticky "
54"vyplnit některá pole štítku."
55
56#. (itstool) path: item/p
57#: C/cddb-search.page:28
58msgid ""
59"<link xref=\"file-select\">Select all the files</link> in the album that you "
60"want to search for. The ordering of the files must match the track order on "
61"the album."
62msgstr ""
63"<link xref=\"file-select\">Vyberte všechna pole</link> v albu, která chcete "
64"vyhledat. Pořadí souborů musí odpovídat pořadí skladeb na albu."
65
66#. (itstool) path: item/p
67#: C/cddb-search.page:33
68msgid ""
69"Select <guiseq><gui style=\"menu\">Miscellaneous</gui> <gui style=\"menuitem"
70"\">CDDB Search…</gui></guiseq>."
71msgstr ""
72"Vyberte <guiseq><gui style=\"menu\">Různé</gui> <gui style=\"menuitem"
73"\">Hledat v CDDB…</gui></guiseq>"
74
75#. (itstool) path: item/p
76#: C/cddb-search.page:37
77msgid ""
78"Press <gui style=\"button\">Find</gui> and wait for the search to finish."
79msgstr ""
80"Zmáčkněte <gui style=\"button\">Najít</gui> a vyčkejte na výsledky hledání."
81
82#. (itstool) path: item/p
83#: C/cddb-search.page:43
84msgid ""
85"Select an album from the list of results, and the track information will be "
86"shown to the right. If the album is not the one that you wanted, try "
87"selecting another result in the list."
88msgstr ""
89"V seznamu výsledků vyberte album a napravo se ukáží informace o skladbách. "
90"Pokud se nejedná o album, které jste chtěli, zkuste v seznamu výsledků "
91"vybrat jiné."
92
93#. (itstool) path: item/p
94#: C/cddb-search.page:46
95msgid ""
96"If there are no results which match the tracks that you selected, select "
97"<gui style=\"tab\">Manual Search</gui> and enter the name of the album in "
98"the search field. Press <gui style=\"button\">Find</gui> and wait for the "
99"search to finish, and check the results again to see if you can find an "
100"album which matches the tracks that you selected."
101msgstr ""
102"Pokud nezískáte žádné výsledky, které by odpovídali vámi vybraným skladbám, "
103"zvolte <gui style=\"tab\">Ruční hledání</gui> a zadejte do vyhledávacího "
104"pole název alba. Zmáčkněte <gui style=\"button\">Najít</gui> a vyčkejte, než "
105"se hledání dokončí. Pak znovu zkontrolujte, jestli mezi výsledky uvidíte "
106"album, které odpovídá vámi vybraným skladbám."
107
108#. (itstool) path: item/p
109#: C/cddb-search.page:53
110msgid ""
111"Choose the tag fields to fill in by selecting either <gui style=\"checkbox"
112"\">All</gui> or a combination of <gui style=\"checkbox\">Filename</gui>, "
113"<gui style=\"checkbox\">Title</gui>, <gui style=\"checkbox\">Artist</gui>, "
114"<gui style=\"checkbox\">Album</gui>, <gui style=\"checkbox\">Year</gui>, "
115"<gui style=\"checkbox\">Track #</gui>, <gui style=\"checkbox\"># Tracks</"
116"gui> and <gui style=\"checkbox\">Genre</gui>."
117msgstr ""
118"Zvolte pole štítku, která se mají vyplnit, buď volbou <gui style=\"checkbox"
119"\">Vše</gui> nebo kombinací <gui style=\"checkbox\">Název souboru</gui>, "
120"<gui style=\"checkbox\">Název</gui>, <gui style=\"checkbox\">Umělec</gui>, "
121"<gui style=\"checkbox\">Album</gui>, <gui style=\"checkbox\">Rok</gui>, <gui "
122"style=\"checkbox\">Číslo skladby</gui>, <gui style=\"checkbox\">Počet "
123"skladeb</gui> a <gui style=\"checkbox\">Žánr</gui>."
124
125#. (itstool) path: item/p
126#: C/cddb-search.page:64
127msgid ""
128"To fill in the tags of the selected files using the details in the search "
129"result, press <gui style=\"button\">Apply</gui>."
130msgstr ""
131"Pro vyplnění štítků u vybraných souborů podle údajů ve výsledcích hledání "
132"zmáčkněte <gui style=\"button\">Použít</gui>."
133
134#. (itstool) path: page/p
135#: C/cddb-search.page:69
136msgid ""
137"If you wish to tag only specific files, you can change your selection after "
138"the search is complete."
139msgstr ""
140"Jestli chcete vyplnit štítky jen u některých souborů, můžete změnit svůj "
141"výběr i po dokončení hledání."
142
143#. (itstool) path: info/desc
144#: C/file-rename.page:16
145msgid "Change the file names using tags"
146msgstr "Jak změnit název souboru pomocí štítku"
147
148#. (itstool) path: page/title
149#: C/file-rename.page:19
150msgid "Rename files"
151msgstr "Přejmenování souborů"
152
153#. (itstool) path: page/p
154#: C/file-rename.page:21
155msgid ""
156"You can rename your music files using the tags from within <app>EasyTAG</"
157"app>:"
158msgstr ""
159"Přímo v aplikaci <app>EasyTAG</app> můžete své hudební soubory přejmenovat "
160"pomocí štítků:"
161
162#. (itstool) path: item/p
163#: C/file-rename.page:26
164msgid ""
165"<link xref=\"file-select\">Select the files</link> that you wish to rename "
166"in the file view."
167msgstr ""
168"<link xref=\"file-select\">Vyberte soubory</link>, které si přejete v "
169"zobrazení souborů přejmenovat."
170
171#. (itstool) path: item/p
172#: C/file-rename.page:30
173msgid ""
174"Select <guiseq><gui style=\"menu\">View</gui> <gui style=\"menuitem\">Show "
175"Scanner</gui></guiseq>."
176msgstr ""
177"Vyberte <guiseq><gui style=\"menu\">Zobrazit</gui> <gui style=\"menuitem"
178"\">Zobrazit průzkumníka</gui></guiseq>."
179
180#. (itstool) path: item/p
181#: C/file-rename.page:34
182msgid "Select the <gui>Rename File and Directory</gui> scanner."
183msgstr "Vyberte průzkumníka <gui>Přejmenovat soubory a složky</gui>."
184
185#. (itstool) path: item/p
186#: C/file-rename.page:37
187msgid ""
188"Using the <gui xref=\"format-specifier\">Legend</gui>, type in the structure "
189"that you would like to use for the file naming. For example, if you wish "
190"your files to be named <file>[artist] - [title].[extension]</file>, "
191"enter <input>%a - %t</input> into the renaming field."
192msgstr ""
193"Podle <gui xref=\"format-specifier\">legendy</gui> zapište strukturu názvu "
194"souboru, aby odpovídala tomu, jak chcete soubor pojmenovat. Když například "
195"chcete název ve tvaru <file>[umělec] - [název].[přípona]</file>, zadejte do "
196"pole pro přejmenování <input>%a - %t</input>"
197
198#. (itstool) path: item/p
199#: C/file-rename.page:44
200msgid ""
201"To apply the changes to the selected files, click <gui style=\"button\">Scan "
202"Files</gui>."
203msgstr ""
204"Pro použití změn u vybraných souborů klikněte na <gui style=\"button"
205"\">Prozkoumat soubory</gui>."
206
207#. (itstool) path: item/p
208#: C/file-rename.page:48
209msgid "Close the <gui style=\"dialog\">Tag and Filename Scan</gui> dialog."
210msgstr ""
211"Zavřete dialogové okno <gui style=\"dialog\">Průzkum štítků a názvů souborů</"
212"gui>."
213
214#. (itstool) path: item/p
215#: C/file-rename.page:51
216msgid ""
217"To save the applied changes, select <guiseq><gui style=\"menu\">File</gui> "
218"<gui style=\"menuitem\">Save Files</gui></guiseq>."
219msgstr ""
220"Aby se použité změny uložily, vyberte <guiseq><gui style=\"menu\">Soubor</"
221"gui> <gui style=\"menuitem\">Uložit soubory</gui></guiseq>."
222
223#. (itstool) path: note/p
224#: C/file-rename.page:58
225msgid "If you close the application without saving, your changes will be lost."
226msgstr "Pokud aplikaci zavřete bez uložení, budou vaše změny ztraceny."
227
228#. (itstool) path: info/desc
229#: C/file-select.page:17
230msgid "Choose files in the file list"
231msgstr "Jak vybrat soubory v seznamu souborů"
232
233#. (itstool) path: page/title
234#: C/file-select.page:20
235msgid "Select files"
236msgstr "Výběr souborů"
237
238#. (itstool) path: page/p
239#: C/file-select.page:22
240msgid ""
241"<app>EasyTAG</app> has several features which operate on the files that are "
242"currently selected in the file list. To select multiple files, you can "
243"either hold down <key>Ctrl</key> while you click on the files that you wish "
244"to select or you can select a file then hold down <key>Shift</key> and click "
245"another file to select all the files between the two, including the first "
246"and last file."
247msgstr ""
248"<app>EasyTAG</app> má několik funkcí pracujících se soubory, které jsou "
249"právě označené v seznamu souborů. K výběru více souborů můžete buď držet "
250"zmáčknutou klávesu <key>Ctrl</key> během klikání na soubory, které si "
251"přejete vybrat, nebo můžete držet zmáčknutou klávesu <key>Shift</key> a "
252"kliknout na další soubor, aby se označily všechny soubory mezi dvěma "
253"soubory, včetně toho prvního a posledního."
254
255#. (itstool) path: info/desc
256#: C/format-specifier.page:17
257msgid "What is a format-specifier and which ones can I use?"
258msgstr "Co jsou to formátovací značky, a které můžete použít"
259
260#. (itstool) path: page/title
261#: C/format-specifier.page:21
262msgid "Format specifiers"
263msgstr "Formátovací značky"
264
265#. (itstool) path: page/p
266#: C/format-specifier.page:23
267msgid ""
268"<em>Format specifiers</em> can be used to split a file name into tags and to "
269"name a file or playlist based on existing tags using <link xref=\"scanner"
270"\">the scanner</link>."
271msgstr ""
272"<em>Formátovací značky</em> můžete použí k rozdělení názvu souboru na štítky "
273"a k pojmenování souboru nebo seznamu k přehrání podle štítků pomocí <link "
274"xref=\"scanner\">průzkumníka</link>."
275
276#. (itstool) path: td/p
277#: C/format-specifier.page:31
278msgid "Format specifier"
279msgstr "Formátovací značka"
280
281#. (itstool) path: td/p
282#: C/format-specifier.page:34
283msgid "Corresponding tag field"
284msgstr "Příslušné pole štítku"
285
286#. (itstool) path: td/p
287#: C/format-specifier.page:41
288msgid "%a"
289msgstr "%a"
290
291#. (itstool) path: td/p
292#: C/format-specifier.page:44
293msgid ""
294"Artist: this is the artist or artists who created the track, this field may "
295"contact a featured artist as well as the album artist"
296msgstr ""
297"umělec: jedná se o umělce, či více umělců, kteří vytvořili skladbu; pole "
298"může odkazovat na umělce skladby i na umělce alba"
299
300#. (itstool) path: td/p
301#: C/format-specifier.page:50
302msgid "%z"
303msgstr "%z"
304
305#. (itstool) path: td/p
306#: C/format-specifier.page:53
307msgid "Album artist"
308msgstr "umělec alba"
309
310#. (itstool) path: td/p
311#: C/format-specifier.page:58
312msgid "%b"
313msgstr "%b"
314
315#. (itstool) path: td/p
316#: C/format-specifier.page:61
317msgid "Album title"
318msgstr "název alba"
319
320#. (itstool) path: td/p
321#: C/format-specifier.page:66
322msgid "%c"
323msgstr "%c"
324
325#. (itstool) path: td/p
326#: C/format-specifier.page:69
327msgid "Comment: this is the free-form comment field"
328msgstr "komentáře: jedná se o volnou formu"
329
330#. (itstool) path: td/p
331#: C/format-specifier.page:74
332msgid "%p"
333msgstr "%p"
334
335#. (itstool) path: td/p
336#: C/format-specifier.page:77
337msgid "Composer: this is the creator of the track"
338msgstr "skladatel: jedná se tvůrce skladby"
339
340#. (itstool) path: td/p
341#: C/format-specifier.page:82
342msgid "%r"
343msgstr "%r"
344
345#. (itstool) path: td/p
346#: C/format-specifier.page:85
347msgid ""
348"Copyright holder: this is usually the artist, but it can also be the record "
349"label"
350msgstr ""
351"držitel autorských práv: obvykle se jedná o umělce, ale může jít i o "
352"vydavatele"
353
354#. (itstool) path: td/p
355#: C/format-specifier.page:91
356msgid "%d"
357msgstr "%d"
358
359#. (itstool) path: td/p
360#: C/format-specifier.page:94
361msgid "Disc number"
362msgstr "číslo disku"
363
364#. (itstool) path: td/p
365#: C/format-specifier.page:99
366msgid "%e"
367msgstr "%e"
368
369#. (itstool) path: td/p
370#: C/format-specifier.page:102
371msgid ""
372"Encoded by: this is usually the person who encoded the file, but the field "
373"is also used for the application that was used to encode the file"
374msgstr ""
375"zakódoval: obvykle se jedná o osobu, který soubor kódovala, ale pole bývá "
376"používáno i pro název aplikace, ve které bylo kódování souboru provedeno"
377
378#. (itstool) path: td/p
379#: C/format-specifier.page:109
380msgid "%g"
381msgstr "%g"
382
383#. (itstool) path: td/p
384#: C/format-specifier.page:112
385msgid "Genre"
386msgstr "žánr"
387
388#. (itstool) path: td/p
389#: C/format-specifier.page:117
390msgid "%i"
391msgstr "%i"
392
393#. (itstool) path: td/p
394#: C/format-specifier.page:120
395msgid ""
396"Ignored: this format specifier can only be used in <gui>Fill Tag</gui> to "
397"specify parts of the file name which should be ignored"
398msgstr ""
399"ignorováno: tuto formátovací značku je možné použít jen ve funkci "
400"<gui>Vyplnit štítek</gui> k určení části názvu souboru, která má být "
401"ignorována"
402
403#. (itstool) path: td/p
404#: C/format-specifier.page:127
405msgid "%l"
406msgstr "%l"
407
408#. (itstool) path: td/p
409#: C/format-specifier.page:130
410msgid "Number of tracks: the total number of tracks on the medium"
411msgstr "počet skladeb: celkový počet skladeb na médiu"
412
413#. (itstool) path: td/p
414#: C/format-specifier.page:135
415msgid "%o"
416msgstr "%o"
417
418#. (itstool) path: td/p
419#: C/format-specifier.page:138
420msgid "Original artist"
421msgstr "původní umělec"
422
423#. (itstool) path: td/p
424#: C/format-specifier.page:143
425msgid "%n"
426msgstr "%n"
427
428#. (itstool) path: td/p
429#: C/format-specifier.page:146
430msgid "Track number"
431msgstr "číslo skladby"
432
433#. (itstool) path: td/p
434#: C/format-specifier.page:151
435msgid "%t"
436msgstr "%t"
437
438#. (itstool) path: td/p
439#: C/format-specifier.page:154
440msgid "Track title"
441msgstr "název skladby"
442
443#. (itstool) path: td/p
444#: C/format-specifier.page:159
445msgid "%u"
446msgstr "%u"
447
448#. (itstool) path: td/p
449#: C/format-specifier.page:162
450msgid "URL"
451msgstr "adresa URL"
452
453#. (itstool) path: td/p
454#: C/format-specifier.page:167
455msgid "%x"
456msgstr "%x"
457
458#. (itstool) path: td/p
459#: C/format-specifier.page:170
460msgid "Number of discs"
461msgstr "počet disků"
462
463#. (itstool) path: td/p
464#: C/format-specifier.page:175
465msgid "%y"
466msgstr "%y"
467
468#. (itstool) path: td/p
469#: C/format-specifier.page:178
470msgid "Year of recording, sometimes the date of release is used instead"
471msgstr "rok nahrání, někdy je místo toho použit rok vydání"
472
473#. (itstool) path: page/title
474#: C/image-delete.page:19
475msgid "Delete an image"
476msgstr "Odstranění obrázku"
477
478#. (itstool) path: page/p
479#: C/image-delete.page:21
480msgid ""
481"To delete an image from a tag, select it and press the <gui style=\"button"
482"\">Remove selected images from the tag</gui> button."
483msgstr ""
484"Když chcete ze štítku odstranit obrázek, vyberte jej a zmáčkněte tlačítko "
485"<gui style=\"button\">Odstranit vybrané obrázky ze štítku</gui>."
486
487#. (itstool) path: page/p
488#: C/image-delete.page:24
489msgid ""
490"To delete more than one image, select those images before deleting them."
491msgstr ""
492"Abyste odstranili více obrázků naráz, nejprve je všechny vyberte a pak "
493"odstraňte."
494
495#. (itstool) path: page/p
496#: C/image-delete.page:27
497msgid ""
498"It is also possible to delete all images from more than one file. To do "
499"this, select the files from which you want to delete the images, delete all "
500"images from the <gui style=\"tab\">Image</gui> tab, then press the <gui "
501"style=\"button\">Tag selected files with these images</gui> button."
502msgstr ""
503"Je také možné odstranit všechny obrázky z více souborů naráz. Udělá se to "
504"tak, že se vyberou soubory, ze kterých chcete obrázky odstranit, odstraní se "
505"obrázky z karty <gui style=\"tab\">Obrázek</gui> a po té se zmáčkne tlačítko "
506"<gui style=\"button\">Nastavit vybraným souborům tyto obrázky</gui>."
507
508#. (itstool) path: page/title
509#: C/image-export.page:19
510msgid "Save an image"
511msgstr "Ukládání obrázku"
512
513#. (itstool) path: page/p
514#: C/image-export.page:21
515msgid ""
516"If the file is already tagged with an image, you can export the image from "
517"the tag by selecting it and pressing <gui style=\"button\">Save the selected "
518"images to files</gui> button. The default filename will be the image "
519"description."
520msgstr ""
521"Když máte soubor, který ve štítku obsahuje obrázek, můžete si tento obrázek "
522"vyexportovat. Stačí jej vybrat a zmáčknout tlačítko <gui style=\"button"
523"\">Uložit vybrané obrázky do souborů</gui>. Jako výchozí název souboru se "
524"použije popis obrázku."
525
526#. (itstool) path: page/p
527#: C/image-export.page:26
528msgid ""
529"To export a number of images, select these images, then press the <gui style="
530"\"button\">Save the selected images to files</gui> button."
531msgstr ""
532"Abyste vyexportovali více obrázků, nejprve je vyberte a pak zmáčkněte "
533"tlačítko <gui style=\"button\">Uložit vybrané obrázky do souborů</gui>."
534
535#. (itstool) path: info/desc
536#: C/image.page:19
537msgid "Add images, such as cover art to the tag"
538msgstr "Jak přidat obrázek, např. přebal, do štítku"
539
540#. (itstool) path: page/title
541#: C/image.page:23
542msgid "Add an image to a file"
543msgstr "Přidání obrázku do souboru"
544
545#. (itstool) path: page/p
546#: C/image.page:25
547msgid ""
548"Most audio file formats support an <sys>image</sys> tag field which can be "
549"used to add cover art and other related images to the audio file."
550msgstr ""
551"Většina formátů zvukových souborů podporuje pole štítku <sys>obrázek</sys>, "
552"které lze použít pro přidání grafiky přebalu a jiných obrázků, vztahujících "
553"se k danému zvukovému souboru."
554
555#. (itstool) path: page/p
556#: C/image.page:28
557msgid ""
558"To add an image to the file, select the file, open the <gui style=\"tab"
559"\">Images</gui> tab and press the <gui style=\"button\">Add images to the "
560"tag</gui> button. Select the image and confirm your selection."
561msgstr ""
562"Abyste do souboru přidali obrázek, vyberte soubor, otevřete kartu <gui style="
563"\"tab\">Obrázky</gui> a zmáčkněte tlačítko <gui style=\"button\">Přidat "
564"obrázky do štítku</gui>. Vyberte obrázek a svůj výběr potvrďte."
565
566#. (itstool) path: page/p
567#: C/image.page:33
568msgid ""
569"Once the image is uploaded, it will be automatically marked as a front cover "
570"and the description will be the filename. To change the <gui>type</gui> and "
571"<gui>description</gui>, press the <gui style=\"button\">Edit image "
572"properties</gui> button. Once you have made the changes, press <gui style="
573"\"button\">OK</gui> to apply the changes."
574msgstr ""
575"Jakmile je obrázek načten, je automaticky označen jako přední přebal a "
576"popsán stejně, jako je pojmenován soubor. Jestli chcete <gui>typ</gui> a "
577"<gui>popis</gui> změnit, zmáčkněte tlačítko <gui style=\"button\">Upravit "
578"vlastnosti obrázku</gui>. Po provedení změn zmáčkněte <gui style=\"button"
579"\">Budiž</gui> a změny se použijí."
580
581#. (itstool) path: note/p
582#: C/image.page:40
583msgid "Your changes will not be saved automatically."
584msgstr "Vaše změny se neukládají automaticky."
585
586#. (itstool) path: page/p
587#: C/image.page:43
588msgid ""
589"You can tag multiple files with the same image by selecting them in the list "
590"of files, then selecting the image and pressing the <gui style=\"button"
591"\">Tag selected files with these images</gui> button. You will need to save "
592"these changes to write them to the files."
593msgstr ""
594"Stejný obrázek můžete přiřadit do štítku více souborům. Stačí soubory vybrat "
595"v seznamu souborů, pak vybrat obrázek a zmáčknout tlačítko <gui style="
596"\"button\">Nastavit vybraným souborům tyto obrázky</gui>. Aby se změny do "
597"souboru zapsaly, musíte je uložit."
598
599#. (itstool) path: page/p
600#: C/image.page:48
601msgid ""
602"You can work with more than one image at a time by selecting those images "
603"before you edit, apply, save to file or delete them."
604msgstr ""
605"Můžete pracovat i s více obrázky naráz, ale musíte je před jejich úpravou, "
606"použitím, uložením do souboru nebo smazáním vybrat."
607
608#. (itstool) path: info/title
609#: C/index.page:17
610msgctxt "link"
611msgid "EasyTAG"
612msgstr "EasyTAG"
613
614#. (itstool) path: info/title
615#: C/index.page:18
616msgctxt "text"
617msgid "EasyTAG"
618msgstr "EasyTAG"
619
620#. (itstool) path: page/title
621#: C/index.page:22
622msgid "<_:media-1/> EasyTAG"
623msgstr "<_:media-1/> EasyTAG"
624
625#. (itstool) path: section/title
626#: C/index.page:28
627msgid "Features"
628msgstr "Funkce"
629
630#. (itstool) path: section/title
631#: C/index.page:32
632msgid "Tags"
633msgstr "Štítky"
634
635#. (itstool) path: section/title
636#: C/index.page:36
637msgid "The image tag field"
638msgstr "Pole štítku s obrázkem"
639
640#. (itstool) path: section/title
641#: C/index.page:44
642msgid "Common problems and questions"
643msgstr "Běžné problémy a dotazy"
644
645#. (itstool) path: page/title
646#: C/introduction.page:21
647msgid "Introduction"
648msgstr "Úvod"
649
650#. (itstool) path: page/p
651#: C/introduction.page:23
652msgid ""
653"<app>EasyTAG</app> is a comprehensive tag editor for FLAC, Monkey's Audio, "
654"MP2, MP3, MP4/AAC, MusePack, Ogg Opus, Ogg Speex, Ogg Vorbis and WavPack "
655"audio files."
656msgstr ""
657"<app>EasyTAG</app> je komplexní editor štítků u zvukových souborů FLAC, "
658"Monkey's Audio, MP2, MP3, MP4/AAC, MusePack, Ogg Opus, Ogg Speex, Ogg Vorbis "
659"a WavPack."
660
661#. (itstool) path: page/title
662#: C/keyboard-shortcuts.page:20
663msgid "Keyboard shortcuts"
664msgstr "Klávesové zkratky"
665
666#. (itstool) path: page/p
667#: C/keyboard-shortcuts.page:22
668msgid ""
669"<app>EasyTAG</app> has a number of keyboard shortcuts, most of which are "
670"listed in the menus. Here are some which are especially useful:"
671msgstr ""
672"<app>EasyTAG</app> má řadu klávesových zkratek, z nichž je většina uvedena v "
673"nabídkách. Zde je vybráno pár opravdu užitečných:"
674
675#. (itstool) path: td/p
676#: C/keyboard-shortcuts.page:29
677msgid "Action"
678msgstr "Činnost"
679
680#. (itstool) path: td/p
681#: C/keyboard-shortcuts.page:32
682msgid "Shortcut"
683msgstr "Klávesová zkratka"
684
685#. (itstool) path: td/p
686#: C/keyboard-shortcuts.page:39
687msgid "Apply tag to selected files"
688msgstr "Použít štítky na vybrané soubory"
689
690#. (itstool) path: td/p
691#: C/keyboard-shortcuts.page:42
692msgid "<keyseq><key>Ctrl</key><key>Return</key></keyseq>"
693msgstr "<keyseq><key>Ctrl</key><key>Enter</key></keyseq>"
694
695#. (itstool) path: td/p
696#: C/keyboard-shortcuts.page:47
697msgid "Search all files, including filenames and tags"
698msgstr "Prohledat všechny soubory, hledá se v názvech souborů i ve štítcích"
699
700#. (itstool) path: td/p
701#: C/keyboard-shortcuts.page:50
702msgid "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
703msgstr "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
704
705#. (itstool) path: td/p
706#: C/keyboard-shortcuts.page:55
707msgid "Go to previous file while keeping focus on the same tag field"
708msgstr ""
709"Přejít na předchozí soubor a přitom nechat zaměřené stejné pole ve štítku"
710
711#. (itstool) path: td/p
712#: C/keyboard-shortcuts.page:58
713msgid "<key>Page Up</key>"
714msgstr "<key>Page Up</key>"
715
716#. (itstool) path: td/p
717#: C/keyboard-shortcuts.page:63
718msgid "Go to next file while keeping focus on the same tag field"
719msgstr ""
720"Přejít na následující soubor a přitom nechat zaměřené stejné pole ve štítku"
721
722#. (itstool) path: td/p
723#: C/keyboard-shortcuts.page:66
724msgid "<key>Page Down</key>"
725msgstr "<key>Page Down</key>"
726
727#. (itstool) path: p/link
728#: C/legal.xml:4
729msgid "Creative Commons Attribution-ShareAlike 3.0 Unported License"
730msgstr "Creative Commons Attribution-ShareAlike 3.0 Unported License"
731
732#. (itstool) path: license/p
733#: C/legal.xml:3
734msgid "This work is licensed under a <_:link-1/>."
735msgstr "Tato práce je licencována pod <_:link-1/>."
736
737#. (itstool) path: info/desc
738#: C/playlist-generate.page:17
739msgid "Generate a playlist from the file list"
740msgstr "Jak ze seznamu souborů vygenerovat seznam k přehrání, tzv. playlist"
741
742#. (itstool) path: page/title
743#: C/playlist-generate.page:20
744msgid "Create a playlist"
745msgstr "Vytvoření seznamu k přehrání"
746
747#. (itstool) path: page/p
748#: C/playlist-generate.page:22
749msgid ""
750"You can create a M3U playlist for use with a music player based on the list "
751"of files shown in <app>EasyTAG</app>:"
752msgstr ""
753"V aplikaci <app>EasyTAG</app> si můžete ze seznamu souborů vytvořit seznam k "
754"přehrání (tzv. playlist) M3U, který pak lze použít v hudebních přehrávačích."
755
756#. (itstool) path: item/p
757#: C/playlist-generate.page:27
758msgid ""
759"<link xref=\"file-select\">Select the files</link> that you wish to be in "
760"the playlist in the file list."
761msgstr ""
762"V seznamu souborů <link xref=\"file-select\">vyberte soubory</link>, které "
763"si přejete mít v seznamu k přehrání."
764
765#. (itstool) path: item/p
766#: C/playlist-generate.page:31
767msgid ""
768"Select <guiseq><gui style=\"menu\">Miscellaneous</gui> <gui style=\"menuitem"
769"\">Generate Playlist…</gui></guiseq>."
770msgstr ""
771"Zvolte <guiseq><gui style=\"memu\">Různé</gui> <gui style=\"menuitem"
772"\">Vygenerovat seznam k přehrání…</gui></guiseq>."
773
774#. (itstool) path: item/p
775#: C/playlist-generate.page:35
776msgid ""
777"Select <gui style=\"radiobutton\">Use mask</gui> and enter a mask, using "
778"<link xref=\"format-specifier\">format specifiers</link>, or select <gui "
779"style=\"radiobutton\">Use directory name</gui> to name the playlist after "
780"the directory which is selected in the <gui style=\"group\">Browser</gui>."
781msgstr ""
782"Vyberte <gui style=\"radiobutton\">Použít masku</gui> a zadejte masku pomocí "
783"<link xref=\"format-specifier\">formátovacích značek</link> nebo vyberte "
784"<gui style=\"radiobutton\">Použít název složky</gui> k pojmenování seznamu k "
785"přehrání podle složky, která je vybrána v <gui style=\"group\">prohlížeči</"
786"gui>."
787
788#. (itstool) path: item/p
789#: C/playlist-generate.page:42
790msgid ""
791"Select <gui style=\"checkbox\">Include only the selected files</gui> to use "
792"the files which are selected in the file list when generating the playlist. "
793"Deselect it to include all the displayed files in the playlist."
794msgstr ""
795"Zaškrtněte <gui style=\"checkbox\">Zahrnout pouze vybrané soubory</gui>, aby "
796"se při generování seznamu k přehrání použily jen soubory, které jsou vybrané "
797"v seznamu souborů. Když zaškrtnutí zrušíte, budou součástí seznamu k "
798"přehrání všechny zobrazené soubory."
799
800#. (itstool) path: item/p
801#: C/playlist-generate.page:48
802msgid ""
803"Select <gui style=\"radiobutton\">Use relative path for files in playlist</"
804"gui> unless you only plan to use the playlist on the same computer and you "
805"do not plan to move the audio files, in which case you can select <gui style="
806"\"radiobutton\">Use full path for files in playlist</gui>."
807msgstr ""
808"Vyberte <gui style=\"radiobutton\">Použít relativní cestu k souborům</gui>. "
809"Pouze pokud plánujete používat seznam k přehrání pořád na stejném počítači a "
810"nechystáte se zvukové soubory někam přesouvat, můžete vybrat <gui style="
811"\"radiobutton\">Použít plnou cestu k souborům</gui>."
812
813#. (itstool) path: item/p
814#: C/playlist-generate.page:55
815msgid ""
816"Select <gui style=\"checkbox\">Create playlist in the parent directory</gui> "
817"if you want to save the playlist in the parent of the directory selected in "
818"the <gui style=\"group\">Browser</gui>. Otherwise, the playlist will be "
819"saved in the directory selected in the <gui style=\"group\">Browser</gui>."
820msgstr ""
821"Zaškrtněte <gui style=\"checkbox\">Vytvořit v nadřazené složce</gui>, pokud "
822"chcete uložit seznam k přehrání v rodičovské složce složky, která je vybraná "
823"v <gui style=\"group\">Prohlížeči</gui>. Když volba zaškrtnutá není, "
824"ukládají se seznamy k přehrání přímo ve složce vybrané v <gui style=\"group"
825"\">Prohlížeči</gui>."
826
827#. (itstool) path: item/p
828#: C/playlist-generate.page:63
829msgid ""
830"If you are creating a playlist for use on a Windows computer, or on a "
831"<sys>NTFS</sys> or <sys>FAT</sys> file system, select <gui style=\"checkbox"
832"\">Use DOS directory separator</gui>."
833msgstr ""
834"V případě, že vytváříte seznam k přehrání pro použití na počítači s Windows "
835"nebo na souborových systémech <sys>NTFS</sys> nebo <sys>FAT</sys>, "
836"zaškrtněte <gui style=\"checkbox\">Použít oddělovač složek jako v systému "
837"DOS</gui>."
838
839#. (itstool) path: item/p
840#: C/playlist-generate.page:68
841msgid ""
842"Select <gui style=\"radiobutton\">Write only list of files</gui> to create a "
843"playlist which only contains a list of files. Select <gui style=\"radiobutton"
844"\">Write info using filename</gui> to also write extended information, "
845"including the duration of the audio file, to the playlist. Select <gui style="
846"\"radiobutton\">Write info using</gui> and enter a mask, using format "
847"specifiers, to write custom extended information to the playlist."
848msgstr ""
849"Vyberte <gui style=\"radiobutton\">Zapsat jen seznam souborů</gui>, aby se "
850"vytvořit seznam k přehrání, který bude obsahovat jen seznam souborů. Pokud "
851"vyberte <gui style=\"radiobutton\">Zapsat informace za použití názvu "
852"souboru</gui>, zapíší se i rozšiřující informace, včetně délky zvukového "
853"souboru. Pomocí <gui style=\"radiobutton\">Zapsat informace za použití</gui> "
854"a zadání masky z formátovacích značek můžete do seznamu k přehrání nechat "
855"zapsat vlastní rozšiřující informace."
856
857#. (itstool) path: item/p
858#: C/playlist-generate.page:77
859msgid "To generate the playlist, select <gui style=\"button\">Save</gui>."
860msgstr ""
861"Výsledný seznam k přehrání vygenerujete zmáčknutím <gui style=\"button"
862"\">Uložit</gui>."
863
864#. (itstool) path: credit/name
865#: C/problems-id3.page:13 C/problems-ogg-split.page:13
866msgid "David King"
867msgstr "David King"
868
869#. (itstool) path: info/desc
870#: C/problems-id3.page:17
871msgid "Fix ID3 tags that show up blank or incorrect tags in other applications"
872msgstr ""
873"Jak opravit štítky MP3, když se v jiných aplikacích zobrazují prázdné nebo "
874"nesprávně"
875
876#. (itstool) path: page/title
877#: C/problems-id3.page:21
878msgid "MP3 tags not showing correctly"
879msgstr "Štítky MP3 se nezobrazují správně"
880
881#. (itstool) path: page/p
882#: C/problems-id3.page:23
883msgid ""
884"<em>ID3</em> tags, which are used for MP3 files, can be of one of several "
885"different versions. <app>EasyTAG</app> supports ID3v2.4, ID3v2.3 and "
886"ID3v1.1. The default version in <app>EasyTAG</app> is ID3v2.4, which has the "
887"most features and is most efficient."
888msgstr ""
889"Štítky <em>ID3</em>, které se používají u souborů MP3, mohou být v několika "
890"různých verzích. <app>EasyTAG</app> podporuje ID3v2.4, ID3v2.3 a ID3v1.1. "
891"Výchozí verzí je v <app>EasyTAG</app> ID3v2.4, který má nejvíce možností a "
892"je nejefektivnější."
893
894#. (itstool) path: page/p
895#: C/problems-id3.page:28
896msgid ""
897"Most applications support the most recent version of the ID3 standard: "
898"ID3v2.4."
899msgstr "Většina aplikací podporuje nejnovější verzi standardu ID3: ID3v2.4."
900
901#. (itstool) path: page/p
902#: C/problems-id3.page:31
903msgid ""
904"Some applications and devices may support only ID3v2.3 and ID3v1.1 tags, and "
905"a few may support only ID3v1.1 tags. If another application or a device has "
906"a problem reading tags from your files, you should try changing the ID3 tag "
907"version settings in the preferences:"
908msgstr ""
909"Některé aplikace a zařízení mohou podporovat jen štítky ID3v2.3 a ID3v1.1 a "
910"pár jich dokonce může podporovat jen štítky ID3v1.1. Pokud jiné aplikace "
911"nebo zařízení mají problémy se čtením štítků z vašich souborů, měli byste "
912"zkusit změnit verzi štítků ID3 v předvolbách:"
913
914#. (itstool) path: item/p
915#: C/problems-id3.page:38 C/problems-ogg-split.page:45
916msgid ""
917"Select <guiseq style=\"menuitem\"><gui style=\"menu\">Edit</gui><gui style="
918"\"menuitem\">Preferences</gui></guiseq>"
919msgstr ""
920"Vyberte <guiseq style=\"menuitem\"><gui style=\"menu\">Upravit</gui><gui "
921"style=\"menuitem\">Předvolby</gui></guiseq>."
922
923#. (itstool) path: item/p
924#: C/problems-id3.page:42
925msgid "Select the <gui style=\"tab\">ID3 Tag Settings</gui> tab"
926msgstr "Vyberte kartu <gui style=\"tab\">Nastavení štítků ID3</gui>."
927
928#. (itstool) path: item/p
929#: C/problems-id3.page:45
930msgid ""
931"In the <gui style=\"group\">ID3v2 tags</gui> section, choose the "
932"<gui>ID3v2.3</gui> setting in the <gui>Version</gui> drop-down lid to "
933"improve compatibility with other systems capable of reading ID3v2 tags"
934msgstr ""
935"V části <gui style=\"group\">Štítky ID3v2</gui> zvolte v rozbalovacím "
936"seznamu <gui>Verze</gui> nastavení <gui>ID3v2.3</gui>, abyste zlepšili "
937"kompatibilitu s ostatními systémy ohledně čtení štítků ID3v2."
938
939#. (itstool) path: item/p
940#: C/problems-id3.page:50
941msgid ""
942"Make sure that <gui style=\"check\">Write ID3v1.x tag</gui> is checked in "
943"the <gui style=\"group\">ID3v1 tags</gui> section"
944msgstr ""
945"Ujistěte se, že v části <gui style=\"group\">Štítky ID3v1</gui> je "
946"zaškrtnuto <gui style=\"check\">Zapisovat štítky ID3v1.x</gui>."
947
948#. (itstool) path: item/p
949#: C/problems-id3.page:54 C/problems-ogg-split.page:56
950msgid "Click <gui style=\"button\">OK</gui> to save the settings"
951msgstr "Kliknutím na <gui style=\"button\">Budiž</gui> nastavení uložte."
952
953#. (itstool) path: info/desc
954#: C/problems-ogg-split.page:21
955msgid ""
956"Split a single tag field into multiple fields when you save Ogg and FLAC "
957"files"
958msgstr ""
959"Jak jedno pole štítku rozdělit do více polí při ukládání souborů Ogg a FLAC"
960
961#. (itstool) path: page/title
962#: C/problems-ogg-split.page:25
963msgid "Split tag fields when saving"
964msgstr "Rozdělení polí štítku při ukládání"
965
966#. (itstool) path: page/p
967#: C/problems-ogg-split.page:27
968msgid ""
969"In Ogg and FLAC files, it is possible to have more than one <link xref=\"tag"
970"\">tag field</link> of each type. For example, if two artists performed a "
971"song, there can be two artist fields in the tag, one for each artist. "
972"<app>EasyTAG</app> automatically reads the extra fields, combining them "
973"together and showing them as if they were a single field."
974msgstr ""
975"V souborech Ogg a FLAC je možné mít více než jedno <link xref=\"tag\">pole "
976"štítku</link> stejného typu. Například, když píseň zpívají dva umělci, "
977"můžete mít ve štítku dvě pole s umělci, pro každého jedno. <app>EasyTAG</"
978"app> automaticky načítá dodatečná pole, spojuje je dohromady a zobrazuje je, "
979"jako by šlo o jedno pole."
980
981#. (itstool) path: page/p
982#: C/problems-ogg-split.page:33
983msgid ""
984"Many applications do not read the multi-value field correctly, so the "
985"default configuration is to save using a single field per entry. If the "
986"application that you are using supports multiple field of one type, you can "
987"configure EasyTAG to split fields when you save the file. Fields will "
988"automatically be split whenever \" - \" occurs in the field. For example, in "
989"the field \"David Bowie - Queen\", two fields would be saved: \"David Bowie"
990"\" and \"Queen\"."
991msgstr ""
992"Spousta aplikaci nečte pole s více hodnotami správně, takže výchozí "
993"nastavení je ukládat jen jedno pole na záznam. Pokud aplikace, kterou "
994"používáte podporuje více polí stejného typu, můžete nastavit <app>EasyTAG</"
995"app>, aby pole při ukládání souboru rozděloval. Pole se automaticky rozdělí "
996"na každém výskytu „ - “. Například pole s „David Bowie - Queen“ by se "
997"uložilo do dvou polí: „David Bowie“ a „Queen“."
998
999#. (itstool) path: page/p
1000#: C/problems-ogg-split.page:41
1001msgid "To split fields when you save the files:"
1002msgstr "Aby se pole při ukládání rozdělovala:"
1003
1004#. (itstool) path: item/p
1005#: C/problems-ogg-split.page:49
1006msgid "Select the <gui style=\"tab\">Tag Settings</gui> tab"
1007msgstr "Vyberte kartu <gui style=\"tab\">Nastavení štítků</gui>."
1008
1009#. (itstool) path: item/p
1010#: C/problems-ogg-split.page:52
1011msgid ""
1012"In <gui style=\"group\">Tag Splitting</gui> section, check the fields that "
1013"you want to be split into multiple fields when saving"
1014msgstr ""
1015"V části <gui style=\"group\">Rozdělování štítků</gui> zaškrtněte pole, která "
1016"chcete při ukládání rozdělovat na více polí."
1017
1018#. (itstool) path: info/desc
1019#: C/scanner.page:17
1020msgid "Update tags automatically."
1021msgstr "Jak aktualizovat štítky automaticky"
1022
1023#. (itstool) path: page/title
1024#: C/scanner.page:21
1025msgid "The <gui>Scanner</gui>"
1026msgstr "Průzkumník"
1027
1028#. (itstool) path: page/p
1029#: C/scanner.page:23
1030msgid ""
1031"The scanner can be used to fill in fields based on the filename, rename a "
1032"file and create a new directory based on the filled fields, and process the "
1033"text in fields and the filename."
1034msgstr ""
1035"Průzkumníka můžete využít k vyplnění polí podle názvu souboru, k "
1036"přejmenování souboru a k vytvoření nové složky na základě vyplněných polí a "
1037"ke zpracování textu v polích a názvu souboru."
1038
1039#. (itstool) path: section/title
1040#: C/scanner.page:28
1041msgid "Fill fields from a filename and directory structure"
1042msgstr "Vyplňování polí z názvu souboru a struktury složek"
1043
1044#. (itstool) path: section/p
1045#: C/scanner.page:30
1046msgid ""
1047"<gui>Fill Tag</gui> can be used to fill in tag fields based on the filename "
1048"and its parent directories."
1049msgstr ""
1050"<gui>Vyplnit štítek</gui> můžete použít k vyplnění polí štítku na základě "
1051"názvu souboru a jeho rodičovských složek."
1052
1053#. (itstool) path: section/p
1054#: C/scanner.page:33
1055msgid ""
1056"Use <em xref=\"format-specifier\">format specifiers</em> and <em>separators</"
1057"em> to split the filename and parent directories into different tag fields. "
1058"The <em>format specifiers</em>, such as <input>%t</input> for track title, "
1059"which are used to indicate the different tag fields, are listed in the "
1060"<gui>Legend</gui>. <em>Separators</em> can be any part of the filename or "
1061"the parent directories. Use <key>/</key> to add the <em>separator</em> for a "
1062"parent directory."
1063msgstr ""
1064"Použijte <em xref=\"format-specifier\">formátovací značky </em> a "
1065"<em>oddělovače</em> k rozdělení názvu souboru a rodičovských složek do "
1066"různých polí štítku. <em>Formátovací značky</em>, jako je <input>%t</input> "
1067"pro název skladby, které se používají k určení různých polí šítku, jsou "
1068"uvedeny v <gui>legendě</gui>. <em>Oddělovače</em> mohou být libovolné části "
1069"názvu souboru nebo rodičovských složek. Jako <em>oddělovač</em> rodičovské "
1070"složky použijte <key>/</key>."
1071
1072#. (itstool) path: section/p
1073#: C/scanner.page:41
1074msgid ""
1075"For example, if you keep your audio files using the <file>artist/"
1076"album/01 track title.flac</file> directory structure and filenames, use the "
1077"<input>%a/%b/%n %t</input> <em>format string</em> to extract the track "
1078"number and title from the filename, the album title from the parent "
1079"directory and the artist from the grandparent directory."
1080msgstr ""
1081"Když například své zvukové soubory uchováváte ve struktuře složek a s názvy "
1082"souborů <file>umělec/album/01 název skladby.flac</file>, použijte "
1083"<em>formátovací řetězec</em> <input>%a/%b/%n %t</input> k získání čísla "
1084"skladby a názvu skladby z názvu souboru, názvu alba z názvu rodičovské "
1085"složky a umělce z názvu prarodičovské složky."
1086
1087#. (itstool) path: section/p
1088#: C/scanner.page:47
1089msgid ""
1090"Fill the tag fields for the selected files using the <gui style=\"button"
1091"\">Scan Files</gui> button."
1092msgstr ""
1093"K vyplnění polí štítku u vybraných souborů použijte tlačítko <gui style="
1094"\"button\">Prozkoumat soubory</gui>."
1095
1096#. (itstool) path: section/title
1097#: C/scanner.page:53
1098msgid "Rename files and create new directories"
1099msgstr "Přejmenování souborů a vytváření nových složek"
1100
1101#. (itstool) path: section/p
1102#: C/scanner.page:55
1103msgid ""
1104"<gui xref=\"file-rename\">Rename File and Directory</gui> can be used to "
1105"create a directory hierarchy and update filenames using the filled tag "
1106"fields. If a new directory hierarchy is specified, it will be created inside "
1107"the directory where the file is currently located."
1108msgstr ""
1109"<gui xref=\"file-rename\">Přejmenovat soubory a složky</gui> můžete použít k "
1110"vytvoření hierarchie složek a k aktualizaci názvů souborů podle vyplněných "
1111"polí štítku. V případě, že je zadána nová hierarchie složek, bude vytvořena "
1112"uvnitř složky, ve které se soubor zrovna nachází."
1113
1114#. (itstool) path: section/p
1115#: C/scanner.page:60
1116msgid ""
1117"For example, if you have a tagged file inside the <file>Music</file> "
1118"directory, you can use the <input>%a/%b/%n %t</input> <em>format string</"
1119"em>, it will create the <file>Music/artist/album/01 track title.flac</file> "
1120"file structure and filename. You will see a preview of the naming scheme "
1121"below your specified format string."
1122msgstr ""
1123"Pokud například máte soubor se štítkem ve složce <file>Hudba</file>, můžete "
1124"použít <em>formátovací řetězec</em> <input>%a/%b/%n %t</input>, aby se "
1125"vytvořila struktura složek a souborů ve formě <file>Hudba/umělec/album/01 "
1126"název skladby.flac</file>. Pod zadaným formátovacím řetězcem uvidíte náhled "
1127"schématu pojmenování."
1128
1129#. (itstool) path: section/p
1130#: C/scanner.page:66
1131msgid ""
1132"To prepare the files for moving and renaming, press the <gui style=\"button"
1133"\">Scan Files</gui> button."
1134msgstr ""
1135"Pro přípravu souborů k přesunu a přejmenování, zmáčkněte tlačítko <gui style="
1136"\"button\">Prozkoumat soubory</gui>."
1137
1138#. (itstool) path: section/title
1139#: C/scanner.page:72
1140msgid "Bulk process tag fields and filename"
1141msgstr "Hromadné zpracování polí štítků a názvů souborů"
1142
1143#. (itstool) path: section/p
1144#: C/scanner.page:74
1145msgid ""
1146"<gui>Process Fields</gui> is a sophisticated find and replace feature which "
1147"allows you to select which tag fields to process. It also allows for the "
1148"filename to be processed as well."
1149msgstr ""
1150"<gui>Zpracovat pole</gui> je sofistikovaná funkce hledání a nahrazování "
1151"umožňující vybrat, která pole štítku se mají zpracovat. Rovněž umožňuje "
1152"zpracovat název souboru."
1153
1154#. (itstool) path: section/p
1155#: C/scanner.page:78
1156msgid ""
1157"You can <gui>Convert</gui> characters for a simple find and replace, change "
1158"capitalization and add or remove spaces."
1159msgstr ""
1160"Můžete <gui>Převést</gui> znaky pomocí jednoduchého vyhledávání a "
1161"nahrazování, měnit velikost písmen a přidávat nebo odstraňovat mezery."
1162
1163#. (itstool) path: section/p
1164#: C/scanner.page:81
1165msgid ""
1166"Use the <gui>Select fields</gui> buttons to specify which fields to change. "
1167"You can also select or deselect all fields and invert your selection."
1168msgstr ""
1169"K určení polí, která se mají změnit, použijte tlačítka <gui>Vybrat pole</"
1170"gui>. Můžete i hromadně všechna pole označit nebo zrušit jejich označení, "
1171"případně označení prohodit."
1172
1173#. (itstool) path: info/desc
1174#: C/starting.page:16
1175msgid "Using <app>EasyTAG</app> for the first time"
1176msgstr "Jak používat <app>EasyTAG</app> napoprvé"
1177
1178#. (itstool) path: page/title
1179#: C/starting.page:19
1180msgid "Start using <app>EasyTAG</app>"
1181msgstr "Začínáme s <app>EasyTAG</app>"
1182
1183#. (itstool) path: page/p
1184#: C/starting.page:21
1185msgid ""
1186"When you start <app>EasyTAG</app> for the first time, it will search your "
1187"<file>Music</file> directory or your home directory for audio files. If you "
1188"wish to skip the search, press the <gui style=\"button\">Stop</gui> button."
1189msgstr ""
1190"Když spustíte <app>EasyTAG</app> poprvé, pokusí se vyhledat zvukové soubory "
1191"ve vaší složce <file>Hudba</file> nebo ve vaší domovské složce. Pokud chcete "
1192"hledání přeskočit, zmáčkněte tlačítko <gui style=\"button\">Zastavit</gui>."
1193
1194#. (itstool) path: page/p
1195#: C/starting.page:25
1196msgid ""
1197"<app>EasyTAG</app> may apply some automatic corrections to some of your "
1198"music files. These files will be highlighted in bold. These are normally "
1199"updates to the tag metadata containers and will not be applied until you "
1200"save the changes."
1201msgstr ""
1202"<app>EasyTAG</app> může použít některé automatické korekce u některých "
1203"vašich hudebních souborů. Tyto soubory budou zvýrazněny tučně. Budou mít "
1204"aktualizovaná metadata ve štítcích, ale ta se nepoužijí, dokud změny "
1205"neuložíte."
1206
1207#. (itstool) path: page/p
1208#: C/starting.page:30
1209msgid ""
1210"To save these changes, select all the files that have been affected and "
1211"press <keyseq><key>Ctrl</key><key>S</key></keyseq>. It is not possible to "
1212"undo the automatic changes but they will not be saved unless you select the "
1213"file and save it. You can disable some of the automatic updates in the <gui "
1214"style=\"tab\">ID3 Tag Settings</gui> tab in the <gui style=\"dialog"
1215"\">Preferences</gui> dialog."
1216msgstr ""
1217"Když chcete změny uložit, vyberte všechny dotčené soubory a zmáčkněte "
1218"<keyseq><key>Ctrl</key><key>S</key></keyseq>. Automaticky provedené změny "
1219"není možné vrátit zpět, ale neuloží se, dokud soubory nevyberete a neuložíte "
1220"ručně. Některé z těchto automatických aktualizací můžete zakázat na kartě "
1221"<gui style=\"tab\">Nastavení štítků ID3</gui> v dialogovém okně <gui style="
1222"\"dialog\">Předvolby</gui>."
1223
1224#. (itstool) path: info/desc
1225#: C/tag-field.page:18
1226msgid "Add text tags to a file"
1227msgstr "Jak přidat štítky do souboru"
1228
1229#. (itstool) path: page/title
1230#: C/tag-field.page:22
1231msgid "Tag a file"
1232msgstr "Přiřazení štítku souboru"
1233
1234#. (itstool) path: page/p
1235#: C/tag-field.page:24
1236msgid ""
1237"Audio files can support a number of different tag <em>fields</em> which "
1238"depend on the file format."
1239msgstr ""
1240"Zvukové soubory mohou podporovat řadu různých <em>polí</em> štítků, které "
1241"závisí na formátu souboru."
1242
1243#. (itstool) path: steps/title
1244#: C/tag-field.page:28
1245msgid "Update a tag field in a file"
1246msgstr "Aktualizace pole štítku v souboru"
1247
1248#. (itstool) path: item/p
1249#: C/tag-field.page:30
1250msgid "Select the file that you wish to tag."
1251msgstr "Vyberte soubor, ve kterém si přejete upravit štítek."
1252
1253#. (itstool) path: item/p
1254#: C/tag-field.page:33
1255msgid "Update the field that you want to change in the <gui>Tag</gui> panel."
1256msgstr ""
1257"V panelu <gui>Štítek</gui> aktualizujte informace v poli, které chcete "
1258"změnit."
1259
1260#. (itstool) path: item/p
1261#: C/tag-field.page:37
1262msgid ""
1263"Select <guiseq><gui style=\"menu\">File</gui><gui style=\"menuitem\">Save "
1264"files</gui></guiseq> to save your changes to the selected file."
1265msgstr ""
1266"Zvolte <guiseq><gui style=\"menu\">Soubor</gui> <gui style=\"menuitem"
1267"\">Uložit soubory</gui></guiseq>, aby se změny do vybraného souboru uložily."
1268
1269#. (itstool) path: item/p
1270#: C/tag-field.page:42
1271msgid ""
1272"When you are asked to <gui>Confirm Tag Writing</gui>, press <gui style="
1273"\"button\">Save</gui> to save the changes."
1274msgstr ""
1275"Až jste dotázání na <gui>Potvrzení zápisu štítku</gui>, zmáčkněte <gui style="
1276"\"button\">Uložit</gui>, aby se změny uložily."
1277
1278#. (itstool) path: page/p
1279#: C/tag-field.page:47
1280msgid ""
1281"You can tag multiple files with the same field by selecting them in the list "
1282"of files and pressing the <gui>Tag selected files with this […]</gui> icon "
1283"in the field that you want to tag. You will need to save these changes to "
1284"write them to the files."
1285msgstr ""
1286"Můžete označit více souborů se stejným polem tak, že soubory vyberete v "
1287"seznamu souborů a zmáčknete ikonu <gui>Nastavit vybraným souborům toto […]</"
1288"gui> nacházející se v poli, které chcete ve štítcích použít. Změny musíte "
1289"uložit, aby se zapsaly do souboru."
1290
1291#. (itstool) path: info/desc
1292#: C/tag.page:17
1293msgid "What is a tag and what are fields?"
1294msgstr "Co jsou to štítky a co pole?"
1295
1296#. (itstool) path: page/title
1297#: C/tag.page:21
1298msgid "Audio file tags"
1299msgstr "Štítky zvukových souborů"
1300
1301#. (itstool) path: page/p
1302#: C/tag.page:23
1303msgid ""
1304"An audio file can contain <em>metadata</em> — information about itself — "
1305"inside a <em>tag</em>. Each tag can contain one or more <em>fields</em>, "
1306"such as <gui>Title</gui> or <gui>Artist</gui>. You can edit some of these "
1307"fields using <app>EasyTAG</app>. The editable fields depend on the format of "
1308"the file that you want to tag."
1309msgstr ""
1310"Zvukové soubory mohou obsahovat <em>metadata</em> – informace o sobě samých "
1311"– ve <em>štítcích</em>. Každý štítek může obsahovat jedno nebo více "
1312"<em>polí</em>, jako <gui>Název</gui> nebo <gui>Umělec</gui>. Některá z "
1313"těchto polí můžete upravovat pomocí aplikace <app>EasyTAG</app>. Která pole "
1314"lze upravovat, záleží na formátu souboru se štítky."
01315
=== added file 'help/cs/cs.stamp'
=== added file 'help/cs/file-rename.page'
--- help/cs/file-rename.page 1970-01-01 00:00:00 +0000
+++ help/cs/file-rename.page 2015-06-04 21:51:20 +0000
@@ -0,0 +1,50 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" type="topic" style="guide" id="file-rename" xml:lang="cs">
3
4 <info>
5 <link type="guide" xref="index#main"/>
6 <revision pkgversion="2.1.9" date="2013-08-18" status="draft"/>
7
8 <credit type="author">
9 <name>Ekaterina Gerasimova</name>
10 <email>kittykat3756@gmail.com</email>
11 </credit>
12
13 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
14
15 <desc>Jak změnit název souboru pomocí štítku</desc>
16 </info>
17
18 <title>Přejmenování souborů</title>
19
20 <p>Přímo v aplikaci <app>EasyTAG</app> můžete své hudební soubory přejmenovat pomocí štítků:</p>
21
22 <steps>
23 <item>
24 <p><link xref="file-select">Vyberte soubory</link>, které si přejete v zobrazení souborů přejmenovat.</p>
25 </item>
26 <item>
27 <p>Vyberte <guiseq><gui style="menu">Zobrazit</gui> <gui style="menuitem">Zobrazit průzkumníka</gui></guiseq>.</p>
28 </item>
29 <item>
30 <p>Vyberte průzkumníka <gui>Přejmenovat soubory a složky</gui>.</p>
31 </item>
32 <item>
33 <p>Podle <gui xref="format-specifier">legendy</gui> zapište strukturu názvu souboru, aby odpovídala tomu, jak chcete soubor pojmenovat. Když například chcete název ve tvaru <file>[umělec] - [název].[přípona]</file>, zadejte do pole pro přejmenování <input>%a - %t</input></p>
34 </item>
35 <item>
36 <p>Pro použití změn u vybraných souborů klikněte na <gui style="button">Prozkoumat soubory</gui>.</p>
37 </item>
38 <item>
39 <p>Zavřete dialogové okno <gui style="dialog">Průzkum štítků a názvů souborů</gui>.</p>
40 </item>
41 <item>
42 <p>Aby se použité změny uložily, vyberte <guiseq><gui style="menu">Soubor</gui> <gui style="menuitem">Uložit soubory</gui></guiseq>.</p>
43 </item>
44 </steps>
45
46 <note style="tip">
47 <p>Pokud aplikaci zavřete bez uložení, budou vaše změny ztraceny.</p>
48 </note>
49
50</page>
051
=== added file 'help/cs/file-select.page'
--- help/cs/file-select.page 1970-01-01 00:00:00 +0000
+++ help/cs/file-select.page 2015-06-04 21:51:20 +0000
@@ -0,0 +1,22 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="guide" id="file-select" xml:lang="cs">
3
4 <info>
5 <link type="guide" style="2column" xref="index#main"/>
6 <revision pkgversion="2.1.9" date="2013-10-06" status="draft"/>
7
8 <credit type="author">
9 <name>Ekaterina Gerasimova</name>
10 <email its:translate="no">kittykat3756@gmail.com</email>
11 </credit>
12
13 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
14
15 <desc>Jak vybrat soubory v seznamu souborů</desc>
16 </info>
17
18 <title>Výběr souborů</title>
19
20 <p><app>EasyTAG</app> má několik funkcí pracujících se soubory, které jsou právě označené v seznamu souborů. K výběru více souborů můžete buď držet zmáčknutou klávesu <key>Ctrl</key> během klikání na soubory, které si přejete vybrat, nebo můžete držet zmáčknutou klávesu <key>Shift</key> a kliknout na další soubor, aby se označily všechny soubory mezi dvěma soubory, včetně toho prvního a posledního.</p>
21
22</page>
023
=== added file 'help/cs/format-specifier.page'
--- help/cs/format-specifier.page 1970-01-01 00:00:00 +0000
+++ help/cs/format-specifier.page 2015-06-04 21:51:20 +0000
@@ -0,0 +1,174 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="task" id="format-specifier" xml:lang="cs">
3
4 <info>
5 <link type="guide" xref="index#main"/>
6 <revision pkgversion="2.1.9" date="2013-08-18" status="candidate"/>
7
8 <credit type="author">
9 <name>Ekaterina Gerasimova</name>
10 <email its:translate="no">kittykat3756@googlemail.com</email>
11 </credit>
12
13 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
14
15 <desc>Co jsou to formátovací značky, a které můžete použít</desc>
16
17 </info>
18
19 <title>Formátovací značky</title>
20
21 <p><em>Formátovací značky</em> můžete použí k rozdělení názvu souboru na štítky a k pojmenování souboru nebo seznamu k přehrání podle štítků pomocí <link xref="scanner">průzkumníka</link>.</p>
22
23 <table rules="rows" frame="top bottom">
24 <thead>
25 <tr>
26 <td>
27 <p>Formátovací značka</p>
28 </td>
29 <td>
30 <p>Příslušné pole štítku</p>
31 </td>
32 </tr>
33 </thead>
34 <tbody>
35 <tr>
36 <td>
37 <p>%a</p>
38 </td>
39 <td>
40 <p>umělec: jedná se o umělce, či více umělců, kteří vytvořili skladbu; pole může odkazovat na umělce skladby i na umělce alba</p>
41 </td>
42 </tr>
43 <tr>
44 <td>
45 <p>%z</p>
46 </td>
47 <td>
48 <p>umělec alba</p>
49 </td>
50 </tr>
51 <tr>
52 <td>
53 <p>%b</p>
54 </td>