Merge lp:~noskcaj/ubuntu/vivid/gnome-music/3.14.3.1 into lp:ubuntu/vivid/gnome-music
- Vivid (15.04)
- 3.14.3.1
- Merge into vivid
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merge reported by: | Tim Lunn |
Merged at revision: | not available |
Proposed branch: | lp:~noskcaj/ubuntu/vivid/gnome-music/3.14.3.1 |
Merge into: | lp:ubuntu/vivid/gnome-music |
Diff against target: |
4388 lines (+2184/-618) 57 files modified
AUTHORS (+6/-0) INSTALL (+2/-2) Makefile.in (+4/-11) NEWS (+37/-0) aclocal.m4 (+41/-117) config.guess (+165/-27) config.h.in (+3/-0) config.sub (+15/-25) configure (+141/-181) configure.ac (+1/-1) data/AboutDialog.ui (+1/-1) data/ArtistAlbumWidget.ui (+1/-1) data/Makefile.in (+1/-1) data/TrackWidget.ui (+1/-0) data/app-menu.ui (+0/-6) debian/changelog (+6/-0) debian/control (+2/-1) debian/control.in (+2/-1) gnomemusic/Makefile.in (+1/-1) gnomemusic/albumArtCache.py (+1/-1) gnomemusic/player.py (+1/-1) gnomemusic/playlists.py (+28/-0) gnomemusic/query.py (+12/-6) gnomemusic/searchbar.py (+31/-2) gnomemusic/view.py (+27/-8) gnomemusic/widgets.py (+15/-8) gnomemusic/window.py (+23/-16) help/Makefile.am (+1/-1) help/Makefile.in (+2/-2) help/de/de.po (+452/-0) help/de/index.page (+35/-0) help/de/introduction.page (+28/-0) help/de/legal.xml (+6/-0) help/de/play-music.page (+43/-0) help/de/playlist-create-albums.page (+78/-0) help/de/playlist-create-artists.page (+54/-0) help/de/playlist-create-songs.page (+53/-0) help/de/playlist-delete.page (+43/-0) help/de/playlist-remove-songs.page (+46/-0) help/de/playlist-repeat.page (+38/-0) help/de/playlist-shuffle.page (+30/-0) help/de/search.page (+30/-0) libgd/Makefile.am (+1/-0) libgd/Makefile.in (+2/-1) libgd/libgd/gd-main-icon-view.c (+1/-0) libgd/libgd/gd-main-list-view.c (+0/-1) libgd/libgd/gd-main-view.c (+60/-28) libgd/libgd/gd-tagged-entry.c (+34/-23) libgd/libgd/gd-toggle-pixbuf-renderer.c (+7/-1) libgd/libgd/gd-two-lines-renderer.c (+27/-5) m4/libtool.m4 (+3/-9) missing (+2/-2) po/LINGUAS (+1/-0) po/fur.po (+354/-0) po/pt.po (+105/-52) po/ro.po (+52/-51) po/sl.po (+28/-24) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/vivid/gnome-music/3.14.3.1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+249739@code.launchpad.net |
Commit message
Description of the change
New upstream bugfix release
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'AUTHORS' |
2 | --- AUTHORS 2014-10-19 23:39:47 +0000 |
3 | +++ AUTHORS 2015-02-14 00:18:38 +0000 |
4 | @@ -61,6 +61,7 @@ |
5 | Daniel Mustieles <dnaiel.mustieles@gmail.com> |
6 | Daniel Șerbănescu <cyber19rider@gmail.com> |
7 | Daniel Șerbănescu <daniel [at] serbanescu [dot] dk> |
8 | +Daniel Șerbănescu <daniel@serbanescu.dk> |
9 | Dawid Loubser <dawid.loubser@ibi.co.za> |
10 | Dimitris Spingos <dmtrs32@gmail.com> |
11 | Dirgita <dirgitadevina@yahoo.co.id> |
12 | @@ -76,6 +77,7 @@ |
13 | Evgeny Bobkin <evgen.ibqn@gmail.com> |
14 | Fabiano Fidêncio <fabiano@fidencio.org> |
15 | Fabiano Fidêncio <fidencio@redhat.com> |
16 | +Fabio Tomat <f.t.public@gmail.com> |
17 | Felipe Borges <felipe10borges@gmail.com> |
18 | Florian Müllner <fmuellner@gnome.org> |
19 | Florian Will <florian.will@gmail.com> |
20 | @@ -130,11 +132,13 @@ |
21 | ngoswami <ngoswami@redhat.com> |
22 | Nilamdyuti Goswami <ngoswami@redhat.com> |
23 | Olav Vitters <olav@vitters.nl> |
24 | +Pacho Ramos <pachoramos1@gmail.com> |
25 | Patrik Novotný <patrik.novotny@gmx.com> |
26 | Pau Iranzo <paugnu@gmail.com> |
27 | Paul martin <codemobius@gmail.com> |
28 | Pawan Chitrakar <chautari@gmail.com> |
29 | Paweł Żołnowski <pawel@zolnowski.name> |
30 | +Pedro Albuquerque <palbuquerque73@gmail.com> |
31 | Piotr Drąg <piotrdrag@gmail.com> |
32 | Praveen Illa <mail2ipn@gmail.com> |
33 | Priit Laes <plaes@plaes.org> |
34 | @@ -145,6 +149,7 @@ |
35 | Rowan Lewis <me@rowanlewis.com> |
36 | royaniva <royaniva@outlook.com> |
37 | Rūdolfs Mazurs <rudolfsm@src.gnome.org> |
38 | +Sagar Ghuge <ghugesss@gmail.com> |
39 | Sai Suman Prayaga <suman.sai14@gmail.com> |
40 | Sai <suman.sai14@gmail.com> |
41 | Seán de Búrca <leftmostcat@gmail.com> |
42 | @@ -161,6 +166,7 @@ |
43 | Stefano Facchini <stefano.facchini@gmail.com> |
44 | Tiagosdot <almosthumane@portugalmail.pt> |
45 | Timo Jyrinki <timo@debian.org> |
46 | +Tina Hinojsa <agustina.hinojosa@gmail.com> |
47 | Tobias Endrigkeit <tobiasendrigkeit@outlook.com> |
48 | Tom Tryfonidis <tomtryf@gmail.com> |
49 | Tong Hui <tonghuix@gmmail.com> |
50 | |
51 | === modified file 'INSTALL' |
52 | --- INSTALL 2014-09-22 21:20:08 +0000 |
53 | +++ INSTALL 2015-02-14 00:18:38 +0000 |
54 | @@ -12,8 +12,8 @@ |
55 | Basic Installation |
56 | ================== |
57 | |
58 | - Briefly, the shell command `./configure && make && make install' |
59 | -should configure, build, and install this package. The following |
60 | + Briefly, the shell commands `./configure; make; make install' should |
61 | +configure, build, and install this package. The following |
62 | more-detailed instructions are generic; see the `README' file for |
63 | instructions specific to this package. Some packages provide this |
64 | `INSTALL' file but do not implement all of the features documented |
65 | |
66 | === modified file 'Makefile.in' |
67 | --- Makefile.in 2014-10-19 23:39:47 +0000 |
68 | +++ Makefile.in 2015-02-14 00:18:38 +0000 |
69 | @@ -1,4 +1,4 @@ |
70 | -# Makefile.in generated by automake 1.14.1 from Makefile.am. |
71 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
72 | # @configure_input@ |
73 | |
74 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
75 | @@ -472,8 +472,8 @@ |
76 | $(am__aclocal_m4_deps): |
77 | |
78 | config.h: stamp-h1 |
79 | - @test -f $@ || rm -f stamp-h1 |
80 | - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 |
81 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
82 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
83 | |
84 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
85 | @rm -f stamp-h1 |
86 | @@ -719,16 +719,10 @@ |
87 | $(am__post_remove_distdir) |
88 | |
89 | dist-tarZ: distdir |
90 | - @echo WARNING: "Support for shar distribution archives is" \ |
91 | - "deprecated." >&2 |
92 | - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
93 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
94 | $(am__post_remove_distdir) |
95 | |
96 | dist-shar: distdir |
97 | - @echo WARNING: "Support for distribution archives compressed with" \ |
98 | - "legacy program 'compress' is deprecated." >&2 |
99 | - @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
100 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
101 | $(am__post_remove_distdir) |
102 | |
103 | @@ -770,10 +764,9 @@ |
104 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
105 | && am__cwd=`pwd` \ |
106 | && $(am__cd) $(distdir)/_build \ |
107 | - && ../configure \ |
108 | + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
109 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
110 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
111 | - --srcdir=.. --prefix="$$dc_install_base" \ |
112 | && $(MAKE) $(AM_MAKEFLAGS) \ |
113 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
114 | && $(MAKE) $(AM_MAKEFLAGS) check \ |
115 | |
116 | === modified file 'NEWS' |
117 | --- NEWS 2014-10-19 23:39:47 +0000 |
118 | +++ NEWS 2015-02-14 00:18:38 +0000 |
119 | @@ -1,3 +1,40 @@ |
120 | +Overview of changes in 3.14.3.1 |
121 | +============================= |
122 | + |
123 | +* Fixed an important bug on startup |
124 | +* Tags in search entries are now visible |
125 | + |
126 | +* Bugs fixed: |
127 | + 743484 gnome-music-3.14.3 doesn't detect music directory properly |
128 | + |
129 | +* Updated translations and help files |
130 | + |
131 | +Overview of changes in 3.14.3 |
132 | +============================= |
133 | + |
134 | +* Bugs fixed: |
135 | + 740330 Album view - music icons are badly rendered |
136 | + 740524 Missing license headers in playlists.py and searchbar.py |
137 | + 731639 The pictures have different proportions, influencing the effect of alignment |
138 | + 729459 under Artists, tracks in the same album are very far apart from each other |
139 | + 740490 Music "forgets" search string, but search results remain |
140 | + 731613 gnome-music-3.12.2 fails to start if xdg default directories are not created |
141 | + 726459 Crash on playlist tabs when new media has been scanned |
142 | + 733686 Gnome music will not launch |
143 | + 742123 Hitting 'cancel' while creating new playlist crashes program |
144 | + 743042 Gstreamer error messages should be more detailed |
145 | + 729376 New Playlist in application menu doesn't do anything |
146 | + |
147 | +* Updated translations and help files |
148 | + |
149 | +Overview of changes in 3.14.2 |
150 | +============================= |
151 | + |
152 | +* Bugs fixed: |
153 | + 734513 play/pause is activated twice when pressing spacebar and play/pause button is active/selected |
154 | + |
155 | +* Updated translations and help files |
156 | + |
157 | Overview of changes in 3.14.1 |
158 | ============================= |
159 | |
160 | |
161 | === modified file 'aclocal.m4' |
162 | --- aclocal.m4 2014-10-19 23:39:47 +0000 |
163 | +++ aclocal.m4 2015-02-14 00:18:38 +0000 |
164 | @@ -1,4 +1,4 @@ |
165 | -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- |
166 | +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- |
167 | |
168 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. |
169 | |
170 | @@ -21,7 +21,7 @@ |
171 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
172 | |
173 | # nls.m4 serial 5 (gettext-0.18) |
174 | -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, |
175 | +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, |
176 | dnl Inc. |
177 | dnl This file is free software; the Free Software Foundation |
178 | dnl gives unlimited permission to copy and/or distribute it, |
179 | @@ -253,21 +253,6 @@ |
180 | m4_popdef([pkg_description]) |
181 | ]) dnl PKG_NOARCH_INSTALLDIR |
182 | |
183 | - |
184 | -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, |
185 | -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
186 | -# ------------------------------------------- |
187 | -# Retrieves the value of the pkg-config variable for the given module. |
188 | -AC_DEFUN([PKG_CHECK_VAR], |
189 | -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
190 | -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl |
191 | - |
192 | -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) |
193 | -AS_VAR_COPY([$1], [pkg_cv_][$1]) |
194 | - |
195 | -AS_VAR_IF([$1], [""], [$5], [$4])dnl |
196 | -])# PKG_CHECK_VAR |
197 | - |
198 | dnl GLIB_GSETTINGS |
199 | dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether |
200 | dnl the schema should be compiled |
201 | @@ -570,7 +555,7 @@ |
202 | EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) |
203 | |
204 | distdir: distdir-help-files |
205 | -distdir-help-files: |
206 | +distdir-help-files: $(_HELP_LC_FILES) |
207 | @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \ |
208 | $(MKDIR_P) "$(distdir)/$$lc"; \ |
209 | for file in $(HELP_FILES); do \ |
210 | @@ -599,7 +584,7 @@ |
211 | |
212 | .PHONY: install-help |
213 | install-data-am: $(if $(HELP_ID),install-help) |
214 | -install-help: |
215 | +install-help: $(_HELP_LC_FILES) |
216 | @for lc in C $(_HELP_LINGUAS); do \ |
217 | $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ |
218 | done |
219 | @@ -675,10 +660,10 @@ |
220 | # generated from the m4 files accompanying Automake X.Y. |
221 | # (This private macro should not be called outside this file.) |
222 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
223 | -[am__api_version='1.14' |
224 | +[am__api_version='1.13' |
225 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
226 | dnl require some minimum version. Point them to the right macro. |
227 | -m4_if([$1], [1.14.1], [], |
228 | +m4_if([$1], [1.13.4], [], |
229 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
230 | ]) |
231 | |
232 | @@ -694,7 +679,7 @@ |
233 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
234 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
235 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
236 | -[AM_AUTOMAKE_VERSION([1.14.1])dnl |
237 | +[AM_AUTOMAKE_VERSION([1.13.4])dnl |
238 | m4_ifndef([AC_AUTOCONF_VERSION], |
239 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
240 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
241 | @@ -1061,12 +1046,6 @@ |
242 | # This macro actually does too much. Some checks are only needed if |
243 | # your package does certain things. But this isn't really a big deal. |
244 | |
245 | -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. |
246 | -m4_define([AC_PROG_CC], |
247 | -m4_defn([AC_PROG_CC]) |
248 | -[_AM_PROG_CC_C_O |
249 | -]) |
250 | - |
251 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
252 | # AM_INIT_AUTOMAKE([OPTIONS]) |
253 | # ----------------------------------------------- |
254 | @@ -1175,48 +1154,7 @@ |
255 | AC_CONFIG_COMMANDS_PRE(dnl |
256 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
257 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
258 | - |
259 | -# POSIX will say in a future version that running "rm -f" with no argument |
260 | -# is OK; and we want to be able to make that assumption in our Makefile |
261 | -# recipes. So use an aggressive probe to check that the usage we want is |
262 | -# actually supported "in the wild" to an acceptable degree. |
263 | -# See automake bug#10828. |
264 | -# To make any issue more visible, cause the running configure to be aborted |
265 | -# by default if the 'rm' program in use doesn't match our expectations; the |
266 | -# user can still override this though. |
267 | -if rm -f && rm -fr && rm -rf; then : OK; else |
268 | - cat >&2 <<'END' |
269 | -Oops! |
270 | - |
271 | -Your 'rm' program seems unable to run without file operands specified |
272 | -on the command line, even when the '-f' option is present. This is contrary |
273 | -to the behaviour of most rm programs out there, and not conforming with |
274 | -the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
275 | - |
276 | -Please tell bug-automake@gnu.org about your system, including the value |
277 | -of your $PATH and any error possibly output before this message. This |
278 | -can help us improve future automake versions. |
279 | - |
280 | -END |
281 | - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
282 | - echo 'Configuration will proceed anyway, since you have set the' >&2 |
283 | - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
284 | - echo >&2 |
285 | - else |
286 | - cat >&2 <<'END' |
287 | -Aborting the configuration process, to ensure you take notice of the issue. |
288 | - |
289 | -You can download and install GNU coreutils to get an 'rm' implementation |
290 | -that behaves properly: <http://www.gnu.org/software/coreutils/>. |
291 | - |
292 | -If you want to complete the configuration process using your problematic |
293 | -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
294 | -to "yes", and re-run configure. |
295 | - |
296 | -END |
297 | - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
298 | - fi |
299 | -fi]) |
300 | +]) |
301 | |
302 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
303 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
304 | @@ -1224,6 +1162,7 @@ |
305 | m4_define([_AC_COMPILER_EXEEXT], |
306 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
307 | |
308 | + |
309 | # When config.status generates a header, we must update the stamp-h file. |
310 | # This file resides in the same directory as the config header |
311 | # that is generated. The stamp files are numbered to have different names. |
312 | @@ -1371,6 +1310,38 @@ |
313 | rm -f confinc confmf |
314 | ]) |
315 | |
316 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
317 | +# |
318 | +# This file is free software; the Free Software Foundation |
319 | +# gives unlimited permission to copy and/or distribute it, |
320 | +# with or without modifications, as long as this notice is preserved. |
321 | + |
322 | +# AM_PROG_CC_C_O |
323 | +# -------------- |
324 | +# Like AC_PROG_CC_C_O, but changed for automake. |
325 | +AC_DEFUN([AM_PROG_CC_C_O], |
326 | +[AC_REQUIRE([AC_PROG_CC_C_O])dnl |
327 | +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
328 | +AC_REQUIRE_AUX_FILE([compile])dnl |
329 | +# FIXME: we rely on the cache variable name because |
330 | +# there is no other way. |
331 | +set dummy $CC |
332 | +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` |
333 | +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
334 | +if test "$am_t" != yes; then |
335 | + # Losing compiler, so override with the script. |
336 | + # FIXME: It is wrong to rewrite CC. |
337 | + # But if we don't then we get into trouble of one sort or another. |
338 | + # A longer-term fix would be to have automake use am__CC in this case, |
339 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
340 | + CC="$am_aux_dir/compile $CC" |
341 | +fi |
342 | +dnl Make sure AC_PROG_CC is never called again, or it will override our |
343 | +dnl setting of CC. |
344 | +m4_define([AC_PROG_CC], |
345 | + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) |
346 | +]) |
347 | + |
348 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
349 | |
350 | # Copyright (C) 1997-2013 Free Software Foundation, Inc. |
351 | @@ -1447,53 +1418,6 @@ |
352 | # gives unlimited permission to copy and/or distribute it, |
353 | # with or without modifications, as long as this notice is preserved. |
354 | |
355 | -# _AM_PROG_CC_C_O |
356 | -# --------------- |
357 | -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC |
358 | -# to automatically call this. |
359 | -AC_DEFUN([_AM_PROG_CC_C_O], |
360 | -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
361 | -AC_REQUIRE_AUX_FILE([compile])dnl |
362 | -AC_LANG_PUSH([C])dnl |
363 | -AC_CACHE_CHECK( |
364 | - [whether $CC understands -c and -o together], |
365 | - [am_cv_prog_cc_c_o], |
366 | - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) |
367 | - # Make sure it works both with $CC and with simple cc. |
368 | - # Following AC_PROG_CC_C_O, we do the test twice because some |
369 | - # compilers refuse to overwrite an existing .o file with -o, |
370 | - # though they will create one. |
371 | - am_cv_prog_cc_c_o=yes |
372 | - for am_i in 1 2; do |
373 | - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ |
374 | - && test -f conftest2.$ac_objext; then |
375 | - : OK |
376 | - else |
377 | - am_cv_prog_cc_c_o=no |
378 | - break |
379 | - fi |
380 | - done |
381 | - rm -f core conftest* |
382 | - unset am_i]) |
383 | -if test "$am_cv_prog_cc_c_o" != yes; then |
384 | - # Losing compiler, so override with the script. |
385 | - # FIXME: It is wrong to rewrite CC. |
386 | - # But if we don't then we get into trouble of one sort or another. |
387 | - # A longer-term fix would be to have automake use am__CC in this case, |
388 | - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
389 | - CC="$am_aux_dir/compile $CC" |
390 | -fi |
391 | -AC_LANG_POP([C])]) |
392 | - |
393 | -# For backward compatibility. |
394 | -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
395 | - |
396 | -# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
397 | -# |
398 | -# This file is free software; the Free Software Foundation |
399 | -# gives unlimited permission to copy and/or distribute it, |
400 | -# with or without modifications, as long as this notice is preserved. |
401 | - |
402 | |
403 | # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
404 | # --------------------------------------------------------------------------- |
405 | |
406 | === modified file 'config.guess' |
407 | --- config.guess 2014-10-19 23:39:47 +0000 |
408 | +++ config.guess 2015-02-14 00:18:38 +0000 |
409 | @@ -1,8 +1,8 @@ |
410 | #! /bin/sh |
411 | # Attempt to guess a canonical system name. |
412 | -# Copyright 1992-2014 Free Software Foundation, Inc. |
413 | +# Copyright 1992-2013 Free Software Foundation, Inc. |
414 | |
415 | -timestamp='2014-03-23' |
416 | +timestamp='2013-06-10' |
417 | |
418 | # This file is free software; you can redistribute it and/or modify it |
419 | # under the terms of the GNU General Public License as published by |
420 | @@ -50,7 +50,7 @@ |
421 | GNU config.guess ($timestamp) |
422 | |
423 | Originally written by Per Bothner. |
424 | -Copyright 1992-2014 Free Software Foundation, Inc. |
425 | +Copyright 1992-2013 Free Software Foundation, Inc. |
426 | |
427 | This is free software; see the source for copying conditions. There is NO |
428 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
429 | @@ -149,7 +149,7 @@ |
430 | LIBC=gnu |
431 | #endif |
432 | EOF |
433 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` |
434 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
435 | ;; |
436 | esac |
437 | |
438 | @@ -826,7 +826,7 @@ |
439 | *:MINGW*:*) |
440 | echo ${UNAME_MACHINE}-pc-mingw32 |
441 | exit ;; |
442 | - *:MSYS*:*) |
443 | + i*:MSYS*:*) |
444 | echo ${UNAME_MACHINE}-pc-msys |
445 | exit ;; |
446 | i*:windows32*:*) |
447 | @@ -969,10 +969,10 @@ |
448 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
449 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
450 | ;; |
451 | - openrisc*:Linux:*:*) |
452 | - echo or1k-unknown-linux-${LIBC} |
453 | + or1k:Linux:*:*) |
454 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
455 | exit ;; |
456 | - or32:Linux:*:* | or1k*:Linux:*:*) |
457 | + or32:Linux:*:*) |
458 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
459 | exit ;; |
460 | padre:Linux:*:*) |
461 | @@ -1260,26 +1260,16 @@ |
462 | if test "$UNAME_PROCESSOR" = unknown ; then |
463 | UNAME_PROCESSOR=powerpc |
464 | fi |
465 | - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then |
466 | - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
467 | - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
468 | - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
469 | - grep IS_64BIT_ARCH >/dev/null |
470 | - then |
471 | - case $UNAME_PROCESSOR in |
472 | - i386) UNAME_PROCESSOR=x86_64 ;; |
473 | - powerpc) UNAME_PROCESSOR=powerpc64 ;; |
474 | - esac |
475 | - fi |
476 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
477 | + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
478 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
479 | + grep IS_64BIT_ARCH >/dev/null |
480 | + then |
481 | + case $UNAME_PROCESSOR in |
482 | + i386) UNAME_PROCESSOR=x86_64 ;; |
483 | + powerpc) UNAME_PROCESSOR=powerpc64 ;; |
484 | + esac |
485 | fi |
486 | - elif test "$UNAME_PROCESSOR" = i386 ; then |
487 | - # Avoid executing cc on OS X 10.9, as it ships with a stub |
488 | - # that puts up a graphical alert prompting to install |
489 | - # developer tools. Any system running Mac OS X 10.7 or |
490 | - # later (Darwin 11 and later) is required to have a 64-bit |
491 | - # processor. This is not true of the ARM version of Darwin |
492 | - # that Apple uses in portable devices. |
493 | - UNAME_PROCESSOR=x86_64 |
494 | fi |
495 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
496 | exit ;; |
497 | @@ -1371,6 +1361,154 @@ |
498 | exit ;; |
499 | esac |
500 | |
501 | +eval $set_cc_for_build |
502 | +cat >$dummy.c <<EOF |
503 | +#ifdef _SEQUENT_ |
504 | +# include <sys/types.h> |
505 | +# include <sys/utsname.h> |
506 | +#endif |
507 | +main () |
508 | +{ |
509 | +#if defined (sony) |
510 | +#if defined (MIPSEB) |
511 | + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, |
512 | + I don't know.... */ |
513 | + printf ("mips-sony-bsd\n"); exit (0); |
514 | +#else |
515 | +#include <sys/param.h> |
516 | + printf ("m68k-sony-newsos%s\n", |
517 | +#ifdef NEWSOS4 |
518 | + "4" |
519 | +#else |
520 | + "" |
521 | +#endif |
522 | + ); exit (0); |
523 | +#endif |
524 | +#endif |
525 | + |
526 | +#if defined (__arm) && defined (__acorn) && defined (__unix) |
527 | + printf ("arm-acorn-riscix\n"); exit (0); |
528 | +#endif |
529 | + |
530 | +#if defined (hp300) && !defined (hpux) |
531 | + printf ("m68k-hp-bsd\n"); exit (0); |
532 | +#endif |
533 | + |
534 | +#if defined (NeXT) |
535 | +#if !defined (__ARCHITECTURE__) |
536 | +#define __ARCHITECTURE__ "m68k" |
537 | +#endif |
538 | + int version; |
539 | + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; |
540 | + if (version < 4) |
541 | + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); |
542 | + else |
543 | + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); |
544 | + exit (0); |
545 | +#endif |
546 | + |
547 | +#if defined (MULTIMAX) || defined (n16) |
548 | +#if defined (UMAXV) |
549 | + printf ("ns32k-encore-sysv\n"); exit (0); |
550 | +#else |
551 | +#if defined (CMU) |
552 | + printf ("ns32k-encore-mach\n"); exit (0); |
553 | +#else |
554 | + printf ("ns32k-encore-bsd\n"); exit (0); |
555 | +#endif |
556 | +#endif |
557 | +#endif |
558 | + |
559 | +#if defined (__386BSD__) |
560 | + printf ("i386-pc-bsd\n"); exit (0); |
561 | +#endif |
562 | + |
563 | +#if defined (sequent) |
564 | +#if defined (i386) |
565 | + printf ("i386-sequent-dynix\n"); exit (0); |
566 | +#endif |
567 | +#if defined (ns32000) |
568 | + printf ("ns32k-sequent-dynix\n"); exit (0); |
569 | +#endif |
570 | +#endif |
571 | + |
572 | +#if defined (_SEQUENT_) |
573 | + struct utsname un; |
574 | + |
575 | + uname(&un); |
576 | + |
577 | + if (strncmp(un.version, "V2", 2) == 0) { |
578 | + printf ("i386-sequent-ptx2\n"); exit (0); |
579 | + } |
580 | + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ |
581 | + printf ("i386-sequent-ptx1\n"); exit (0); |
582 | + } |
583 | + printf ("i386-sequent-ptx\n"); exit (0); |
584 | + |
585 | +#endif |
586 | + |
587 | +#if defined (vax) |
588 | +# if !defined (ultrix) |
589 | +# include <sys/param.h> |
590 | +# if defined (BSD) |
591 | +# if BSD == 43 |
592 | + printf ("vax-dec-bsd4.3\n"); exit (0); |
593 | +# else |
594 | +# if BSD == 199006 |
595 | + printf ("vax-dec-bsd4.3reno\n"); exit (0); |
596 | +# else |
597 | + printf ("vax-dec-bsd\n"); exit (0); |
598 | +# endif |
599 | +# endif |
600 | +# else |
601 | + printf ("vax-dec-bsd\n"); exit (0); |
602 | +# endif |
603 | +# else |
604 | + printf ("vax-dec-ultrix\n"); exit (0); |
605 | +# endif |
606 | +#endif |
607 | + |
608 | +#if defined (alliant) && defined (i860) |
609 | + printf ("i860-alliant-bsd\n"); exit (0); |
610 | +#endif |
611 | + |
612 | + exit (1); |
613 | +} |
614 | +EOF |
615 | + |
616 | +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && |
617 | + { echo "$SYSTEM_NAME"; exit; } |
618 | + |
619 | +# Apollos put the system type in the environment. |
620 | + |
621 | +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } |
622 | + |
623 | +# Convex versions that predate uname can use getsysinfo(1) |
624 | + |
625 | +if [ -x /usr/convex/getsysinfo ] |
626 | +then |
627 | + case `getsysinfo -f cpu_type` in |
628 | + c1*) |
629 | + echo c1-convex-bsd |
630 | + exit ;; |
631 | + c2*) |
632 | + if getsysinfo -f scalar_acc |
633 | + then echo c32-convex-bsd |
634 | + else echo c2-convex-bsd |
635 | + fi |
636 | + exit ;; |
637 | + c34*) |
638 | + echo c34-convex-bsd |
639 | + exit ;; |
640 | + c38*) |
641 | + echo c38-convex-bsd |
642 | + exit ;; |
643 | + c4*) |
644 | + echo c4-convex-bsd |
645 | + exit ;; |
646 | + esac |
647 | +fi |
648 | + |
649 | cat >&2 <<EOF |
650 | $0: unable to guess system type |
651 | |
652 | |
653 | === modified file 'config.h.in' |
654 | --- config.h.in 2014-09-22 21:20:08 +0000 |
655 | +++ config.h.in 2015-02-14 00:18:38 +0000 |
656 | @@ -67,6 +67,9 @@ |
657 | */ |
658 | #undef LT_OBJDIR |
659 | |
660 | +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ |
661 | +#undef NO_MINUS_C_MINUS_O |
662 | + |
663 | /* Name of package */ |
664 | #undef PACKAGE |
665 | |
666 | |
667 | === modified file 'config.sub' |
668 | --- config.sub 2014-10-19 23:39:47 +0000 |
669 | +++ config.sub 2015-02-14 00:18:38 +0000 |
670 | @@ -1,8 +1,8 @@ |
671 | #! /bin/sh |
672 | # Configuration validation subroutine script. |
673 | -# Copyright 1992-2014 Free Software Foundation, Inc. |
674 | +# Copyright 1992-2013 Free Software Foundation, Inc. |
675 | |
676 | -timestamp='2014-07-28' |
677 | +timestamp='2013-04-24' |
678 | |
679 | # This file is free software; you can redistribute it and/or modify it |
680 | # under the terms of the GNU General Public License as published by |
681 | @@ -68,7 +68,7 @@ |
682 | version="\ |
683 | GNU config.sub ($timestamp) |
684 | |
685 | -Copyright 1992-2014 Free Software Foundation, Inc. |
686 | +Copyright 1992-2013 Free Software Foundation, Inc. |
687 | |
688 | This is free software; see the source for copying conditions. There is NO |
689 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
690 | @@ -257,7 +257,7 @@ |
691 | | avr | avr32 \ |
692 | | be32 | be64 \ |
693 | | bfin \ |
694 | - | c4x | c8051 | clipper \ |
695 | + | c4x | clipper \ |
696 | | d10v | d30v | dlx | dsp16xx \ |
697 | | epiphany \ |
698 | | fido | fr30 | frv \ |
699 | @@ -265,7 +265,6 @@ |
700 | | hexagon \ |
701 | | i370 | i860 | i960 | ia64 \ |
702 | | ip2k | iq2000 \ |
703 | - | k1om \ |
704 | | le32 | le64 \ |
705 | | lm32 \ |
706 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
707 | @@ -283,10 +282,8 @@ |
708 | | mips64vr5900 | mips64vr5900el \ |
709 | | mipsisa32 | mipsisa32el \ |
710 | | mipsisa32r2 | mipsisa32r2el \ |
711 | - | mipsisa32r6 | mipsisa32r6el \ |
712 | | mipsisa64 | mipsisa64el \ |
713 | | mipsisa64r2 | mipsisa64r2el \ |
714 | - | mipsisa64r6 | mipsisa64r6el \ |
715 | | mipsisa64sb1 | mipsisa64sb1el \ |
716 | | mipsisa64sr71k | mipsisa64sr71kel \ |
717 | | mipsr5900 | mipsr5900el \ |
718 | @@ -298,7 +295,8 @@ |
719 | | nds32 | nds32le | nds32be \ |
720 | | nios | nios2 | nios2eb | nios2el \ |
721 | | ns16k | ns32k \ |
722 | - | open8 | or1k | or1knd | or32 \ |
723 | + | open8 \ |
724 | + | or1k | or32 \ |
725 | | pdp10 | pdp11 | pj | pjl \ |
726 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
727 | | pyramid \ |
728 | @@ -326,7 +324,7 @@ |
729 | c6x) |
730 | basic_machine=tic6x-unknown |
731 | ;; |
732 | - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) |
733 | + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
734 | basic_machine=$basic_machine-unknown |
735 | os=-none |
736 | ;; |
737 | @@ -374,7 +372,7 @@ |
738 | | be32-* | be64-* \ |
739 | | bfin-* | bs2000-* \ |
740 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
741 | - | c8051-* | clipper-* | craynv-* | cydra-* \ |
742 | + | clipper-* | craynv-* | cydra-* \ |
743 | | d10v-* | d30v-* | dlx-* \ |
744 | | elxsi-* \ |
745 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
746 | @@ -383,7 +381,6 @@ |
747 | | hexagon-* \ |
748 | | i*86-* | i860-* | i960-* | ia64-* \ |
749 | | ip2k-* | iq2000-* \ |
750 | - | k1om-* \ |
751 | | le32-* | le64-* \ |
752 | | lm32-* \ |
753 | | m32c-* | m32r-* | m32rle-* \ |
754 | @@ -403,10 +400,8 @@ |
755 | | mips64vr5900-* | mips64vr5900el-* \ |
756 | | mipsisa32-* | mipsisa32el-* \ |
757 | | mipsisa32r2-* | mipsisa32r2el-* \ |
758 | - | mipsisa32r6-* | mipsisa32r6el-* \ |
759 | | mipsisa64-* | mipsisa64el-* \ |
760 | | mipsisa64r2-* | mipsisa64r2el-* \ |
761 | - | mipsisa64r6-* | mipsisa64r6el-* \ |
762 | | mipsisa64sb1-* | mipsisa64sb1el-* \ |
763 | | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
764 | | mipsr5900-* | mipsr5900el-* \ |
765 | @@ -418,7 +413,6 @@ |
766 | | nios-* | nios2-* | nios2eb-* | nios2el-* \ |
767 | | none-* | np1-* | ns16k-* | ns32k-* \ |
768 | | open8-* \ |
769 | - | or1k*-* \ |
770 | | orion-* \ |
771 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
772 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
773 | @@ -800,7 +794,7 @@ |
774 | os=-mingw64 |
775 | ;; |
776 | mingw32) |
777 | - basic_machine=i686-pc |
778 | + basic_machine=i386-pc |
779 | os=-mingw32 |
780 | ;; |
781 | mingw32ce) |
782 | @@ -828,10 +822,6 @@ |
783 | basic_machine=powerpc-unknown |
784 | os=-morphos |
785 | ;; |
786 | - moxiebox) |
787 | - basic_machine=moxie-unknown |
788 | - os=-moxiebox |
789 | - ;; |
790 | msdos) |
791 | basic_machine=i386-pc |
792 | os=-msdos |
793 | @@ -840,7 +830,7 @@ |
794 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
795 | ;; |
796 | msys) |
797 | - basic_machine=i686-pc |
798 | + basic_machine=i386-pc |
799 | os=-msys |
800 | ;; |
801 | mvs) |
802 | @@ -1377,14 +1367,14 @@ |
803 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
804 | | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
805 | | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
806 | - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ |
807 | + | -uxpv* | -beos* | -mpeix* | -udk* \ |
808 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
809 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
810 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
811 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
812 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
813 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
814 | - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) |
815 | + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
816 | # Remember, each alternative MUST END IN *, to match a version number. |
817 | ;; |
818 | -qnx*) |
819 | @@ -1556,9 +1546,6 @@ |
820 | c4x-* | tic4x-*) |
821 | os=-coff |
822 | ;; |
823 | - c8051-*) |
824 | - os=-elf |
825 | - ;; |
826 | hexagon-*) |
827 | os=-elf |
828 | ;; |
829 | @@ -1602,6 +1589,9 @@ |
830 | mips*-*) |
831 | os=-elf |
832 | ;; |
833 | + or1k-*) |
834 | + os=-elf |
835 | + ;; |
836 | or32-*) |
837 | os=-coff |
838 | ;; |
839 | |
840 | === modified file 'configure' |
841 | --- configure 2014-10-19 23:39:47 +0000 |
842 | +++ configure 2015-02-14 00:18:38 +0000 |
843 | @@ -1,6 +1,6 @@ |
844 | #! /bin/sh |
845 | # Guess values for system-dependent variables and create Makefiles. |
846 | -# Generated by GNU Autoconf 2.69 for gnome-music 3.14.1. |
847 | +# Generated by GNU Autoconf 2.69 for gnome-music 3.14.3.1. |
848 | # |
849 | # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-music>. |
850 | # |
851 | @@ -591,8 +591,8 @@ |
852 | # Identity of this package. |
853 | PACKAGE_NAME='gnome-music' |
854 | PACKAGE_TARNAME='gnome-music' |
855 | -PACKAGE_VERSION='3.14.1' |
856 | -PACKAGE_STRING='gnome-music 3.14.1' |
857 | +PACKAGE_VERSION='3.14.3.1' |
858 | +PACKAGE_STRING='gnome-music 3.14.3.1' |
859 | PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-music' |
860 | PACKAGE_URL='https://wiki.gnome.org/Apps/Music' |
861 | |
862 | @@ -1446,7 +1446,7 @@ |
863 | # Omit some internal or obsolete options to make the list less imposing. |
864 | # This message is too long to be a string in the A/UX 3.1 sh. |
865 | cat <<_ACEOF |
866 | -\`configure' configures gnome-music 3.14.1 to adapt to many kinds of systems. |
867 | +\`configure' configures gnome-music 3.14.3.1 to adapt to many kinds of systems. |
868 | |
869 | Usage: $0 [OPTION]... [VAR=VALUE]... |
870 | |
871 | @@ -1516,7 +1516,7 @@ |
872 | |
873 | if test -n "$ac_init_help"; then |
874 | case $ac_init_help in |
875 | - short | recursive ) echo "Configuration of gnome-music 3.14.1:";; |
876 | + short | recursive ) echo "Configuration of gnome-music 3.14.3.1:";; |
877 | esac |
878 | cat <<\_ACEOF |
879 | |
880 | @@ -1648,7 +1648,7 @@ |
881 | test -n "$ac_init_help" && exit $ac_status |
882 | if $ac_init_version; then |
883 | cat <<\_ACEOF |
884 | -gnome-music configure 3.14.1 |
885 | +gnome-music configure 3.14.3.1 |
886 | generated by GNU Autoconf 2.69 |
887 | |
888 | Copyright (C) 2012 Free Software Foundation, Inc. |
889 | @@ -1926,7 +1926,7 @@ |
890 | This file contains any messages produced by compilers while |
891 | running configure, to aid debugging if configure makes a mistake. |
892 | |
893 | -It was created by gnome-music $as_me 3.14.1, which was |
894 | +It was created by gnome-music $as_me 3.14.3.1, which was |
895 | generated by GNU Autoconf 2.69. Invocation command line was |
896 | |
897 | $ $0 $@ |
898 | @@ -2278,7 +2278,7 @@ |
899 | |
900 | ac_config_headers="$ac_config_headers config.h" |
901 | |
902 | -am__api_version='1.14' |
903 | +am__api_version='1.13' |
904 | |
905 | ac_aux_dir= |
906 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
907 | @@ -2793,7 +2793,7 @@ |
908 | |
909 | # Define the identity of the package. |
910 | PACKAGE='gnome-music' |
911 | - VERSION='3.14.1' |
912 | + VERSION='3.14.3.1' |
913 | |
914 | |
915 | cat >>confdefs.h <<_ACEOF |
916 | @@ -2960,47 +2960,6 @@ |
917 | |
918 | |
919 | |
920 | -# POSIX will say in a future version that running "rm -f" with no argument |
921 | -# is OK; and we want to be able to make that assumption in our Makefile |
922 | -# recipes. So use an aggressive probe to check that the usage we want is |
923 | -# actually supported "in the wild" to an acceptable degree. |
924 | -# See automake bug#10828. |
925 | -# To make any issue more visible, cause the running configure to be aborted |
926 | -# by default if the 'rm' program in use doesn't match our expectations; the |
927 | -# user can still override this though. |
928 | -if rm -f && rm -fr && rm -rf; then : OK; else |
929 | - cat >&2 <<'END' |
930 | -Oops! |
931 | - |
932 | -Your 'rm' program seems unable to run without file operands specified |
933 | -on the command line, even when the '-f' option is present. This is contrary |
934 | -to the behaviour of most rm programs out there, and not conforming with |
935 | -the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
936 | - |
937 | -Please tell bug-automake@gnu.org about your system, including the value |
938 | -of your $PATH and any error possibly output before this message. This |
939 | -can help us improve future automake versions. |
940 | - |
941 | -END |
942 | - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
943 | - echo 'Configuration will proceed anyway, since you have set the' >&2 |
944 | - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
945 | - echo >&2 |
946 | - else |
947 | - cat >&2 <<'END' |
948 | -Aborting the configuration process, to ensure you take notice of the issue. |
949 | - |
950 | -You can download and install GNU coreutils to get an 'rm' implementation |
951 | -that behaves properly: <http://www.gnu.org/software/coreutils/>. |
952 | - |
953 | -If you want to complete the configuration process using your problematic |
954 | -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
955 | -to "yes", and re-run configure. |
956 | - |
957 | -END |
958 | - as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 |
959 | - fi |
960 | -fi |
961 | |
962 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
963 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
964 | @@ -4199,65 +4158,6 @@ |
965 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
966 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
967 | |
968 | -ac_ext=c |
969 | -ac_cpp='$CPP $CPPFLAGS' |
970 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
971 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
972 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu |
973 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 |
974 | -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } |
975 | -if ${am_cv_prog_cc_c_o+:} false; then : |
976 | - $as_echo_n "(cached) " >&6 |
977 | -else |
978 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
979 | -/* end confdefs.h. */ |
980 | - |
981 | -int |
982 | -main () |
983 | -{ |
984 | - |
985 | - ; |
986 | - return 0; |
987 | -} |
988 | -_ACEOF |
989 | - # Make sure it works both with $CC and with simple cc. |
990 | - # Following AC_PROG_CC_C_O, we do the test twice because some |
991 | - # compilers refuse to overwrite an existing .o file with -o, |
992 | - # though they will create one. |
993 | - am_cv_prog_cc_c_o=yes |
994 | - for am_i in 1 2; do |
995 | - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 |
996 | - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 |
997 | - ac_status=$? |
998 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
999 | - (exit $ac_status); } \ |
1000 | - && test -f conftest2.$ac_objext; then |
1001 | - : OK |
1002 | - else |
1003 | - am_cv_prog_cc_c_o=no |
1004 | - break |
1005 | - fi |
1006 | - done |
1007 | - rm -f core conftest* |
1008 | - unset am_i |
1009 | -fi |
1010 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 |
1011 | -$as_echo "$am_cv_prog_cc_c_o" >&6; } |
1012 | -if test "$am_cv_prog_cc_c_o" != yes; then |
1013 | - # Losing compiler, so override with the script. |
1014 | - # FIXME: It is wrong to rewrite CC. |
1015 | - # But if we don't then we get into trouble of one sort or another. |
1016 | - # A longer-term fix would be to have automake use am__CC in this case, |
1017 | - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1018 | - CC="$am_aux_dir/compile $CC" |
1019 | -fi |
1020 | -ac_ext=c |
1021 | -ac_cpp='$CPP $CPPFLAGS' |
1022 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1023 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1024 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1025 | - |
1026 | - |
1027 | depcc="$CC" am_compiler_list= |
1028 | |
1029 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
1030 | @@ -5160,7 +5060,7 @@ |
1031 | EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) |
1032 | |
1033 | distdir: distdir-help-files |
1034 | -distdir-help-files: |
1035 | +distdir-help-files: $(_HELP_LC_FILES) |
1036 | @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \ |
1037 | $(MKDIR_P) "$(distdir)/$$lc"; \ |
1038 | for file in $(HELP_FILES); do \ |
1039 | @@ -5189,7 +5089,7 @@ |
1040 | |
1041 | .PHONY: install-help |
1042 | install-data-am: $(if $(HELP_ID),install-help) |
1043 | -install-help: |
1044 | +install-help: $(_HELP_LC_FILES) |
1045 | @for lc in C $(_HELP_LINGUAS); do \ |
1046 | $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ |
1047 | done |
1048 | @@ -5792,65 +5692,6 @@ |
1049 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1050 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1051 | |
1052 | -ac_ext=c |
1053 | -ac_cpp='$CPP $CPPFLAGS' |
1054 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1055 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1056 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1057 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 |
1058 | -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } |
1059 | -if ${am_cv_prog_cc_c_o+:} false; then : |
1060 | - $as_echo_n "(cached) " >&6 |
1061 | -else |
1062 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1063 | -/* end confdefs.h. */ |
1064 | - |
1065 | -int |
1066 | -main () |
1067 | -{ |
1068 | - |
1069 | - ; |
1070 | - return 0; |
1071 | -} |
1072 | -_ACEOF |
1073 | - # Make sure it works both with $CC and with simple cc. |
1074 | - # Following AC_PROG_CC_C_O, we do the test twice because some |
1075 | - # compilers refuse to overwrite an existing .o file with -o, |
1076 | - # though they will create one. |
1077 | - am_cv_prog_cc_c_o=yes |
1078 | - for am_i in 1 2; do |
1079 | - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 |
1080 | - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 |
1081 | - ac_status=$? |
1082 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1083 | - (exit $ac_status); } \ |
1084 | - && test -f conftest2.$ac_objext; then |
1085 | - : OK |
1086 | - else |
1087 | - am_cv_prog_cc_c_o=no |
1088 | - break |
1089 | - fi |
1090 | - done |
1091 | - rm -f core conftest* |
1092 | - unset am_i |
1093 | -fi |
1094 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 |
1095 | -$as_echo "$am_cv_prog_cc_c_o" >&6; } |
1096 | -if test "$am_cv_prog_cc_c_o" != yes; then |
1097 | - # Losing compiler, so override with the script. |
1098 | - # FIXME: It is wrong to rewrite CC. |
1099 | - # But if we don't then we get into trouble of one sort or another. |
1100 | - # A longer-term fix would be to have automake use am__CC in this case, |
1101 | - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1102 | - CC="$am_aux_dir/compile $CC" |
1103 | -fi |
1104 | -ac_ext=c |
1105 | -ac_cpp='$CPP $CPPFLAGS' |
1106 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1107 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1108 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1109 | - |
1110 | - |
1111 | depcc="$CC" am_compiler_list= |
1112 | |
1113 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
1114 | @@ -5979,6 +5820,131 @@ |
1115 | fi |
1116 | |
1117 | |
1118 | +if test "x$CC" != xcc; then |
1119 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 |
1120 | +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } |
1121 | +else |
1122 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 |
1123 | +$as_echo_n "checking whether cc understands -c and -o together... " >&6; } |
1124 | +fi |
1125 | +set dummy $CC; ac_cc=`$as_echo "$2" | |
1126 | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
1127 | +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : |
1128 | + $as_echo_n "(cached) " >&6 |
1129 | +else |
1130 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1131 | +/* end confdefs.h. */ |
1132 | + |
1133 | +int |
1134 | +main () |
1135 | +{ |
1136 | + |
1137 | + ; |
1138 | + return 0; |
1139 | +} |
1140 | +_ACEOF |
1141 | +# Make sure it works both with $CC and with simple cc. |
1142 | +# We do the test twice because some compilers refuse to overwrite an |
1143 | +# existing .o file with -o, though they will create one. |
1144 | +ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
1145 | +rm -f conftest2.* |
1146 | +if { { case "(($ac_try" in |
1147 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1148 | + *) ac_try_echo=$ac_try;; |
1149 | +esac |
1150 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1151 | +$as_echo "$ac_try_echo"; } >&5 |
1152 | + (eval "$ac_try") 2>&5 |
1153 | + ac_status=$? |
1154 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1155 | + test $ac_status = 0; } && |
1156 | + test -f conftest2.$ac_objext && { { case "(($ac_try" in |
1157 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1158 | + *) ac_try_echo=$ac_try;; |
1159 | +esac |
1160 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1161 | +$as_echo "$ac_try_echo"; } >&5 |
1162 | + (eval "$ac_try") 2>&5 |
1163 | + ac_status=$? |
1164 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1165 | + test $ac_status = 0; }; |
1166 | +then |
1167 | + eval ac_cv_prog_cc_${ac_cc}_c_o=yes |
1168 | + if test "x$CC" != xcc; then |
1169 | + # Test first that cc exists at all. |
1170 | + if { ac_try='cc -c conftest.$ac_ext >&5' |
1171 | + { { case "(($ac_try" in |
1172 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1173 | + *) ac_try_echo=$ac_try;; |
1174 | +esac |
1175 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1176 | +$as_echo "$ac_try_echo"; } >&5 |
1177 | + (eval "$ac_try") 2>&5 |
1178 | + ac_status=$? |
1179 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1180 | + test $ac_status = 0; }; }; then |
1181 | + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
1182 | + rm -f conftest2.* |
1183 | + if { { case "(($ac_try" in |
1184 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1185 | + *) ac_try_echo=$ac_try;; |
1186 | +esac |
1187 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1188 | +$as_echo "$ac_try_echo"; } >&5 |
1189 | + (eval "$ac_try") 2>&5 |
1190 | + ac_status=$? |
1191 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1192 | + test $ac_status = 0; } && |
1193 | + test -f conftest2.$ac_objext && { { case "(($ac_try" in |
1194 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1195 | + *) ac_try_echo=$ac_try;; |
1196 | +esac |
1197 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1198 | +$as_echo "$ac_try_echo"; } >&5 |
1199 | + (eval "$ac_try") 2>&5 |
1200 | + ac_status=$? |
1201 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1202 | + test $ac_status = 0; }; |
1203 | + then |
1204 | + # cc works too. |
1205 | + : |
1206 | + else |
1207 | + # cc exists but doesn't like -o. |
1208 | + eval ac_cv_prog_cc_${ac_cc}_c_o=no |
1209 | + fi |
1210 | + fi |
1211 | + fi |
1212 | +else |
1213 | + eval ac_cv_prog_cc_${ac_cc}_c_o=no |
1214 | +fi |
1215 | +rm -f core conftest* |
1216 | + |
1217 | +fi |
1218 | +if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then |
1219 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1220 | +$as_echo "yes" >&6; } |
1221 | +else |
1222 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1223 | +$as_echo "no" >&6; } |
1224 | + |
1225 | +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h |
1226 | + |
1227 | +fi |
1228 | + |
1229 | +# FIXME: we rely on the cache variable name because |
1230 | +# there is no other way. |
1231 | +set dummy $CC |
1232 | +am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
1233 | +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
1234 | +if test "$am_t" != yes; then |
1235 | + # Losing compiler, so override with the script. |
1236 | + # FIXME: It is wrong to rewrite CC. |
1237 | + # But if we don't then we get into trouble of one sort or another. |
1238 | + # A longer-term fix would be to have automake use am__CC in this case, |
1239 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1240 | + CC="$am_aux_dir/compile $CC" |
1241 | +fi |
1242 | + |
1243 | |
1244 | case `pwd` in |
1245 | *\ * | *\ *) |
1246 | @@ -8378,7 +8344,7 @@ |
1247 | rm -rf conftest* |
1248 | ;; |
1249 | |
1250 | -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
1251 | +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
1252 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
1253 | # Find out which ABI we are using. |
1254 | echo 'int i;' > conftest.$ac_ext |
1255 | @@ -8396,10 +8362,7 @@ |
1256 | x86_64-*linux*) |
1257 | LD="${LD-ld} -m elf_i386" |
1258 | ;; |
1259 | - powerpc64le-*linux*) |
1260 | - LD="${LD-ld} -m elf32lppclinux" |
1261 | - ;; |
1262 | - powerpc64-*linux*) |
1263 | + ppc64-*linux*|powerpc64-*linux*) |
1264 | LD="${LD-ld} -m elf32ppclinux" |
1265 | ;; |
1266 | s390x-*linux*) |
1267 | @@ -8418,10 +8381,7 @@ |
1268 | x86_64-*linux*) |
1269 | LD="${LD-ld} -m elf_x86_64" |
1270 | ;; |
1271 | - powerpcle-*linux*) |
1272 | - LD="${LD-ld} -m elf64lppc" |
1273 | - ;; |
1274 | - powerpc-*linux*) |
1275 | + ppc*-*linux*|powerpc*-*linux*) |
1276 | LD="${LD-ld} -m elf64ppc" |
1277 | ;; |
1278 | s390*-*linux*|s390*-*tpf*) |
1279 | @@ -15565,7 +15525,7 @@ |
1280 | # report actual input values of CONFIG_FILES etc. instead of their |
1281 | # values after options handling. |
1282 | ac_log=" |
1283 | -This file was extended by gnome-music $as_me 3.14.1, which was |
1284 | +This file was extended by gnome-music $as_me 3.14.3.1, which was |
1285 | generated by GNU Autoconf 2.69. Invocation command line was |
1286 | |
1287 | CONFIG_FILES = $CONFIG_FILES |
1288 | @@ -15632,7 +15592,7 @@ |
1289 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1290 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
1291 | ac_cs_version="\\ |
1292 | -gnome-music config.status 3.14.1 |
1293 | +gnome-music config.status 3.14.3.1 |
1294 | configured by $0, generated by GNU Autoconf 2.69, |
1295 | with options \\"\$ac_cs_config\\" |
1296 | |
1297 | |
1298 | === modified file 'configure.ac' |
1299 | --- configure.ac 2014-10-19 23:39:47 +0000 |
1300 | +++ configure.ac 2015-02-14 00:18:38 +0000 |
1301 | @@ -1,6 +1,6 @@ |
1302 | AC_PREREQ(2.63) |
1303 | AC_INIT([gnome-music], |
1304 | - [3.14.1], |
1305 | + [3.14.3.1], |
1306 | [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-music], |
1307 | [gnome-music], |
1308 | [https://wiki.gnome.org/Apps/Music]) |
1309 | |
1310 | === modified file 'data/AboutDialog.ui' |
1311 | --- data/AboutDialog.ui 2014-10-19 23:39:47 +0000 |
1312 | +++ data/AboutDialog.ui 2015-02-14 00:18:38 +0000 |
1313 | @@ -5,7 +5,7 @@ |
1314 | <property name="can_focus">False</property> |
1315 | <property name="modal">True</property> |
1316 | <property name="program_name" translatable="yes">Music</property> |
1317 | - <property name="version">3.14.1</property> |
1318 | + <property name="version">3.14.3.1</property> |
1319 | <property name="copyright" translatable="yes">Copyright © 2013 GNOME Music Developers</property> |
1320 | <property name="comments" translatable="yes">A music player and management application for GNOME.</property> |
1321 | <property name="website">https://wiki.gnome.org/Apps/Music</property> |
1322 | |
1323 | === modified file 'data/ArtistAlbumWidget.ui' |
1324 | --- data/ArtistAlbumWidget.ui 2013-10-18 21:04:06 +0000 |
1325 | +++ data/ArtistAlbumWidget.ui 2015-02-14 00:18:38 +0000 |
1326 | @@ -116,7 +116,7 @@ |
1327 | </child> |
1328 | </object> |
1329 | <packing> |
1330 | - <property name="expand">True</property> |
1331 | + <property name="expand">False</property> |
1332 | <property name="fill">True</property> |
1333 | <property name="position">1</property> |
1334 | </packing> |
1335 | |
1336 | === modified file 'data/Makefile.in' |
1337 | --- data/Makefile.in 2014-10-19 23:39:47 +0000 |
1338 | +++ data/Makefile.in 2015-02-14 00:18:38 +0000 |
1339 | @@ -1,4 +1,4 @@ |
1340 | -# Makefile.in generated by automake 1.14.1 from Makefile.am. |
1341 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
1342 | # @configure_input@ |
1343 | |
1344 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
1345 | |
1346 | === modified file 'data/TrackWidget.ui' |
1347 | --- data/TrackWidget.ui 2014-09-22 21:20:08 +0000 |
1348 | +++ data/TrackWidget.ui 2015-02-14 00:18:38 +0000 |
1349 | @@ -80,6 +80,7 @@ |
1350 | <property name="valign">start</property> |
1351 | <property name="xalign">0</property> |
1352 | <property name="ellipsize">end</property> |
1353 | + <property name="max-width-chars">20</property> |
1354 | </object> |
1355 | <packing> |
1356 | <property name="expand">True</property> |
1357 | |
1358 | === modified file 'data/app-menu.ui' |
1359 | --- data/app-menu.ui 2014-10-19 23:39:47 +0000 |
1360 | +++ data/app-menu.ui 2015-02-14 00:18:38 +0000 |
1361 | @@ -2,12 +2,6 @@ |
1362 | <menu id="app-menu"> |
1363 | <section> |
1364 | <item> |
1365 | - <attribute name="action">app.newPlaylist</attribute> |
1366 | - <attribute name="label" translatable="yes">_New Playlist</attribute> |
1367 | - </item> |
1368 | - </section> |
1369 | - <section> |
1370 | - <item> |
1371 | <attribute name="label" translatable="yes">_Help</attribute> |
1372 | <attribute name="action">app.help</attribute> |
1373 | <attribute name="accel">F1</attribute> |
1374 | |
1375 | === modified file 'debian/changelog' |
1376 | --- debian/changelog 2014-10-19 23:39:47 +0000 |
1377 | +++ debian/changelog 2015-02-14 00:18:38 +0000 |
1378 | @@ -1,3 +1,9 @@ |
1379 | +gnome-music (3.14.3.1-0ubuntu1) vivid; urgency=medium |
1380 | + |
1381 | + * New upstream release. |
1382 | + |
1383 | + -- Jackson Doak <noskcaj@ubuntu.com> Sat, 14 Feb 2015 11:07:17 +1100 |
1384 | + |
1385 | gnome-music (3.14.1-1) unstable; urgency=medium |
1386 | |
1387 | [ Pedro Beja ] |
1388 | |
1389 | === modified file 'debian/control' |
1390 | --- debian/control 2014-10-19 23:39:47 +0000 |
1391 | +++ debian/control 2015-02-14 00:18:38 +0000 |
1392 | @@ -5,7 +5,8 @@ |
1393 | Source: gnome-music |
1394 | Section: gnome |
1395 | Priority: extra |
1396 | -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
1397 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
1398 | +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
1399 | Uploaders: Andreas Henriksson <andreas@fatal.se>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org> |
1400 | Build-Depends: debhelper (>= 9), |
1401 | gnome-common, |
1402 | |
1403 | === modified file 'debian/control.in' |
1404 | --- debian/control.in 2014-10-19 23:39:47 +0000 |
1405 | +++ debian/control.in 2015-02-14 00:18:38 +0000 |
1406 | @@ -1,7 +1,8 @@ |
1407 | Source: gnome-music |
1408 | Section: gnome |
1409 | Priority: extra |
1410 | -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
1411 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
1412 | +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
1413 | Uploaders: @GNOME_TEAM@ |
1414 | Build-Depends: debhelper (>= 9), |
1415 | gnome-common, |
1416 | |
1417 | === modified file 'gnomemusic/Makefile.in' |
1418 | --- gnomemusic/Makefile.in 2014-10-19 23:39:47 +0000 |
1419 | +++ gnomemusic/Makefile.in 2015-02-14 00:18:38 +0000 |
1420 | @@ -1,4 +1,4 @@ |
1421 | -# Makefile.in generated by automake 1.14.1 from Makefile.am. |
1422 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
1423 | # @configure_input@ |
1424 | |
1425 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
1426 | |
1427 | === modified file 'gnomemusic/albumArtCache.py' |
1428 | --- gnomemusic/albumArtCache.py 2014-10-19 23:39:47 +0000 |
1429 | +++ gnomemusic/albumArtCache.py 2015-02-14 00:18:38 +0000 |
1430 | @@ -139,7 +139,7 @@ |
1431 | icon.get_width() * 3 / 2, |
1432 | icon.get_height() * 3 / 2, |
1433 | 1, 1, |
1434 | - GdkPixbuf.InterpType.NEAREST, 0xff) |
1435 | + GdkPixbuf.InterpType.NEAREST, 0x33) |
1436 | return _make_icon_frame(result) |
1437 | |
1438 | @log |
1439 | |
1440 | === modified file 'gnomemusic/player.py' |
1441 | --- gnomemusic/player.py 2014-10-19 23:39:47 +0000 |
1442 | +++ gnomemusic/player.py 2015-02-14 00:18:38 +0000 |
1443 | @@ -117,7 +117,7 @@ |
1444 | return |
1445 | |
1446 | if not url.startswith("file://"): |
1447 | - logger.debug("Skipping discovery of %s as a remote url" % url) |
1448 | + logger.debug("Skipping discovery of %s as not a local file" % url) |
1449 | return |
1450 | |
1451 | obj = (callback, data) |
1452 | |
1453 | === modified file 'gnomemusic/playlists.py' |
1454 | --- gnomemusic/playlists.py 2014-10-19 23:39:47 +0000 |
1455 | +++ gnomemusic/playlists.py 2015-02-14 00:18:38 +0000 |
1456 | @@ -1,3 +1,31 @@ |
1457 | +# Copyright (c) 2013 Arnel A. Borja <kyoushuu@yahoo.com> |
1458 | +# Copyright (c) 2013 Sai Suman Prayaga <suman.sai14@gmail.com> |
1459 | +# Copyright (c) 2013 Eslam Mostafa <cseslam@gmail.com> |
1460 | +# Copyright (c) 2013 Vadim Rutkovsky <vrutkovs@redhat.com> |
1461 | +# |
1462 | +# GNOME Music is free software; you can redistribute it and/or modify |
1463 | +# it under the terms of the GNU General Public License as published by |
1464 | +# the Free Software Foundation; either version 2 of the License, or |
1465 | +# (at your option) any later version. |
1466 | +# |
1467 | +# GNOME Music is distributed in the hope that it will be useful, |
1468 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1469 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1470 | +# GNU General Public License for more details. |
1471 | +# |
1472 | +# You should have received a copy of the GNU General Public License along |
1473 | +# with GNOME Music; if not, write to the Free Software Foundation, Inc., |
1474 | +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
1475 | +# |
1476 | +# The GNOME Music authors hereby grant permission for non-GPL compatible |
1477 | +# GStreamer plugins to be used and distributed together with GStreamer |
1478 | +# and GNOME Music. This permission is above and beyond the permissions |
1479 | +# granted by the GPL license by which GNOME Music is covered. If you |
1480 | +# modify this code, you may extend this exception to your version of the |
1481 | +# code, but you are not obligated to do so. If you do not wish to do so, |
1482 | +# delete this exception statement from your version. |
1483 | + |
1484 | + |
1485 | from gi.repository import Grl, GLib, GObject |
1486 | from gi.repository import Tracker |
1487 | from gnomemusic.grilo import grilo |
1488 | |
1489 | === modified file 'gnomemusic/query.py' |
1490 | --- gnomemusic/query.py 2014-10-19 23:39:47 +0000 |
1491 | +++ gnomemusic/query.py 2015-02-14 00:18:38 +0000 |
1492 | @@ -29,12 +29,18 @@ |
1493 | |
1494 | |
1495 | class Query(): |
1496 | - MUSIC_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri( |
1497 | - GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC) |
1498 | - )) |
1499 | - DOWNLOAD_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri( |
1500 | - GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DOWNLOAD) |
1501 | - )) |
1502 | + music_folder = None |
1503 | + MUSIC_DIR = None |
1504 | + download_folder = None |
1505 | + DOWNLOAD_DIR = None |
1506 | + try: |
1507 | + music_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC) |
1508 | + MUSIC_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri(music_folder)) |
1509 | + download_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DOWNLOAD) |
1510 | + DOWNLOAD_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri(download_folder)) |
1511 | + |
1512 | + except TypeError: |
1513 | + print("XDG user dirs are not set") |
1514 | |
1515 | @staticmethod |
1516 | def all_albums(): |
1517 | |
1518 | === modified file 'gnomemusic/searchbar.py' |
1519 | --- gnomemusic/searchbar.py 2014-10-19 23:39:47 +0000 |
1520 | +++ gnomemusic/searchbar.py 2015-02-14 00:18:38 +0000 |
1521 | @@ -1,3 +1,30 @@ |
1522 | +# Copyright (c) 2013 Seif Lotfy <seif@lotfy.com> |
1523 | +# Copyright (c) 2013 Vadim Rutkovsky <vrutkovs@redhat.com> |
1524 | +# Copyright (c) 2014 Arnel A. Borja <kyoushuu@yahoo.com> |
1525 | +# |
1526 | +# GNOME Music is free software; you can redistribute it and/or modify |
1527 | +# it under the terms of the GNU General Public License as published by |
1528 | +# the Free Software Foundation; either version 2 of the License, or |
1529 | +# (at your option) any later version. |
1530 | +# |
1531 | +# GNOME Music is distributed in the hope that it will be useful, |
1532 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1533 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1534 | +# GNU General Public License for more details. |
1535 | +# |
1536 | +# You should have received a copy of the GNU General Public License along |
1537 | +# with GNOME Music; if not, write to the Free Software Foundation, Inc., |
1538 | +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
1539 | +# |
1540 | +# The GNOME Music authors hereby grant permission for non-GPL compatible |
1541 | +# GStreamer plugins to be used and distributed together with GStreamer |
1542 | +# and GNOME Music. This permission is above and beyond the permissions |
1543 | +# granted by the GPL license by which GNOME Music is covered. If you |
1544 | +# modify this code, you may extend this exception to your version of the |
1545 | +# code, but you are not obligated to do so. If you do not wish to do so, |
1546 | +# delete this exception statement from your version. |
1547 | + |
1548 | + |
1549 | from gi.repository import Gtk, Gd, GObject, Pango, GLib |
1550 | from gettext import gettext as _ |
1551 | from gnomemusic.grilo import grilo |
1552 | @@ -19,6 +46,7 @@ |
1553 | self.label = label |
1554 | self.entry = entry |
1555 | self.tag = Gd.TaggedEntryTag() |
1556 | + self.tag.set_style('button') |
1557 | self.tag.manager = self |
1558 | self.values = [] |
1559 | |
1560 | @@ -273,14 +301,15 @@ |
1561 | return False |
1562 | |
1563 | @log |
1564 | - def show_bar(self, show): |
1565 | + def show_bar(self, show, clear=True): |
1566 | self.set_reveal_child(show) |
1567 | self._search_button.set_active(show) |
1568 | |
1569 | if show: |
1570 | + if clear: |
1571 | + self._search_entry.set_text('') |
1572 | self._search_entry.grab_focus() |
1573 | else: |
1574 | - self._search_entry.set_text('') |
1575 | self._dropDownButton.set_active(False) |
1576 | |
1577 | @log |
1578 | |
1579 | === modified file 'gnomemusic/view.py' |
1580 | --- gnomemusic/view.py 2014-10-19 23:39:47 +0000 |
1581 | +++ gnomemusic/view.py 2015-02-14 00:18:38 +0000 |
1582 | @@ -270,8 +270,11 @@ |
1583 | @log |
1584 | def _on_discovered(self, info, error, _iter): |
1585 | if error: |
1586 | - print("Info %s: error: %s" % (info, error)) |
1587 | - self._model.set(_iter, [8, 10], [self.errorIconName, True]) |
1588 | + try: |
1589 | + logger.warn("File will be skipped: %s\n%s" % (error.message, info.get_uri())) |
1590 | + self._model.set(_iter, [8, 10], [self.errorIconName, True]) |
1591 | + except Exception: |
1592 | + pass |
1593 | |
1594 | @log |
1595 | def _add_item(self, source, param, item, remaining=0, data=None): |
1596 | @@ -291,7 +294,7 @@ |
1597 | try: |
1598 | self.player.discoverer.discover_uri(item.get_url()) |
1599 | except: |
1600 | - print('failed to discover url ' + item.get_url()) |
1601 | + logger.warn('failed to discover url ' + item.get_url()) |
1602 | icon_name = self.errorIconName |
1603 | self._model.set(_iter, |
1604 | [0, 1, 2, 3, 4, 5, 7, 8, 9, 10], |
1605 | @@ -369,7 +372,10 @@ |
1606 | |
1607 | @log |
1608 | def _on_item_activated(self, widget, id, path): |
1609 | - _iter = self._model.get_iter(path) |
1610 | + try: |
1611 | + _iter = self._model.get_iter(path) |
1612 | + except TypeError: |
1613 | + return |
1614 | title = self._model.get_value(_iter, 2) |
1615 | artist = self._model.get_value(_iter, 3) |
1616 | item = self._model.get_value(_iter, 5) |
1617 | @@ -454,7 +460,10 @@ |
1618 | |
1619 | @log |
1620 | def _on_item_activated(self, widget, id, path): |
1621 | - _iter = self._model.get_iter(path) |
1622 | + try: |
1623 | + _iter = self._model.get_iter(path) |
1624 | + except TypeError: |
1625 | + return |
1626 | if self._model.get_value(_iter, 8) != self.errorIconName: |
1627 | self.player.set_playlist('Songs', None, self._model, _iter, 5) |
1628 | self.player.set_playing(True) |
1629 | @@ -664,7 +673,10 @@ |
1630 | |
1631 | @log |
1632 | def _on_item_activated(self, widget, item_id, path): |
1633 | - _iter = self._model.get_iter(path) |
1634 | + try: |
1635 | + _iter = self._model.get_iter(path) |
1636 | + except TypeError: |
1637 | + return |
1638 | self._last_selection = _iter |
1639 | artist = self._model.get_value(_iter, 2) |
1640 | albums = self._artists[artist.casefold()]['albums'] |
1641 | @@ -999,7 +1011,10 @@ |
1642 | |
1643 | @log |
1644 | def _on_item_activated(self, widget, id, path): |
1645 | - _iter = self._model.get_iter(path) |
1646 | + try: |
1647 | + _iter = self._model.get_iter(path) |
1648 | + except TypeError: |
1649 | + return |
1650 | if self._model.get_value(_iter, 8) != self.errorIconName: |
1651 | self.player.set_playlist( |
1652 | 'Playlist', self.current_playlist.get_id(), |
1653 | @@ -1227,6 +1242,7 @@ |
1654 | |
1655 | @log |
1656 | def _back_button_clicked(self, widget, data=None): |
1657 | + self.header_bar.searchbar.show_bar(True, False) |
1658 | if self.get_visible_child() == self._artistAlbumsWidget: |
1659 | self._artistAlbumsWidget.destroy() |
1660 | self._artistAlbumsWidget = None |
1661 | @@ -1234,7 +1250,10 @@ |
1662 | |
1663 | @log |
1664 | def _on_item_activated(self, widget, id, path): |
1665 | - child_path = self.filter_model.convert_path_to_child_path(path) |
1666 | + try: |
1667 | + child_path = self.filter_model.convert_path_to_child_path(path) |
1668 | + except TypeError: |
1669 | + return |
1670 | _iter = self._model.get_iter(child_path) |
1671 | if self._model[_iter][11] == 'album': |
1672 | title = self._model.get_value(_iter, 2) |
1673 | |
1674 | === modified file 'gnomemusic/widgets.py' |
1675 | --- gnomemusic/widgets.py 2014-10-19 23:39:47 +0000 |
1676 | +++ gnomemusic/widgets.py 2015-02-14 00:18:38 +0000 |
1677 | @@ -349,6 +349,8 @@ |
1678 | self._hbox.pack_start(self.ui.get_object('ArtistAlbumsWidget'), |
1679 | False, False, 0) |
1680 | self._hbox.pack_start(self._albumBox, False, False, 16) |
1681 | + self._coverSizeGroup = Gtk.SizeGroup.new(Gtk.SizeGroupMode.HORIZONTAL) |
1682 | + self._songsGridSizeGroup = Gtk.SizeGroup.new(Gtk.SizeGroupMode.HORIZONTAL) |
1683 | self.pack_start(self._scrolledWindow, True, True, 0) |
1684 | |
1685 | for album in albums: |
1686 | @@ -363,6 +365,8 @@ |
1687 | self.artist, album, self.player, self.model, |
1688 | self.header_bar, self.selectionModeAllowed |
1689 | ) |
1690 | + self._coverSizeGroup.add_widget(widget.cover) |
1691 | + self._songsGridSizeGroup.add_widget(widget.songsGrid) |
1692 | self._albumBox.pack_start(widget, False, False, 0) |
1693 | self.widgets.append(widget) |
1694 | |
1695 | @@ -484,7 +488,9 @@ |
1696 | |
1697 | GLib.idle_add(self._update_album_art) |
1698 | |
1699 | - self.ui.get_object('cover').set_from_pixbuf(self.pixbuf) |
1700 | + self.cover = self.ui.get_object('cover') |
1701 | + self.cover.set_from_pixbuf(self.pixbuf) |
1702 | + self.songsGrid = self.ui.get_object('grid1') |
1703 | self.ui.get_object('title').set_label(album.get_title()) |
1704 | if album.get_creation_date(): |
1705 | self.ui.get_object('year').set_markup( |
1706 | @@ -522,7 +528,7 @@ |
1707 | title = AlbumArtCache.get_media_title(track) |
1708 | ui.get_object('title').set_text(title) |
1709 | ui.get_object('title').set_alignment(0.0, 0.5) |
1710 | - self.ui.get_object('grid1').attach( |
1711 | + self.songsGrid.attach( |
1712 | song_widget, |
1713 | int(i / (len(self.tracks) / 2)), |
1714 | int(i % (len(self.tracks) / 2)), 1, 1 |
1715 | @@ -551,7 +557,7 @@ |
1716 | song_widget.can_be_played = True |
1717 | song_widget.connect('button-release-event', |
1718 | self.track_selected) |
1719 | - self.ui.get_object('grid1').show_all() |
1720 | + self.songsGrid.show_all() |
1721 | |
1722 | @log |
1723 | def _update_album_art(self): |
1724 | @@ -565,7 +571,7 @@ |
1725 | @log |
1726 | def _get_album_cover(self, pixbuf, path, data=None): |
1727 | if pixbuf: |
1728 | - self.ui.get_object('cover').set_from_pixbuf(pixbuf) |
1729 | + self.cover.set_from_pixbuf(pixbuf) |
1730 | |
1731 | @log |
1732 | def track_selected(self, widget, event): |
1733 | @@ -728,7 +734,8 @@ |
1734 | @log |
1735 | def _on_playlist_created(self, playlists, item): |
1736 | new_iter = self._add_item_to_model(item) |
1737 | - self.view.set_cursor(self.model.get_path(new_iter), |
1738 | - self.view.get_columns()[0], False) |
1739 | - self.view.row_activated(self.model.get_path(new_iter), |
1740 | - self.view.get_columns()[0]) |
1741 | + if self.view.get_columns(): |
1742 | + self.view.set_cursor(self.model.get_path(new_iter), |
1743 | + self.view.get_columns()[0], False) |
1744 | + self.view.row_activated(self.model.get_path(new_iter), |
1745 | + self.view.get_columns()[0]) |
1746 | |
1747 | === modified file 'gnomemusic/window.py' |
1748 | --- gnomemusic/window.py 2014-10-19 23:39:47 +0000 |
1749 | +++ gnomemusic/window.py 2015-02-14 00:18:38 +0000 |
1750 | @@ -195,22 +195,27 @@ |
1751 | self._box.pack_start(self.player.actionbar, False, False, 0) |
1752 | self._box.pack_start(self.selection_toolbar.actionbar, False, False, 0) |
1753 | self.add(self._box) |
1754 | - count = 1 |
1755 | + count = 0 |
1756 | cursor = None |
1757 | - try: |
1758 | - cursor = tracker.query(Query.all_songs_count(), None) |
1759 | - except Exception as e: |
1760 | - logger.error("Tracker query crashed: %s" % e) |
1761 | - count = 0 |
1762 | - |
1763 | - if cursor is not None and cursor.next(None): |
1764 | - count = cursor.get_integer(0) |
1765 | - if count > 0: |
1766 | - self._switch_to_player_view() |
1767 | - # To revert to the No Music View when no songs are found |
1768 | + |
1769 | + if Query.music_folder and Query.download_folder: |
1770 | + try: |
1771 | + cursor = tracker.query(Query.all_songs_count(), None) |
1772 | + if cursor is not None and cursor.next(None): |
1773 | + count = cursor.get_integer(0) |
1774 | + except Exception as e: |
1775 | + logger.error("Tracker query crashed: %s" % e) |
1776 | + count = 0 |
1777 | + |
1778 | + if count > 0: |
1779 | + self._switch_to_player_view() |
1780 | + # To revert to the No Music View when no songs are found |
1781 | + else: |
1782 | + if self.toolbar._selectionMode is False: |
1783 | + self._switch_to_empty_view() |
1784 | else: |
1785 | - if self.toolbar._selectionMode is False: |
1786 | - self._switch_to_empty_view() |
1787 | + # Revert to No Music view if XDG dirs are not set |
1788 | + self._switch_to_empty_view() |
1789 | |
1790 | self.toolbar._search_button.connect('toggled', self._on_search_toggled) |
1791 | self.toolbar.connect('selection-mode-changed', self._on_selection_mode_changed) |
1792 | @@ -329,7 +334,8 @@ |
1793 | else: |
1794 | if not self.toolbar.searchbar.get_reveal_child(): |
1795 | if event.keyval == Gdk.KEY_space and self.player.actionbar.get_visible(): |
1796 | - self.player.play_pause() |
1797 | + if self.get_focus() != self.player.playBtn: |
1798 | + self.player.play_pause() |
1799 | |
1800 | @log |
1801 | def _notify_mode_disconnect(self, data=None): |
1802 | @@ -358,7 +364,8 @@ |
1803 | |
1804 | @log |
1805 | def _on_search_toggled(self, button, data=None): |
1806 | - self.toolbar.searchbar.show_bar(button.get_active()) |
1807 | + self.toolbar.searchbar.show_bar(button.get_active(), |
1808 | + self.curr_view != self.views[4]) |
1809 | if not button.get_active() and self.curr_view == self.views[4] and \ |
1810 | self.toolbar._state == ToolbarState.MAIN: |
1811 | self._stack.set_visible_child(self.prev_view) |
1812 | |
1813 | === modified file 'help/Makefile.am' |
1814 | --- help/Makefile.am 2014-10-19 23:39:47 +0000 |
1815 | +++ help/Makefile.am 2015-02-14 00:18:38 +0000 |
1816 | @@ -19,4 +19,4 @@ |
1817 | HELP_MEDIA = \ |
1818 | figures/gnome-music-3.12.png |
1819 | |
1820 | -HELP_LINGUAS = cs el es fr gl hu ko pt_BR ro |
1821 | +HELP_LINGUAS = cs de el es fr gl hu ko pt_BR ro |
1822 | |
1823 | === modified file 'help/Makefile.in' |
1824 | --- help/Makefile.in 2014-10-19 23:39:47 +0000 |
1825 | +++ help/Makefile.in 2015-02-14 00:18:38 +0000 |
1826 | @@ -1,4 +1,4 @@ |
1827 | -# Makefile.in generated by automake 1.14.1 from Makefile.am. |
1828 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
1829 | # @configure_input@ |
1830 | |
1831 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
1832 | @@ -304,7 +304,7 @@ |
1833 | HELP_MEDIA = \ |
1834 | figures/gnome-music-3.12.png |
1835 | |
1836 | -HELP_LINGUAS = cs el es fr gl hu ko pt_BR ro |
1837 | +HELP_LINGUAS = cs de el es fr gl hu ko pt_BR ro |
1838 | all: all-am |
1839 | |
1840 | .SUFFIXES: |
1841 | |
1842 | === added directory 'help/de' |
1843 | === added file 'help/de/de.po' |
1844 | --- help/de/de.po 1970-01-01 00:00:00 +0000 |
1845 | +++ help/de/de.po 2015-02-14 00:18:38 +0000 |
1846 | @@ -0,0 +1,452 @@ |
1847 | +# German translation for gnome-music. |
1848 | +# Copyright (C) 2014 gnome-music's COPYRIGHT HOLDER |
1849 | +# This file is distributed under the same license as the gnome-music package. |
1850 | +# Christian Kirbach <Christian.Kirbach@gmail.com>, 2014. |
1851 | +# |
1852 | +msgid "" |
1853 | +msgstr "" |
1854 | +"Project-Id-Version: gnome-music gnome-3-14\n" |
1855 | +"POT-Creation-Date: 2014-10-30 19:49+0000\n" |
1856 | +"PO-Revision-Date: 2014-10-30 22:12+0100\n" |
1857 | +"Last-Translator: Bernd Homuth <dev@hmt.im>\n" |
1858 | +"Language-Team: German <gnome-de@gnome.org>\n" |
1859 | +"Language: de\n" |
1860 | +"MIME-Version: 1.0\n" |
1861 | +"Content-Type: text/plain; charset=UTF-8\n" |
1862 | +"Content-Transfer-Encoding: 8bit\n" |
1863 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
1864 | +"X-Generator: Poedit 1.6.10\n" |
1865 | + |
1866 | +#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 |
1867 | +msgctxt "_" |
1868 | +msgid "translator-credits" |
1869 | +msgstr "Christian Kirbach <Christian.Kirbach@gmail.com>, 2014" |
1870 | + |
1871 | +#. (itstool) path: credit/name |
1872 | +#: C/introduction.page:11 C/index.page:11 C/play-music.page:11 |
1873 | +#: C/playlist-create-albums.page:11 C/playlist-create-songs.page:11 |
1874 | +#: C/playlist-create-artists.page:11 C/playlist-delete.page:11 |
1875 | +#: C/playlist-remove-songs.page:11 C/playlist-repeat.page:11 |
1876 | +#: C/playlist-shuffle.page:11 C/search.page:11 |
1877 | +msgid "Shobha Tyagi" |
1878 | +msgstr "Shobha Tyagi" |
1879 | + |
1880 | +#. (itstool) path: credit/years |
1881 | +#: C/introduction.page:13 C/index.page:13 C/play-music.page:13 |
1882 | +#: C/playlist-create-albums.page:13 C/playlist-create-songs.page:13 |
1883 | +#: C/playlist-create-artists.page:13 C/playlist-delete.page:13 |
1884 | +#: C/playlist-remove-songs.page:13 C/playlist-repeat.page:13 |
1885 | +#: C/playlist-shuffle.page:13 C/search.page:13 |
1886 | +msgid "2014" |
1887 | +msgstr "2014" |
1888 | + |
1889 | +#. (itstool) path: info/desc |
1890 | +#. (itstool) path: page/p |
1891 | +#: C/introduction.page:18 C/introduction.page:23 |
1892 | +msgid "" |
1893 | +"A simple and elegant replacement for using files to show the music directory." |
1894 | +msgstr "" |
1895 | +"Eine einfache und elegante Alternative zum Anzeigen des Musikordners mit " |
1896 | +"»Dateien«." |
1897 | + |
1898 | +#. (itstool) path: page/title |
1899 | +#: C/introduction.page:22 |
1900 | +msgid "Introduction to Music" |
1901 | +msgstr "Einführung in Musik" |
1902 | + |
1903 | +#. (itstool) path: info/title |
1904 | +#: C/index.page:6 |
1905 | +msgctxt "link" |
1906 | +msgid "Music" |
1907 | +msgstr "Musik" |
1908 | + |
1909 | +#. (itstool) path: info/title |
1910 | +#: C/index.page:7 |
1911 | +msgctxt "text" |
1912 | +msgid "Music" |
1913 | +msgstr "Musik" |
1914 | + |
1915 | +#. (itstool) path: page/title |
1916 | +#: C/index.page:18 |
1917 | +msgid "<_:media-1/> Music" |
1918 | +msgstr "<_:media-1/> Musik" |
1919 | + |
1920 | +#. (itstool) path: section/title |
1921 | +#: C/index.page:25 |
1922 | +msgid "Create playlist" |
1923 | +msgstr "Wiedergabeliste anlegen" |
1924 | + |
1925 | +#. (itstool) path: section/title |
1926 | +#: C/index.page:28 |
1927 | +msgid "Play a song" |
1928 | +msgstr "Titel wiedergeben" |
1929 | + |
1930 | +#. (itstool) path: section/title |
1931 | +#: C/index.page:31 |
1932 | +msgid "Remove songs and playlist" |
1933 | +msgstr "Titel und Wiedergabeliste entfernen" |
1934 | + |
1935 | +#. (itstool) path: info/desc |
1936 | +#: C/play-music.page:18 |
1937 | +msgid "Play your favorite songs." |
1938 | +msgstr "Geben Sie Ihre Lieblingsmusik wieder." |
1939 | + |
1940 | +#. (itstool) path: page/title |
1941 | +#: C/play-music.page:22 |
1942 | +msgid "Play music" |
1943 | +msgstr "Musik abspielen" |
1944 | + |
1945 | +#. (itstool) path: page/p |
1946 | +#: C/play-music.page:24 |
1947 | +msgid "" |
1948 | +"You can play your favorite music by creating a playlist or by simply " |
1949 | +"clicking on the song of your choice from any view." |
1950 | +msgstr "" |
1951 | +"Erstellen Sie Wiedergabelisten und geben Sie Ihre Lieblingsmusik wieder, " |
1952 | +"oder klicken Sie einfach zur Wiedergabe auf einen Musiktitel Ihrer Wahl in " |
1953 | +"einer beliebigen Ansicht." |
1954 | + |
1955 | +#. (itstool) path: steps/title |
1956 | +#: C/play-music.page:28 C/playlist-delete.page:27 |
1957 | +#: C/playlist-remove-songs.page:27 |
1958 | +msgid "While in <em>Playlists</em>:" |
1959 | +msgstr "In den <em>Wiedergabelisten</em>:" |
1960 | + |
1961 | +#. (itstool) path: item/p |
1962 | +#: C/play-music.page:30 |
1963 | +msgid "Select a playlist." |
1964 | +msgstr "Wählen Sie eine Wiedergabeliste." |
1965 | + |
1966 | +#. (itstool) path: item/p |
1967 | +#: C/play-music.page:33 C/playlist-delete.page:32 |
1968 | +msgid "Click on the gear button on the right hand side." |
1969 | +msgstr "Klicken Sie auf den Knopf mit dem Zahnrad auf der rechten Seite." |
1970 | + |
1971 | +#. (itstool) path: item/p |
1972 | +#: C/play-music.page:36 |
1973 | +msgid "Click on <gui>Play</gui>." |
1974 | +msgstr "Klicken Sie auf <gui>Wiedergabe</gui>." |
1975 | + |
1976 | +#. (itstool) path: info/desc |
1977 | +#: C/playlist-create-albums.page:18 |
1978 | +msgid "Add songs to playlists using albums." |
1979 | +msgstr "Lieder zu Wiedergabelisten mit Hilfe von Alben hinzufügen." |
1980 | + |
1981 | +#. (itstool) path: page/title |
1982 | +#: C/playlist-create-albums.page:21 |
1983 | +msgid "Create a playlist using albums" |
1984 | +msgstr "Eine Wiedergabeliste mit Hilfe von Alben anlegen" |
1985 | + |
1986 | +#. (itstool) path: page/p |
1987 | +#: C/playlist-create-albums.page:23 |
1988 | +msgid "" |
1989 | +"You can view all your albums by clicking on the <gui style=\"button" |
1990 | +"\">Albums</gui> button." |
1991 | +msgstr "" |
1992 | +"Schauen Sie sich alle Ihre Alben an, indem Sie auf den Knopf <gui style=" |
1993 | +"\"button\">Alben</gui> klicken." |
1994 | + |
1995 | +#. (itstool) path: steps/title |
1996 | +#: C/playlist-create-albums.page:27 |
1997 | +msgid "To add all the songs in an album:" |
1998 | +msgstr "So fügen Sie alle Titel eines Albums hinzu:" |
1999 | + |
2000 | +#. (itstool) path: item/p |
2001 | +#: C/playlist-create-albums.page:29 C/playlist-create-songs.page:29 |
2002 | +#: C/playlist-create-artists.page:30 |
2003 | +msgid "Click on the check button in the top-right of the window." |
2004 | +msgstr "" |
2005 | +"Klicken Sie auf das Ankreuzfeld in der rechten oberen Ecke des Fensters." |
2006 | + |
2007 | +#. (itstool) path: item/p |
2008 | +#: C/playlist-create-albums.page:32 |
2009 | +msgid "Select albums." |
2010 | +msgstr "Wählen Sie Alben." |
2011 | + |
2012 | +#. (itstool) path: item/p |
2013 | +#: C/playlist-create-albums.page:35 C/playlist-create-albums.page:60 |
2014 | +#: C/playlist-create-songs.page:35 C/playlist-create-artists.page:37 |
2015 | +msgid "Click on the <gui style=\"button\">Add to Playlist</gui> button." |
2016 | +msgstr "" |
2017 | +"Klicken Sie auf <gui style=\"button\">Zur Wiedergabeliste hinzufügen</gui>." |
2018 | + |
2019 | +#. (itstool) path: item/p |
2020 | +#: C/playlist-create-albums.page:38 C/playlist-create-albums.page:63 |
2021 | +#: C/playlist-create-artists.page:40 |
2022 | +msgid "Click on <gui>New Playlist</gui> and type a name for your playlist." |
2023 | +msgstr "" |
2024 | +"Klicken Sie auf <gui>Neue Wiedergabeliste</gui> und geben Sie einen Namen " |
2025 | +"für Ihre Wiedergabeliste ein." |
2026 | + |
2027 | +#. (itstool) path: item/p |
2028 | +#: C/playlist-create-albums.page:42 C/playlist-create-albums.page:67 |
2029 | +#: C/playlist-create-songs.page:42 |
2030 | +msgid "Click on <gui style=\"button\">Select</gui>." |
2031 | +msgstr "Klicken Sie auf <gui style=\"button\">Wählen</gui>." |
2032 | + |
2033 | +#. (itstool) path: page/p |
2034 | +#: C/playlist-create-albums.page:46 |
2035 | +msgid "You can also create a playlist from specific songs." |
2036 | +msgstr "Sie können auch eine Wiedergabeliste anhand bestimmter Titel anlegen." |
2037 | + |
2038 | +#. (itstool) path: steps/title |
2039 | +#: C/playlist-create-albums.page:49 |
2040 | +msgid "To add selected songs from an album:" |
2041 | +msgstr "So fügen Sie ausgewählte Titel eines Albums hinzu:" |
2042 | + |
2043 | +#. (itstool) path: item/p |
2044 | +#: C/playlist-create-albums.page:51 |
2045 | +msgid "Click on an album." |
2046 | +msgstr "Klicken Sie auf ein Album." |
2047 | + |
2048 | +#. (itstool) path: item/p |
2049 | +#: C/playlist-create-albums.page:54 |
2050 | +msgid "Click on the check button." |
2051 | +msgstr "Klicken Sie auf den Ankreuzknopf." |
2052 | + |
2053 | +#. (itstool) path: item/p |
2054 | +#: C/playlist-create-albums.page:57 |
2055 | +msgid "Select songs." |
2056 | +msgstr "Wählen Sie einige Titel." |
2057 | + |
2058 | +#. (itstool) path: note/p |
2059 | +#: C/playlist-create-albums.page:72 C/playlist-create-songs.page:47 |
2060 | +#: C/playlist-create-artists.page:49 |
2061 | +msgid "" |
2062 | +"To select all the songs click <guiseq><gui>Click on items to select them</" |
2063 | +"gui><gui>Select All</gui></guiseq> in the toolbar or press " |
2064 | +"<keyseq><key>Ctrl</key><key>A</key></keyseq>." |
2065 | +msgstr "" |
2066 | +"Klicken Sie auf <guiseq><gui>Objekte per Klick auswählen</gui><gui>Alle " |
2067 | +"auswählen</gui></guiseq> in der Werkzeugleiste, um alle Titel auszuwählen, " |
2068 | +"oder drücken Sie <keyseq><key>Strg</key><key>A</key></keyseq>." |
2069 | + |
2070 | +#. (itstool) path: note/p |
2071 | +#: C/playlist-create-albums.page:76 C/playlist-create-songs.page:51 |
2072 | +#: C/playlist-create-artists.page:53 |
2073 | +msgid "" |
2074 | +"To clear the selection click <guiseq><gui>Click on items to select them</" |
2075 | +"gui><gui>Select None</gui></guiseq> in the toolbar." |
2076 | +msgstr "" |
2077 | +"Klicken Sie auf <guiseq><gui>Objekte per Klick auswählen</gui><gui>Keine " |
2078 | +"auswählen</gui></guiseq> in der Werkzeugleiste, um die Auswahl aufzuheben." |
2079 | + |
2080 | +#. (itstool) path: info/desc |
2081 | +#: C/playlist-create-songs.page:18 |
2082 | +msgid "Create playlist by selecting your favorite songs." |
2083 | +msgstr "Eine Wiedergabeliste durch Wählen Ihrer Lieblingstitel anlegen." |
2084 | + |
2085 | +#. (itstool) path: page/title |
2086 | +#: C/playlist-create-songs.page:21 |
2087 | +msgid "Create playlists using songs" |
2088 | +msgstr "Wiedergabelisten mit Hilfe von Titeln anlegen" |
2089 | + |
2090 | +#. (itstool) path: page/p |
2091 | +#: C/playlist-create-songs.page:23 |
2092 | +msgid "" |
2093 | +"You can view all the songs by clicking on the <gui style=\"button\">Songs</" |
2094 | +"gui> button." |
2095 | +msgstr "" |
2096 | +"Schauen Sie sich alle Titel an, indem Sie auf den Knopf <gui style=\"button" |
2097 | +"\">Titel</gui> klicken." |
2098 | + |
2099 | +#. (itstool) path: steps/title |
2100 | +#: C/playlist-create-songs.page:27 |
2101 | +msgid "To create a new playlist while in <em>Songs</em> view:" |
2102 | +msgstr "" |
2103 | +"So erstellen Sie eine neue Wiedergabeliste in der <em>Titel</em>-Ansicht:" |
2104 | + |
2105 | +#. (itstool) path: item/p |
2106 | +#: C/playlist-create-songs.page:32 |
2107 | +msgid "Select all the songs you want to add to the playlist." |
2108 | +msgstr "Wählen Sie alle Titel, die Sie zur Wiedergabeliste hinzufügen wollen." |
2109 | + |
2110 | +#. (itstool) path: item/p |
2111 | +#: C/playlist-create-songs.page:38 |
2112 | +msgid "" |
2113 | +"Click on <gui style=\"button\">New Playlist</gui> and type a name for your " |
2114 | +"playlist." |
2115 | +msgstr "" |
2116 | +"Klicken Sie auf <gui style=\"button\">Neue Wiedergabeliste</gui> und geben " |
2117 | +"Sie einen Namen für Ihre Wiedergabeliste ein." |
2118 | + |
2119 | +#. (itstool) path: info/desc |
2120 | +#: C/playlist-create-artists.page:18 |
2121 | +msgid "Create playlist by selecting your favorite artists." |
2122 | +msgstr "Eine Wiedergabeliste durch Wählen Ihrer Lieblingskünstler anlegen." |
2123 | + |
2124 | +#. (itstool) path: page/title |
2125 | +#: C/playlist-create-artists.page:22 |
2126 | +msgid "Create playlists using artists" |
2127 | +msgstr "Wiedergabelisten mit Hilfe von Künstlern anlegen" |
2128 | + |
2129 | +#. (itstool) path: page/p |
2130 | +#: C/playlist-create-artists.page:24 |
2131 | +msgid "" |
2132 | +"You can view all the artists and their songs by clicking on the <gui syle=" |
2133 | +"\"button\">Artists</gui> button." |
2134 | +msgstr "" |
2135 | +"Schauen Sie sich alle Künstler und deren Titel an, indem Sie auf den Knopf " |
2136 | +"<gui style=\"button\">Künstler</gui> klicken." |
2137 | + |
2138 | +#. (itstool) path: steps/title |
2139 | +#: C/playlist-create-artists.page:28 |
2140 | +msgid "To create a new playlist while in <em>Artists</em> view:" |
2141 | +msgstr "" |
2142 | +"So erstellen Sie eine neue Wiedergabeliste in der <em>Künstler</em>-Ansicht:" |
2143 | + |
2144 | +#. (itstool) path: item/p |
2145 | +#: C/playlist-create-artists.page:33 |
2146 | +msgid "Select all the artists whose songs you want to add to the playlist." |
2147 | +msgstr "" |
2148 | +"Wählen Sie alle Künstler, deren Titel Sie zur Wiedergabeliste hinzufügen " |
2149 | +"möchten." |
2150 | + |
2151 | +#. (itstool) path: item/p |
2152 | +#: C/playlist-create-artists.page:44 |
2153 | +msgid "Click on <gui>Select</gui>." |
2154 | +msgstr "Klicken Sie auf <gui>Wählen</gui>." |
2155 | + |
2156 | +#. (itstool) path: info/desc |
2157 | +#: C/playlist-delete.page:18 |
2158 | +msgid "Remove an unwanted playlist." |
2159 | +msgstr "Eine unerwünschte Wiedergabeliste entfernen." |
2160 | + |
2161 | +#. (itstool) path: page/title |
2162 | +#: C/playlist-delete.page:22 |
2163 | +msgid "Delete a playlist" |
2164 | +msgstr "Eine Wiedergabeliste löschen" |
2165 | + |
2166 | +#. (itstool) path: page/p |
2167 | +#: C/playlist-delete.page:24 |
2168 | +msgid "You can remove an old and unwanted playlist." |
2169 | +msgstr "Sie können alte und unerwünschte Wiedergabeliste löschen." |
2170 | + |
2171 | +#. (itstool) path: item/p |
2172 | +#: C/playlist-delete.page:29 |
2173 | +msgid "Select the playlist which you want to delete." |
2174 | +msgstr "Wählen Sie die Wiedergabeliste aus, die Sie löschen wollen." |
2175 | + |
2176 | +#. (itstool) path: item/p |
2177 | +#: C/playlist-delete.page:35 |
2178 | +msgid "Click on <gui>Delete</gui>." |
2179 | +msgstr "Klicken Sie auf <gui>Löschen</gui>." |
2180 | + |
2181 | +#. (itstool) path: info/desc |
2182 | +#: C/playlist-remove-songs.page:18 |
2183 | +msgid "Delete songs from the playlist." |
2184 | +msgstr "So löschen Sie Titel aus der Wiedergabeliste." |
2185 | + |
2186 | +#. (itstool) path: page/title |
2187 | +#: C/playlist-remove-songs.page:22 |
2188 | +msgid "Remove songs" |
2189 | +msgstr "Titel entfernen" |
2190 | + |
2191 | +#. (itstool) path: page/p |
2192 | +#: C/playlist-remove-songs.page:24 |
2193 | +msgid "You can remove any unwanted songs from a playlist." |
2194 | +msgstr "Sie können unerwünschte Titel aus einer Wiedergabeliste entfernen." |
2195 | + |
2196 | +#. (itstool) path: item/p |
2197 | +#: C/playlist-remove-songs.page:29 |
2198 | +msgid "Select the playlist from which you want to remove songs." |
2199 | +msgstr "Wählen Sie die Wiedergabeliste, aus der Sie Titel löschen wollen." |
2200 | + |
2201 | +#. (itstool) path: item/p |
2202 | +#: C/playlist-remove-songs.page:32 |
2203 | +msgid "Click on the check button on the toolbar." |
2204 | +msgstr "Klicken Sie auf den Ankreuzknopf in der Werkzeugleiste." |
2205 | + |
2206 | +#. (itstool) path: item/p |
2207 | +#: C/playlist-remove-songs.page:35 |
2208 | +msgid "Select all the songs which you want to remove." |
2209 | +msgstr "Wählen Sie alle Titel, die Sie entfernen wollen." |
2210 | + |
2211 | +#. (itstool) path: item/p |
2212 | +#: C/playlist-remove-songs.page:38 |
2213 | +msgid "Click on <gui style=\"button\">Remove from Playlist</gui>." |
2214 | +msgstr "" |
2215 | +"Klicken Sie auf <gui style=\"button\">Aus der Wiedergabeliste entfernen</" |
2216 | +"gui>." |
2217 | + |
2218 | +#. (itstool) path: info/desc |
2219 | +#: C/playlist-repeat.page:18 |
2220 | +msgid "Repeat all songs in the playlist or only the current song." |
2221 | +msgstr "" |
2222 | +"Alle Titel der Wiedergabeliste oder nur den aktuellen Titel wiederholen." |
2223 | + |
2224 | +#. (itstool) path: page/title |
2225 | +#: C/playlist-repeat.page:22 |
2226 | +msgid "How do I play songs on repeat?" |
2227 | +msgstr "Wie werden Titel wiederholt wiedergegeben?" |
2228 | + |
2229 | +#. (itstool) path: list/title |
2230 | +#: C/playlist-repeat.page:25 |
2231 | +msgid "In the taskbar, click on the button on the right side:" |
2232 | +msgstr "Klicken Sie in der Programmleiste auf den Knopf auf der rechten Seite:" |
2233 | + |
2234 | +#. (itstool) path: item/p |
2235 | +#: C/playlist-repeat.page:27 |
2236 | +msgid "Select <gui>Repeat Song</gui> to repeat a single song." |
2237 | +msgstr "" |
2238 | +"Wählen Sie <gui>Titel wiederholen</gui>, um einen einzelnen Titel zu " |
2239 | +"wiederholen." |
2240 | + |
2241 | +#. (itstool) path: item/p |
2242 | +#: C/playlist-repeat.page:30 |
2243 | +msgid "Select <gui>Repeat All</gui> to repeat all the song in the playlist." |
2244 | +msgstr "" |
2245 | +"Wählen Sie <gui>Alle wiederholen</gui>, um alle Titel in der Wiedergabeliste " |
2246 | +"zu wiederholen." |
2247 | + |
2248 | +#. (itstool) path: info/desc |
2249 | +#: C/playlist-shuffle.page:18 |
2250 | +msgid "Shuffle songs in the playlist." |
2251 | +msgstr "So mischen Sie die Titel der Wiedergabeliste." |
2252 | + |
2253 | +#. (itstool) path: page/title |
2254 | +#: C/playlist-shuffle.page:22 |
2255 | +msgid "How do I shuffle my songs?" |
2256 | +msgstr "Wie mischt man eigene Titel?" |
2257 | + |
2258 | +#. (itstool) path: page/p |
2259 | +#: C/playlist-shuffle.page:24 |
2260 | +msgid "" |
2261 | +"In the taskbar, click on the button on right hand side and select " |
2262 | +"<gui>Shuffle</gui>." |
2263 | +msgstr "" |
2264 | +"Klicken Sie in der Programmleiste auf den Knopf auf der rechten Seite und " |
2265 | +"wählen Sie <gui>Mischen</gui>." |
2266 | + |
2267 | +#. (itstool) path: info/desc |
2268 | +#: C/search.page:18 |
2269 | +msgid "Search through your music collection." |
2270 | +msgstr "Durchsuchen Sie Ihre Musiksammlung." |
2271 | + |
2272 | +#. (itstool) path: page/title |
2273 | +#: C/search.page:22 |
2274 | +msgid "Find music" |
2275 | +msgstr "Musik suchen" |
2276 | + |
2277 | +#. (itstool) path: page/p |
2278 | +#: C/search.page:24 |
2279 | +msgid "" |
2280 | +"You can search your albums, artists, songs and playlists. Select what you " |
2281 | +"want to search through then click the <gui>Search</gui> button and start " |
2282 | +"searching." |
2283 | +msgstr "" |
2284 | +"Durchsuchen Sie Ihre Alben, Künstler, Titel und Wiedergabelisten. Wählen " |
2285 | +"Sie, wo Sie überall suchen möchten und klicken Sie dann auf den Knopf " |
2286 | +"<gui>Suchen</gui>." |
2287 | + |
2288 | +#. (itstool) path: p/link |
2289 | +#: C/legal.xml:5 |
2290 | +msgid "Creative Commons Attribution-ShareAlike 3.0 Unported License" |
2291 | +msgstr "" |
2292 | +"Creative Commons Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 " |
2293 | +"nicht angepasst" |
2294 | + |
2295 | +#. (itstool) path: license/p |
2296 | +#: C/legal.xml:4 |
2297 | +msgid "This work is licensed under a <_:link-1/>." |
2298 | +msgstr "Dieses Werk ist unter <_:link-1/> lizenziert." |
2299 | |
2300 | === added file 'help/de/de.stamp' |
2301 | === added file 'help/de/index.page' |
2302 | --- help/de/index.page 1970-01-01 00:00:00 +0000 |
2303 | +++ help/de/index.page 2015-02-14 00:18:38 +0000 |
2304 | @@ -0,0 +1,35 @@ |
2305 | +<?xml version="1.0" encoding="utf-8"?> |
2306 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" id="index" xml:lang="de"> |
2307 | + |
2308 | + <info> |
2309 | + <title type="link">Musik</title> |
2310 | + <title type="text">Musik</title> |
2311 | + <revision pkgversion="3.12" date="2014-02-24" status="review"/> |
2312 | + |
2313 | + <credit type="author"> |
2314 | + <name>Shobha Tyagi</name> |
2315 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2316 | + <years>2014</years> |
2317 | + </credit> |
2318 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2319 | + |
2320 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2321 | + <mal:name>Christian Kirbach</mal:name> |
2322 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2323 | + <mal:years>2014</mal:years> |
2324 | + </mal:credit> |
2325 | + </info> |
2326 | + |
2327 | + <title><media type="image" mime="image/png" src="figures/gnome-music-3.12.png" its:translate="no"/> Musik</title> |
2328 | + |
2329 | + <section id="create" style="2column"> |
2330 | + <title>Wiedergabeliste anlegen</title> |
2331 | + </section> |
2332 | + <section id="use" style="2column"> |
2333 | + <title>Titel wiedergeben</title> |
2334 | + </section> |
2335 | + <section id="delete" style="2column"> |
2336 | + <title>Titel und Wiedergabeliste entfernen</title> |
2337 | + </section> |
2338 | + |
2339 | +</page> |
2340 | |
2341 | === added file 'help/de/introduction.page' |
2342 | --- help/de/introduction.page 1970-01-01 00:00:00 +0000 |
2343 | +++ help/de/introduction.page 2015-02-14 00:18:38 +0000 |
2344 | @@ -0,0 +1,28 @@ |
2345 | +<?xml version="1.0" encoding="utf-8"?> |
2346 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="introduction" xml:lang="de"> |
2347 | + |
2348 | + <info> |
2349 | + <link type="guide" xref="index" group="#first"/> |
2350 | + <revision pkgversion="3.12" date="2014-02-24" status="review"/> |
2351 | + |
2352 | + <credit type="author"> |
2353 | + <name>Shobha Tyagi</name> |
2354 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2355 | + <years>2014</years> |
2356 | + </credit> |
2357 | + |
2358 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2359 | + |
2360 | + <desc>Eine einfache und elegante Alternative zum Anzeigen des Musikordners mit »Dateien«.</desc> |
2361 | + |
2362 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2363 | + <mal:name>Christian Kirbach</mal:name> |
2364 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2365 | + <mal:years>2014</mal:years> |
2366 | + </mal:credit> |
2367 | + </info> |
2368 | + |
2369 | + <title>Einführung in Musik</title> |
2370 | + <p>Eine einfache und elegante Alternative zum Anzeigen des Musikordners mit »Dateien«.</p> |
2371 | + |
2372 | +</page> |
2373 | |
2374 | === added file 'help/de/legal.xml' |
2375 | --- help/de/legal.xml 1970-01-01 00:00:00 +0000 |
2376 | +++ help/de/legal.xml 2015-02-14 00:18:38 +0000 |
2377 | @@ -0,0 +1,6 @@ |
2378 | +<?xml version="1.0" encoding="utf-8"?> |
2379 | +<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/"> |
2380 | + |
2381 | + <p>Dieses Werk ist unter <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 nicht angepasst</link> lizenziert.</p> |
2382 | + |
2383 | +</license> |
2384 | |
2385 | === added file 'help/de/play-music.page' |
2386 | --- help/de/play-music.page 1970-01-01 00:00:00 +0000 |
2387 | +++ help/de/play-music.page 2015-02-14 00:18:38 +0000 |
2388 | @@ -0,0 +1,43 @@ |
2389 | +<?xml version="1.0" encoding="utf-8"?> |
2390 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="play-music" xml:lang="de"> |
2391 | + |
2392 | + <info> |
2393 | + <link type="guide" xref="index#use"/> |
2394 | + <revision pkgversion="3.12" date="2014-03-09" status="review"/> |
2395 | + |
2396 | + <credit type="author"> |
2397 | + <name>Shobha Tyagi</name> |
2398 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2399 | + <years>2014</years> |
2400 | + </credit> |
2401 | + |
2402 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2403 | + |
2404 | + <desc>Geben Sie Ihre Lieblingsmusik wieder.</desc> |
2405 | + |
2406 | + |
2407 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2408 | + <mal:name>Christian Kirbach</mal:name> |
2409 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2410 | + <mal:years>2014</mal:years> |
2411 | + </mal:credit> |
2412 | + </info> |
2413 | + |
2414 | + <title>Musik abspielen</title> |
2415 | + |
2416 | + <p>Erstellen Sie Wiedergabelisten und geben Sie Ihre Lieblingsmusik wieder, oder klicken Sie einfach zur Wiedergabe auf einen Musiktitel Ihrer Wahl in einer beliebigen Ansicht.</p> |
2417 | + |
2418 | + <steps> |
2419 | + <title>In den <em>Wiedergabelisten</em>:</title> |
2420 | + <item> |
2421 | + <p>Wählen Sie eine Wiedergabeliste.</p> |
2422 | + </item> |
2423 | + <item> |
2424 | + <p>Klicken Sie auf den Knopf mit dem Zahnrad auf der rechten Seite.</p> |
2425 | + </item> |
2426 | + <item> |
2427 | + <p>Klicken Sie auf <gui>Wiedergabe</gui>.</p> |
2428 | + </item> |
2429 | + </steps> |
2430 | + |
2431 | +</page> |
2432 | |
2433 | === added file 'help/de/playlist-create-albums.page' |
2434 | --- help/de/playlist-create-albums.page 1970-01-01 00:00:00 +0000 |
2435 | +++ help/de/playlist-create-albums.page 2015-02-14 00:18:38 +0000 |
2436 | @@ -0,0 +1,78 @@ |
2437 | +<?xml version="1.0" encoding="utf-8"?> |
2438 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-create-albums" xml:lang="de"> |
2439 | + |
2440 | + <info> |
2441 | + <link type="guide" xref="index#create"/> |
2442 | + <revision pkgversion="3.12" date="2014-02-22" status="review"/> |
2443 | + |
2444 | + <credit type="author"> |
2445 | + <name>Shobha Tyagi</name> |
2446 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2447 | + <years>2014</years> |
2448 | + </credit> |
2449 | + |
2450 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2451 | + |
2452 | + <desc>Lieder zu Wiedergabelisten mit Hilfe von Alben hinzufügen.</desc> |
2453 | + |
2454 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2455 | + <mal:name>Christian Kirbach</mal:name> |
2456 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2457 | + <mal:years>2014</mal:years> |
2458 | + </mal:credit> |
2459 | + </info> |
2460 | + |
2461 | + <title>Eine Wiedergabeliste mit Hilfe von Alben anlegen</title> |
2462 | + |
2463 | + <p>Schauen Sie sich alle Ihre Alben an, indem Sie auf den Knopf <gui style="button">Alben</gui> klicken.</p> |
2464 | + |
2465 | + <steps> |
2466 | + <title>So fügen Sie alle Titel eines Albums hinzu:</title> |
2467 | + <item> |
2468 | + <p>Klicken Sie auf das Ankreuzfeld in der rechten oberen Ecke des Fensters.</p> |
2469 | + </item> |
2470 | + <item> |
2471 | + <p>Wählen Sie Alben.</p> |
2472 | + </item> |
2473 | + <item> |
2474 | + <p>Klicken Sie auf <gui style="button">Zur Wiedergabeliste hinzufügen</gui>.</p> |
2475 | + </item> |
2476 | + <item> |
2477 | + <p>Klicken Sie auf <gui>Neue Wiedergabeliste</gui> und geben Sie einen Namen für Ihre Wiedergabeliste ein.</p> |
2478 | + </item> |
2479 | + <item> |
2480 | + <p>Klicken Sie auf <gui style="button">Wählen</gui>.</p> |
2481 | + </item> |
2482 | + </steps> |
2483 | + |
2484 | + <p>Sie können auch eine Wiedergabeliste anhand bestimmter Titel anlegen.</p> |
2485 | + |
2486 | + <steps> |
2487 | + <title>So fügen Sie ausgewählte Titel eines Albums hinzu:</title> |
2488 | + <item> |
2489 | + <p>Klicken Sie auf ein Album.</p> |
2490 | + </item> |
2491 | + <item> |
2492 | + <p>Klicken Sie auf den Ankreuzknopf.</p> |
2493 | + </item> |
2494 | + <item> |
2495 | + <p>Wählen Sie einige Titel.</p> |
2496 | + </item> |
2497 | + <item> |
2498 | + <p>Klicken Sie auf <gui style="button">Zur Wiedergabeliste hinzufügen</gui>.</p> |
2499 | + </item> |
2500 | + <item> |
2501 | + <p>Klicken Sie auf <gui>Neue Wiedergabeliste</gui> und geben Sie einen Namen für Ihre Wiedergabeliste ein.</p> |
2502 | + </item> |
2503 | + <item> |
2504 | + <p>Klicken Sie auf <gui style="button">Wählen</gui>.</p> |
2505 | + </item> |
2506 | + </steps> |
2507 | + |
2508 | + <note> |
2509 | + <p>Klicken Sie auf <guiseq><gui>Objekte per Klick auswählen</gui><gui>Alle auswählen</gui></guiseq> in der Werkzeugleiste, um alle Titel auszuwählen, oder drücken Sie <keyseq><key>Strg</key><key>A</key></keyseq>.</p> |
2510 | + |
2511 | + <p>Klicken Sie auf <guiseq><gui>Objekte per Klick auswählen</gui><gui>Keine auswählen</gui></guiseq> in der Werkzeugleiste, um die Auswahl aufzuheben.</p> |
2512 | + </note> |
2513 | + |
2514 | +</page> |
2515 | |
2516 | === added file 'help/de/playlist-create-artists.page' |
2517 | --- help/de/playlist-create-artists.page 1970-01-01 00:00:00 +0000 |
2518 | +++ help/de/playlist-create-artists.page 2015-02-14 00:18:38 +0000 |
2519 | @@ -0,0 +1,54 @@ |
2520 | +<?xml version="1.0" encoding="utf-8"?> |
2521 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-create-artists" xml:lang="de"> |
2522 | + |
2523 | + <info> |
2524 | + <link type="guide" xref="index#create"/> |
2525 | + <revision pkgversion="3.12" date="2014-03-08" status="review"/> |
2526 | + |
2527 | + <credit type="author"> |
2528 | + <name>Shobha Tyagi</name> |
2529 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2530 | + <years>2014</years> |
2531 | + </credit> |
2532 | + |
2533 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2534 | + |
2535 | + <desc>Eine Wiedergabeliste durch Wählen Ihrer Lieblingskünstler anlegen.</desc> |
2536 | + |
2537 | + |
2538 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2539 | + <mal:name>Christian Kirbach</mal:name> |
2540 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2541 | + <mal:years>2014</mal:years> |
2542 | + </mal:credit> |
2543 | + </info> |
2544 | + |
2545 | + <title>Wiedergabelisten mit Hilfe von Künstlern anlegen</title> |
2546 | + |
2547 | + <p>Schauen Sie sich alle Künstler und deren Titel an, indem Sie auf den Knopf <gui style="button">Künstler</gui> klicken.</p> |
2548 | + |
2549 | + <steps> |
2550 | + <title>So erstellen Sie eine neue Wiedergabeliste in der <em>Künstler</em>-Ansicht:</title> |
2551 | + <item> |
2552 | + <p>Klicken Sie auf das Ankreuzfeld in der rechten oberen Ecke des Fensters.</p> |
2553 | + </item> |
2554 | + <item> |
2555 | + <p>Wählen Sie alle Künstler, deren Titel Sie zur Wiedergabeliste hinzufügen möchten.</p> |
2556 | + </item> |
2557 | + <item> |
2558 | + <p>Klicken Sie auf <gui style="button">Zur Wiedergabeliste hinzufügen</gui>.</p> |
2559 | + </item> |
2560 | + <item> |
2561 | + <p>Klicken Sie auf <gui>Neue Wiedergabeliste</gui> und geben Sie einen Namen für Ihre Wiedergabeliste ein.</p> |
2562 | + </item> |
2563 | + <item> |
2564 | + <p>Klicken Sie auf <gui>Wählen</gui>.</p> |
2565 | + </item> |
2566 | + </steps> |
2567 | + |
2568 | + <note> |
2569 | + <p>Klicken Sie auf <guiseq><gui>Objekte per Klick auswählen</gui><gui>Alle auswählen</gui></guiseq> in der Werkzeugleiste, um alle Titel auszuwählen, oder drücken Sie <keyseq><key>Strg</key><key>A</key></keyseq>.</p> |
2570 | + |
2571 | + <p>Klicken Sie auf <guiseq><gui>Objekte per Klick auswählen</gui><gui>Keine auswählen</gui></guiseq> in der Werkzeugleiste, um die Auswahl aufzuheben.</p> |
2572 | + </note> |
2573 | +</page> |
2574 | |
2575 | === added file 'help/de/playlist-create-songs.page' |
2576 | --- help/de/playlist-create-songs.page 1970-01-01 00:00:00 +0000 |
2577 | +++ help/de/playlist-create-songs.page 2015-02-14 00:18:38 +0000 |
2578 | @@ -0,0 +1,53 @@ |
2579 | +<?xml version="1.0" encoding="utf-8"?> |
2580 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-create-songs" xml:lang="de"> |
2581 | + |
2582 | + <info> |
2583 | + <link type="guide" xref="index#create"/> |
2584 | + <revision pkgversion="3.12" date="2014-03-03" status="review"/> |
2585 | + |
2586 | + <credit type="author"> |
2587 | + <name>Shobha Tyagi</name> |
2588 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2589 | + <years>2014</years> |
2590 | + </credit> |
2591 | + |
2592 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2593 | + |
2594 | + <desc>Eine Wiedergabeliste durch Wählen Ihrer Lieblingstitel anlegen.</desc> |
2595 | + |
2596 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2597 | + <mal:name>Christian Kirbach</mal:name> |
2598 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2599 | + <mal:years>2014</mal:years> |
2600 | + </mal:credit> |
2601 | + </info> |
2602 | + |
2603 | + <title>Wiedergabelisten mit Hilfe von Titeln anlegen</title> |
2604 | + |
2605 | + <p>Schauen Sie sich alle Titel an, indem Sie auf den Knopf <gui style="button">Titel</gui> klicken.</p> |
2606 | + |
2607 | + <steps> |
2608 | + <title>So erstellen Sie eine neue Wiedergabeliste in der <em>Titel</em>-Ansicht:</title> |
2609 | + <item> |
2610 | + <p>Klicken Sie auf das Ankreuzfeld in der rechten oberen Ecke des Fensters.</p> |
2611 | + </item> |
2612 | + <item> |
2613 | + <p>Wählen Sie alle Titel, die Sie zur Wiedergabeliste hinzufügen wollen.</p> |
2614 | + </item> |
2615 | + <item> |
2616 | + <p>Klicken Sie auf <gui style="button">Zur Wiedergabeliste hinzufügen</gui>.</p> |
2617 | + </item> |
2618 | + <item> |
2619 | + <p>Klicken Sie auf <gui style="button">Neue Wiedergabeliste</gui> und geben Sie einen Namen für Ihre Wiedergabeliste ein.</p> |
2620 | + </item> |
2621 | + <item> |
2622 | + <p>Klicken Sie auf <gui style="button">Wählen</gui>.</p> |
2623 | + </item> |
2624 | + </steps> |
2625 | + |
2626 | + <note> |
2627 | + <p>Klicken Sie auf <guiseq><gui>Objekte per Klick auswählen</gui><gui>Alle auswählen</gui></guiseq> in der Werkzeugleiste, um alle Titel auszuwählen, oder drücken Sie <keyseq><key>Strg</key><key>A</key></keyseq>.</p> |
2628 | + |
2629 | + <p>Klicken Sie auf <guiseq><gui>Objekte per Klick auswählen</gui><gui>Keine auswählen</gui></guiseq> in der Werkzeugleiste, um die Auswahl aufzuheben.</p> |
2630 | + </note> |
2631 | +</page> |
2632 | |
2633 | === added file 'help/de/playlist-delete.page' |
2634 | --- help/de/playlist-delete.page 1970-01-01 00:00:00 +0000 |
2635 | +++ help/de/playlist-delete.page 2015-02-14 00:18:38 +0000 |
2636 | @@ -0,0 +1,43 @@ |
2637 | +<?xml version="1.0" encoding="utf-8"?> |
2638 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-delete" xml:lang="de"> |
2639 | + |
2640 | + <info> |
2641 | + <link type="guide" xref="index#delete"/> |
2642 | + <revision pkgversion="3.12" date="2014-03-08" status="review"/> |
2643 | + |
2644 | + <credit type="author"> |
2645 | + <name>Shobha Tyagi</name> |
2646 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2647 | + <years>2014</years> |
2648 | + </credit> |
2649 | + |
2650 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2651 | + |
2652 | + <desc>Eine unerwünschte Wiedergabeliste entfernen.</desc> |
2653 | + |
2654 | + |
2655 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2656 | + <mal:name>Christian Kirbach</mal:name> |
2657 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2658 | + <mal:years>2014</mal:years> |
2659 | + </mal:credit> |
2660 | + </info> |
2661 | + |
2662 | + <title>Eine Wiedergabeliste löschen</title> |
2663 | + |
2664 | + <p>Sie können alte und unerwünschte Wiedergabeliste löschen.</p> |
2665 | + |
2666 | + <steps> |
2667 | + <title>In den <em>Wiedergabelisten</em>:</title> |
2668 | + <item> |
2669 | + <p>Wählen Sie die Wiedergabeliste aus, die Sie löschen wollen.</p> |
2670 | + </item> |
2671 | + <item> |
2672 | + <p>Klicken Sie auf den Knopf mit dem Zahnrad auf der rechten Seite.</p> |
2673 | + </item> |
2674 | + <item> |
2675 | + <p>Klicken Sie auf <gui>Löschen</gui>.</p> |
2676 | + </item> |
2677 | + </steps> |
2678 | + |
2679 | +</page> |
2680 | |
2681 | === added file 'help/de/playlist-remove-songs.page' |
2682 | --- help/de/playlist-remove-songs.page 1970-01-01 00:00:00 +0000 |
2683 | +++ help/de/playlist-remove-songs.page 2015-02-14 00:18:38 +0000 |
2684 | @@ -0,0 +1,46 @@ |
2685 | +<?xml version="1.0" encoding="utf-8"?> |
2686 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-remove-songs" xml:lang="de"> |
2687 | + |
2688 | + <info> |
2689 | + <link type="guide" xref="index#delete"/> |
2690 | + <revision pkgversion="3.12" date="2014-03-09" status="review"/> |
2691 | + |
2692 | + <credit type="author"> |
2693 | + <name>Shobha Tyagi</name> |
2694 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2695 | + <years>2014</years> |
2696 | + </credit> |
2697 | + |
2698 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2699 | + |
2700 | + <desc>So löschen Sie Titel aus der Wiedergabeliste.</desc> |
2701 | + |
2702 | + |
2703 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2704 | + <mal:name>Christian Kirbach</mal:name> |
2705 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2706 | + <mal:years>2014</mal:years> |
2707 | + </mal:credit> |
2708 | + </info> |
2709 | + |
2710 | + <title>Titel entfernen</title> |
2711 | + |
2712 | + <p>Sie können unerwünschte Titel aus einer Wiedergabeliste entfernen.</p> |
2713 | + |
2714 | + <steps> |
2715 | + <title>In den <em>Wiedergabelisten</em>:</title> |
2716 | + <item> |
2717 | + <p>Wählen Sie die Wiedergabeliste, aus der Sie Titel löschen wollen.</p> |
2718 | + </item> |
2719 | + <item> |
2720 | + <p>Klicken Sie auf den Ankreuzknopf in der Werkzeugleiste.</p> |
2721 | + </item> |
2722 | + <item> |
2723 | + <p>Wählen Sie alle Titel, die Sie entfernen wollen.</p> |
2724 | + </item> |
2725 | + <item> |
2726 | + <p>Klicken Sie auf <gui style="button">Aus der Wiedergabeliste entfernen</gui>.</p> |
2727 | + </item> |
2728 | + </steps> |
2729 | + |
2730 | +</page> |
2731 | |
2732 | === added file 'help/de/playlist-repeat.page' |
2733 | --- help/de/playlist-repeat.page 1970-01-01 00:00:00 +0000 |
2734 | +++ help/de/playlist-repeat.page 2015-02-14 00:18:38 +0000 |
2735 | @@ -0,0 +1,38 @@ |
2736 | +<?xml version="1.0" encoding="utf-8"?> |
2737 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-repeat" xml:lang="de"> |
2738 | + |
2739 | + <info> |
2740 | + <link type="guide" xref="index#use"/> |
2741 | + <revision pkgversion="3.12" date="2014-03-25" status="review"/> |
2742 | + |
2743 | + <credit type="author"> |
2744 | + <name>Shobha Tyagi</name> |
2745 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2746 | + <years>2014</years> |
2747 | + </credit> |
2748 | + |
2749 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2750 | + |
2751 | + <desc>Alle Titel der Wiedergabeliste oder nur den aktuellen Titel wiederholen.</desc> |
2752 | + |
2753 | + |
2754 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2755 | + <mal:name>Christian Kirbach</mal:name> |
2756 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2757 | + <mal:years>2014</mal:years> |
2758 | + </mal:credit> |
2759 | + </info> |
2760 | + |
2761 | + <title>Wie werden Titel wiederholt wiedergegeben?</title> |
2762 | + |
2763 | + <list> |
2764 | + <title>Klicken Sie in der Programmleiste auf den Knopf auf der rechten Seite:</title> |
2765 | + <item> |
2766 | + <p>Wählen Sie <gui>Titel wiederholen</gui>, um einen einzelnen Titel zu wiederholen.</p> |
2767 | + </item> |
2768 | + <item> |
2769 | + <p>Wählen Sie <gui>Alle wiederholen</gui>, um alle Titel in der Wiedergabeliste zu wiederholen.</p> |
2770 | + </item> |
2771 | + </list> |
2772 | + |
2773 | +</page> |
2774 | |
2775 | === added file 'help/de/playlist-shuffle.page' |
2776 | --- help/de/playlist-shuffle.page 1970-01-01 00:00:00 +0000 |
2777 | +++ help/de/playlist-shuffle.page 2015-02-14 00:18:38 +0000 |
2778 | @@ -0,0 +1,30 @@ |
2779 | +<?xml version="1.0" encoding="utf-8"?> |
2780 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-shuffle" xml:lang="de"> |
2781 | + |
2782 | + <info> |
2783 | + <link type="guide" xref="index#use"/> |
2784 | + <revision pkgversion="3.12" date="2014-03-25" status="review"/> |
2785 | + |
2786 | + <credit type="author"> |
2787 | + <name>Shobha Tyagi</name> |
2788 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2789 | + <years>2014</years> |
2790 | + </credit> |
2791 | + |
2792 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2793 | + |
2794 | + <desc>So mischen Sie die Titel der Wiedergabeliste.</desc> |
2795 | + |
2796 | + |
2797 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2798 | + <mal:name>Christian Kirbach</mal:name> |
2799 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2800 | + <mal:years>2014</mal:years> |
2801 | + </mal:credit> |
2802 | + </info> |
2803 | + |
2804 | + <title>Wie mischt man eigene Titel?</title> |
2805 | + |
2806 | + <p>Klicken Sie in der Programmleiste auf den Knopf auf der rechten Seite und wählen Sie <gui>Mischen</gui>.</p> |
2807 | + |
2808 | +</page> |
2809 | |
2810 | === added file 'help/de/search.page' |
2811 | --- help/de/search.page 1970-01-01 00:00:00 +0000 |
2812 | +++ help/de/search.page 2015-02-14 00:18:38 +0000 |
2813 | @@ -0,0 +1,30 @@ |
2814 | +<?xml version="1.0" encoding="utf-8"?> |
2815 | +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="search" xml:lang="de"> |
2816 | + |
2817 | + <info> |
2818 | + <link type="guide" xref="index#create"/> |
2819 | + <revision pkgversion="3.12" date="2014-03-09" status="review"/> |
2820 | + |
2821 | + <credit type="author"> |
2822 | + <name>Shobha Tyagi</name> |
2823 | + <email its:translate="no">tyagishobha@gmail.com</email> |
2824 | + <years>2014</years> |
2825 | + </credit> |
2826 | + |
2827 | + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> |
2828 | + |
2829 | + <desc>Durchsuchen Sie Ihre Musiksammlung.</desc> |
2830 | + |
2831 | + |
2832 | + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> |
2833 | + <mal:name>Christian Kirbach</mal:name> |
2834 | + <mal:email>Christian.Kirbach@gmail.com</mal:email> |
2835 | + <mal:years>2014</mal:years> |
2836 | + </mal:credit> |
2837 | + </info> |
2838 | + |
2839 | + <title>Musik suchen</title> |
2840 | + |
2841 | + <p>Durchsuchen Sie Ihre Alben, Künstler, Titel und Wiedergabelisten. Wählen Sie, wo Sie überall suchen möchten und klicken Sie dann auf den Knopf <gui>Suchen</gui>.</p> |
2842 | + |
2843 | +</page> |
2844 | |
2845 | === modified file 'libgd/Makefile.am' |
2846 | --- libgd/Makefile.am 2014-05-10 03:47:53 +0000 |
2847 | +++ libgd/Makefile.am 2015-02-14 00:18:38 +0000 |
2848 | @@ -1,3 +1,4 @@ |
2849 | +AUTOMAKE_OPTIONS=subdir-objects |
2850 | NULL = |
2851 | CLEANFILES = |
2852 | MAINTAINERCLEANFILES = |
2853 | |
2854 | === modified file 'libgd/Makefile.in' |
2855 | --- libgd/Makefile.in 2014-10-19 23:39:47 +0000 |
2856 | +++ libgd/Makefile.in 2015-02-14 00:18:38 +0000 |
2857 | @@ -1,4 +1,4 @@ |
2858 | -# Makefile.in generated by automake 1.14.1 from Makefile.am. |
2859 | +# Makefile.in generated by automake 1.13.4 from Makefile.am. |
2860 | # @configure_input@ |
2861 | |
2862 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2863 | @@ -504,6 +504,7 @@ |
2864 | top_build_prefix = @top_build_prefix@ |
2865 | top_builddir = @top_builddir@ |
2866 | top_srcdir = @top_srcdir@ |
2867 | +AUTOMAKE_OPTIONS = subdir-objects |
2868 | NULL = |
2869 | CLEANFILES = $(am__append_34) |
2870 | MAINTAINERCLEANFILES = $(am__append_33) $(am__append_37) |
2871 | |
2872 | === modified file 'libgd/libgd/gd-main-icon-view.c' |
2873 | --- libgd/libgd/gd-main-icon-view.c 2014-05-10 03:47:53 +0000 |
2874 | +++ libgd/libgd/gd-main-icon-view.c 2015-02-14 00:18:38 +0000 |
2875 | @@ -135,6 +135,7 @@ |
2876 | g_object_set (cell, |
2877 | "xalign", 0.5, |
2878 | "yalign", 0.5, |
2879 | + "follow-state", TRUE, |
2880 | NULL); |
2881 | gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, FALSE); |
2882 | |
2883 | |
2884 | === modified file 'libgd/libgd/gd-main-list-view.c' |
2885 | --- libgd/libgd/gd-main-list-view.c 2014-05-10 03:47:53 +0000 |
2886 | +++ libgd/libgd/gd-main-list-view.c 2015-02-14 00:18:38 +0000 |
2887 | @@ -61,7 +61,6 @@ |
2888 | GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); |
2889 | GType icon_gtype; |
2890 | |
2891 | - |
2892 | if (!model) |
2893 | return; |
2894 | |
2895 | |
2896 | === modified file 'libgd/libgd/gd-main-view.c' |
2897 | --- libgd/libgd/gd-main-view.c 2014-05-10 03:47:53 +0000 |
2898 | +++ libgd/libgd/gd-main-view.c 2015-02-14 00:18:38 +0000 |
2899 | @@ -25,6 +25,8 @@ |
2900 | #include "gd-main-icon-view.h" |
2901 | #include "gd-main-list-view.h" |
2902 | |
2903 | +#include <cairo-gobject.h> |
2904 | + |
2905 | #define MAIN_VIEW_TYPE_INITIAL -1 |
2906 | #define MAIN_VIEW_DND_ICON_OFFSET 20 |
2907 | #define MAIN_VIEW_RUBBERBAND_SELECT_TRIGGER_LENGTH 32 |
2908 | @@ -231,15 +233,14 @@ |
2909 | g_object_class_install_properties (oclass, NUM_PROPERTIES, properties); |
2910 | } |
2911 | |
2912 | -static GdkPixbuf * |
2913 | +static cairo_surface_t * |
2914 | gd_main_view_get_counter_icon (GdMainView *self, |
2915 | - GdkPixbuf *base, |
2916 | + cairo_surface_t *base, |
2917 | gint number) |
2918 | { |
2919 | GtkStyleContext *context; |
2920 | cairo_t *cr, *emblem_cr; |
2921 | cairo_surface_t *surface, *emblem_surface; |
2922 | - GdkPixbuf *retval; |
2923 | gint width, height; |
2924 | gint layout_width, layout_height; |
2925 | gint emblem_size; |
2926 | @@ -255,18 +256,18 @@ |
2927 | gtk_style_context_save (context); |
2928 | gtk_style_context_add_class (context, "documents-counter"); |
2929 | |
2930 | - width = gdk_pixbuf_get_width (base); |
2931 | - height = gdk_pixbuf_get_height (base); |
2932 | + width = cairo_image_surface_get_width (base); |
2933 | + height = cairo_image_surface_get_height (base); |
2934 | |
2935 | - surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, |
2936 | - width, height); |
2937 | + surface = cairo_surface_create_similar (base, CAIRO_CONTENT_COLOR_ALPHA, |
2938 | + width, height); |
2939 | cr = cairo_create (surface); |
2940 | - gdk_cairo_set_source_pixbuf (cr, base, 0, 0); |
2941 | + cairo_set_source_surface (cr, base, 0, 0); |
2942 | cairo_paint (cr); |
2943 | |
2944 | emblem_size = MIN (width / 2, height / 2); |
2945 | - emblem_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, |
2946 | - emblem_size, emblem_size); |
2947 | + emblem_surface = cairo_surface_create_similar (base, CAIRO_CONTENT_COLOR_ALPHA, |
2948 | + emblem_size, emblem_size); |
2949 | emblem_cr = cairo_create (emblem_surface); |
2950 | gtk_render_background (context, emblem_cr, |
2951 | 0, 0, emblem_size, emblem_size); |
2952 | @@ -315,15 +316,10 @@ |
2953 | cairo_paint (cr); |
2954 | cairo_destroy (cr); |
2955 | |
2956 | - retval = gdk_pixbuf_get_from_surface (surface, |
2957 | - 0, 0, |
2958 | - width, height); |
2959 | - |
2960 | cairo_surface_destroy (emblem_surface); |
2961 | - cairo_surface_destroy (surface); |
2962 | gtk_style_context_restore (context); |
2963 | |
2964 | - return retval; |
2965 | + return surface; |
2966 | } |
2967 | |
2968 | static GdMainViewGeneric * |
2969 | @@ -823,6 +819,22 @@ |
2970 | return FALSE; |
2971 | } |
2972 | |
2973 | +static cairo_surface_t * |
2974 | +copy_surface (cairo_surface_t *surface) |
2975 | +{ |
2976 | + cairo_surface_t *copy; |
2977 | + cairo_t *cr; |
2978 | + |
2979 | + copy = cairo_surface_create_similar (surface, CAIRO_CONTENT_COLOR_ALPHA, |
2980 | + cairo_image_surface_get_width (surface), |
2981 | + cairo_image_surface_get_height (surface)); |
2982 | + cr = cairo_create (copy); |
2983 | + cairo_set_source_surface (cr, surface, 0, 0); |
2984 | + cairo_paint (cr); |
2985 | + cairo_destroy (cr); |
2986 | + |
2987 | + return copy; |
2988 | +} |
2989 | |
2990 | static void |
2991 | on_drag_begin (GdMainViewGeneric *generic, |
2992 | @@ -835,41 +847,61 @@ |
2993 | { |
2994 | gboolean res; |
2995 | GtkTreeIter iter; |
2996 | - GdkPixbuf *icon = NULL; |
2997 | + gpointer data; |
2998 | + cairo_surface_t *surface = NULL; |
2999 | GtkTreePath *path; |
3000 | + GType column_gtype; |
3001 | |
3002 | path = gtk_tree_path_new_from_string (self->priv->button_press_item_path); |
3003 | res = gtk_tree_model_get_iter (self->priv->model, |
3004 | &iter, path); |
3005 | if (res) |
3006 | gtk_tree_model_get (self->priv->model, &iter, |
3007 | - GD_MAIN_COLUMN_ICON, &icon, |
3008 | + GD_MAIN_COLUMN_ICON, &data, |
3009 | -1); |
3010 | |
3011 | - if (self->priv->selection_mode && |
3012 | - icon != NULL) |
3013 | + column_gtype = gtk_tree_model_get_column_type (self->priv->model, |
3014 | + GD_MAIN_COLUMN_ICON); |
3015 | + |
3016 | + if (column_gtype == CAIRO_GOBJECT_TYPE_SURFACE) |
3017 | + { |
3018 | + surface = copy_surface (data); |
3019 | + cairo_surface_destroy (data); |
3020 | + } |
3021 | + else if (column_gtype == GDK_TYPE_PIXBUF) |
3022 | + { |
3023 | + surface = gdk_cairo_surface_create_from_pixbuf (data, 1, NULL); |
3024 | + g_object_unref (data); |
3025 | + } |
3026 | + else |
3027 | + g_assert_not_reached (); |
3028 | + |
3029 | + if (self->priv->selection_mode && |
3030 | + surface != NULL) |
3031 | { |
3032 | GList *selection; |
3033 | - GdkPixbuf *counter; |
3034 | + cairo_surface_t *counter; |
3035 | |
3036 | selection = gd_main_view_get_selection (self); |
3037 | |
3038 | if (g_list_length (selection) > 1) |
3039 | { |
3040 | - counter = gd_main_view_get_counter_icon (self, icon, g_list_length (selection)); |
3041 | - g_clear_object (&icon); |
3042 | - icon = counter; |
3043 | + counter = gd_main_view_get_counter_icon (self, surface, g_list_length (selection)); |
3044 | + cairo_surface_destroy (surface); |
3045 | + surface = counter; |
3046 | } |
3047 | |
3048 | if (selection != NULL) |
3049 | g_list_free_full (selection, (GDestroyNotify) gtk_tree_path_free); |
3050 | } |
3051 | |
3052 | - if (icon != NULL) |
3053 | + if (surface != NULL) |
3054 | { |
3055 | - gtk_drag_set_icon_pixbuf (drag_context, icon, |
3056 | - MAIN_VIEW_DND_ICON_OFFSET, MAIN_VIEW_DND_ICON_OFFSET); |
3057 | - g_object_unref (icon); |
3058 | + cairo_surface_set_device_offset (surface, |
3059 | + -MAIN_VIEW_DND_ICON_OFFSET, |
3060 | + -MAIN_VIEW_DND_ICON_OFFSET); |
3061 | + gtk_drag_set_icon_surface (drag_context, surface); |
3062 | + cairo_surface_destroy (surface); |
3063 | } |
3064 | |
3065 | gtk_tree_path_free (path); |
3066 | |
3067 | === modified file 'libgd/libgd/gd-tagged-entry.c' |
3068 | --- libgd/libgd/gd-tagged-entry.c 2014-09-22 21:20:08 +0000 |
3069 | +++ libgd/libgd/gd-tagged-entry.c 2015-02-14 00:18:38 +0000 |
3070 | @@ -35,7 +35,7 @@ |
3071 | gchar *style; |
3072 | gboolean has_close_button; |
3073 | |
3074 | - GdkPixbuf *close_pixbuf; |
3075 | + cairo_surface_t *close_surface; |
3076 | GtkStateFlags last_button_state; |
3077 | }; |
3078 | |
3079 | @@ -99,28 +99,32 @@ |
3080 | } |
3081 | |
3082 | static void |
3083 | -gd_tagged_entry_tag_ensure_close_pixbuf (GdTaggedEntryTag *tag, |
3084 | - GtkStyleContext *context) |
3085 | +gd_tagged_entry_tag_ensure_close_surface (GdTaggedEntryTag *tag, |
3086 | + GtkStyleContext *context) |
3087 | { |
3088 | GtkIconInfo *info; |
3089 | + GdkPixbuf *pixbuf; |
3090 | gint icon_size; |
3091 | + gint scale_factor; |
3092 | |
3093 | - if (tag->priv->close_pixbuf != NULL) |
3094 | + if (tag->priv->close_surface != NULL) |
3095 | return; |
3096 | |
3097 | gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, |
3098 | &icon_size, NULL); |
3099 | - |
3100 | - info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), |
3101 | - "window-close-symbolic", |
3102 | - icon_size, |
3103 | - GTK_ICON_LOOKUP_GENERIC_FALLBACK); |
3104 | - |
3105 | - tag->priv->close_pixbuf = |
3106 | - gtk_icon_info_load_symbolic_for_context (info, context, |
3107 | - NULL, NULL); |
3108 | + scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (tag->priv->entry)); |
3109 | + |
3110 | + info = gtk_icon_theme_lookup_icon_for_scale (gtk_icon_theme_get_default (), |
3111 | + "window-close-symbolic", |
3112 | + icon_size, scale_factor, |
3113 | + GTK_ICON_LOOKUP_GENERIC_FALLBACK); |
3114 | |
3115 | /* FIXME: we need a fallback icon in case the icon is not found */ |
3116 | + pixbuf = gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL); |
3117 | + tag->priv->close_surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale_factor, tag->priv->window); |
3118 | + |
3119 | + g_object_unref (info); |
3120 | + g_object_unref (pixbuf); |
3121 | } |
3122 | |
3123 | static gint |
3124 | @@ -260,6 +264,7 @@ |
3125 | GtkStateFlags state; |
3126 | gint layout_width; |
3127 | gint button_width; |
3128 | + gint scale_factor; |
3129 | |
3130 | gd_tagged_entry_tag_ensure_layout (tag, entry); |
3131 | pango_layout_get_pixel_size (tag->priv->layout, &layout_width, NULL); |
3132 | @@ -271,13 +276,17 @@ |
3133 | gtk_style_context_get_border (context, state, &button_border); |
3134 | gtk_style_context_get_margin (context, state, &button_margin); |
3135 | |
3136 | - gd_tagged_entry_tag_ensure_close_pixbuf (tag, context); |
3137 | + gd_tagged_entry_tag_ensure_close_surface (tag, context); |
3138 | |
3139 | g_object_unref (context); |
3140 | |
3141 | button_width = 0; |
3142 | if (entry->priv->button_visible && tag->priv->has_close_button) |
3143 | - button_width = gdk_pixbuf_get_width (tag->priv->close_pixbuf) + BUTTON_INTERNAL_SPACING; |
3144 | + { |
3145 | + scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (entry)); |
3146 | + button_width = cairo_image_surface_get_width (tag->priv->close_surface) / scale_factor + |
3147 | + BUTTON_INTERNAL_SPACING; |
3148 | + } |
3149 | |
3150 | return layout_width + button_padding.left + button_padding.right + |
3151 | button_border.left + button_border.right + |
3152 | @@ -313,11 +322,13 @@ |
3153 | GtkAllocation background_allocation, layout_allocation, button_allocation; |
3154 | gint width, height, x, y, pix_width, pix_height; |
3155 | gint layout_width, layout_height; |
3156 | + gint scale_factor; |
3157 | GtkBorder padding, border; |
3158 | GtkStateFlags state; |
3159 | |
3160 | width = gdk_window_get_width (tag->priv->window); |
3161 | height = gdk_window_get_height (tag->priv->window); |
3162 | + scale_factor = gdk_window_get_scale_factor (tag->priv->window); |
3163 | |
3164 | state = gd_tagged_entry_tag_get_state (tag, entry); |
3165 | gtk_style_context_get_margin (context, state, &padding); |
3166 | @@ -345,8 +356,8 @@ |
3167 | |
3168 | if (entry->priv->button_visible && tag->priv->has_close_button) |
3169 | { |
3170 | - pix_width = gdk_pixbuf_get_width (tag->priv->close_pixbuf); |
3171 | - pix_height = gdk_pixbuf_get_height (tag->priv->close_pixbuf); |
3172 | + pix_width = cairo_image_surface_get_width (tag->priv->close_surface) / scale_factor; |
3173 | + pix_height = cairo_image_surface_get_height (tag->priv->close_surface) / scale_factor; |
3174 | } |
3175 | else |
3176 | { |
3177 | @@ -468,8 +479,8 @@ |
3178 | */ |
3179 | if (state != tag->priv->last_button_state) |
3180 | { |
3181 | - g_clear_object (&tag->priv->close_pixbuf); |
3182 | - gd_tagged_entry_tag_ensure_close_pixbuf (tag, context); |
3183 | + g_clear_pointer (&tag->priv->close_surface, cairo_surface_destroy); |
3184 | + gd_tagged_entry_tag_ensure_close_surface (tag, context); |
3185 | |
3186 | tag->priv->last_button_state = state; |
3187 | } |
3188 | @@ -481,9 +492,9 @@ |
3189 | button_allocation.x, button_allocation.y, |
3190 | button_allocation.width, button_allocation.height); |
3191 | |
3192 | - gtk_render_icon (context, cr, |
3193 | - tag->priv->close_pixbuf, |
3194 | - button_allocation.x, button_allocation.y); |
3195 | + gtk_render_icon_surface (context, cr, |
3196 | + tag->priv->close_surface, |
3197 | + button_allocation.x, button_allocation.y); |
3198 | |
3199 | done: |
3200 | cairo_restore (cr); |
3201 | @@ -950,7 +961,7 @@ |
3202 | gd_tagged_entry_tag_unrealize (tag); |
3203 | |
3204 | g_clear_object (&priv->layout); |
3205 | - g_clear_object (&priv->close_pixbuf); |
3206 | + g_clear_pointer (&priv->close_surface, cairo_surface_destroy); |
3207 | g_free (priv->label); |
3208 | g_free (priv->style); |
3209 | |
3210 | |
3211 | === modified file 'libgd/libgd/gd-toggle-pixbuf-renderer.c' |
3212 | --- libgd/libgd/gd-toggle-pixbuf-renderer.c 2014-10-19 23:39:47 +0000 |
3213 | +++ libgd/libgd/gd-toggle-pixbuf-renderer.c 2015-02-14 00:18:38 +0000 |
3214 | @@ -70,8 +70,14 @@ |
3215 | gtk_style_context_add_class (context, GTK_STYLE_CLASS_CHECK); |
3216 | |
3217 | if (self->priv->active) |
3218 | - gtk_style_context_set_state (context, GTK_STATE_FLAG_ACTIVE); |
3219 | + gtk_style_context_set_state (context, gtk_widget_get_state_flags (widget) | GTK_STATE_FLAG_CHECKED); |
3220 | |
3221 | + gtk_render_background (context, cr, |
3222 | + check_x, check_y, |
3223 | + icon_size, icon_size); |
3224 | + gtk_render_frame (context, cr, |
3225 | + check_x, check_y, |
3226 | + icon_size, icon_size); |
3227 | gtk_render_check (context, cr, |
3228 | check_x, check_y, |
3229 | icon_size, icon_size); |
3230 | |
3231 | === modified file 'libgd/libgd/gd-two-lines-renderer.c' |
3232 | --- libgd/libgd/gd-two-lines-renderer.c 2014-05-10 03:47:53 +0000 |
3233 | +++ libgd/libgd/gd-two-lines-renderer.c 2015-02-14 00:18:38 +0000 |
3234 | @@ -22,6 +22,9 @@ |
3235 | #include "gd-two-lines-renderer.h" |
3236 | #include <string.h> |
3237 | |
3238 | +#define SUBTITLE_DIM_PERCENTAGE 0.55 |
3239 | +#define SUBTITLE_SIZE_PERCENTAGE 0.82 |
3240 | + |
3241 | G_DEFINE_TYPE (GdTwoLinesRenderer, gd_two_lines_renderer, GTK_TYPE_CELL_RENDERER_TEXT) |
3242 | |
3243 | struct _GdTwoLinesRendererPrivate { |
3244 | @@ -84,13 +87,32 @@ |
3245 | GtkStateFlags flags) |
3246 | { |
3247 | PangoFontDescription *desc; |
3248 | - |
3249 | - gtk_style_context_add_class (context, "dim-label"); |
3250 | - gtk_style_context_add_class (context, "subtitle"); |
3251 | - |
3252 | - gtk_style_context_get (context, flags, "font", &desc, NULL); |
3253 | + GdkRGBA rgba; |
3254 | + PangoAttrList *layout_attr; |
3255 | + PangoAttribute *attr_color; |
3256 | + |
3257 | + gtk_style_context_get (context, flags, |
3258 | + "font", &desc, |
3259 | + "color", &rgba, |
3260 | + NULL); |
3261 | + |
3262 | + /* Set the font size */ |
3263 | + pango_font_description_set_size (desc, pango_font_description_get_size (desc) * SUBTITLE_SIZE_PERCENTAGE); |
3264 | pango_layout_set_font_description (layout, desc); |
3265 | pango_font_description_free (desc); |
3266 | + |
3267 | + /* Set the color */ |
3268 | + rgba.red = CLAMP(1.0 - ((1.0 - rgba.red) * SUBTITLE_DIM_PERCENTAGE), 0.0, 1.0); |
3269 | + rgba.green = CLAMP(1.0 - ((1.0 - rgba.green) * SUBTITLE_DIM_PERCENTAGE), 0.0, 1.0); |
3270 | + rgba.blue = CLAMP(1.0 - ((1.0 - rgba.blue) * SUBTITLE_DIM_PERCENTAGE), 0.0, 1.0); |
3271 | + |
3272 | + layout_attr = pango_attr_list_new (); |
3273 | + attr_color = pango_attr_foreground_new (rgba.red * 65535, |
3274 | + rgba.green * 65535, |
3275 | + rgba.blue * 65535); |
3276 | + pango_attr_list_insert (layout_attr, attr_color); |
3277 | + pango_layout_set_attributes (layout, layout_attr); |
3278 | + pango_attr_list_unref (layout_attr); |
3279 | } |
3280 | |
3281 | static void |
3282 | |
3283 | === modified file 'm4/libtool.m4' |
3284 | --- m4/libtool.m4 2014-10-19 23:39:47 +0000 |
3285 | +++ m4/libtool.m4 2015-02-14 00:18:38 +0000 |
3286 | @@ -1312,7 +1312,7 @@ |
3287 | rm -rf conftest* |
3288 | ;; |
3289 | |
3290 | -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ |
3291 | +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
3292 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
3293 | # Find out which ABI we are using. |
3294 | echo 'int i;' > conftest.$ac_ext |
3295 | @@ -1326,10 +1326,7 @@ |
3296 | x86_64-*linux*) |
3297 | LD="${LD-ld} -m elf_i386" |
3298 | ;; |
3299 | - powerpc64le-*linux*) |
3300 | - LD="${LD-ld} -m elf32lppclinux" |
3301 | - ;; |
3302 | - powerpc64-*linux*) |
3303 | + ppc64-*linux*|powerpc64-*linux*) |
3304 | LD="${LD-ld} -m elf32ppclinux" |
3305 | ;; |
3306 | s390x-*linux*) |
3307 | @@ -1348,10 +1345,7 @@ |
3308 | x86_64-*linux*) |
3309 | LD="${LD-ld} -m elf_x86_64" |
3310 | ;; |
3311 | - powerpcle-*linux*) |
3312 | - LD="${LD-ld} -m elf64lppc" |
3313 | - ;; |
3314 | - powerpc-*linux*) |
3315 | + ppc*-*linux*|powerpc*-*linux*) |
3316 | LD="${LD-ld} -m elf64ppc" |
3317 | ;; |
3318 | s390*-*linux*|s390*-*tpf*) |
3319 | |
3320 | === modified file 'missing' |
3321 | --- missing 2014-09-22 21:20:08 +0000 |
3322 | +++ missing 2015-02-14 00:18:38 +0000 |
3323 | @@ -1,7 +1,7 @@ |
3324 | #! /bin/sh |
3325 | # Common wrapper for a few potentially missing GNU programs. |
3326 | |
3327 | -scriptversion=2013-10-28.13; # UTC |
3328 | +scriptversion=2012-06-26.16; # UTC |
3329 | |
3330 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. |
3331 | # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
3332 | @@ -160,7 +160,7 @@ |
3333 | ;; |
3334 | autom4te*) |
3335 | echo "You might have modified some maintainer files that require" |
3336 | - echo "the 'autom4te' program to be rebuilt." |
3337 | + echo "the 'automa4te' program to be rebuilt." |
3338 | program_details 'autom4te' |
3339 | ;; |
3340 | bison*|yacc*) |
3341 | |
3342 | === modified file 'po/LINGUAS' |
3343 | --- po/LINGUAS 2014-10-19 23:39:47 +0000 |
3344 | +++ po/LINGUAS 2015-02-14 00:18:38 +0000 |
3345 | @@ -17,6 +17,7 @@ |
3346 | fa |
3347 | fi |
3348 | fr |
3349 | +fur |
3350 | ga |
3351 | gl |
3352 | he |
3353 | |
3354 | === added file 'po/fur.po' |
3355 | --- po/fur.po 1970-01-01 00:00:00 +0000 |
3356 | +++ po/fur.po 2015-02-14 00:18:38 +0000 |
3357 | @@ -0,0 +1,354 @@ |
3358 | +# Friulian translation for gnome-music. |
3359 | +# Copyright (C) 2014 gnome-music's COPYRIGHT HOLDER |
3360 | +# This file is distributed under the same license as the gnome-music package. |
3361 | +# Fabio Tomat <f.t.public@gmail.com>, 2014. |
3362 | +# |
3363 | +msgid "" |
3364 | +msgstr "" |
3365 | +"Project-Id-Version: gnome-music gnome-3-14\n" |
3366 | +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" |
3367 | +"music&keywords=I18N+L10N&component=general\n" |
3368 | +"POT-Creation-Date: 2014-10-13 14:18+0000\n" |
3369 | +"PO-Revision-Date: 2014-10-15 01:54+0100\n" |
3370 | +"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n" |
3371 | +"Language-Team: Friulian <fur@li.org>\n" |
3372 | +"Language: fur\n" |
3373 | +"MIME-Version: 1.0\n" |
3374 | +"Content-Type: text/plain; charset=UTF-8\n" |
3375 | +"Content-Transfer-Encoding: 8bit\n" |
3376 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
3377 | +"X-Generator: Poedit 1.5.4\n" |
3378 | + |
3379 | +#: ../data/org.gnome.Music.gschema.xml.h:1 |
3380 | +msgid "Window size" |
3381 | +msgstr "Dimension barcon" |
3382 | + |
3383 | +#: ../data/org.gnome.Music.gschema.xml.h:2 |
3384 | +msgid "Window size (width and height)." |
3385 | +msgstr "Dimension barcon (largjece e altece)." |
3386 | + |
3387 | +#: ../data/org.gnome.Music.gschema.xml.h:3 |
3388 | +msgid "Window position" |
3389 | +msgstr "Posizion barcon" |
3390 | + |
3391 | +#: ../data/org.gnome.Music.gschema.xml.h:4 |
3392 | +msgid "Window position (x and y)." |
3393 | +msgstr "Posizion barcon (x e y)." |
3394 | + |
3395 | +#: ../data/org.gnome.Music.gschema.xml.h:5 |
3396 | +msgid "Window maximized" |
3397 | +msgstr "" |
3398 | + |
3399 | +#: ../data/org.gnome.Music.gschema.xml.h:6 |
3400 | +msgid "Window maximized state." |
3401 | +msgstr "" |
3402 | + |
3403 | +#: ../data/org.gnome.Music.gschema.xml.h:7 |
3404 | +msgid "Playback repeat mode" |
3405 | +msgstr "Modalitât ripetizion" |
3406 | + |
3407 | +#. Translators: Don't translate allowed values, just the description in the brackets |
3408 | +#: ../data/org.gnome.Music.gschema.xml.h:9 |
3409 | +msgid "" |
3410 | +"Value identifies whether to repeat or randomize playback through the " |
3411 | +"collection. Allowed values are: \"none\" (repeat and shuffle are off), \"song" |
3412 | +"\" (repeat current song), \"all\" (repeat playlist, no shuffle), \"shuffle" |
3413 | +"\" (shuffle playlist, presumes repeat all)." |
3414 | +msgstr "" |
3415 | + |
3416 | +#: ../data/org.gnome.Music.gschema.xml.h:10 |
3417 | +msgid "Search mode" |
3418 | +msgstr "Modalitât di ricercje" |
3419 | + |
3420 | +#: ../data/org.gnome.Music.gschema.xml.h:11 |
3421 | +msgid "If true, the search bar is shown." |
3422 | +msgstr "Se VÊR, al mostre la rie pe ricercje." |
3423 | + |
3424 | +#: ../data/gnome-music.desktop.in.h:1 ../gnomemusic/application.py:50 |
3425 | +#: ../gnomemusic/application.py:112 ../gnomemusic/window.py:62 |
3426 | +#: ../data/AboutDialog.ui.in.h:1 |
3427 | +msgid "Music" |
3428 | +msgstr "Musiche" |
3429 | + |
3430 | +#: ../data/gnome-music.desktop.in.h:2 |
3431 | +msgid "Music Player" |
3432 | +msgstr "Riprodutôr di Musiche" |
3433 | + |
3434 | +#: ../data/gnome-music.desktop.in.h:3 ../data/gnome-music.appdata.xml.in.h:2 |
3435 | +msgid "Play and organize your music collection" |
3436 | +msgstr "Sune e ministre le tô colezion musicâl" |
3437 | + |
3438 | +#: ../data/gnome-music.appdata.xml.in.h:1 |
3439 | +msgid "GNOME Music" |
3440 | +msgstr "GNOME Musiche" |
3441 | + |
3442 | +#: ../data/gnome-music.appdata.xml.in.h:3 |
3443 | +msgid "Music is the new GNOME music playing application." |
3444 | +msgstr "Musiche a je le gnove aplicazion di GNOME par scoltâ le musiche." |
3445 | + |
3446 | +#: ../gnomemusic/albumArtCache.py:99 ../gnomemusic/albumArtCache.py:107 |
3447 | +msgid "Untitled" |
3448 | +msgstr "Cence titul" |
3449 | + |
3450 | +#: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100 |
3451 | +#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:574 |
3452 | +#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1290 |
3453 | +msgid "Unknown Album" |
3454 | +msgstr "Album no cognossût" |
3455 | + |
3456 | +#: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98 |
3457 | +#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:283 |
3458 | +#: ../gnomemusic/view.py:483 ../gnomemusic/view.py:717 |
3459 | +#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1288 |
3460 | +#: ../gnomemusic/view.py:1319 ../gnomemusic/widgets.py:181 |
3461 | +#: ../gnomemusic/widgets.py:560 |
3462 | +msgid "Unknown Artist" |
3463 | +msgstr "Artist no cognossût" |
3464 | + |
3465 | +#: ../gnomemusic/notification.py:89 |
3466 | +msgid "Not playing" |
3467 | +msgstr "No in riproduzion" |
3468 | + |
3469 | +#. TRANSLATORS: by refers to the artist, from to the album |
3470 | +#: ../gnomemusic/notification.py:104 |
3471 | +#, python-format |
3472 | +msgid "by %s, from %s" |
3473 | +msgstr "di %s, in %s" |
3474 | + |
3475 | +#: ../gnomemusic/notification.py:125 ../data/PlayerToolbar.ui.h:5 |
3476 | +msgid "Previous" |
3477 | +msgstr "Precedent" |
3478 | + |
3479 | +#: ../gnomemusic/notification.py:128 ../gnomemusic/player.py:348 |
3480 | +msgid "Pause" |
3481 | +msgstr "Pause" |
3482 | + |
3483 | +#: ../gnomemusic/notification.py:131 ../gnomemusic/player.py:351 |
3484 | +#: ../data/PlayerToolbar.ui.h:6 |
3485 | +msgid "Play" |
3486 | +msgstr "Sune" |
3487 | + |
3488 | +#: ../gnomemusic/notification.py:133 ../data/PlayerToolbar.ui.h:7 |
3489 | +msgid "Next" |
3490 | +msgstr "Prossim" |
3491 | + |
3492 | +#: ../gnomemusic/searchbar.py:30 ../gnomemusic/searchbar.py:73 |
3493 | +msgid "All" |
3494 | +msgstr "Ducj" |
3495 | + |
3496 | +#: ../gnomemusic/searchbar.py:31 |
3497 | +msgid "Artist" |
3498 | +msgstr "Artist" |
3499 | + |
3500 | +#: ../gnomemusic/searchbar.py:32 |
3501 | +msgid "Album" |
3502 | +msgstr "Album" |
3503 | + |
3504 | +#: ../gnomemusic/searchbar.py:33 |
3505 | +msgid "Track Title" |
3506 | +msgstr "Titul Linie" |
3507 | + |
3508 | +#: ../gnomemusic/searchbar.py:74 |
3509 | +msgid "Local" |
3510 | +msgstr "Locâl" |
3511 | + |
3512 | +#: ../gnomemusic/searchbar.py:176 |
3513 | +msgid "Sources" |
3514 | +msgstr "Sorzints" |
3515 | + |
3516 | +#: ../gnomemusic/searchbar.py:183 |
3517 | +msgid "Match" |
3518 | +msgstr "Corispondence" |
3519 | + |
3520 | +#: ../gnomemusic/view.py:198 ../gnomemusic/widgets.py:222 |
3521 | +#: ../gnomemusic/widgets.py:439 ../gnomemusic/window.py:284 |
3522 | +#, python-format |
3523 | +msgid "Selected %d item" |
3524 | +msgid_plural "Selected %d items" |
3525 | +msgstr[0] "Selezionât %d element" |
3526 | +msgstr[1] "Selezionâts %d elements" |
3527 | + |
3528 | +#: ../gnomemusic/view.py:200 ../gnomemusic/widgets.py:224 |
3529 | +#: ../gnomemusic/widgets.py:441 ../gnomemusic/window.py:288 |
3530 | +#: ../gnomemusic/window.py:300 ../data/headerbar.ui.h:3 |
3531 | +msgid "Click on items to select them" |
3532 | +msgstr "Cliche sui elements par selezionâju" |
3533 | + |
3534 | +#: ../gnomemusic/view.py:337 |
3535 | +#, python-format |
3536 | +msgid "" |
3537 | +"No Music found!\n" |
3538 | +" Put some files into the folder %s" |
3539 | +msgstr "" |
3540 | +"Nissune musiche cjatade!\n" |
3541 | +" Cjarie cualchi file te cartele %s" |
3542 | + |
3543 | +#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1534 |
3544 | +msgid "Albums" |
3545 | +msgstr "Album" |
3546 | + |
3547 | +#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1536 |
3548 | +msgid "Songs" |
3549 | +msgstr "Cjançons" |
3550 | + |
3551 | +#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1535 |
3552 | +msgid "Artists" |
3553 | +msgstr "Artiscj" |
3554 | + |
3555 | +#: ../gnomemusic/view.py:636 ../gnomemusic/view.py:638 |
3556 | +#: ../gnomemusic/widgets.py:448 |
3557 | +msgid "All Artists" |
3558 | +msgstr "Ducj i Artiscj" |
3559 | + |
3560 | +#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1537 |
3561 | +msgid "Playlists" |
3562 | +msgstr "Playlist" |
3563 | + |
3564 | +#: ../gnomemusic/view.py:1077 |
3565 | +#, python-format |
3566 | +msgid "%d Song" |
3567 | +msgid_plural "%d Songs" |
3568 | +msgstr[0] "%d cjançon" |
3569 | +msgstr[1] "%d cjançons" |
3570 | + |
3571 | +#: ../gnomemusic/widgets.py:270 ../gnomemusic/widgets.py:308 |
3572 | +#, python-format |
3573 | +msgid "%d min" |
3574 | +msgstr "%d min" |
3575 | + |
3576 | +#: ../gnomemusic/widgets.py:674 |
3577 | +msgid "New Playlist" |
3578 | +msgstr "Gnove playlist" |
3579 | + |
3580 | +#: ../gnomemusic/window.py:232 |
3581 | +msgid "Empty" |
3582 | +msgstr "Vueide" |
3583 | + |
3584 | +#: ../data/AboutDialog.ui.in.h:2 |
3585 | +msgid "Copyright © 2013 GNOME Music Developers" |
3586 | +msgstr "Copyright © 2013 GNOME Music Developers" |
3587 | + |
3588 | +#: ../data/AboutDialog.ui.in.h:3 |
3589 | +msgid "A music player and management application for GNOME." |
3590 | +msgstr "Une aplicazion GNOME par sunâ e ministrâ le proprie musiche." |
3591 | + |
3592 | +#: ../data/AboutDialog.ui.in.h:4 |
3593 | +msgid "Visit GNOME Music website" |
3594 | +msgstr "Visite il sît web di GNOME Music" |
3595 | + |
3596 | +#: ../data/AboutDialog.ui.in.h:5 |
3597 | +msgid "" |
3598 | +"GNOME Music is free software; you can redistribute it and/or modify it under " |
3599 | +"the terms of the GNU General Public License as published by the Free " |
3600 | +"Software Foundation; either version 2 of the License, or (at your option) " |
3601 | +"any later version.\n" |
3602 | +"\n" |
3603 | +"GNOME Music is distributed in the hope that it will be useful, but WITHOUT " |
3604 | +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " |
3605 | +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " |
3606 | +"more details.\n" |
3607 | +"\n" |
3608 | +"You should have received a copy of the GNU General Public License along with " |
3609 | +"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 " |
3610 | +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n" |
3611 | +"\n" |
3612 | +"The GNOME Music authors hereby grant permission for non-GPL compatible " |
3613 | +"GStreamer plugins to be used and distributed together with GStreamer and " |
3614 | +"GNOME Music. This permission is above and beyond the permissions granted by " |
3615 | +"the GPL license by which GNOME Music is covered. If you modify this code, " |
3616 | +"you may extend this exception to your version of the code, but you are not " |
3617 | +"obligated to do so. If you do not wish to do so, delete this exception " |
3618 | +"statement from your version." |
3619 | +msgstr "" |
3620 | + |
3621 | +#: ../data/AlbumWidget.ui.h:1 |
3622 | +msgid "Released" |
3623 | +msgstr "Publicât" |
3624 | + |
3625 | +#: ../data/AlbumWidget.ui.h:2 |
3626 | +msgid "Running Length" |
3627 | +msgstr "Durade" |
3628 | + |
3629 | +#: ../data/app-menu.ui.h:1 |
3630 | +msgid "_New Playlist" |
3631 | +msgstr "_Gnove playlist" |
3632 | + |
3633 | +#: ../data/app-menu.ui.h:2 |
3634 | +msgid "_Help" |
3635 | +msgstr "_Jutori" |
3636 | + |
3637 | +#: ../data/app-menu.ui.h:3 |
3638 | +msgid "_About" |
3639 | +msgstr "_Informazions" |
3640 | + |
3641 | +#: ../data/app-menu.ui.h:4 |
3642 | +msgid "_Quit" |
3643 | +msgstr "_Jes" |
3644 | + |
3645 | +#: ../data/PlayerToolbar.ui.h:1 |
3646 | +msgid "Shuffle" |
3647 | +msgstr "Misclice" |
3648 | + |
3649 | +#: ../data/PlayerToolbar.ui.h:2 |
3650 | +msgid "Repeat All" |
3651 | +msgstr "Ripeti dut" |
3652 | + |
3653 | +#: ../data/PlayerToolbar.ui.h:3 |
3654 | +msgid "Repeat Song" |
3655 | +msgstr "Ripeti cjançon" |
3656 | + |
3657 | +#: ../data/PlayerToolbar.ui.h:4 |
3658 | +msgid "Shuffle/Repeat Off" |
3659 | +msgstr "Miscliçâ/Ripeti disativâts" |
3660 | + |
3661 | +#: ../data/NoMusic.ui.h:1 |
3662 | +msgid "No Music Found" |
3663 | +msgstr "Nissune musiche cjatade" |
3664 | + |
3665 | +#: ../data/headerbar.ui.h:1 |
3666 | +msgid "Select All" |
3667 | +msgstr "Selezione dut" |
3668 | + |
3669 | +#: ../data/headerbar.ui.h:2 |
3670 | +msgid "Select None" |
3671 | +msgstr "Selezione nissun" |
3672 | + |
3673 | +#: ../data/headerbar.ui.h:4 |
3674 | +msgid "Search" |
3675 | +msgstr "Cîr" |
3676 | + |
3677 | +#: ../data/headerbar.ui.h:5 ../data/PlaylistDialog.ui.h:3 |
3678 | +msgid "Select" |
3679 | +msgstr "Selezione" |
3680 | + |
3681 | +#: ../data/headerbar.ui.h:6 ../data/PlaylistDialog.ui.h:2 |
3682 | +msgid "Cancel" |
3683 | +msgstr "Anule" |
3684 | + |
3685 | +#: ../data/headerbar.ui.h:7 |
3686 | +msgid "Back" |
3687 | +msgstr "Torne indaûr" |
3688 | + |
3689 | +#: ../data/SelectionToolbar.ui.h:1 |
3690 | +msgid "Add to Playlist" |
3691 | +msgstr "Zonte inte playlist" |
3692 | + |
3693 | +#: ../data/SelectionToolbar.ui.h:2 |
3694 | +msgid "Remove from Playlist" |
3695 | +msgstr "Gjave de playlist" |
3696 | + |
3697 | +#: ../data/PlaylistControls.ui.h:1 |
3698 | +msgid "_Play" |
3699 | +msgstr "_Sune" |
3700 | + |
3701 | +#: ../data/PlaylistControls.ui.h:2 |
3702 | +msgid "_Delete" |
3703 | +msgstr "_Elimine" |
3704 | + |
3705 | +#: ../data/PlaylistControls.ui.h:3 |
3706 | +msgid "Playlist Name" |
3707 | +msgstr "Non playlist" |
3708 | + |
3709 | +#: ../data/PlaylistDialog.ui.h:1 |
3710 | +msgid "Select Playlist" |
3711 | +msgstr "Selezione playlist" |
3712 | |
3713 | === modified file 'po/pt.po' |
3714 | --- po/pt.po 2014-10-19 23:39:47 +0000 |
3715 | +++ po/pt.po 2015-02-14 00:18:38 +0000 |
3716 | @@ -9,9 +9,9 @@ |
3717 | "Project-Id-Version: gnome-music master\n" |
3718 | "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" |
3719 | "music&keywords=I18N+L10N&component=general\n" |
3720 | -"POT-Creation-Date: 2014-03-07 10:04+0000\n" |
3721 | -"PO-Revision-Date: 2014-03-15 01:10+0100\n" |
3722 | -"Last-Translator: Tiago S. <almosthumane@portugalmail.pt>\n" |
3723 | +"POT-Creation-Date: 2014-10-06 19:05+0000\n" |
3724 | +"PO-Revision-Date: 2014-10-07 07:10+0100\n" |
3725 | +"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n" |
3726 | "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n" |
3727 | "Language: pt\n" |
3728 | "MIME-Version: 1.0\n" |
3729 | @@ -69,8 +69,8 @@ |
3730 | msgid "If true, the search bar is shown." |
3731 | msgstr "Se verdadeiro, a barra de pesquisa é apresentada." |
3732 | |
3733 | -#: ../data/gnome-music.desktop.in.h:1 ../gnomemusic/application.py:46 |
3734 | -#: ../gnomemusic/application.py:102 ../gnomemusic/window.py:58 |
3735 | +#: ../data/gnome-music.desktop.in.h:1 ../gnomemusic/application.py:50 |
3736 | +#: ../gnomemusic/application.py:112 ../gnomemusic/window.py:62 |
3737 | #: ../data/AboutDialog.ui.in.h:1 |
3738 | msgid "Music" |
3739 | msgstr "Música" |
3740 | @@ -91,61 +91,97 @@ |
3741 | msgid "Music is the new GNOME music playing application." |
3742 | msgstr "Música é a nova aplicação de reprodução de música do GNOME" |
3743 | |
3744 | -#: ../gnomemusic/albumArtCache.py:235 ../gnomemusic/albumArtCache.py:243 |
3745 | +#: ../gnomemusic/albumArtCache.py:99 ../gnomemusic/albumArtCache.py:107 |
3746 | msgid "Untitled" |
3747 | msgstr "Sem nome" |
3748 | |
3749 | -#: ../gnomemusic/notification.py:70 |
3750 | +#: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100 |
3751 | +#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:574 |
3752 | +#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1290 |
3753 | +msgid "Unknown Album" |
3754 | +msgstr "Álbum Desconhecido" |
3755 | + |
3756 | +#: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98 |
3757 | +#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:283 |
3758 | +#: ../gnomemusic/view.py:483 ../gnomemusic/view.py:717 |
3759 | +#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1288 |
3760 | +#: ../gnomemusic/view.py:1319 ../gnomemusic/widgets.py:181 |
3761 | +#: ../gnomemusic/widgets.py:560 |
3762 | +msgid "Unknown Artist" |
3763 | +msgstr "Artista Desconhecido" |
3764 | + |
3765 | +#: ../gnomemusic/notification.py:89 |
3766 | msgid "Not playing" |
3767 | msgstr "Não está a reproduzir" |
3768 | |
3769 | -#: ../gnomemusic/notification.py:79 ../gnomemusic/player.py:365 |
3770 | -#: ../gnomemusic/view.py:253 ../gnomemusic/view.py:455 |
3771 | -#: ../gnomemusic/view.py:676 ../gnomemusic/view.py:990 |
3772 | -msgid "Unknown Artist" |
3773 | -msgstr "Artista Desconhecido" |
3774 | - |
3775 | -#: ../gnomemusic/notification.py:81 ../gnomemusic/view.py:553 |
3776 | -msgid "Unknown Album" |
3777 | -msgstr "Álbum Desconhecido" |
3778 | - |
3779 | #. TRANSLATORS: by refers to the artist, from to the album |
3780 | -#: ../gnomemusic/notification.py:85 |
3781 | +#: ../gnomemusic/notification.py:104 |
3782 | #, python-format |
3783 | msgid "by %s, from %s" |
3784 | msgstr "por %s, de %s" |
3785 | |
3786 | -#: ../gnomemusic/notification.py:125 |
3787 | +#: ../gnomemusic/notification.py:125 ../data/PlayerToolbar.ui.h:5 |
3788 | msgid "Previous" |
3789 | msgstr "Anterior" |
3790 | |
3791 | -#: ../gnomemusic/notification.py:128 |
3792 | +#: ../gnomemusic/notification.py:128 ../gnomemusic/player.py:348 |
3793 | msgid "Pause" |
3794 | msgstr "Pausa" |
3795 | |
3796 | -#: ../gnomemusic/notification.py:131 |
3797 | +#: ../gnomemusic/notification.py:131 ../gnomemusic/player.py:351 |
3798 | +#: ../data/PlayerToolbar.ui.h:6 |
3799 | msgid "Play" |
3800 | msgstr "Reproduzir" |
3801 | |
3802 | -#: ../gnomemusic/notification.py:133 |
3803 | +#: ../gnomemusic/notification.py:133 ../data/PlayerToolbar.ui.h:7 |
3804 | msgid "Next" |
3805 | msgstr "Próximo" |
3806 | |
3807 | -#: ../gnomemusic/view.py:197 ../gnomemusic/widgets.py:261 |
3808 | -#: ../gnomemusic/window.py:244 |
3809 | +#: ../gnomemusic/searchbar.py:30 ../gnomemusic/searchbar.py:73 |
3810 | +msgid "All" |
3811 | +msgstr "Todas" |
3812 | + |
3813 | +#: ../gnomemusic/searchbar.py:31 |
3814 | +#| msgid "Artists" |
3815 | +msgid "Artist" |
3816 | +msgstr "Artista" |
3817 | + |
3818 | +#: ../gnomemusic/searchbar.py:32 |
3819 | +#| msgid "Albums" |
3820 | +msgid "Album" |
3821 | +msgstr "Álbum" |
3822 | + |
3823 | +#: ../gnomemusic/searchbar.py:33 |
3824 | +msgid "Track Title" |
3825 | +msgstr "Título da faixa" |
3826 | + |
3827 | +#: ../gnomemusic/searchbar.py:74 |
3828 | +msgid "Local" |
3829 | +msgstr "Local" |
3830 | + |
3831 | +#: ../gnomemusic/searchbar.py:176 |
3832 | +msgid "Sources" |
3833 | +msgstr "Fontes" |
3834 | + |
3835 | +#: ../gnomemusic/searchbar.py:183 |
3836 | +msgid "Match" |
3837 | +msgstr "Comparar" |
3838 | + |
3839 | +#: ../gnomemusic/view.py:198 ../gnomemusic/widgets.py:222 |
3840 | +#: ../gnomemusic/widgets.py:439 ../gnomemusic/window.py:284 |
3841 | #, python-format |
3842 | msgid "Selected %d item" |
3843 | msgid_plural "Selected %d items" |
3844 | msgstr[0] "%d item selecionado" |
3845 | msgstr[1] "%d itens selecionados" |
3846 | |
3847 | -#: ../gnomemusic/view.py:199 ../gnomemusic/widgets.py:263 |
3848 | -#: ../gnomemusic/window.py:248 ../gnomemusic/window.py:262 |
3849 | -#: ../data/headerbar.ui.in.h:3 |
3850 | +#: ../gnomemusic/view.py:200 ../gnomemusic/widgets.py:224 |
3851 | +#: ../gnomemusic/widgets.py:441 ../gnomemusic/window.py:288 |
3852 | +#: ../gnomemusic/window.py:300 ../data/headerbar.ui.h:3 |
3853 | msgid "Click on items to select them" |
3854 | msgstr "Clique nos itens para os selecionar" |
3855 | |
3856 | -#: ../gnomemusic/view.py:322 |
3857 | +#: ../gnomemusic/view.py:337 |
3858 | #, python-format |
3859 | msgid "" |
3860 | "No Music found!\n" |
3861 | @@ -154,47 +190,44 @@ |
3862 | "Nenhuma música encontrada!\n" |
3863 | " Coloque alguns ficheiros na pasta %s" |
3864 | |
3865 | -#: ../gnomemusic/view.py:329 |
3866 | +#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1534 |
3867 | msgid "Albums" |
3868 | msgstr "Álbuns" |
3869 | |
3870 | -#: ../gnomemusic/view.py:402 |
3871 | +#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1536 |
3872 | msgid "Songs" |
3873 | msgstr "Músicas" |
3874 | |
3875 | -#: ../gnomemusic/view.py:566 |
3876 | +#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1535 |
3877 | msgid "Artists" |
3878 | msgstr "Artistas" |
3879 | |
3880 | -#: ../gnomemusic/view.py:611 ../gnomemusic/view.py:613 |
3881 | -#: ../gnomemusic/widgets.py:451 |
3882 | +#: ../gnomemusic/view.py:636 ../gnomemusic/view.py:638 |
3883 | +#: ../gnomemusic/widgets.py:448 |
3884 | msgid "All Artists" |
3885 | msgstr "Todos os Artistas" |
3886 | |
3887 | -#: ../gnomemusic/view.py:743 |
3888 | +#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1537 |
3889 | msgid "Playlists" |
3890 | msgstr "Listas de Reprodução" |
3891 | |
3892 | -#: ../gnomemusic/view.py:1007 |
3893 | +#: ../gnomemusic/view.py:1077 |
3894 | #, python-format |
3895 | msgid "%d Song" |
3896 | msgid_plural "%d Songs" |
3897 | msgstr[0] "%d Música" |
3898 | msgstr[1] "%d Músicas" |
3899 | |
3900 | -#: ../gnomemusic/widgets.py:75 ../gnomemusic/widgets.py:95 |
3901 | -msgid "Load More" |
3902 | -msgstr "Carregar Mais" |
3903 | - |
3904 | -#: ../gnomemusic/widgets.py:85 |
3905 | -msgid "Loading..." |
3906 | -msgstr "A carregar..." |
3907 | - |
3908 | -#: ../gnomemusic/widgets.py:670 |
3909 | +#: ../gnomemusic/widgets.py:270 ../gnomemusic/widgets.py:308 |
3910 | +#, python-format |
3911 | +msgid "%d min" |
3912 | +msgstr "%d min" |
3913 | + |
3914 | +#: ../gnomemusic/widgets.py:674 |
3915 | msgid "New Playlist" |
3916 | msgstr "Nova Lista de Reprodução" |
3917 | |
3918 | -#: ../gnomemusic/window.py:209 |
3919 | +#: ../gnomemusic/window.py:232 |
3920 | msgid "Empty" |
3921 | msgstr "Vazio" |
3922 | |
3923 | @@ -283,18 +316,31 @@ |
3924 | msgid "No Music Found" |
3925 | msgstr "Nenhuma Música Encontrada" |
3926 | |
3927 | -#: ../data/headerbar.ui.in.h:1 |
3928 | +#: ../data/headerbar.ui.h:1 |
3929 | msgid "Select All" |
3930 | msgstr "Selecionar Todas" |
3931 | |
3932 | -#: ../data/headerbar.ui.in.h:2 |
3933 | +#: ../data/headerbar.ui.h:2 |
3934 | msgid "Select None" |
3935 | msgstr "Selecionar Nenhuma" |
3936 | |
3937 | -#: ../data/headerbar.ui.in.h:4 ../data/PlaylistDialog.ui.in.h:2 |
3938 | +#: ../data/headerbar.ui.h:4 |
3939 | +#| msgid "Search mode" |
3940 | +msgid "Search" |
3941 | +msgstr "Procurar" |
3942 | + |
3943 | +#: ../data/headerbar.ui.h:5 ../data/PlaylistDialog.ui.h:3 |
3944 | +msgid "Select" |
3945 | +msgstr "Selecionar" |
3946 | + |
3947 | +#: ../data/headerbar.ui.h:6 ../data/PlaylistDialog.ui.h:2 |
3948 | msgid "Cancel" |
3949 | msgstr "Cancelar" |
3950 | |
3951 | +#: ../data/headerbar.ui.h:7 |
3952 | +msgid "Back" |
3953 | +msgstr "Anterior" |
3954 | + |
3955 | #: ../data/SelectionToolbar.ui.h:1 |
3956 | msgid "Add to Playlist" |
3957 | msgstr "Adicionar à Lista de Reprodução" |
3958 | @@ -311,13 +357,20 @@ |
3959 | msgid "_Delete" |
3960 | msgstr "_Apagar" |
3961 | |
3962 | -#: ../data/PlaylistDialog.ui.in.h:1 |
3963 | +#: ../data/PlaylistControls.ui.h:3 |
3964 | +#| msgid "Playlists" |
3965 | +msgid "Playlist Name" |
3966 | +msgstr "Nome da lista de reprodução" |
3967 | + |
3968 | +#: ../data/PlaylistDialog.ui.h:1 |
3969 | msgid "Select Playlist" |
3970 | msgstr "Selecionar Lista de Reprodução" |
3971 | |
3972 | -#: ../data/PlaylistDialog.ui.in.h:3 |
3973 | -msgid "Select" |
3974 | -msgstr "Selecionar" |
3975 | +#~ msgid "Load More" |
3976 | +#~ msgstr "Carregar Mais" |
3977 | + |
3978 | +#~ msgid "Loading..." |
3979 | +#~ msgstr "A carregar..." |
3980 | |
3981 | #~ msgid "_Now Playing" |
3982 | #~ msgstr "_Agora a Reproduzir" |
3983 | |
3984 | === modified file 'po/ro.po' |
3985 | --- po/ro.po 2014-09-22 21:20:08 +0000 |
3986 | +++ po/ro.po 2015-02-14 00:18:38 +0000 |
3987 | @@ -2,23 +2,24 @@ |
3988 | # Copyright (C) 2014 gnome-music's COPYRIGHT HOLDER |
3989 | # This file is distributed under the same license as the gnome-music package. |
3990 | # Bogdan Mințoi <mintoi.bogdan@gmail.com>, 2014. |
3991 | -# |
3992 | +# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2014. |
3993 | msgid "" |
3994 | msgstr "" |
3995 | "Project-Id-Version: gnome-music master\n" |
3996 | "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" |
3997 | "music&keywords=I18N+L10N&component=general\n" |
3998 | -"POT-Creation-Date: 2014-07-28 06:59+0000\n" |
3999 | -"PO-Revision-Date: 2014-07-29 12:15+0300\n" |
4000 | -"Last-Translator: Bogdan Mințoi <mintoi.bogdan@gmail.com>\n" |
4001 | -"Language-Team: Română <>\n" |
4002 | +"POT-Creation-Date: 2014-11-24 12:31+0000\n" |
4003 | +"PO-Revision-Date: 2014-12-07 18:36+0200\n" |
4004 | +"Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n" |
4005 | +"Language-Team: Gnome Romanian Translation Team\n" |
4006 | "Language: ro\n" |
4007 | "MIME-Version: 1.0\n" |
4008 | "Content-Type: text/plain; charset=UTF-8\n" |
4009 | "Content-Transfer-Encoding: 8bit\n" |
4010 | "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " |
4011 | -"20)) ? 1 : 2);\n" |
4012 | -"X-Generator: Gtranslator 2.91.6\n" |
4013 | +"20)) ? 1 : 2);;\n" |
4014 | +"X-Generator: Virtaal 0.7.1\n" |
4015 | +"X-Project-Style: gnome\n" |
4016 | |
4017 | #: ../data/org.gnome.Music.gschema.xml.h:1 |
4018 | msgid "Window size" |
4019 | @@ -92,22 +93,22 @@ |
4020 | msgid "Music is the new GNOME music playing application." |
4021 | msgstr "Muzică este noua aplicație GNOME pentru redare de muzică." |
4022 | |
4023 | -#: ../gnomemusic/albumArtCache.py:100 ../gnomemusic/albumArtCache.py:108 |
4024 | +#: ../gnomemusic/albumArtCache.py:99 ../gnomemusic/albumArtCache.py:107 |
4025 | msgid "Untitled" |
4026 | msgstr "Fără titlu" |
4027 | |
4028 | #: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100 |
4029 | -#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:577 |
4030 | -#: ../gnomemusic/view.py:964 ../gnomemusic/view.py:1291 |
4031 | +#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:574 |
4032 | +#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1291 |
4033 | msgid "Unknown Album" |
4034 | msgstr "Album necunoscut" |
4035 | |
4036 | #: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98 |
4037 | -#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:286 |
4038 | -#: ../gnomemusic/view.py:486 ../gnomemusic/view.py:720 |
4039 | -#: ../gnomemusic/view.py:1068 ../gnomemusic/view.py:1289 |
4040 | -#: ../gnomemusic/view.py:1320 ../gnomemusic/widgets.py:184 |
4041 | -#: ../gnomemusic/widgets.py:563 |
4042 | +#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:283 |
4043 | +#: ../gnomemusic/view.py:483 ../gnomemusic/view.py:717 |
4044 | +#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1289 |
4045 | +#: ../gnomemusic/view.py:1320 ../gnomemusic/widgets.py:181 |
4046 | +#: ../gnomemusic/widgets.py:566 |
4047 | msgid "Unknown Artist" |
4048 | msgstr "Artist necunoscut" |
4049 | |
4050 | @@ -121,55 +122,53 @@ |
4051 | msgid "by %s, from %s" |
4052 | msgstr "de %s, de la %s" |
4053 | |
4054 | -#: ../gnomemusic/notification.py:128 ../data/PlayerToolbar.ui.h:5 |
4055 | +#: ../gnomemusic/notification.py:125 ../data/PlayerToolbar.ui.h:5 |
4056 | msgid "Previous" |
4057 | msgstr "Precedent" |
4058 | |
4059 | -#: ../gnomemusic/notification.py:131 ../gnomemusic/player.py:348 |
4060 | +#: ../gnomemusic/notification.py:128 ../gnomemusic/player.py:348 |
4061 | msgid "Pause" |
4062 | msgstr "Pauză" |
4063 | |
4064 | -#: ../gnomemusic/notification.py:134 ../gnomemusic/player.py:351 |
4065 | +#: ../gnomemusic/notification.py:131 ../gnomemusic/player.py:351 |
4066 | #: ../data/PlayerToolbar.ui.h:6 |
4067 | msgid "Play" |
4068 | msgstr "Redare" |
4069 | |
4070 | -#: ../gnomemusic/notification.py:136 ../data/PlayerToolbar.ui.h:7 |
4071 | +#: ../gnomemusic/notification.py:133 ../data/PlayerToolbar.ui.h:7 |
4072 | msgid "Next" |
4073 | msgstr "Următorul" |
4074 | |
4075 | -#: ../gnomemusic/searchbar.py:30 ../gnomemusic/searchbar.py:73 |
4076 | +#: ../gnomemusic/searchbar.py:57 ../gnomemusic/searchbar.py:100 |
4077 | msgid "All" |
4078 | msgstr "Toate" |
4079 | |
4080 | -#: ../gnomemusic/searchbar.py:31 |
4081 | -#| msgid "Artists" |
4082 | +#: ../gnomemusic/searchbar.py:58 |
4083 | msgid "Artist" |
4084 | msgstr "Artist" |
4085 | |
4086 | -#: ../gnomemusic/searchbar.py:32 |
4087 | -#| msgid "Albums" |
4088 | +#: ../gnomemusic/searchbar.py:59 |
4089 | msgid "Album" |
4090 | msgstr "Album" |
4091 | |
4092 | -#: ../gnomemusic/searchbar.py:33 |
4093 | +#: ../gnomemusic/searchbar.py:60 |
4094 | msgid "Track Title" |
4095 | msgstr "Numele melodiei" |
4096 | |
4097 | -#: ../gnomemusic/searchbar.py:74 |
4098 | +#: ../gnomemusic/searchbar.py:101 |
4099 | msgid "Local" |
4100 | msgstr "Local" |
4101 | |
4102 | -#: ../gnomemusic/searchbar.py:176 |
4103 | +#: ../gnomemusic/searchbar.py:203 |
4104 | msgid "Sources" |
4105 | msgstr "Surse" |
4106 | |
4107 | -#: ../gnomemusic/searchbar.py:183 |
4108 | +#: ../gnomemusic/searchbar.py:210 |
4109 | msgid "Match" |
4110 | msgstr "Potrivire" |
4111 | |
4112 | -#: ../gnomemusic/view.py:201 ../gnomemusic/widgets.py:225 |
4113 | -#: ../gnomemusic/widgets.py:442 ../gnomemusic/window.py:278 |
4114 | +#: ../gnomemusic/view.py:198 ../gnomemusic/widgets.py:222 |
4115 | +#: ../gnomemusic/widgets.py:443 ../gnomemusic/window.py:284 |
4116 | #, python-format |
4117 | msgid "Selected %d item" |
4118 | msgid_plural "Selected %d items" |
4119 | @@ -177,57 +176,60 @@ |
4120 | msgstr[1] "Selectat %d elemente" |
4121 | msgstr[2] "Selectat %d de elemente" |
4122 | |
4123 | -#: ../gnomemusic/view.py:203 ../gnomemusic/widgets.py:227 |
4124 | -#: ../gnomemusic/widgets.py:444 ../gnomemusic/window.py:282 |
4125 | -#: ../gnomemusic/window.py:294 ../data/headerbar.ui.h:3 |
4126 | +#: ../gnomemusic/view.py:200 ../gnomemusic/widgets.py:224 |
4127 | +#: ../gnomemusic/widgets.py:445 ../gnomemusic/window.py:288 |
4128 | +#: ../gnomemusic/window.py:300 ../data/headerbar.ui.h:3 |
4129 | msgid "Click on items to select them" |
4130 | msgstr "Clic pe obiecte pentru a le selecta" |
4131 | |
4132 | -#: ../gnomemusic/view.py:340 |
4133 | +#: ../gnomemusic/view.py:337 |
4134 | #, python-format |
4135 | msgid "" |
4136 | "No Music found!\n" |
4137 | " Put some files into the folder %s" |
4138 | msgstr "" |
4139 | -"Nu s-a găsit nicio muzică!\n" |
4140 | +"Nu s-a găsit niciun fișier audio!\n" |
4141 | " Adăugați câteva fișiere în dosarul %s" |
4142 | |
4143 | -#: ../gnomemusic/view.py:348 ../gnomemusic/view.py:1535 |
4144 | +#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1535 |
4145 | msgid "Albums" |
4146 | msgstr "Albume" |
4147 | |
4148 | -#: ../gnomemusic/view.py:430 ../gnomemusic/view.py:1537 |
4149 | +#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1537 |
4150 | msgid "Songs" |
4151 | msgstr "Melodii" |
4152 | |
4153 | -#: ../gnomemusic/view.py:594 ../gnomemusic/view.py:1536 |
4154 | +#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1536 |
4155 | msgid "Artists" |
4156 | msgstr "Artiști" |
4157 | |
4158 | -#: ../gnomemusic/view.py:639 ../gnomemusic/view.py:641 |
4159 | -#: ../gnomemusic/widgets.py:451 |
4160 | +#: ../gnomemusic/view.py:636 ../gnomemusic/view.py:638 |
4161 | +#: ../gnomemusic/widgets.py:452 |
4162 | msgid "All Artists" |
4163 | msgstr "Toți artiștii" |
4164 | |
4165 | -#: ../gnomemusic/view.py:800 ../gnomemusic/view.py:1538 |
4166 | +#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1538 |
4167 | msgid "Playlists" |
4168 | msgstr "Liste de redare" |
4169 | |
4170 | -#: ../gnomemusic/view.py:1080 |
4171 | +#: ../gnomemusic/view.py:1077 |
4172 | #, python-format |
4173 | -#| msgid "Songs" |
4174 | msgid "%d Song" |
4175 | msgid_plural "%d Songs" |
4176 | msgstr[0] "%d melodie" |
4177 | msgstr[1] "%d melodii" |
4178 | msgstr[2] "%d de melodii" |
4179 | |
4180 | -#: ../gnomemusic/widgets.py:677 |
4181 | -#| msgid "_New Playlist" |
4182 | +#: ../gnomemusic/widgets.py:270 ../gnomemusic/widgets.py:308 |
4183 | +#, python-format |
4184 | +msgid "%d min" |
4185 | +msgstr "%d min" |
4186 | + |
4187 | +#: ../gnomemusic/widgets.py:680 |
4188 | msgid "New Playlist" |
4189 | msgstr "Listă de redare nouă" |
4190 | |
4191 | -#: ../gnomemusic/window.py:226 |
4192 | +#: ../gnomemusic/window.py:232 |
4193 | msgid "Empty" |
4194 | msgstr "Gol" |
4195 | |
4196 | @@ -342,12 +344,10 @@ |
4197 | msgstr "Deselectare totală" |
4198 | |
4199 | #: ../data/headerbar.ui.h:4 |
4200 | -#| msgid "Search mode" |
4201 | msgid "Search" |
4202 | msgstr "Caută" |
4203 | |
4204 | #: ../data/headerbar.ui.h:5 ../data/PlaylistDialog.ui.h:3 |
4205 | -#| msgid "Select All" |
4206 | msgid "Select" |
4207 | msgstr "Selectează" |
4208 | |
4209 | @@ -364,12 +364,10 @@ |
4210 | msgstr "Adaugă în lista de redare" |
4211 | |
4212 | #: ../data/SelectionToolbar.ui.h:2 |
4213 | -#| msgid "Add to Playlist" |
4214 | msgid "Remove from Playlist" |
4215 | msgstr "Elimină din lista de redare" |
4216 | |
4217 | #: ../data/PlaylistControls.ui.h:1 |
4218 | -#| msgid "Play" |
4219 | msgid "_Play" |
4220 | msgstr "_Redare" |
4221 | |
4222 | @@ -377,8 +375,11 @@ |
4223 | msgid "_Delete" |
4224 | msgstr "Ș_terge" |
4225 | |
4226 | +#: ../data/PlaylistControls.ui.h:3 |
4227 | +msgid "Playlist Name" |
4228 | +msgstr "Numele listei de redare" |
4229 | + |
4230 | #: ../data/PlaylistDialog.ui.h:1 |
4231 | -#| msgid "Select All" |
4232 | msgid "Select Playlist" |
4233 | msgstr "Selectează lista de redare" |
4234 | |
4235 | |
4236 | === modified file 'po/sl.po' |
4237 | --- po/sl.po 2014-10-19 23:39:47 +0000 |
4238 | +++ po/sl.po 2015-02-14 00:18:38 +0000 |
4239 | @@ -9,8 +9,8 @@ |
4240 | "Project-Id-Version: gnome-music master\n" |
4241 | "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" |
4242 | "music&keywords=I18N+L10N&component=general\n" |
4243 | -"POT-Creation-Date: 2014-09-14 07:02+0000\n" |
4244 | -"PO-Revision-Date: 2014-09-14 19:36+0100\n" |
4245 | +"POT-Creation-Date: 2014-12-25 07:57+0000\n" |
4246 | +"PO-Revision-Date: 2014-12-25 19:23+0100\n" |
4247 | "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n" |
4248 | "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" |
4249 | "Language: sl_SI\n" |
4250 | @@ -94,22 +94,22 @@ |
4251 | msgid "Music is the new GNOME music playing application." |
4252 | msgstr "Glasba je nov program za predvajanje glasbe za namizje GNOME" |
4253 | |
4254 | -#: ../gnomemusic/albumArtCache.py:100 ../gnomemusic/albumArtCache.py:108 |
4255 | +#: ../gnomemusic/albumArtCache.py:99 ../gnomemusic/albumArtCache.py:107 |
4256 | msgid "Untitled" |
4257 | msgstr "Neimenovano" |
4258 | |
4259 | #: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100 |
4260 | #: ../gnomemusic/player.py:400 ../gnomemusic/view.py:574 |
4261 | -#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1290 |
4262 | +#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1291 |
4263 | msgid "Unknown Album" |
4264 | msgstr "Neznan album" |
4265 | |
4266 | #: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98 |
4267 | #: ../gnomemusic/player.py:391 ../gnomemusic/view.py:283 |
4268 | #: ../gnomemusic/view.py:483 ../gnomemusic/view.py:717 |
4269 | -#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1288 |
4270 | -#: ../gnomemusic/view.py:1319 ../gnomemusic/widgets.py:181 |
4271 | -#: ../gnomemusic/widgets.py:560 |
4272 | +#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1289 |
4273 | +#: ../gnomemusic/view.py:1320 ../gnomemusic/widgets.py:181 |
4274 | +#: ../gnomemusic/widgets.py:566 |
4275 | msgid "Unknown Artist" |
4276 | msgstr "Neznan izvajalec" |
4277 | |
4278 | @@ -140,36 +140,36 @@ |
4279 | msgid "Next" |
4280 | msgstr "Naslednja" |
4281 | |
4282 | -#: ../gnomemusic/searchbar.py:30 ../gnomemusic/searchbar.py:73 |
4283 | +#: ../gnomemusic/searchbar.py:57 ../gnomemusic/searchbar.py:100 |
4284 | msgid "All" |
4285 | msgstr "Vse" |
4286 | |
4287 | -#: ../gnomemusic/searchbar.py:31 |
4288 | +#: ../gnomemusic/searchbar.py:58 |
4289 | msgid "Artist" |
4290 | msgstr "Izvajalec" |
4291 | |
4292 | -#: ../gnomemusic/searchbar.py:32 |
4293 | +#: ../gnomemusic/searchbar.py:59 |
4294 | msgid "Album" |
4295 | msgstr "Album" |
4296 | |
4297 | -#: ../gnomemusic/searchbar.py:33 |
4298 | +#: ../gnomemusic/searchbar.py:60 |
4299 | msgid "Track Title" |
4300 | msgstr "Naslov skladbe" |
4301 | |
4302 | -#: ../gnomemusic/searchbar.py:74 |
4303 | +#: ../gnomemusic/searchbar.py:101 |
4304 | msgid "Local" |
4305 | msgstr "Krajevno" |
4306 | |
4307 | -#: ../gnomemusic/searchbar.py:176 |
4308 | +#: ../gnomemusic/searchbar.py:203 |
4309 | msgid "Sources" |
4310 | msgstr "Viri" |
4311 | |
4312 | -#: ../gnomemusic/searchbar.py:183 |
4313 | +#: ../gnomemusic/searchbar.py:210 |
4314 | msgid "Match" |
4315 | msgstr "Se sklada" |
4316 | |
4317 | #: ../gnomemusic/view.py:198 ../gnomemusic/widgets.py:222 |
4318 | -#: ../gnomemusic/widgets.py:439 ../gnomemusic/window.py:278 |
4319 | +#: ../gnomemusic/widgets.py:443 ../gnomemusic/window.py:284 |
4320 | #, python-format |
4321 | msgid "Selected %d item" |
4322 | msgid_plural "Selected %d items" |
4323 | @@ -179,8 +179,8 @@ |
4324 | msgstr[3] "Izbrani so %d predmeti" |
4325 | |
4326 | #: ../gnomemusic/view.py:200 ../gnomemusic/widgets.py:224 |
4327 | -#: ../gnomemusic/widgets.py:441 ../gnomemusic/window.py:282 |
4328 | -#: ../gnomemusic/window.py:294 ../data/headerbar.ui.h:3 |
4329 | +#: ../gnomemusic/widgets.py:445 ../gnomemusic/window.py:288 |
4330 | +#: ../gnomemusic/window.py:300 ../data/headerbar.ui.h:3 |
4331 | msgid "Click on items to select them" |
4332 | msgstr "S klikom se predmeti izberejo." |
4333 | |
4334 | @@ -193,24 +193,24 @@ |
4335 | "Posnetkov ni mogoče najti!\n" |
4336 | " Nekaj datotek je treba kopirati v mapo %s" |
4337 | |
4338 | -#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1534 |
4339 | +#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1535 |
4340 | msgid "Albums" |
4341 | msgstr "Albumi" |
4342 | |
4343 | -#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1536 |
4344 | +#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1537 |
4345 | msgid "Songs" |
4346 | msgstr "Skladbe" |
4347 | |
4348 | -#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1535 |
4349 | +#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1536 |
4350 | msgid "Artists" |
4351 | msgstr "Izvajalci" |
4352 | |
4353 | #: ../gnomemusic/view.py:636 ../gnomemusic/view.py:638 |
4354 | -#: ../gnomemusic/widgets.py:448 |
4355 | +#: ../gnomemusic/widgets.py:452 |
4356 | msgid "All Artists" |
4357 | msgstr "Vsi izvajalci" |
4358 | |
4359 | -#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1537 |
4360 | +#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1538 |
4361 | msgid "Playlists" |
4362 | msgstr "Seznami predvajanja" |
4363 | |
4364 | @@ -228,11 +228,11 @@ |
4365 | msgid "%d min" |
4366 | msgstr "%d min" |
4367 | |
4368 | -#: ../gnomemusic/widgets.py:674 |
4369 | +#: ../gnomemusic/widgets.py:680 |
4370 | msgid "New Playlist" |
4371 | msgstr "Nov seznam predvajanja" |
4372 | |
4373 | -#: ../gnomemusic/window.py:226 |
4374 | +#: ../gnomemusic/window.py:232 |
4375 | msgid "Empty" |
4376 | msgstr "Prazno" |
4377 | |
4378 | @@ -377,6 +377,10 @@ |
4379 | msgid "_Delete" |
4380 | msgstr "_Izbriši" |
4381 | |
4382 | +#: ../data/PlaylistControls.ui.h:3 |
4383 | +msgid "Playlist Name" |
4384 | +msgstr "Ime seznama predvajanja" |
4385 | + |
4386 | #: ../data/PlaylistDialog.ui.h:1 |
4387 | msgid "Select Playlist" |
4388 | msgstr "Izbor seznama predvajanja" |