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