Merge lp:~noskcaj/ubuntu/vivid/gnome-music/3.14.3.1 into lp:ubuntu/vivid/gnome-music

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
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+249739@code.launchpad.net

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
=== modified file 'AUTHORS'
--- AUTHORS 2014-10-19 23:39:47 +0000
+++ AUTHORS 2015-02-14 00:18:38 +0000
@@ -61,6 +61,7 @@
61Daniel Mustieles <dnaiel.mustieles@gmail.com>61Daniel Mustieles <dnaiel.mustieles@gmail.com>
62Daniel Șerbănescu <cyber19rider@gmail.com>62Daniel Șerbănescu <cyber19rider@gmail.com>
63Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>63Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>
64Daniel Șerbănescu <daniel@serbanescu.dk>
64Dawid Loubser <dawid.loubser@ibi.co.za>65Dawid Loubser <dawid.loubser@ibi.co.za>
65Dimitris Spingos <dmtrs32@gmail.com>66Dimitris Spingos <dmtrs32@gmail.com>
66Dirgita <dirgitadevina@yahoo.co.id>67Dirgita <dirgitadevina@yahoo.co.id>
@@ -76,6 +77,7 @@
76Evgeny Bobkin <evgen.ibqn@gmail.com>77Evgeny Bobkin <evgen.ibqn@gmail.com>
77Fabiano Fidêncio <fabiano@fidencio.org>78Fabiano Fidêncio <fabiano@fidencio.org>
78Fabiano Fidêncio <fidencio@redhat.com>79Fabiano Fidêncio <fidencio@redhat.com>
80Fabio Tomat <f.t.public@gmail.com>
79Felipe Borges <felipe10borges@gmail.com>81Felipe Borges <felipe10borges@gmail.com>
80Florian Müllner <fmuellner@gnome.org>82Florian Müllner <fmuellner@gnome.org>
81Florian Will <florian.will@gmail.com>83Florian Will <florian.will@gmail.com>
@@ -130,11 +132,13 @@
130ngoswami <ngoswami@redhat.com>132ngoswami <ngoswami@redhat.com>
131Nilamdyuti Goswami <ngoswami@redhat.com>133Nilamdyuti Goswami <ngoswami@redhat.com>
132Olav Vitters <olav@vitters.nl>134Olav Vitters <olav@vitters.nl>
135Pacho Ramos <pachoramos1@gmail.com>
133Patrik Novotný <patrik.novotny@gmx.com>136Patrik Novotný <patrik.novotny@gmx.com>
134Pau Iranzo <paugnu@gmail.com>137Pau Iranzo <paugnu@gmail.com>
135Paul martin <codemobius@gmail.com>138Paul martin <codemobius@gmail.com>
136Pawan Chitrakar <chautari@gmail.com>139Pawan Chitrakar <chautari@gmail.com>
137Paweł Żołnowski <pawel@zolnowski.name>140Paweł Żołnowski <pawel@zolnowski.name>
141Pedro Albuquerque <palbuquerque73@gmail.com>
138Piotr Drąg <piotrdrag@gmail.com>142Piotr Drąg <piotrdrag@gmail.com>
139Praveen Illa <mail2ipn@gmail.com>143Praveen Illa <mail2ipn@gmail.com>
140Priit Laes <plaes@plaes.org>144Priit Laes <plaes@plaes.org>
@@ -145,6 +149,7 @@
145Rowan Lewis <me@rowanlewis.com>149Rowan Lewis <me@rowanlewis.com>
146royaniva <royaniva@outlook.com>150royaniva <royaniva@outlook.com>
147Rūdolfs Mazurs <rudolfsm@src.gnome.org>151Rūdolfs Mazurs <rudolfsm@src.gnome.org>
152Sagar Ghuge <ghugesss@gmail.com>
148Sai Suman Prayaga <suman.sai14@gmail.com>153Sai Suman Prayaga <suman.sai14@gmail.com>
149Sai <suman.sai14@gmail.com>154Sai <suman.sai14@gmail.com>
150Seán de Búrca <leftmostcat@gmail.com>155Seán de Búrca <leftmostcat@gmail.com>
@@ -161,6 +166,7 @@
161Stefano Facchini <stefano.facchini@gmail.com>166Stefano Facchini <stefano.facchini@gmail.com>
162Tiagosdot <almosthumane@portugalmail.pt>167Tiagosdot <almosthumane@portugalmail.pt>
163Timo Jyrinki <timo@debian.org>168Timo Jyrinki <timo@debian.org>
169Tina Hinojsa <agustina.hinojosa@gmail.com>
164Tobias Endrigkeit <tobiasendrigkeit@outlook.com>170Tobias Endrigkeit <tobiasendrigkeit@outlook.com>
165Tom Tryfonidis <tomtryf@gmail.com>171Tom Tryfonidis <tomtryf@gmail.com>
166Tong Hui <tonghuix@gmmail.com>172Tong Hui <tonghuix@gmmail.com>
167173
=== modified file 'INSTALL'
--- INSTALL 2014-09-22 21:20:08 +0000
+++ INSTALL 2015-02-14 00:18:38 +0000
@@ -12,8 +12,8 @@
12Basic Installation12Basic Installation
13==================13==================
1414
15 Briefly, the shell command `./configure && make && make install'15 Briefly, the shell commands `./configure; make; make install' should
16should configure, build, and install this package. The following16configure, build, and install this package. The following
17more-detailed instructions are generic; see the `README' file for17more-detailed instructions are generic; see the `README' file for
18instructions specific to this package. Some packages provide this18instructions specific to this package. Some packages provide this
19`INSTALL' file but do not implement all of the features documented19`INSTALL' file but do not implement all of the features documented
2020
=== modified file 'Makefile.in'
--- Makefile.in 2014-10-19 23:39:47 +0000
+++ Makefile.in 2015-02-14 00:18:38 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.14.1 from Makefile.am.1# Makefile.in generated by automake 1.13.4 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -472,8 +472,8 @@
472$(am__aclocal_m4_deps):472$(am__aclocal_m4_deps):
473473
474config.h: stamp-h1474config.h: stamp-h1
475 @test -f $@ || rm -f stamp-h1475 @if test ! -f $@; then rm -f stamp-h1; else :; fi
476 @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1476 @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
477477
478stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status478stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
479 @rm -f stamp-h1479 @rm -f stamp-h1
@@ -719,16 +719,10 @@
719 $(am__post_remove_distdir)719 $(am__post_remove_distdir)
720720
721dist-tarZ: distdir721dist-tarZ: distdir
722 @echo WARNING: "Support for shar distribution archives is" \
723 "deprecated." >&2
724 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
725 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z722 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
726 $(am__post_remove_distdir)723 $(am__post_remove_distdir)
727724
728dist-shar: distdir725dist-shar: distdir
729 @echo WARNING: "Support for distribution archives compressed with" \
730 "legacy program 'compress' is deprecated." >&2
731 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
732 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz726 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
733 $(am__post_remove_distdir)727 $(am__post_remove_distdir)
734728
@@ -770,10 +764,9 @@
770 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \764 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
771 && am__cwd=`pwd` \765 && am__cwd=`pwd` \
772 && $(am__cd) $(distdir)/_build \766 && $(am__cd) $(distdir)/_build \
773 && ../configure \767 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
774 $(AM_DISTCHECK_CONFIGURE_FLAGS) \768 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
775 $(DISTCHECK_CONFIGURE_FLAGS) \769 $(DISTCHECK_CONFIGURE_FLAGS) \
776 --srcdir=.. --prefix="$$dc_install_base" \
777 && $(MAKE) $(AM_MAKEFLAGS) \770 && $(MAKE) $(AM_MAKEFLAGS) \
778 && $(MAKE) $(AM_MAKEFLAGS) dvi \771 && $(MAKE) $(AM_MAKEFLAGS) dvi \
779 && $(MAKE) $(AM_MAKEFLAGS) check \772 && $(MAKE) $(AM_MAKEFLAGS) check \
780773
=== modified file 'NEWS'
--- NEWS 2014-10-19 23:39:47 +0000
+++ NEWS 2015-02-14 00:18:38 +0000
@@ -1,3 +1,40 @@
1Overview of changes in 3.14.3.1
2=============================
3
4* Fixed an important bug on startup
5* Tags in search entries are now visible
6
7* Bugs fixed:
8 743484 gnome-music-3.14.3 doesn't detect music directory properly
9
10* Updated translations and help files
11
12Overview of changes in 3.14.3
13=============================
14
15* Bugs fixed:
16 740330 Album view - music icons are badly rendered
17 740524 Missing license headers in playlists.py and searchbar.py
18 731639 The pictures have different proportions, influencing the effect of alignment
19 729459 under Artists, tracks in the same album are very far apart from each other
20 740490 Music "forgets" search string, but search results remain
21 731613 gnome-music-3.12.2 fails to start if xdg default directories are not created
22 726459 Crash on playlist tabs when new media has been scanned
23 733686 Gnome music will not launch
24 742123 Hitting 'cancel' while creating new playlist crashes program
25 743042 Gstreamer error messages should be more detailed
26 729376 New Playlist in application menu doesn't do anything
27
28* Updated translations and help files
29
30Overview of changes in 3.14.2
31=============================
32
33* Bugs fixed:
34 734513 play/pause is activated twice when pressing spacebar and play/pause button is active/selected
35
36* Updated translations and help files
37
1Overview of changes in 3.14.138Overview of changes in 3.14.1
2=============================39=============================
340
441
=== modified file 'aclocal.m4'
--- aclocal.m4 2014-10-19 23:39:47 +0000
+++ aclocal.m4 2015-02-14 00:18:38 +0000
@@ -1,4 +1,4 @@
1# generated automatically by aclocal 1.14.1 -*- Autoconf -*-1# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
22
3# Copyright (C) 1996-2013 Free Software Foundation, Inc.3# Copyright (C) 1996-2013 Free Software Foundation, Inc.
44
@@ -21,7 +21,7 @@
21To do so, use the procedure documented by the package, typically 'autoreconf'.])])21To do so, use the procedure documented by the package, typically 'autoreconf'.])])
2222
23# nls.m4 serial 5 (gettext-0.18)23# nls.m4 serial 5 (gettext-0.18)
24dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,24dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
25dnl Inc.25dnl Inc.
26dnl This file is free software; the Free Software Foundation26dnl This file is free software; the Free Software Foundation
27dnl gives unlimited permission to copy and/or distribute it,27dnl gives unlimited permission to copy and/or distribute it,
@@ -253,21 +253,6 @@
253m4_popdef([pkg_description])253m4_popdef([pkg_description])
254]) dnl PKG_NOARCH_INSTALLDIR254]) dnl PKG_NOARCH_INSTALLDIR
255255
256
257# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
258# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
259# -------------------------------------------
260# Retrieves the value of the pkg-config variable for the given module.
261AC_DEFUN([PKG_CHECK_VAR],
262[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
263AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
264
265_PKG_CONFIG([$1], [variable="][$3]["], [$2])
266AS_VAR_COPY([$1], [pkg_cv_][$1])
267
268AS_VAR_IF([$1], [""], [$5], [$4])dnl
269])# PKG_CHECK_VAR
270
271dnl GLIB_GSETTINGS256dnl GLIB_GSETTINGS
272dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether257dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
273dnl the schema should be compiled258dnl the schema should be compiled
@@ -570,7 +555,7 @@
570EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))555EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
571556
572distdir: distdir-help-files557distdir: distdir-help-files
573distdir-help-files:558distdir-help-files: $(_HELP_LC_FILES)
574 @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \559 @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
575 $(MKDIR_P) "$(distdir)/$$lc"; \560 $(MKDIR_P) "$(distdir)/$$lc"; \
576 for file in $(HELP_FILES); do \561 for file in $(HELP_FILES); do \
@@ -599,7 +584,7 @@
599584
600.PHONY: install-help585.PHONY: install-help
601install-data-am: $(if $(HELP_ID),install-help)586install-data-am: $(if $(HELP_ID),install-help)
602install-help:587install-help: $(_HELP_LC_FILES)
603 @for lc in C $(_HELP_LINGUAS); do \588 @for lc in C $(_HELP_LINGUAS); do \
604 $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \589 $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
605 done590 done
@@ -675,10 +660,10 @@
675# generated from the m4 files accompanying Automake X.Y.660# generated from the m4 files accompanying Automake X.Y.
676# (This private macro should not be called outside this file.)661# (This private macro should not be called outside this file.)
677AC_DEFUN([AM_AUTOMAKE_VERSION],662AC_DEFUN([AM_AUTOMAKE_VERSION],
678[am__api_version='1.14'663[am__api_version='1.13'
679dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to664dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
680dnl require some minimum version. Point them to the right macro.665dnl require some minimum version. Point them to the right macro.
681m4_if([$1], [1.14.1], [],666m4_if([$1], [1.13.4], [],
682 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl667 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
683])668])
684669
@@ -694,7 +679,7 @@
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.
695# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.680# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
696AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],681AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
697[AM_AUTOMAKE_VERSION([1.14.1])dnl682[AM_AUTOMAKE_VERSION([1.13.4])dnl
698m4_ifndef([AC_AUTOCONF_VERSION],683m4_ifndef([AC_AUTOCONF_VERSION],
699 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl684 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
700_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])685_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -1061,12 +1046,6 @@
1061# This macro actually does too much. Some checks are only needed if1046# This macro actually does too much. Some checks are only needed if
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.
10631048
1064dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
1065m4_define([AC_PROG_CC],
1066m4_defn([AC_PROG_CC])
1067[_AM_PROG_CC_C_O
1068])
1069
1070# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])1049# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
1071# AM_INIT_AUTOMAKE([OPTIONS])1050# AM_INIT_AUTOMAKE([OPTIONS])
1072# -----------------------------------------------1051# -----------------------------------------------
@@ -1175,48 +1154,7 @@
1175AC_CONFIG_COMMANDS_PRE(dnl1154AC_CONFIG_COMMANDS_PRE(dnl
1176[m4_provide_if([_AM_COMPILER_EXEEXT],1155[m4_provide_if([_AM_COMPILER_EXEEXT],
1177 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl1156 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
11781157])
1179# POSIX will say in a future version that running "rm -f" with no argument
1180# is OK; and we want to be able to make that assumption in our Makefile
1181# recipes. So use an aggressive probe to check that the usage we want is
1182# actually supported "in the wild" to an acceptable degree.
1183# See automake bug#10828.
1184# To make any issue more visible, cause the running configure to be aborted
1185# by default if the 'rm' program in use doesn't match our expectations; the
1186# user can still override this though.
1187if rm -f && rm -fr && rm -rf; then : OK; else
1188 cat >&2 <<'END'
1189Oops!
1190
1191Your 'rm' program seems unable to run without file operands specified
1192on the command line, even when the '-f' option is present. This is contrary
1193to the behaviour of most rm programs out there, and not conforming with
1194the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
1195
1196Please tell bug-automake@gnu.org about your system, including the value
1197of your $PATH and any error possibly output before this message. This
1198can help us improve future automake versions.
1199
1200END
1201 if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
1202 echo 'Configuration will proceed anyway, since you have set the' >&2
1203 echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
1204 echo >&2
1205 else
1206 cat >&2 <<'END'
1207Aborting the configuration process, to ensure you take notice of the issue.
1208
1209You can download and install GNU coreutils to get an 'rm' implementation
1210that behaves properly: <http://www.gnu.org/software/coreutils/>.
1211
1212If you want to complete the configuration process using your problematic
1213'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
1214to "yes", and re-run configure.
1215
1216END
1217 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
1218 fi
1219fi])
12201158
1221dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not1159dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1222dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further1160dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -1224,6 +1162,7 @@
1224m4_define([_AC_COMPILER_EXEEXT],1162m4_define([_AC_COMPILER_EXEEXT],
1225m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])1163m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
12261164
1165
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.
1228# This file resides in the same directory as the config header1167# This file resides in the same directory as the config header
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.
@@ -1371,6 +1310,38 @@
1371rm -f confinc confmf1310rm -f confinc confmf
1372])1311])
13731312
1313# Copyright (C) 1999-2013 Free Software Foundation, Inc.
1314#
1315# This file is free software; the Free Software Foundation
1316# gives unlimited permission to copy and/or distribute it,
1317# with or without modifications, as long as this notice is preserved.
1318
1319# AM_PROG_CC_C_O
1320# --------------
1321# Like AC_PROG_CC_C_O, but changed for automake.
1322AC_DEFUN([AM_PROG_CC_C_O],
1323[AC_REQUIRE([AC_PROG_CC_C_O])dnl
1324AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1325AC_REQUIRE_AUX_FILE([compile])dnl
1326# FIXME: we rely on the cache variable name because
1327# there is no other way.
1328set dummy $CC
1329am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
1330eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
1331if test "$am_t" != yes; then
1332 # Losing compiler, so override with the script.
1333 # FIXME: It is wrong to rewrite CC.
1334 # But if we don't then we get into trouble of one sort or another.
1335 # A longer-term fix would be to have automake use am__CC in this case,
1336 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1337 CC="$am_aux_dir/compile $CC"
1338fi
1339dnl Make sure AC_PROG_CC is never called again, or it will override our
1340dnl setting of CC.
1341m4_define([AC_PROG_CC],
1342 [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
1343])
1344
1374# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-1345# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
13751346
1376# Copyright (C) 1997-2013 Free Software Foundation, Inc.1347# Copyright (C) 1997-2013 Free Software Foundation, Inc.
@@ -1447,53 +1418,6 @@
1447# gives unlimited permission to copy and/or distribute it,1418# gives unlimited permission to copy and/or distribute it,
1448# with or without modifications, as long as this notice is preserved.1419# with or without modifications, as long as this notice is preserved.
14491420
1450# _AM_PROG_CC_C_O
1451# ---------------
1452# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
1453# to automatically call this.
1454AC_DEFUN([_AM_PROG_CC_C_O],
1455[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1456AC_REQUIRE_AUX_FILE([compile])dnl
1457AC_LANG_PUSH([C])dnl
1458AC_CACHE_CHECK(
1459 [whether $CC understands -c and -o together],
1460 [am_cv_prog_cc_c_o],
1461 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
1462 # Make sure it works both with $CC and with simple cc.
1463 # Following AC_PROG_CC_C_O, we do the test twice because some
1464 # compilers refuse to overwrite an existing .o file with -o,
1465 # though they will create one.
1466 am_cv_prog_cc_c_o=yes
1467 for am_i in 1 2; do
1468 if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
1469 && test -f conftest2.$ac_objext; then
1470 : OK
1471 else
1472 am_cv_prog_cc_c_o=no
1473 break
1474 fi
1475 done
1476 rm -f core conftest*
1477 unset am_i])
1478if test "$am_cv_prog_cc_c_o" != yes; then
1479 # Losing compiler, so override with the script.
1480 # FIXME: It is wrong to rewrite CC.
1481 # But if we don't then we get into trouble of one sort or another.
1482 # A longer-term fix would be to have automake use am__CC in this case,
1483 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1484 CC="$am_aux_dir/compile $CC"
1485fi
1486AC_LANG_POP([C])])
1487
1488# For backward compatibility.
1489AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
1490
1491# Copyright (C) 1999-2013 Free Software Foundation, Inc.
1492#
1493# This file is free software; the Free Software Foundation
1494# gives unlimited permission to copy and/or distribute it,
1495# with or without modifications, as long as this notice is preserved.
1496
14971421
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])
1499# ---------------------------------------------------------------------------1423# ---------------------------------------------------------------------------
15001424
=== modified file 'config.guess'
--- config.guess 2014-10-19 23:39:47 +0000
+++ config.guess 2015-02-14 00:18:38 +0000
@@ -1,8 +1,8 @@
1#! /bin/sh1#! /bin/sh
2# Attempt to guess a canonical system name.2# Attempt to guess a canonical system name.
3# Copyright 1992-2014 Free Software Foundation, Inc.3# Copyright 1992-2013 Free Software Foundation, Inc.
44
5timestamp='2014-03-23'5timestamp='2013-06-10'
66
7# This file is free software; you can redistribute it and/or modify it7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by8# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
50GNU config.guess ($timestamp)50GNU config.guess ($timestamp)
5151
52Originally written by Per Bothner.52Originally written by Per Bothner.
53Copyright 1992-2014 Free Software Foundation, Inc.53Copyright 1992-2013 Free Software Foundation, Inc.
5454
55This is free software; see the source for copying conditions. There is NO55This is free software; see the source for copying conditions. There is NO
56warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."56warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@
149 LIBC=gnu149 LIBC=gnu
150 #endif150 #endif
151 EOF151 EOF
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'`
153 ;;153 ;;
154esac154esac
155155
@@ -826,7 +826,7 @@
826 *:MINGW*:*)826 *:MINGW*:*)
827 echo ${UNAME_MACHINE}-pc-mingw32827 echo ${UNAME_MACHINE}-pc-mingw32
828 exit ;;828 exit ;;
829 *:MSYS*:*)829 i*:MSYS*:*)
830 echo ${UNAME_MACHINE}-pc-msys830 echo ${UNAME_MACHINE}-pc-msys
831 exit ;;831 exit ;;
832 i*:windows32*:*)832 i*:windows32*:*)
@@ -969,10 +969,10 @@
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'`
970 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }970 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
971 ;;971 ;;
972 openrisc*:Linux:*:*)972 or1k:Linux:*:*)
973 echo or1k-unknown-linux-${LIBC}973 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
974 exit ;;974 exit ;;
975 or32:Linux:*:* | or1k*:Linux:*:*)975 or32:Linux:*:*)
976 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}976 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
977 exit ;;977 exit ;;
978 padre:Linux:*:*)978 padre:Linux:*:*)
@@ -1260,26 +1260,16 @@
1260 if test "$UNAME_PROCESSOR" = unknown ; then1260 if test "$UNAME_PROCESSOR" = unknown ; then
1261 UNAME_PROCESSOR=powerpc1261 UNAME_PROCESSOR=powerpc
1262 fi1262 fi
1263 if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then1263 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1264 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then1264 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1265 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \1265 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1266 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \1266 grep IS_64BIT_ARCH >/dev/null
1267 grep IS_64BIT_ARCH >/dev/null1267 then
1268 then1268 case $UNAME_PROCESSOR in
1269 case $UNAME_PROCESSOR in1269 i386) UNAME_PROCESSOR=x86_64 ;;
1270 i386) UNAME_PROCESSOR=x86_64 ;;1270 powerpc) UNAME_PROCESSOR=powerpc64 ;;
1271 powerpc) UNAME_PROCESSOR=powerpc64 ;;1271 esac
1272 esac
1273 fi
1274 fi1272 fi
1275 elif test "$UNAME_PROCESSOR" = i386 ; then
1276 # Avoid executing cc on OS X 10.9, as it ships with a stub
1277 # that puts up a graphical alert prompting to install
1278 # developer tools. Any system running Mac OS X 10.7 or
1279 # later (Darwin 11 and later) is required to have a 64-bit
1280 # processor. This is not true of the ARM version of Darwin
1281 # that Apple uses in portable devices.
1282 UNAME_PROCESSOR=x86_64
1283 fi1273 fi
1284 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}1274 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1285 exit ;;1275 exit ;;
@@ -1371,6 +1361,154 @@
1371 exit ;;1361 exit ;;
1372esac1362esac
13731363
1364eval $set_cc_for_build
1365cat >$dummy.c <<EOF
1366#ifdef _SEQUENT_
1367# include <sys/types.h>
1368# include <sys/utsname.h>
1369#endif
1370main ()
1371{
1372#if defined (sony)
1373#if defined (MIPSEB)
1374 /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
1375 I don't know.... */
1376 printf ("mips-sony-bsd\n"); exit (0);
1377#else
1378#include <sys/param.h>
1379 printf ("m68k-sony-newsos%s\n",
1380#ifdef NEWSOS4
1381 "4"
1382#else
1383 ""
1384#endif
1385 ); exit (0);
1386#endif
1387#endif
1388
1389#if defined (__arm) && defined (__acorn) && defined (__unix)
1390 printf ("arm-acorn-riscix\n"); exit (0);
1391#endif
1392
1393#if defined (hp300) && !defined (hpux)
1394 printf ("m68k-hp-bsd\n"); exit (0);
1395#endif
1396
1397#if defined (NeXT)
1398#if !defined (__ARCHITECTURE__)
1399#define __ARCHITECTURE__ "m68k"
1400#endif
1401 int version;
1402 version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1403 if (version < 4)
1404 printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1405 else
1406 printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
1407 exit (0);
1408#endif
1409
1410#if defined (MULTIMAX) || defined (n16)
1411#if defined (UMAXV)
1412 printf ("ns32k-encore-sysv\n"); exit (0);
1413#else
1414#if defined (CMU)
1415 printf ("ns32k-encore-mach\n"); exit (0);
1416#else
1417 printf ("ns32k-encore-bsd\n"); exit (0);
1418#endif
1419#endif
1420#endif
1421
1422#if defined (__386BSD__)
1423 printf ("i386-pc-bsd\n"); exit (0);
1424#endif
1425
1426#if defined (sequent)
1427#if defined (i386)
1428 printf ("i386-sequent-dynix\n"); exit (0);
1429#endif
1430#if defined (ns32000)
1431 printf ("ns32k-sequent-dynix\n"); exit (0);
1432#endif
1433#endif
1434
1435#if defined (_SEQUENT_)
1436 struct utsname un;
1437
1438 uname(&un);
1439
1440 if (strncmp(un.version, "V2", 2) == 0) {
1441 printf ("i386-sequent-ptx2\n"); exit (0);
1442 }
1443 if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
1444 printf ("i386-sequent-ptx1\n"); exit (0);
1445 }
1446 printf ("i386-sequent-ptx\n"); exit (0);
1447
1448#endif
1449
1450#if defined (vax)
1451# if !defined (ultrix)
1452# include <sys/param.h>
1453# if defined (BSD)
1454# if BSD == 43
1455 printf ("vax-dec-bsd4.3\n"); exit (0);
1456# else
1457# if BSD == 199006
1458 printf ("vax-dec-bsd4.3reno\n"); exit (0);
1459# else
1460 printf ("vax-dec-bsd\n"); exit (0);
1461# endif
1462# endif
1463# else
1464 printf ("vax-dec-bsd\n"); exit (0);
1465# endif
1466# else
1467 printf ("vax-dec-ultrix\n"); exit (0);
1468# endif
1469#endif
1470
1471#if defined (alliant) && defined (i860)
1472 printf ("i860-alliant-bsd\n"); exit (0);
1473#endif
1474
1475 exit (1);
1476}
1477EOF
1478
1479$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1480 { echo "$SYSTEM_NAME"; exit; }
1481
1482# Apollos put the system type in the environment.
1483
1484test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1485
1486# Convex versions that predate uname can use getsysinfo(1)
1487
1488if [ -x /usr/convex/getsysinfo ]
1489then
1490 case `getsysinfo -f cpu_type` in
1491 c1*)
1492 echo c1-convex-bsd
1493 exit ;;
1494 c2*)
1495 if getsysinfo -f scalar_acc
1496 then echo c32-convex-bsd
1497 else echo c2-convex-bsd
1498 fi
1499 exit ;;
1500 c34*)
1501 echo c34-convex-bsd
1502 exit ;;
1503 c38*)
1504 echo c38-convex-bsd
1505 exit ;;
1506 c4*)
1507 echo c4-convex-bsd
1508 exit ;;
1509 esac
1510fi
1511
1374cat >&2 <<EOF1512cat >&2 <<EOF
1375$0: unable to guess system type1513$0: unable to guess system type
13761514
13771515
=== modified file 'config.h.in'
--- config.h.in 2014-09-22 21:20:08 +0000
+++ config.h.in 2015-02-14 00:18:38 +0000
@@ -67,6 +67,9 @@
67 */67 */
68#undef LT_OBJDIR68#undef LT_OBJDIR
6969
70/* Define to 1 if your C compiler doesn't accept -c and -o together. */
71#undef NO_MINUS_C_MINUS_O
72
70/* Name of package */73/* Name of package */
71#undef PACKAGE74#undef PACKAGE
7275
7376
=== modified file 'config.sub'
--- config.sub 2014-10-19 23:39:47 +0000
+++ config.sub 2015-02-14 00:18:38 +0000
@@ -1,8 +1,8 @@
1#! /bin/sh1#! /bin/sh
2# Configuration validation subroutine script.2# Configuration validation subroutine script.
3# Copyright 1992-2014 Free Software Foundation, Inc.3# Copyright 1992-2013 Free Software Foundation, Inc.
44
5timestamp='2014-07-28'5timestamp='2013-04-24'
66
7# This file is free software; you can redistribute it and/or modify it7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by8# under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@
68version="\68version="\
69GNU config.sub ($timestamp)69GNU config.sub ($timestamp)
7070
71Copyright 1992-2014 Free Software Foundation, Inc.71Copyright 1992-2013 Free Software Foundation, Inc.
7272
73This is free software; see the source for copying conditions. There is NO73This is free software; see the source for copying conditions. There is NO
74warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."74warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -257,7 +257,7 @@
257 | avr | avr32 \257 | avr | avr32 \
258 | be32 | be64 \258 | be32 | be64 \
259 | bfin \259 | bfin \
260 | c4x | c8051 | clipper \260 | c4x | clipper \
261 | d10v | d30v | dlx | dsp16xx \261 | d10v | d30v | dlx | dsp16xx \
262 | epiphany \262 | epiphany \
263 | fido | fr30 | frv \263 | fido | fr30 | frv \
@@ -265,7 +265,6 @@
265 | hexagon \265 | hexagon \
266 | i370 | i860 | i960 | ia64 \266 | i370 | i860 | i960 | ia64 \
267 | ip2k | iq2000 \267 | ip2k | iq2000 \
268 | k1om \
269 | le32 | le64 \268 | le32 | le64 \
270 | lm32 \269 | lm32 \
271 | m32c | m32r | m32rle | m68000 | m68k | m88k \270 | m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -283,10 +282,8 @@
283 | mips64vr5900 | mips64vr5900el \282 | mips64vr5900 | mips64vr5900el \
284 | mipsisa32 | mipsisa32el \283 | mipsisa32 | mipsisa32el \
285 | mipsisa32r2 | mipsisa32r2el \284 | mipsisa32r2 | mipsisa32r2el \
286 | mipsisa32r6 | mipsisa32r6el \
287 | mipsisa64 | mipsisa64el \285 | mipsisa64 | mipsisa64el \
288 | mipsisa64r2 | mipsisa64r2el \286 | mipsisa64r2 | mipsisa64r2el \
289 | mipsisa64r6 | mipsisa64r6el \
290 | mipsisa64sb1 | mipsisa64sb1el \287 | mipsisa64sb1 | mipsisa64sb1el \
291 | mipsisa64sr71k | mipsisa64sr71kel \288 | mipsisa64sr71k | mipsisa64sr71kel \
292 | mipsr5900 | mipsr5900el \289 | mipsr5900 | mipsr5900el \
@@ -298,7 +295,8 @@
298 | nds32 | nds32le | nds32be \295 | nds32 | nds32le | nds32be \
299 | nios | nios2 | nios2eb | nios2el \296 | nios | nios2 | nios2eb | nios2el \
300 | ns16k | ns32k \297 | ns16k | ns32k \
301 | open8 | or1k | or1knd | or32 \298 | open8 \
299 | or1k | or32 \
302 | pdp10 | pdp11 | pj | pjl \300 | pdp10 | pdp11 | pj | pjl \
303 | powerpc | powerpc64 | powerpc64le | powerpcle \301 | powerpc | powerpc64 | powerpc64le | powerpcle \
304 | pyramid \302 | pyramid \
@@ -326,7 +324,7 @@
326 c6x)324 c6x)
327 basic_machine=tic6x-unknown325 basic_machine=tic6x-unknown
328 ;;326 ;;
329 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)327 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
330 basic_machine=$basic_machine-unknown328 basic_machine=$basic_machine-unknown
331 os=-none329 os=-none
332 ;;330 ;;
@@ -374,7 +372,7 @@
374 | be32-* | be64-* \372 | be32-* | be64-* \
375 | bfin-* | bs2000-* \373 | bfin-* | bs2000-* \
376 | c[123]* | c30-* | [cjt]90-* | c4x-* \374 | c[123]* | c30-* | [cjt]90-* | c4x-* \
377 | c8051-* | clipper-* | craynv-* | cydra-* \375 | clipper-* | craynv-* | cydra-* \
378 | d10v-* | d30v-* | dlx-* \376 | d10v-* | d30v-* | dlx-* \
379 | elxsi-* \377 | elxsi-* \
380 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \378 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -383,7 +381,6 @@
383 | hexagon-* \381 | hexagon-* \
384 | i*86-* | i860-* | i960-* | ia64-* \382 | i*86-* | i860-* | i960-* | ia64-* \
385 | ip2k-* | iq2000-* \383 | ip2k-* | iq2000-* \
386 | k1om-* \
387 | le32-* | le64-* \384 | le32-* | le64-* \
388 | lm32-* \385 | lm32-* \
389 | m32c-* | m32r-* | m32rle-* \386 | m32c-* | m32r-* | m32rle-* \
@@ -403,10 +400,8 @@
403 | mips64vr5900-* | mips64vr5900el-* \400 | mips64vr5900-* | mips64vr5900el-* \
404 | mipsisa32-* | mipsisa32el-* \401 | mipsisa32-* | mipsisa32el-* \
405 | mipsisa32r2-* | mipsisa32r2el-* \402 | mipsisa32r2-* | mipsisa32r2el-* \
406 | mipsisa32r6-* | mipsisa32r6el-* \
407 | mipsisa64-* | mipsisa64el-* \403 | mipsisa64-* | mipsisa64el-* \
408 | mipsisa64r2-* | mipsisa64r2el-* \404 | mipsisa64r2-* | mipsisa64r2el-* \
409 | mipsisa64r6-* | mipsisa64r6el-* \
410 | mipsisa64sb1-* | mipsisa64sb1el-* \405 | mipsisa64sb1-* | mipsisa64sb1el-* \
411 | mipsisa64sr71k-* | mipsisa64sr71kel-* \406 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
412 | mipsr5900-* | mipsr5900el-* \407 | mipsr5900-* | mipsr5900el-* \
@@ -418,7 +413,6 @@
418 | nios-* | nios2-* | nios2eb-* | nios2el-* \413 | nios-* | nios2-* | nios2eb-* | nios2el-* \
419 | none-* | np1-* | ns16k-* | ns32k-* \414 | none-* | np1-* | ns16k-* | ns32k-* \
420 | open8-* \415 | open8-* \
421 | or1k*-* \
422 | orion-* \416 | orion-* \
423 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \417 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
424 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \418 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -800,7 +794,7 @@
800 os=-mingw64794 os=-mingw64
801 ;;795 ;;
802 mingw32)796 mingw32)
803 basic_machine=i686-pc797 basic_machine=i386-pc
804 os=-mingw32798 os=-mingw32
805 ;;799 ;;
806 mingw32ce)800 mingw32ce)
@@ -828,10 +822,6 @@
828 basic_machine=powerpc-unknown822 basic_machine=powerpc-unknown
829 os=-morphos823 os=-morphos
830 ;;824 ;;
831 moxiebox)
832 basic_machine=moxie-unknown
833 os=-moxiebox
834 ;;
835 msdos)825 msdos)
836 basic_machine=i386-pc826 basic_machine=i386-pc
837 os=-msdos827 os=-msdos
@@ -840,7 +830,7 @@
840 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`830 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
841 ;;831 ;;
842 msys)832 msys)
843 basic_machine=i686-pc833 basic_machine=i386-pc
844 os=-msys834 os=-msys
845 ;;835 ;;
846 mvs)836 mvs)
@@ -1377,14 +1367,14 @@
1377 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \1367 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1378 | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \1368 | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1379 | -linux-newlib* | -linux-musl* | -linux-uclibc* \1369 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1380 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \1370 | -uxpv* | -beos* | -mpeix* | -udk* \
1381 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \1371 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1382 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \1372 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1383 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \1373 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1384 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \1374 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1385 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \1375 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1386 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \1376 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1387 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)1377 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1388 # Remember, each alternative MUST END IN *, to match a version number.1378 # Remember, each alternative MUST END IN *, to match a version number.
1389 ;;1379 ;;
1390 -qnx*)1380 -qnx*)
@@ -1556,9 +1546,6 @@
1556 c4x-* | tic4x-*)1546 c4x-* | tic4x-*)
1557 os=-coff1547 os=-coff
1558 ;;1548 ;;
1559 c8051-*)
1560 os=-elf
1561 ;;
1562 hexagon-*)1549 hexagon-*)
1563 os=-elf1550 os=-elf
1564 ;;1551 ;;
@@ -1602,6 +1589,9 @@
1602 mips*-*)1589 mips*-*)
1603 os=-elf1590 os=-elf
1604 ;;1591 ;;
1592 or1k-*)
1593 os=-elf
1594 ;;
1605 or32-*)1595 or32-*)
1606 os=-coff1596 os=-coff
1607 ;;1597 ;;
16081598
=== modified file 'configure'
--- configure 2014-10-19 23:39:47 +0000
+++ configure 2015-02-14 00:18:38 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.69 for gnome-music 3.14.1.3# Generated by GNU Autoconf 2.69 for gnome-music 3.14.3.1.
4#4#
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>.
6#6#
@@ -591,8 +591,8 @@
591# Identity of this package.591# Identity of this package.
592PACKAGE_NAME='gnome-music'592PACKAGE_NAME='gnome-music'
593PACKAGE_TARNAME='gnome-music'593PACKAGE_TARNAME='gnome-music'
594PACKAGE_VERSION='3.14.1'594PACKAGE_VERSION='3.14.3.1'
595PACKAGE_STRING='gnome-music 3.14.1'595PACKAGE_STRING='gnome-music 3.14.3.1'
596PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-music'596PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-music'
597PACKAGE_URL='https://wiki.gnome.org/Apps/Music'597PACKAGE_URL='https://wiki.gnome.org/Apps/Music'
598598
@@ -1446,7 +1446,7 @@
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.
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.
1448 cat <<_ACEOF1448 cat <<_ACEOF
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.
14501450
1451Usage: $0 [OPTION]... [VAR=VALUE]...1451Usage: $0 [OPTION]... [VAR=VALUE]...
14521452
@@ -1516,7 +1516,7 @@
15161516
1517if test -n "$ac_init_help"; then1517if test -n "$ac_init_help"; then
1518 case $ac_init_help in1518 case $ac_init_help in
1519 short | recursive ) echo "Configuration of gnome-music 3.14.1:";;1519 short | recursive ) echo "Configuration of gnome-music 3.14.3.1:";;
1520 esac1520 esac
1521 cat <<\_ACEOF1521 cat <<\_ACEOF
15221522
@@ -1648,7 +1648,7 @@
1648test -n "$ac_init_help" && exit $ac_status1648test -n "$ac_init_help" && exit $ac_status
1649if $ac_init_version; then1649if $ac_init_version; then
1650 cat <<\_ACEOF1650 cat <<\_ACEOF
1651gnome-music configure 3.14.11651gnome-music configure 3.14.3.1
1652generated by GNU Autoconf 2.691652generated by GNU Autoconf 2.69
16531653
1654Copyright (C) 2012 Free Software Foundation, Inc.1654Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1926,7 +1926,7 @@
1926This file contains any messages produced by compilers while1926This file contains any messages produced by compilers while
1927running configure, to aid debugging if configure makes a mistake.1927running configure, to aid debugging if configure makes a mistake.
19281928
1929It was created by gnome-music $as_me 3.14.1, which was1929It was created by gnome-music $as_me 3.14.3.1, which was
1930generated by GNU Autoconf 2.69. Invocation command line was1930generated by GNU Autoconf 2.69. Invocation command line was
19311931
1932 $ $0 $@1932 $ $0 $@
@@ -2278,7 +2278,7 @@
22782278
2279ac_config_headers="$ac_config_headers config.h"2279ac_config_headers="$ac_config_headers config.h"
22802280
2281am__api_version='1.14'2281am__api_version='1.13'
22822282
2283ac_aux_dir=2283ac_aux_dir=
2284for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do2284for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2793,7 +2793,7 @@
27932793
2794# Define the identity of the package.2794# Define the identity of the package.
2795 PACKAGE='gnome-music'2795 PACKAGE='gnome-music'
2796 VERSION='3.14.1'2796 VERSION='3.14.3.1'
27972797
27982798
2799cat >>confdefs.h <<_ACEOF2799cat >>confdefs.h <<_ACEOF
@@ -2960,47 +2960,6 @@
29602960
29612961
29622962
2963# POSIX will say in a future version that running "rm -f" with no argument
2964# is OK; and we want to be able to make that assumption in our Makefile
2965# recipes. So use an aggressive probe to check that the usage we want is
2966# actually supported "in the wild" to an acceptable degree.
2967# See automake bug#10828.
2968# To make any issue more visible, cause the running configure to be aborted
2969# by default if the 'rm' program in use doesn't match our expectations; the
2970# user can still override this though.
2971if rm -f && rm -fr && rm -rf; then : OK; else
2972 cat >&2 <<'END'
2973Oops!
2974
2975Your 'rm' program seems unable to run without file operands specified
2976on the command line, even when the '-f' option is present. This is contrary
2977to the behaviour of most rm programs out there, and not conforming with
2978the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
2979
2980Please tell bug-automake@gnu.org about your system, including the value
2981of your $PATH and any error possibly output before this message. This
2982can help us improve future automake versions.
2983
2984END
2985 if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
2986 echo 'Configuration will proceed anyway, since you have set the' >&2
2987 echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
2988 echo >&2
2989 else
2990 cat >&2 <<'END'
2991Aborting the configuration process, to ensure you take notice of the issue.
2992
2993You can download and install GNU coreutils to get an 'rm' implementation
2994that behaves properly: <http://www.gnu.org/software/coreutils/>.
2995
2996If you want to complete the configuration process using your problematic
2997'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
2998to "yes", and re-run configure.
2999
3000END
3001 as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
3002 fi
3003fi
30042963
3005{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&52964{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
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; }
@@ -4199,65 +4158,6 @@
4199ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'4158ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4200ac_compiler_gnu=$ac_cv_c_compiler_gnu4159ac_compiler_gnu=$ac_cv_c_compiler_gnu
42014160
4202ac_ext=c
4203ac_cpp='$CPP $CPPFLAGS'
4204ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4205ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4206ac_compiler_gnu=$ac_cv_c_compiler_gnu
4207{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
4208$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
4209if ${am_cv_prog_cc_c_o+:} false; then :
4210 $as_echo_n "(cached) " >&6
4211else
4212 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4213/* end confdefs.h. */
4214
4215int
4216main ()
4217{
4218
4219 ;
4220 return 0;
4221}
4222_ACEOF
4223 # Make sure it works both with $CC and with simple cc.
4224 # Following AC_PROG_CC_C_O, we do the test twice because some
4225 # compilers refuse to overwrite an existing .o file with -o,
4226 # though they will create one.
4227 am_cv_prog_cc_c_o=yes
4228 for am_i in 1 2; do
4229 if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
4230 ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
4231 ac_status=$?
4232 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4233 (exit $ac_status); } \
4234 && test -f conftest2.$ac_objext; then
4235 : OK
4236 else
4237 am_cv_prog_cc_c_o=no
4238 break
4239 fi
4240 done
4241 rm -f core conftest*
4242 unset am_i
4243fi
4244{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
4245$as_echo "$am_cv_prog_cc_c_o" >&6; }
4246if test "$am_cv_prog_cc_c_o" != yes; then
4247 # Losing compiler, so override with the script.
4248 # FIXME: It is wrong to rewrite CC.
4249 # But if we don't then we get into trouble of one sort or another.
4250 # A longer-term fix would be to have automake use am__CC in this case,
4251 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
4252 CC="$am_aux_dir/compile $CC"
4253fi
4254ac_ext=c
4255ac_cpp='$CPP $CPPFLAGS'
4256ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4257ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4258ac_compiler_gnu=$ac_cv_c_compiler_gnu
4259
4260
4261depcc="$CC" am_compiler_list=4161depcc="$CC" am_compiler_list=
42624162
4263{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&54163{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -5160,7 +5060,7 @@
5160EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))5060EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
51615061
5162distdir: distdir-help-files5062distdir: distdir-help-files
5163distdir-help-files:5063distdir-help-files: $(_HELP_LC_FILES)
5164 @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \5064 @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
5165 $(MKDIR_P) "$(distdir)/$$lc"; \5065 $(MKDIR_P) "$(distdir)/$$lc"; \
5166 for file in $(HELP_FILES); do \5066 for file in $(HELP_FILES); do \
@@ -5189,7 +5089,7 @@
51895089
5190.PHONY: install-help5090.PHONY: install-help
5191install-data-am: $(if $(HELP_ID),install-help)5091install-data-am: $(if $(HELP_ID),install-help)
5192install-help:5092install-help: $(_HELP_LC_FILES)
5193 @for lc in C $(_HELP_LINGUAS); do \5093 @for lc in C $(_HELP_LINGUAS); do \
5194 $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \5094 $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
5195 done5095 done
@@ -5792,65 +5692,6 @@
5792ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'5692ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5793ac_compiler_gnu=$ac_cv_c_compiler_gnu5693ac_compiler_gnu=$ac_cv_c_compiler_gnu
57945694
5795ac_ext=c
5796ac_cpp='$CPP $CPPFLAGS'
5797ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5798ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5799ac_compiler_gnu=$ac_cv_c_compiler_gnu
5800{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
5801$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
5802if ${am_cv_prog_cc_c_o+:} false; then :
5803 $as_echo_n "(cached) " >&6
5804else
5805 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5806/* end confdefs.h. */
5807
5808int
5809main ()
5810{
5811
5812 ;
5813 return 0;
5814}
5815_ACEOF
5816 # Make sure it works both with $CC and with simple cc.
5817 # Following AC_PROG_CC_C_O, we do the test twice because some
5818 # compilers refuse to overwrite an existing .o file with -o,
5819 # though they will create one.
5820 am_cv_prog_cc_c_o=yes
5821 for am_i in 1 2; do
5822 if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
5823 ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
5824 ac_status=$?
5825 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5826 (exit $ac_status); } \
5827 && test -f conftest2.$ac_objext; then
5828 : OK
5829 else
5830 am_cv_prog_cc_c_o=no
5831 break
5832 fi
5833 done
5834 rm -f core conftest*
5835 unset am_i
5836fi
5837{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
5838$as_echo "$am_cv_prog_cc_c_o" >&6; }
5839if test "$am_cv_prog_cc_c_o" != yes; then
5840 # Losing compiler, so override with the script.
5841 # FIXME: It is wrong to rewrite CC.
5842 # But if we don't then we get into trouble of one sort or another.
5843 # A longer-term fix would be to have automake use am__CC in this case,
5844 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
5845 CC="$am_aux_dir/compile $CC"
5846fi
5847ac_ext=c
5848ac_cpp='$CPP $CPPFLAGS'
5849ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5850ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5851ac_compiler_gnu=$ac_cv_c_compiler_gnu
5852
5853
5854depcc="$CC" am_compiler_list=5695depcc="$CC" am_compiler_list=
58555696
5856{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&55697{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -5979,6 +5820,131 @@
5979fi5820fi
59805821
59815822
5823if test "x$CC" != xcc; then
5824 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
5825$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
5826else
5827 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
5828$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
5829fi
5830set dummy $CC; ac_cc=`$as_echo "$2" |
5831 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
5832if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
5833 $as_echo_n "(cached) " >&6
5834else
5835 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5836/* end confdefs.h. */
5837
5838int
5839main ()
5840{
5841
5842 ;
5843 return 0;
5844}
5845_ACEOF
5846# Make sure it works both with $CC and with simple cc.
5847# We do the test twice because some compilers refuse to overwrite an
5848# existing .o file with -o, though they will create one.
5849ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
5850rm -f conftest2.*
5851if { { case "(($ac_try" in
5852 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5853 *) ac_try_echo=$ac_try;;
5854esac
5855eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5856$as_echo "$ac_try_echo"; } >&5
5857 (eval "$ac_try") 2>&5
5858 ac_status=$?
5859 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5860 test $ac_status = 0; } &&
5861 test -f conftest2.$ac_objext && { { case "(($ac_try" in
5862 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5863 *) ac_try_echo=$ac_try;;
5864esac
5865eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5866$as_echo "$ac_try_echo"; } >&5
5867 (eval "$ac_try") 2>&5
5868 ac_status=$?
5869 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5870 test $ac_status = 0; };
5871then
5872 eval ac_cv_prog_cc_${ac_cc}_c_o=yes
5873 if test "x$CC" != xcc; then
5874 # Test first that cc exists at all.
5875 if { ac_try='cc -c conftest.$ac_ext >&5'
5876 { { case "(($ac_try" in
5877 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5878 *) ac_try_echo=$ac_try;;
5879esac
5880eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5881$as_echo "$ac_try_echo"; } >&5
5882 (eval "$ac_try") 2>&5
5883 ac_status=$?
5884 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5885 test $ac_status = 0; }; }; then
5886 ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
5887 rm -f conftest2.*
5888 if { { case "(($ac_try" in
5889 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5890 *) ac_try_echo=$ac_try;;
5891esac
5892eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5893$as_echo "$ac_try_echo"; } >&5
5894 (eval "$ac_try") 2>&5
5895 ac_status=$?
5896 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5897 test $ac_status = 0; } &&
5898 test -f conftest2.$ac_objext && { { case "(($ac_try" in
5899 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5900 *) ac_try_echo=$ac_try;;
5901esac
5902eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5903$as_echo "$ac_try_echo"; } >&5
5904 (eval "$ac_try") 2>&5
5905 ac_status=$?
5906 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5907 test $ac_status = 0; };
5908 then
5909 # cc works too.
5910 :
5911 else
5912 # cc exists but doesn't like -o.
5913 eval ac_cv_prog_cc_${ac_cc}_c_o=no
5914 fi
5915 fi
5916 fi
5917else
5918 eval ac_cv_prog_cc_${ac_cc}_c_o=no
5919fi
5920rm -f core conftest*
5921
5922fi
5923if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
5924 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5925$as_echo "yes" >&6; }
5926else
5927 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5928$as_echo "no" >&6; }
5929
5930$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
5931
5932fi
5933
5934# FIXME: we rely on the cache variable name because
5935# there is no other way.
5936set dummy $CC
5937am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
5938eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
5939if test "$am_t" != yes; then
5940 # Losing compiler, so override with the script.
5941 # FIXME: It is wrong to rewrite CC.
5942 # But if we don't then we get into trouble of one sort or another.
5943 # A longer-term fix would be to have automake use am__CC in this case,
5944 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
5945 CC="$am_aux_dir/compile $CC"
5946fi
5947
59825948
5983case `pwd` in5949case `pwd` in
5984 *\ * | *\ *)5950 *\ * | *\ *)
@@ -8378,7 +8344,7 @@
8378 rm -rf conftest*8344 rm -rf conftest*
8379 ;;8345 ;;
83808346
8381x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \8347x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
8382s390*-*linux*|s390*-*tpf*|sparc*-*linux*)8348s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
8383 # Find out which ABI we are using.8349 # Find out which ABI we are using.
8384 echo 'int i;' > conftest.$ac_ext8350 echo 'int i;' > conftest.$ac_ext
@@ -8396,10 +8362,7 @@
8396 x86_64-*linux*)8362 x86_64-*linux*)
8397 LD="${LD-ld} -m elf_i386"8363 LD="${LD-ld} -m elf_i386"
8398 ;;8364 ;;
8399 powerpc64le-*linux*)8365 ppc64-*linux*|powerpc64-*linux*)
8400 LD="${LD-ld} -m elf32lppclinux"
8401 ;;
8402 powerpc64-*linux*)
8403 LD="${LD-ld} -m elf32ppclinux"8366 LD="${LD-ld} -m elf32ppclinux"
8404 ;;8367 ;;
8405 s390x-*linux*)8368 s390x-*linux*)
@@ -8418,10 +8381,7 @@
8418 x86_64-*linux*)8381 x86_64-*linux*)
8419 LD="${LD-ld} -m elf_x86_64"8382 LD="${LD-ld} -m elf_x86_64"
8420 ;;8383 ;;
8421 powerpcle-*linux*)8384 ppc*-*linux*|powerpc*-*linux*)
8422 LD="${LD-ld} -m elf64lppc"
8423 ;;
8424 powerpc-*linux*)
8425 LD="${LD-ld} -m elf64ppc"8385 LD="${LD-ld} -m elf64ppc"
8426 ;;8386 ;;
8427 s390*-*linux*|s390*-*tpf*)8387 s390*-*linux*|s390*-*tpf*)
@@ -15565,7 +15525,7 @@
15565# report actual input values of CONFIG_FILES etc. instead of their15525# report actual input values of CONFIG_FILES etc. instead of their
15566# values after options handling.15526# values after options handling.
15567ac_log="15527ac_log="
15568This file was extended by gnome-music $as_me 3.14.1, which was15528This file was extended by gnome-music $as_me 3.14.3.1, which was
15569generated by GNU Autoconf 2.69. Invocation command line was15529generated by GNU Autoconf 2.69. Invocation command line was
1557015530
15571 CONFIG_FILES = $CONFIG_FILES15531 CONFIG_FILES = $CONFIG_FILES
@@ -15632,7 +15592,7 @@
15632cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=115592cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15633ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"15593ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15634ac_cs_version="\\15594ac_cs_version="\\
15635gnome-music config.status 3.14.115595gnome-music config.status 3.14.3.1
15636configured by $0, generated by GNU Autoconf 2.69,15596configured by $0, generated by GNU Autoconf 2.69,
15637 with options \\"\$ac_cs_config\\"15597 with options \\"\$ac_cs_config\\"
1563815598
1563915599
=== modified file 'configure.ac'
--- configure.ac 2014-10-19 23:39:47 +0000
+++ configure.ac 2015-02-14 00:18:38 +0000
@@ -1,6 +1,6 @@
1AC_PREREQ(2.63)1AC_PREREQ(2.63)
2AC_INIT([gnome-music],2AC_INIT([gnome-music],
3 [3.14.1],3 [3.14.3.1],
4 [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-music],4 [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-music],
5 [gnome-music],5 [gnome-music],
6 [https://wiki.gnome.org/Apps/Music])6 [https://wiki.gnome.org/Apps/Music])
77
=== modified file 'data/AboutDialog.ui'
--- data/AboutDialog.ui 2014-10-19 23:39:47 +0000
+++ data/AboutDialog.ui 2015-02-14 00:18:38 +0000
@@ -5,7 +5,7 @@
5 <property name="can_focus">False</property>5 <property name="can_focus">False</property>
6 <property name="modal">True</property>6 <property name="modal">True</property>
7 <property name="program_name" translatable="yes">Music</property>7 <property name="program_name" translatable="yes">Music</property>
8 <property name="version">3.14.1</property>8 <property name="version">3.14.3.1</property>
9 <property name="copyright" translatable="yes">Copyright © 2013 GNOME Music Developers</property>9 <property name="copyright" translatable="yes">Copyright © 2013 GNOME Music Developers</property>
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>
11 <property name="website">https://wiki.gnome.org/Apps/Music</property>11 <property name="website">https://wiki.gnome.org/Apps/Music</property>
1212
=== modified file 'data/ArtistAlbumWidget.ui'
--- data/ArtistAlbumWidget.ui 2013-10-18 21:04:06 +0000
+++ data/ArtistAlbumWidget.ui 2015-02-14 00:18:38 +0000
@@ -116,7 +116,7 @@
116 </child>116 </child>
117 </object>117 </object>
118 <packing>118 <packing>
119 <property name="expand">True</property>119 <property name="expand">False</property>
120 <property name="fill">True</property>120 <property name="fill">True</property>
121 <property name="position">1</property>121 <property name="position">1</property>
122 </packing>122 </packing>
123123
=== modified file 'data/Makefile.in'
--- data/Makefile.in 2014-10-19 23:39:47 +0000
+++ data/Makefile.in 2015-02-14 00:18:38 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.14.1 from Makefile.am.1# Makefile.in generated by automake 1.13.4 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
55
=== modified file 'data/TrackWidget.ui'
--- data/TrackWidget.ui 2014-09-22 21:20:08 +0000
+++ data/TrackWidget.ui 2015-02-14 00:18:38 +0000
@@ -80,6 +80,7 @@
80 <property name="valign">start</property>80 <property name="valign">start</property>
81 <property name="xalign">0</property>81 <property name="xalign">0</property>
82 <property name="ellipsize">end</property>82 <property name="ellipsize">end</property>
83 <property name="max-width-chars">20</property>
83 </object>84 </object>
84 <packing>85 <packing>
85 <property name="expand">True</property>86 <property name="expand">True</property>
8687
=== modified file 'data/app-menu.ui'
--- data/app-menu.ui 2014-10-19 23:39:47 +0000
+++ data/app-menu.ui 2015-02-14 00:18:38 +0000
@@ -2,12 +2,6 @@
2 <menu id="app-menu">2 <menu id="app-menu">
3 <section>3 <section>
4 <item>4 <item>
5 <attribute name="action">app.newPlaylist</attribute>
6 <attribute name="label" translatable="yes">_New Playlist</attribute>
7 </item>
8 </section>
9 <section>
10 <item>
11 <attribute name="label" translatable="yes">_Help</attribute>5 <attribute name="label" translatable="yes">_Help</attribute>
12 <attribute name="action">app.help</attribute>6 <attribute name="action">app.help</attribute>
13 <attribute name="accel">F1</attribute>7 <attribute name="accel">F1</attribute>
148
=== modified file 'debian/changelog'
--- debian/changelog 2014-10-19 23:39:47 +0000
+++ debian/changelog 2015-02-14 00:18:38 +0000
@@ -1,3 +1,9 @@
1gnome-music (3.14.3.1-0ubuntu1) vivid; urgency=medium
2
3 * New upstream release.
4
5 -- Jackson Doak <noskcaj@ubuntu.com> Sat, 14 Feb 2015 11:07:17 +1100
6
1gnome-music (3.14.1-1) unstable; urgency=medium7gnome-music (3.14.1-1) unstable; urgency=medium
28
3 [ Pedro Beja ]9 [ Pedro Beja ]
410
=== modified file 'debian/control'
--- debian/control 2014-10-19 23:39:47 +0000
+++ debian/control 2015-02-14 00:18:38 +0000
@@ -5,7 +5,8 @@
5Source: gnome-music5Source: gnome-music
6Section: gnome6Section: gnome
7Priority: extra7Priority: extra
8Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>8Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
9XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
9Uploaders: Andreas Henriksson <andreas@fatal.se>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>10Uploaders: Andreas Henriksson <andreas@fatal.se>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
10Build-Depends: debhelper (>= 9),11Build-Depends: debhelper (>= 9),
11 gnome-common,12 gnome-common,
1213
=== modified file 'debian/control.in'
--- debian/control.in 2014-10-19 23:39:47 +0000
+++ debian/control.in 2015-02-14 00:18:38 +0000
@@ -1,7 +1,8 @@
1Source: gnome-music1Source: gnome-music
2Section: gnome2Section: gnome
3Priority: extra3Priority: extra
4Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
5Uploaders: @GNOME_TEAM@6Uploaders: @GNOME_TEAM@
6Build-Depends: debhelper (>= 9),7Build-Depends: debhelper (>= 9),
7 gnome-common,8 gnome-common,
89
=== modified file 'gnomemusic/Makefile.in'
--- gnomemusic/Makefile.in 2014-10-19 23:39:47 +0000
+++ gnomemusic/Makefile.in 2015-02-14 00:18:38 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.14.1 from Makefile.am.1# Makefile.in generated by automake 1.13.4 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
55
=== modified file 'gnomemusic/albumArtCache.py'
--- gnomemusic/albumArtCache.py 2014-10-19 23:39:47 +0000
+++ gnomemusic/albumArtCache.py 2015-02-14 00:18:38 +0000
@@ -139,7 +139,7 @@
139 icon.get_width() * 3 / 2,139 icon.get_width() * 3 / 2,
140 icon.get_height() * 3 / 2,140 icon.get_height() * 3 / 2,
141 1, 1,141 1, 1,
142 GdkPixbuf.InterpType.NEAREST, 0xff)142 GdkPixbuf.InterpType.NEAREST, 0x33)
143 return _make_icon_frame(result)143 return _make_icon_frame(result)
144144
145 @log145 @log
146146
=== modified file 'gnomemusic/player.py'
--- gnomemusic/player.py 2014-10-19 23:39:47 +0000
+++ gnomemusic/player.py 2015-02-14 00:18:38 +0000
@@ -117,7 +117,7 @@
117 return117 return
118118
119 if not url.startswith("file://"):119 if not url.startswith("file://"):
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)
121 return121 return
122122
123 obj = (callback, data)123 obj = (callback, data)
124124
=== modified file 'gnomemusic/playlists.py'
--- gnomemusic/playlists.py 2014-10-19 23:39:47 +0000
+++ gnomemusic/playlists.py 2015-02-14 00:18:38 +0000
@@ -1,3 +1,31 @@
1# Copyright (c) 2013 Arnel A. Borja <kyoushuu@yahoo.com>
2# Copyright (c) 2013 Sai Suman Prayaga <suman.sai14@gmail.com>
3# Copyright (c) 2013 Eslam Mostafa <cseslam@gmail.com>
4# Copyright (c) 2013 Vadim Rutkovsky <vrutkovs@redhat.com>
5#
6# GNOME Music is free software; you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation; either version 2 of the License, or
9# (at your option) any later version.
10#
11# GNOME Music is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License along
17# with GNOME Music; if not, write to the Free Software Foundation, Inc.,
18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19#
20# The GNOME Music authors hereby grant permission for non-GPL compatible
21# GStreamer plugins to be used and distributed together with GStreamer
22# and GNOME Music. This permission is above and beyond the permissions
23# granted by the GPL license by which GNOME Music is covered. If you
24# modify this code, you may extend this exception to your version of the
25# code, but you are not obligated to do so. If you do not wish to do so,
26# delete this exception statement from your version.
27
28
1from gi.repository import Grl, GLib, GObject29from gi.repository import Grl, GLib, GObject
2from gi.repository import Tracker30from gi.repository import Tracker
3from gnomemusic.grilo import grilo31from gnomemusic.grilo import grilo
432
=== modified file 'gnomemusic/query.py'
--- gnomemusic/query.py 2014-10-19 23:39:47 +0000
+++ gnomemusic/query.py 2015-02-14 00:18:38 +0000
@@ -29,12 +29,18 @@
2929
3030
31class Query():31class Query():
32 MUSIC_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri(32 music_folder = None
33 GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)33 MUSIC_DIR = None
34 ))34 download_folder = None
35 DOWNLOAD_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri(35 DOWNLOAD_DIR = None
36 GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DOWNLOAD)36 try:
37 ))37 music_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
38 MUSIC_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri(music_folder))
39 download_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DOWNLOAD)
40 DOWNLOAD_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri(download_folder))
41
42 except TypeError:
43 print("XDG user dirs are not set")
3844
39 @staticmethod45 @staticmethod
40 def all_albums():46 def all_albums():
4147
=== modified file 'gnomemusic/searchbar.py'
--- gnomemusic/searchbar.py 2014-10-19 23:39:47 +0000
+++ gnomemusic/searchbar.py 2015-02-14 00:18:38 +0000
@@ -1,3 +1,30 @@
1# Copyright (c) 2013 Seif Lotfy <seif@lotfy.com>
2# Copyright (c) 2013 Vadim Rutkovsky <vrutkovs@redhat.com>
3# Copyright (c) 2014 Arnel A. Borja <kyoushuu@yahoo.com>
4#
5# GNOME Music is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by
7# the Free Software Foundation; either version 2 of the License, or
8# (at your option) any later version.
9#
10# GNOME Music is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY; without even the implied warranty of
12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13# GNU General Public License for more details.
14#
15# You should have received a copy of the GNU General Public License along
16# with GNOME Music; if not, write to the Free Software Foundation, Inc.,
17# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18#
19# The GNOME Music authors hereby grant permission for non-GPL compatible
20# GStreamer plugins to be used and distributed together with GStreamer
21# and GNOME Music. This permission is above and beyond the permissions
22# granted by the GPL license by which GNOME Music is covered. If you
23# modify this code, you may extend this exception to your version of the
24# code, but you are not obligated to do so. If you do not wish to do so,
25# delete this exception statement from your version.
26
27
1from gi.repository import Gtk, Gd, GObject, Pango, GLib28from gi.repository import Gtk, Gd, GObject, Pango, GLib
2from gettext import gettext as _29from gettext import gettext as _
3from gnomemusic.grilo import grilo30from gnomemusic.grilo import grilo
@@ -19,6 +46,7 @@
19 self.label = label46 self.label = label
20 self.entry = entry47 self.entry = entry
21 self.tag = Gd.TaggedEntryTag()48 self.tag = Gd.TaggedEntryTag()
49 self.tag.set_style('button')
22 self.tag.manager = self50 self.tag.manager = self
23 self.values = []51 self.values = []
2452
@@ -273,14 +301,15 @@
273 return False301 return False
274302
275 @log303 @log
276 def show_bar(self, show):304 def show_bar(self, show, clear=True):
277 self.set_reveal_child(show)305 self.set_reveal_child(show)
278 self._search_button.set_active(show)306 self._search_button.set_active(show)
279307
280 if show:308 if show:
309 if clear:
310 self._search_entry.set_text('')
281 self._search_entry.grab_focus()311 self._search_entry.grab_focus()
282 else:312 else:
283 self._search_entry.set_text('')
284 self._dropDownButton.set_active(False)313 self._dropDownButton.set_active(False)
285314
286 @log315 @log
287316
=== modified file 'gnomemusic/view.py'
--- gnomemusic/view.py 2014-10-19 23:39:47 +0000
+++ gnomemusic/view.py 2015-02-14 00:18:38 +0000
@@ -270,8 +270,11 @@
270 @log270 @log
271 def _on_discovered(self, info, error, _iter):271 def _on_discovered(self, info, error, _iter):
272 if error:272 if error:
273 print("Info %s: error: %s" % (info, error))273 try:
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()))
275 self._model.set(_iter, [8, 10], [self.errorIconName, True])
276 except Exception:
277 pass
275278
276 @log279 @log
277 def _add_item(self, source, param, item, remaining=0, data=None):280 def _add_item(self, source, param, item, remaining=0, data=None):
@@ -291,7 +294,7 @@
291 try:294 try:
292 self.player.discoverer.discover_uri(item.get_url())295 self.player.discoverer.discover_uri(item.get_url())
293 except:296 except:
294 print('failed to discover url ' + item.get_url())297 logger.warn('failed to discover url ' + item.get_url())
295 icon_name = self.errorIconName298 icon_name = self.errorIconName
296 self._model.set(_iter,299 self._model.set(_iter,
297 [0, 1, 2, 3, 4, 5, 7, 8, 9, 10],300 [0, 1, 2, 3, 4, 5, 7, 8, 9, 10],
@@ -369,7 +372,10 @@
369372
370 @log373 @log
371 def _on_item_activated(self, widget, id, path):374 def _on_item_activated(self, widget, id, path):
372 _iter = self._model.get_iter(path)375 try:
376 _iter = self._model.get_iter(path)
377 except TypeError:
378 return
373 title = self._model.get_value(_iter, 2)379 title = self._model.get_value(_iter, 2)
374 artist = self._model.get_value(_iter, 3)380 artist = self._model.get_value(_iter, 3)
375 item = self._model.get_value(_iter, 5)381 item = self._model.get_value(_iter, 5)
@@ -454,7 +460,10 @@
454460
455 @log461 @log
456 def _on_item_activated(self, widget, id, path):462 def _on_item_activated(self, widget, id, path):
457 _iter = self._model.get_iter(path)463 try:
464 _iter = self._model.get_iter(path)
465 except TypeError:
466 return
458 if self._model.get_value(_iter, 8) != self.errorIconName:467 if self._model.get_value(_iter, 8) != self.errorIconName:
459 self.player.set_playlist('Songs', None, self._model, _iter, 5)468 self.player.set_playlist('Songs', None, self._model, _iter, 5)
460 self.player.set_playing(True)469 self.player.set_playing(True)
@@ -664,7 +673,10 @@
664673
665 @log674 @log
666 def _on_item_activated(self, widget, item_id, path):675 def _on_item_activated(self, widget, item_id, path):
667 _iter = self._model.get_iter(path)676 try:
677 _iter = self._model.get_iter(path)
678 except TypeError:
679 return
668 self._last_selection = _iter680 self._last_selection = _iter
669 artist = self._model.get_value(_iter, 2)681 artist = self._model.get_value(_iter, 2)
670 albums = self._artists[artist.casefold()]['albums']682 albums = self._artists[artist.casefold()]['albums']
@@ -999,7 +1011,10 @@
9991011
1000 @log1012 @log
1001 def _on_item_activated(self, widget, id, path):1013 def _on_item_activated(self, widget, id, path):
1002 _iter = self._model.get_iter(path)1014 try:
1015 _iter = self._model.get_iter(path)
1016 except TypeError:
1017 return
1003 if self._model.get_value(_iter, 8) != self.errorIconName:1018 if self._model.get_value(_iter, 8) != self.errorIconName:
1004 self.player.set_playlist(1019 self.player.set_playlist(
1005 'Playlist', self.current_playlist.get_id(),1020 'Playlist', self.current_playlist.get_id(),
@@ -1227,6 +1242,7 @@
12271242
1228 @log1243 @log
1229 def _back_button_clicked(self, widget, data=None):1244 def _back_button_clicked(self, widget, data=None):
1245 self.header_bar.searchbar.show_bar(True, False)
1230 if self.get_visible_child() == self._artistAlbumsWidget:1246 if self.get_visible_child() == self._artistAlbumsWidget:
1231 self._artistAlbumsWidget.destroy()1247 self._artistAlbumsWidget.destroy()
1232 self._artistAlbumsWidget = None1248 self._artistAlbumsWidget = None
@@ -1234,7 +1250,10 @@
12341250
1235 @log1251 @log
1236 def _on_item_activated(self, widget, id, path):1252 def _on_item_activated(self, widget, id, path):
1237 child_path = self.filter_model.convert_path_to_child_path(path)1253 try:
1254 child_path = self.filter_model.convert_path_to_child_path(path)
1255 except TypeError:
1256 return
1238 _iter = self._model.get_iter(child_path)1257 _iter = self._model.get_iter(child_path)
1239 if self._model[_iter][11] == 'album':1258 if self._model[_iter][11] == 'album':
1240 title = self._model.get_value(_iter, 2)1259 title = self._model.get_value(_iter, 2)
12411260
=== modified file 'gnomemusic/widgets.py'
--- gnomemusic/widgets.py 2014-10-19 23:39:47 +0000
+++ gnomemusic/widgets.py 2015-02-14 00:18:38 +0000
@@ -349,6 +349,8 @@
349 self._hbox.pack_start(self.ui.get_object('ArtistAlbumsWidget'),349 self._hbox.pack_start(self.ui.get_object('ArtistAlbumsWidget'),
350 False, False, 0)350 False, False, 0)
351 self._hbox.pack_start(self._albumBox, False, False, 16)351 self._hbox.pack_start(self._albumBox, False, False, 16)
352 self._coverSizeGroup = Gtk.SizeGroup.new(Gtk.SizeGroupMode.HORIZONTAL)
353 self._songsGridSizeGroup = Gtk.SizeGroup.new(Gtk.SizeGroupMode.HORIZONTAL)
352 self.pack_start(self._scrolledWindow, True, True, 0)354 self.pack_start(self._scrolledWindow, True, True, 0)
353355
354 for album in albums:356 for album in albums:
@@ -363,6 +365,8 @@
363 self.artist, album, self.player, self.model,365 self.artist, album, self.player, self.model,
364 self.header_bar, self.selectionModeAllowed366 self.header_bar, self.selectionModeAllowed
365 )367 )
368 self._coverSizeGroup.add_widget(widget.cover)
369 self._songsGridSizeGroup.add_widget(widget.songsGrid)
366 self._albumBox.pack_start(widget, False, False, 0)370 self._albumBox.pack_start(widget, False, False, 0)
367 self.widgets.append(widget)371 self.widgets.append(widget)
368372
@@ -484,7 +488,9 @@
484488
485 GLib.idle_add(self._update_album_art)489 GLib.idle_add(self._update_album_art)
486490
487 self.ui.get_object('cover').set_from_pixbuf(self.pixbuf)491 self.cover = self.ui.get_object('cover')
492 self.cover.set_from_pixbuf(self.pixbuf)
493 self.songsGrid = self.ui.get_object('grid1')
488 self.ui.get_object('title').set_label(album.get_title())494 self.ui.get_object('title').set_label(album.get_title())
489 if album.get_creation_date():495 if album.get_creation_date():
490 self.ui.get_object('year').set_markup(496 self.ui.get_object('year').set_markup(
@@ -522,7 +528,7 @@
522 title = AlbumArtCache.get_media_title(track)528 title = AlbumArtCache.get_media_title(track)
523 ui.get_object('title').set_text(title)529 ui.get_object('title').set_text(title)
524 ui.get_object('title').set_alignment(0.0, 0.5)530 ui.get_object('title').set_alignment(0.0, 0.5)
525 self.ui.get_object('grid1').attach(531 self.songsGrid.attach(
526 song_widget,532 song_widget,
527 int(i / (len(self.tracks) / 2)),533 int(i / (len(self.tracks) / 2)),
528 int(i % (len(self.tracks) / 2)), 1, 1534 int(i % (len(self.tracks) / 2)), 1, 1
@@ -551,7 +557,7 @@
551 song_widget.can_be_played = True557 song_widget.can_be_played = True
552 song_widget.connect('button-release-event',558 song_widget.connect('button-release-event',
553 self.track_selected)559 self.track_selected)
554 self.ui.get_object('grid1').show_all()560 self.songsGrid.show_all()
555561
556 @log562 @log
557 def _update_album_art(self):563 def _update_album_art(self):
@@ -565,7 +571,7 @@
565 @log571 @log
566 def _get_album_cover(self, pixbuf, path, data=None):572 def _get_album_cover(self, pixbuf, path, data=None):
567 if pixbuf:573 if pixbuf:
568 self.ui.get_object('cover').set_from_pixbuf(pixbuf)574 self.cover.set_from_pixbuf(pixbuf)
569575
570 @log576 @log
571 def track_selected(self, widget, event):577 def track_selected(self, widget, event):
@@ -728,7 +734,8 @@
728 @log734 @log
729 def _on_playlist_created(self, playlists, item):735 def _on_playlist_created(self, playlists, item):
730 new_iter = self._add_item_to_model(item)736 new_iter = self._add_item_to_model(item)
731 self.view.set_cursor(self.model.get_path(new_iter),737 if self.view.get_columns():
732 self.view.get_columns()[0], False)738 self.view.set_cursor(self.model.get_path(new_iter),
733 self.view.row_activated(self.model.get_path(new_iter),739 self.view.get_columns()[0], False)
734 self.view.get_columns()[0])740 self.view.row_activated(self.model.get_path(new_iter),
741 self.view.get_columns()[0])
735742
=== modified file 'gnomemusic/window.py'
--- gnomemusic/window.py 2014-10-19 23:39:47 +0000
+++ gnomemusic/window.py 2015-02-14 00:18:38 +0000
@@ -195,22 +195,27 @@
195 self._box.pack_start(self.player.actionbar, False, False, 0)195 self._box.pack_start(self.player.actionbar, False, False, 0)
196 self._box.pack_start(self.selection_toolbar.actionbar, False, False, 0)196 self._box.pack_start(self.selection_toolbar.actionbar, False, False, 0)
197 self.add(self._box)197 self.add(self._box)
198 count = 1198 count = 0
199 cursor = None199 cursor = None
200 try:200
201 cursor = tracker.query(Query.all_songs_count(), None)201 if Query.music_folder and Query.download_folder:
202 except Exception as e:202 try:
203 logger.error("Tracker query crashed: %s" % e)203 cursor = tracker.query(Query.all_songs_count(), None)
204 count = 0204 if cursor is not None and cursor.next(None):
205205 count = cursor.get_integer(0)
206 if cursor is not None and cursor.next(None):206 except Exception as e:
207 count = cursor.get_integer(0)207 logger.error("Tracker query crashed: %s" % e)
208 if count > 0:208 count = 0
209 self._switch_to_player_view()209
210 # To revert to the No Music View when no songs are found210 if count > 0:
211 self._switch_to_player_view()
212 # To revert to the No Music View when no songs are found
213 else:
214 if self.toolbar._selectionMode is False:
215 self._switch_to_empty_view()
211 else:216 else:
212 if self.toolbar._selectionMode is False:217 # Revert to No Music view if XDG dirs are not set
213 self._switch_to_empty_view()218 self._switch_to_empty_view()
214219
215 self.toolbar._search_button.connect('toggled', self._on_search_toggled)220 self.toolbar._search_button.connect('toggled', self._on_search_toggled)
216 self.toolbar.connect('selection-mode-changed', self._on_selection_mode_changed)221 self.toolbar.connect('selection-mode-changed', self._on_selection_mode_changed)
@@ -329,7 +334,8 @@
329 else:334 else:
330 if not self.toolbar.searchbar.get_reveal_child():335 if not self.toolbar.searchbar.get_reveal_child():
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():
332 self.player.play_pause()337 if self.get_focus() != self.player.playBtn:
338 self.player.play_pause()
333339
334 @log340 @log
335 def _notify_mode_disconnect(self, data=None):341 def _notify_mode_disconnect(self, data=None):
@@ -358,7 +364,8 @@
358364
359 @log365 @log
360 def _on_search_toggled(self, button, data=None):366 def _on_search_toggled(self, button, data=None):
361 self.toolbar.searchbar.show_bar(button.get_active())367 self.toolbar.searchbar.show_bar(button.get_active(),
368 self.curr_view != self.views[4])
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 \
363 self.toolbar._state == ToolbarState.MAIN:370 self.toolbar._state == ToolbarState.MAIN:
364 self._stack.set_visible_child(self.prev_view)371 self._stack.set_visible_child(self.prev_view)
365372
=== modified file 'help/Makefile.am'
--- help/Makefile.am 2014-10-19 23:39:47 +0000
+++ help/Makefile.am 2015-02-14 00:18:38 +0000
@@ -19,4 +19,4 @@
19HELP_MEDIA = \19HELP_MEDIA = \
20 figures/gnome-music-3.12.png20 figures/gnome-music-3.12.png
2121
22HELP_LINGUAS = cs el es fr gl hu ko pt_BR ro22HELP_LINGUAS = cs de el es fr gl hu ko pt_BR ro
2323
=== modified file 'help/Makefile.in'
--- help/Makefile.in 2014-10-19 23:39:47 +0000
+++ help/Makefile.in 2015-02-14 00:18:38 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.14.1 from Makefile.am.1# Makefile.in generated by automake 1.13.4 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -304,7 +304,7 @@
304HELP_MEDIA = \304HELP_MEDIA = \
305 figures/gnome-music-3.12.png305 figures/gnome-music-3.12.png
306306
307HELP_LINGUAS = cs el es fr gl hu ko pt_BR ro307HELP_LINGUAS = cs de el es fr gl hu ko pt_BR ro
308all: all-am308all: all-am
309309
310.SUFFIXES:310.SUFFIXES:
311311
=== added directory 'help/de'
=== added file 'help/de/de.po'
--- help/de/de.po 1970-01-01 00:00:00 +0000
+++ help/de/de.po 2015-02-14 00:18:38 +0000
@@ -0,0 +1,452 @@
1# German translation for gnome-music.
2# Copyright (C) 2014 gnome-music's COPYRIGHT HOLDER
3# This file is distributed under the same license as the gnome-music package.
4# Christian Kirbach <Christian.Kirbach@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: gnome-music gnome-3-14\n"
9"POT-Creation-Date: 2014-10-30 19:49+0000\n"
10"PO-Revision-Date: 2014-10-30 22:12+0100\n"
11"Last-Translator: Bernd Homuth <dev@hmt.im>\n"
12"Language-Team: German <gnome-de@gnome.org>\n"
13"Language: de\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=(n != 1);\n"
18"X-Generator: Poedit 1.6.10\n"
19
20#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
21msgctxt "_"
22msgid "translator-credits"
23msgstr "Christian Kirbach <Christian.Kirbach@gmail.com>, 2014"
24
25#. (itstool) path: credit/name
26#: C/introduction.page:11 C/index.page:11 C/play-music.page:11
27#: C/playlist-create-albums.page:11 C/playlist-create-songs.page:11
28#: C/playlist-create-artists.page:11 C/playlist-delete.page:11
29#: C/playlist-remove-songs.page:11 C/playlist-repeat.page:11
30#: C/playlist-shuffle.page:11 C/search.page:11
31msgid "Shobha Tyagi"
32msgstr "Shobha Tyagi"
33
34#. (itstool) path: credit/years
35#: C/introduction.page:13 C/index.page:13 C/play-music.page:13
36#: C/playlist-create-albums.page:13 C/playlist-create-songs.page:13
37#: C/playlist-create-artists.page:13 C/playlist-delete.page:13
38#: C/playlist-remove-songs.page:13 C/playlist-repeat.page:13
39#: C/playlist-shuffle.page:13 C/search.page:13
40msgid "2014"
41msgstr "2014"
42
43#. (itstool) path: info/desc
44#. (itstool) path: page/p
45#: C/introduction.page:18 C/introduction.page:23
46msgid ""
47"A simple and elegant replacement for using files to show the music directory."
48msgstr ""
49"Eine einfache und elegante Alternative zum Anzeigen des Musikordners mit "
50"»Dateien«."
51
52#. (itstool) path: page/title
53#: C/introduction.page:22
54msgid "Introduction to Music"
55msgstr "Einführung in Musik"
56
57#. (itstool) path: info/title
58#: C/index.page:6
59msgctxt "link"
60msgid "Music"
61msgstr "Musik"
62
63#. (itstool) path: info/title
64#: C/index.page:7
65msgctxt "text"
66msgid "Music"
67msgstr "Musik"
68
69#. (itstool) path: page/title
70#: C/index.page:18
71msgid "<_:media-1/> Music"
72msgstr "<_:media-1/> Musik"
73
74#. (itstool) path: section/title
75#: C/index.page:25
76msgid "Create playlist"
77msgstr "Wiedergabeliste anlegen"
78
79#. (itstool) path: section/title
80#: C/index.page:28
81msgid "Play a song"
82msgstr "Titel wiedergeben"
83
84#. (itstool) path: section/title
85#: C/index.page:31
86msgid "Remove songs and playlist"
87msgstr "Titel und Wiedergabeliste entfernen"
88
89#. (itstool) path: info/desc
90#: C/play-music.page:18
91msgid "Play your favorite songs."
92msgstr "Geben Sie Ihre Lieblingsmusik wieder."
93
94#. (itstool) path: page/title
95#: C/play-music.page:22
96msgid "Play music"
97msgstr "Musik abspielen"
98
99#. (itstool) path: page/p
100#: C/play-music.page:24
101msgid ""
102"You can play your favorite music by creating a playlist or by simply "
103"clicking on the song of your choice from any view."
104msgstr ""
105"Erstellen Sie Wiedergabelisten und geben Sie Ihre Lieblingsmusik wieder, "
106"oder klicken Sie einfach zur Wiedergabe auf einen Musiktitel Ihrer Wahl in "
107"einer beliebigen Ansicht."
108
109#. (itstool) path: steps/title
110#: C/play-music.page:28 C/playlist-delete.page:27
111#: C/playlist-remove-songs.page:27
112msgid "While in <em>Playlists</em>:"
113msgstr "In den <em>Wiedergabelisten</em>:"
114
115#. (itstool) path: item/p
116#: C/play-music.page:30
117msgid "Select a playlist."
118msgstr "Wählen Sie eine Wiedergabeliste."
119
120#. (itstool) path: item/p
121#: C/play-music.page:33 C/playlist-delete.page:32
122msgid "Click on the gear button on the right hand side."
123msgstr "Klicken Sie auf den Knopf mit dem Zahnrad auf der rechten Seite."
124
125#. (itstool) path: item/p
126#: C/play-music.page:36
127msgid "Click on <gui>Play</gui>."
128msgstr "Klicken Sie auf <gui>Wiedergabe</gui>."
129
130#. (itstool) path: info/desc
131#: C/playlist-create-albums.page:18
132msgid "Add songs to playlists using albums."
133msgstr "Lieder zu Wiedergabelisten mit Hilfe von Alben hinzufügen."
134
135#. (itstool) path: page/title
136#: C/playlist-create-albums.page:21
137msgid "Create a playlist using albums"
138msgstr "Eine Wiedergabeliste mit Hilfe von Alben anlegen"
139
140#. (itstool) path: page/p
141#: C/playlist-create-albums.page:23
142msgid ""
143"You can view all your albums by clicking on the <gui style=\"button"
144"\">Albums</gui> button."
145msgstr ""
146"Schauen Sie sich alle Ihre Alben an, indem Sie auf den Knopf <gui style="
147"\"button\">Alben</gui> klicken."
148
149#. (itstool) path: steps/title
150#: C/playlist-create-albums.page:27
151msgid "To add all the songs in an album:"
152msgstr "So fügen Sie alle Titel eines Albums hinzu:"
153
154#. (itstool) path: item/p
155#: C/playlist-create-albums.page:29 C/playlist-create-songs.page:29
156#: C/playlist-create-artists.page:30
157msgid "Click on the check button in the top-right of the window."
158msgstr ""
159"Klicken Sie auf das Ankreuzfeld in der rechten oberen Ecke des Fensters."
160
161#. (itstool) path: item/p
162#: C/playlist-create-albums.page:32
163msgid "Select albums."
164msgstr "Wählen Sie Alben."
165
166#. (itstool) path: item/p
167#: C/playlist-create-albums.page:35 C/playlist-create-albums.page:60
168#: C/playlist-create-songs.page:35 C/playlist-create-artists.page:37
169msgid "Click on the <gui style=\"button\">Add to Playlist</gui> button."
170msgstr ""
171"Klicken Sie auf <gui style=\"button\">Zur Wiedergabeliste hinzufügen</gui>."
172
173#. (itstool) path: item/p
174#: C/playlist-create-albums.page:38 C/playlist-create-albums.page:63
175#: C/playlist-create-artists.page:40
176msgid "Click on <gui>New Playlist</gui> and type a name for your playlist."
177msgstr ""
178"Klicken Sie auf <gui>Neue Wiedergabeliste</gui> und geben Sie einen Namen "
179"für Ihre Wiedergabeliste ein."
180
181#. (itstool) path: item/p
182#: C/playlist-create-albums.page:42 C/playlist-create-albums.page:67
183#: C/playlist-create-songs.page:42
184msgid "Click on <gui style=\"button\">Select</gui>."
185msgstr "Klicken Sie auf <gui style=\"button\">Wählen</gui>."
186
187#. (itstool) path: page/p
188#: C/playlist-create-albums.page:46
189msgid "You can also create a playlist from specific songs."
190msgstr "Sie können auch eine Wiedergabeliste anhand bestimmter Titel anlegen."
191
192#. (itstool) path: steps/title
193#: C/playlist-create-albums.page:49
194msgid "To add selected songs from an album:"
195msgstr "So fügen Sie ausgewählte Titel eines Albums hinzu:"
196
197#. (itstool) path: item/p
198#: C/playlist-create-albums.page:51
199msgid "Click on an album."
200msgstr "Klicken Sie auf ein Album."
201
202#. (itstool) path: item/p
203#: C/playlist-create-albums.page:54
204msgid "Click on the check button."
205msgstr "Klicken Sie auf den Ankreuzknopf."
206
207#. (itstool) path: item/p
208#: C/playlist-create-albums.page:57
209msgid "Select songs."
210msgstr "Wählen Sie einige Titel."
211
212#. (itstool) path: note/p
213#: C/playlist-create-albums.page:72 C/playlist-create-songs.page:47
214#: C/playlist-create-artists.page:49
215msgid ""
216"To select all the songs click <guiseq><gui>Click on items to select them</"
217"gui><gui>Select All</gui></guiseq> in the toolbar or press "
218"<keyseq><key>Ctrl</key><key>A</key></keyseq>."
219msgstr ""
220"Klicken Sie auf <guiseq><gui>Objekte per Klick auswählen</gui><gui>Alle "
221"auswählen</gui></guiseq> in der Werkzeugleiste, um alle Titel auszuwählen, "
222"oder drücken Sie <keyseq><key>Strg</key><key>A</key></keyseq>."
223
224#. (itstool) path: note/p
225#: C/playlist-create-albums.page:76 C/playlist-create-songs.page:51
226#: C/playlist-create-artists.page:53
227msgid ""
228"To clear the selection click <guiseq><gui>Click on items to select them</"
229"gui><gui>Select None</gui></guiseq> in the toolbar."
230msgstr ""
231"Klicken Sie auf <guiseq><gui>Objekte per Klick auswählen</gui><gui>Keine "
232"auswählen</gui></guiseq> in der Werkzeugleiste, um die Auswahl aufzuheben."
233
234#. (itstool) path: info/desc
235#: C/playlist-create-songs.page:18
236msgid "Create playlist by selecting your favorite songs."
237msgstr "Eine Wiedergabeliste durch Wählen Ihrer Lieblingstitel anlegen."
238
239#. (itstool) path: page/title
240#: C/playlist-create-songs.page:21
241msgid "Create playlists using songs"
242msgstr "Wiedergabelisten mit Hilfe von Titeln anlegen"
243
244#. (itstool) path: page/p
245#: C/playlist-create-songs.page:23
246msgid ""
247"You can view all the songs by clicking on the <gui style=\"button\">Songs</"
248"gui> button."
249msgstr ""
250"Schauen Sie sich alle Titel an, indem Sie auf den Knopf <gui style=\"button"
251"\">Titel</gui> klicken."
252
253#. (itstool) path: steps/title
254#: C/playlist-create-songs.page:27
255msgid "To create a new playlist while in <em>Songs</em> view:"
256msgstr ""
257"So erstellen Sie eine neue Wiedergabeliste in der <em>Titel</em>-Ansicht:"
258
259#. (itstool) path: item/p
260#: C/playlist-create-songs.page:32
261msgid "Select all the songs you want to add to the playlist."
262msgstr "Wählen Sie alle Titel, die Sie zur Wiedergabeliste hinzufügen wollen."
263
264#. (itstool) path: item/p
265#: C/playlist-create-songs.page:38
266msgid ""
267"Click on <gui style=\"button\">New Playlist</gui> and type a name for your "
268"playlist."
269msgstr ""
270"Klicken Sie auf <gui style=\"button\">Neue Wiedergabeliste</gui> und geben "
271"Sie einen Namen für Ihre Wiedergabeliste ein."
272
273#. (itstool) path: info/desc
274#: C/playlist-create-artists.page:18
275msgid "Create playlist by selecting your favorite artists."
276msgstr "Eine Wiedergabeliste durch Wählen Ihrer Lieblingskünstler anlegen."
277
278#. (itstool) path: page/title
279#: C/playlist-create-artists.page:22
280msgid "Create playlists using artists"
281msgstr "Wiedergabelisten mit Hilfe von Künstlern anlegen"
282
283#. (itstool) path: page/p
284#: C/playlist-create-artists.page:24
285msgid ""
286"You can view all the artists and their songs by clicking on the <gui syle="
287"\"button\">Artists</gui> button."
288msgstr ""
289"Schauen Sie sich alle Künstler und deren Titel an, indem Sie auf den Knopf "
290"<gui style=\"button\">Künstler</gui> klicken."
291
292#. (itstool) path: steps/title
293#: C/playlist-create-artists.page:28
294msgid "To create a new playlist while in <em>Artists</em> view:"
295msgstr ""
296"So erstellen Sie eine neue Wiedergabeliste in der <em>Künstler</em>-Ansicht:"
297
298#. (itstool) path: item/p
299#: C/playlist-create-artists.page:33
300msgid "Select all the artists whose songs you want to add to the playlist."
301msgstr ""
302"Wählen Sie alle Künstler, deren Titel Sie zur Wiedergabeliste hinzufügen "
303"möchten."
304
305#. (itstool) path: item/p
306#: C/playlist-create-artists.page:44
307msgid "Click on <gui>Select</gui>."
308msgstr "Klicken Sie auf <gui>Wählen</gui>."
309
310#. (itstool) path: info/desc
311#: C/playlist-delete.page:18
312msgid "Remove an unwanted playlist."
313msgstr "Eine unerwünschte Wiedergabeliste entfernen."
314
315#. (itstool) path: page/title
316#: C/playlist-delete.page:22
317msgid "Delete a playlist"
318msgstr "Eine Wiedergabeliste löschen"
319
320#. (itstool) path: page/p
321#: C/playlist-delete.page:24
322msgid "You can remove an old and unwanted playlist."
323msgstr "Sie können alte und unerwünschte Wiedergabeliste löschen."
324
325#. (itstool) path: item/p
326#: C/playlist-delete.page:29
327msgid "Select the playlist which you want to delete."
328msgstr "Wählen Sie die Wiedergabeliste aus, die Sie löschen wollen."
329
330#. (itstool) path: item/p
331#: C/playlist-delete.page:35
332msgid "Click on <gui>Delete</gui>."
333msgstr "Klicken Sie auf <gui>Löschen</gui>."
334
335#. (itstool) path: info/desc
336#: C/playlist-remove-songs.page:18
337msgid "Delete songs from the playlist."
338msgstr "So löschen Sie Titel aus der Wiedergabeliste."
339
340#. (itstool) path: page/title
341#: C/playlist-remove-songs.page:22
342msgid "Remove songs"
343msgstr "Titel entfernen"
344
345#. (itstool) path: page/p
346#: C/playlist-remove-songs.page:24
347msgid "You can remove any unwanted songs from a playlist."
348msgstr "Sie können unerwünschte Titel aus einer Wiedergabeliste entfernen."
349
350#. (itstool) path: item/p
351#: C/playlist-remove-songs.page:29
352msgid "Select the playlist from which you want to remove songs."
353msgstr "Wählen Sie die Wiedergabeliste, aus der Sie Titel löschen wollen."
354
355#. (itstool) path: item/p
356#: C/playlist-remove-songs.page:32
357msgid "Click on the check button on the toolbar."
358msgstr "Klicken Sie auf den Ankreuzknopf in der Werkzeugleiste."
359
360#. (itstool) path: item/p
361#: C/playlist-remove-songs.page:35
362msgid "Select all the songs which you want to remove."
363msgstr "Wählen Sie alle Titel, die Sie entfernen wollen."
364
365#. (itstool) path: item/p
366#: C/playlist-remove-songs.page:38
367msgid "Click on <gui style=\"button\">Remove from Playlist</gui>."
368msgstr ""
369"Klicken Sie auf <gui style=\"button\">Aus der Wiedergabeliste entfernen</"
370"gui>."
371
372#. (itstool) path: info/desc
373#: C/playlist-repeat.page:18
374msgid "Repeat all songs in the playlist or only the current song."
375msgstr ""
376"Alle Titel der Wiedergabeliste oder nur den aktuellen Titel wiederholen."
377
378#. (itstool) path: page/title
379#: C/playlist-repeat.page:22
380msgid "How do I play songs on repeat?"
381msgstr "Wie werden Titel wiederholt wiedergegeben?"
382
383#. (itstool) path: list/title
384#: C/playlist-repeat.page:25
385msgid "In the taskbar, click on the button on the right side:"
386msgstr "Klicken Sie in der Programmleiste auf den Knopf auf der rechten Seite:"
387
388#. (itstool) path: item/p
389#: C/playlist-repeat.page:27
390msgid "Select <gui>Repeat Song</gui> to repeat a single song."
391msgstr ""
392"Wählen Sie <gui>Titel wiederholen</gui>, um einen einzelnen Titel zu "
393"wiederholen."
394
395#. (itstool) path: item/p
396#: C/playlist-repeat.page:30
397msgid "Select <gui>Repeat All</gui> to repeat all the song in the playlist."
398msgstr ""
399"Wählen Sie <gui>Alle wiederholen</gui>, um alle Titel in der Wiedergabeliste "
400"zu wiederholen."
401
402#. (itstool) path: info/desc
403#: C/playlist-shuffle.page:18
404msgid "Shuffle songs in the playlist."
405msgstr "So mischen Sie die Titel der Wiedergabeliste."
406
407#. (itstool) path: page/title
408#: C/playlist-shuffle.page:22
409msgid "How do I shuffle my songs?"
410msgstr "Wie mischt man eigene Titel?"
411
412#. (itstool) path: page/p
413#: C/playlist-shuffle.page:24
414msgid ""
415"In the taskbar, click on the button on right hand side and select "
416"<gui>Shuffle</gui>."
417msgstr ""
418"Klicken Sie in der Programmleiste auf den Knopf auf der rechten Seite und "
419"wählen Sie <gui>Mischen</gui>."
420
421#. (itstool) path: info/desc
422#: C/search.page:18
423msgid "Search through your music collection."
424msgstr "Durchsuchen Sie Ihre Musiksammlung."
425
426#. (itstool) path: page/title
427#: C/search.page:22
428msgid "Find music"
429msgstr "Musik suchen"
430
431#. (itstool) path: page/p
432#: C/search.page:24
433msgid ""
434"You can search your albums, artists, songs and playlists. Select what you "
435"want to search through then click the <gui>Search</gui> button and start "
436"searching."
437msgstr ""
438"Durchsuchen Sie Ihre Alben, Künstler, Titel und Wiedergabelisten. Wählen "
439"Sie, wo Sie überall suchen möchten und klicken Sie dann auf den Knopf "
440"<gui>Suchen</gui>."
441
442#. (itstool) path: p/link
443#: C/legal.xml:5
444msgid "Creative Commons Attribution-ShareAlike 3.0 Unported License"
445msgstr ""
446"Creative Commons Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 "
447"nicht angepasst"
448
449#. (itstool) path: license/p
450#: C/legal.xml:4
451msgid "This work is licensed under a <_:link-1/>."
452msgstr "Dieses Werk ist unter <_:link-1/> lizenziert."
0453
=== added file 'help/de/de.stamp'
=== added file 'help/de/index.page'
--- help/de/index.page 1970-01-01 00:00:00 +0000
+++ help/de/index.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,35 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" id="index" xml:lang="de">
3
4 <info>
5 <title type="link">Musik</title>
6 <title type="text">Musik</title>
7 <revision pkgversion="3.12" date="2014-02-24" status="review"/>
8
9 <credit type="author">
10 <name>Shobha Tyagi</name>
11 <email its:translate="no">tyagishobha@gmail.com</email>
12 <years>2014</years>
13 </credit>
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
17 <mal:name>Christian Kirbach</mal:name>
18 <mal:email>Christian.Kirbach@gmail.com</mal:email>
19 <mal:years>2014</mal:years>
20 </mal:credit>
21 </info>
22
23 <title><media type="image" mime="image/png" src="figures/gnome-music-3.12.png" its:translate="no"/> Musik</title>
24
25 <section id="create" style="2column">
26 <title>Wiedergabeliste anlegen</title>
27 </section>
28 <section id="use" style="2column">
29 <title>Titel wiedergeben</title>
30 </section>
31 <section id="delete" style="2column">
32 <title>Titel und Wiedergabeliste entfernen</title>
33 </section>
34
35</page>
036
=== added file 'help/de/introduction.page'
--- help/de/introduction.page 1970-01-01 00:00:00 +0000
+++ help/de/introduction.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,28 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="introduction" xml:lang="de">
3
4 <info>
5 <link type="guide" xref="index" group="#first"/>
6 <revision pkgversion="3.12" date="2014-02-24" status="review"/>
7
8 <credit type="author">
9 <name>Shobha Tyagi</name>
10 <email its:translate="no">tyagishobha@gmail.com</email>
11 <years>2014</years>
12 </credit>
13
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <desc>Eine einfache und elegante Alternative zum Anzeigen des Musikordners mit »Dateien«.</desc>
17
18 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
19 <mal:name>Christian Kirbach</mal:name>
20 <mal:email>Christian.Kirbach@gmail.com</mal:email>
21 <mal:years>2014</mal:years>
22 </mal:credit>
23 </info>
24
25 <title>Einführung in Musik</title>
26 <p>Eine einfache und elegante Alternative zum Anzeigen des Musikordners mit »Dateien«.</p>
27
28</page>
029
=== added file 'help/de/legal.xml'
--- help/de/legal.xml 1970-01-01 00:00:00 +0000
+++ help/de/legal.xml 2015-02-14 00:18:38 +0000
@@ -0,0 +1,6 @@
1<?xml version="1.0" encoding="utf-8"?>
2<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
3
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>
5
6</license>
07
=== added file 'help/de/play-music.page'
--- help/de/play-music.page 1970-01-01 00:00:00 +0000
+++ help/de/play-music.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,43 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="play-music" xml:lang="de">
3
4 <info>
5 <link type="guide" xref="index#use"/>
6 <revision pkgversion="3.12" date="2014-03-09" status="review"/>
7
8 <credit type="author">
9 <name>Shobha Tyagi</name>
10 <email its:translate="no">tyagishobha@gmail.com</email>
11 <years>2014</years>
12 </credit>
13
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <desc>Geben Sie Ihre Lieblingsmusik wieder.</desc>
17
18
19 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
20 <mal:name>Christian Kirbach</mal:name>
21 <mal:email>Christian.Kirbach@gmail.com</mal:email>
22 <mal:years>2014</mal:years>
23 </mal:credit>
24 </info>
25
26 <title>Musik abspielen</title>
27
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>
29
30 <steps>
31 <title>In den <em>Wiedergabelisten</em>:</title>
32 <item>
33 <p>Wählen Sie eine Wiedergabeliste.</p>
34 </item>
35 <item>
36 <p>Klicken Sie auf den Knopf mit dem Zahnrad auf der rechten Seite.</p>
37 </item>
38 <item>
39 <p>Klicken Sie auf <gui>Wiedergabe</gui>.</p>
40 </item>
41 </steps>
42
43</page>
044
=== added file 'help/de/playlist-create-albums.page'
--- help/de/playlist-create-albums.page 1970-01-01 00:00:00 +0000
+++ help/de/playlist-create-albums.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,78 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-create-albums" xml:lang="de">
3
4 <info>
5 <link type="guide" xref="index#create"/>
6 <revision pkgversion="3.12" date="2014-02-22" status="review"/>
7
8 <credit type="author">
9 <name>Shobha Tyagi</name>
10 <email its:translate="no">tyagishobha@gmail.com</email>
11 <years>2014</years>
12 </credit>
13
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <desc>Lieder zu Wiedergabelisten mit Hilfe von Alben hinzufügen.</desc>
17
18 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
19 <mal:name>Christian Kirbach</mal:name>
20 <mal:email>Christian.Kirbach@gmail.com</mal:email>
21 <mal:years>2014</mal:years>
22 </mal:credit>
23 </info>
24
25 <title>Eine Wiedergabeliste mit Hilfe von Alben anlegen</title>
26
27 <p>Schauen Sie sich alle Ihre Alben an, indem Sie auf den Knopf <gui style="button">Alben</gui> klicken.</p>
28
29 <steps>
30 <title>So fügen Sie alle Titel eines Albums hinzu:</title>
31 <item>
32 <p>Klicken Sie auf das Ankreuzfeld in der rechten oberen Ecke des Fensters.</p>
33 </item>
34 <item>
35 <p>Wählen Sie Alben.</p>
36 </item>
37 <item>
38 <p>Klicken Sie auf <gui style="button">Zur Wiedergabeliste hinzufügen</gui>.</p>
39 </item>
40 <item>
41 <p>Klicken Sie auf <gui>Neue Wiedergabeliste</gui> und geben Sie einen Namen für Ihre Wiedergabeliste ein.</p>
42 </item>
43 <item>
44 <p>Klicken Sie auf <gui style="button">Wählen</gui>.</p>
45 </item>
46 </steps>
47
48 <p>Sie können auch eine Wiedergabeliste anhand bestimmter Titel anlegen.</p>
49
50 <steps>
51 <title>So fügen Sie ausgewählte Titel eines Albums hinzu:</title>
52 <item>
53 <p>Klicken Sie auf ein Album.</p>
54 </item>
55 <item>
56 <p>Klicken Sie auf den Ankreuzknopf.</p>
57 </item>
58 <item>
59 <p>Wählen Sie einige Titel.</p>
60 </item>
61 <item>
62 <p>Klicken Sie auf <gui style="button">Zur Wiedergabeliste hinzufügen</gui>.</p>
63 </item>
64 <item>
65 <p>Klicken Sie auf <gui>Neue Wiedergabeliste</gui> und geben Sie einen Namen für Ihre Wiedergabeliste ein.</p>
66 </item>
67 <item>
68 <p>Klicken Sie auf <gui style="button">Wählen</gui>.</p>
69 </item>
70 </steps>
71
72 <note>
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>
74
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>
76 </note>
77
78</page>
079
=== added file 'help/de/playlist-create-artists.page'
--- help/de/playlist-create-artists.page 1970-01-01 00:00:00 +0000
+++ help/de/playlist-create-artists.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,54 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-create-artists" xml:lang="de">
3
4 <info>
5 <link type="guide" xref="index#create"/>
6 <revision pkgversion="3.12" date="2014-03-08" status="review"/>
7
8 <credit type="author">
9 <name>Shobha Tyagi</name>
10 <email its:translate="no">tyagishobha@gmail.com</email>
11 <years>2014</years>
12 </credit>
13
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <desc>Eine Wiedergabeliste durch Wählen Ihrer Lieblingskünstler anlegen.</desc>
17
18
19 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
20 <mal:name>Christian Kirbach</mal:name>
21 <mal:email>Christian.Kirbach@gmail.com</mal:email>
22 <mal:years>2014</mal:years>
23 </mal:credit>
24 </info>
25
26 <title>Wiedergabelisten mit Hilfe von Künstlern anlegen</title>
27
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>
29
30 <steps>
31 <title>So erstellen Sie eine neue Wiedergabeliste in der <em>Künstler</em>-Ansicht:</title>
32 <item>
33 <p>Klicken Sie auf das Ankreuzfeld in der rechten oberen Ecke des Fensters.</p>
34 </item>
35 <item>
36 <p>Wählen Sie alle Künstler, deren Titel Sie zur Wiedergabeliste hinzufügen möchten.</p>
37 </item>
38 <item>
39 <p>Klicken Sie auf <gui style="button">Zur Wiedergabeliste hinzufügen</gui>.</p>
40 </item>
41 <item>
42 <p>Klicken Sie auf <gui>Neue Wiedergabeliste</gui> und geben Sie einen Namen für Ihre Wiedergabeliste ein.</p>
43 </item>
44 <item>
45 <p>Klicken Sie auf <gui>Wählen</gui>.</p>
46 </item>
47 </steps>
48
49 <note>
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>
51
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>
53 </note>
54</page>
055
=== added file 'help/de/playlist-create-songs.page'
--- help/de/playlist-create-songs.page 1970-01-01 00:00:00 +0000
+++ help/de/playlist-create-songs.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,53 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-create-songs" xml:lang="de">
3
4 <info>
5 <link type="guide" xref="index#create"/>
6 <revision pkgversion="3.12" date="2014-03-03" status="review"/>
7
8 <credit type="author">
9 <name>Shobha Tyagi</name>
10 <email its:translate="no">tyagishobha@gmail.com</email>
11 <years>2014</years>
12 </credit>
13
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <desc>Eine Wiedergabeliste durch Wählen Ihrer Lieblingstitel anlegen.</desc>
17
18 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
19 <mal:name>Christian Kirbach</mal:name>
20 <mal:email>Christian.Kirbach@gmail.com</mal:email>
21 <mal:years>2014</mal:years>
22 </mal:credit>
23 </info>
24
25 <title>Wiedergabelisten mit Hilfe von Titeln anlegen</title>
26
27 <p>Schauen Sie sich alle Titel an, indem Sie auf den Knopf <gui style="button">Titel</gui> klicken.</p>
28
29 <steps>
30 <title>So erstellen Sie eine neue Wiedergabeliste in der <em>Titel</em>-Ansicht:</title>
31 <item>
32 <p>Klicken Sie auf das Ankreuzfeld in der rechten oberen Ecke des Fensters.</p>
33 </item>
34 <item>
35 <p>Wählen Sie alle Titel, die Sie zur Wiedergabeliste hinzufügen wollen.</p>
36 </item>
37 <item>
38 <p>Klicken Sie auf <gui style="button">Zur Wiedergabeliste hinzufügen</gui>.</p>
39 </item>
40 <item>
41 <p>Klicken Sie auf <gui style="button">Neue Wiedergabeliste</gui> und geben Sie einen Namen für Ihre Wiedergabeliste ein.</p>
42 </item>
43 <item>
44 <p>Klicken Sie auf <gui style="button">Wählen</gui>.</p>
45 </item>
46 </steps>
47
48 <note>
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>
50
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>
52 </note>
53</page>
054
=== added file 'help/de/playlist-delete.page'
--- help/de/playlist-delete.page 1970-01-01 00:00:00 +0000
+++ help/de/playlist-delete.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,43 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-delete" xml:lang="de">
3
4 <info>
5 <link type="guide" xref="index#delete"/>
6 <revision pkgversion="3.12" date="2014-03-08" status="review"/>
7
8 <credit type="author">
9 <name>Shobha Tyagi</name>
10 <email its:translate="no">tyagishobha@gmail.com</email>
11 <years>2014</years>
12 </credit>
13
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <desc>Eine unerwünschte Wiedergabeliste entfernen.</desc>
17
18
19 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
20 <mal:name>Christian Kirbach</mal:name>
21 <mal:email>Christian.Kirbach@gmail.com</mal:email>
22 <mal:years>2014</mal:years>
23 </mal:credit>
24 </info>
25
26 <title>Eine Wiedergabeliste löschen</title>
27
28 <p>Sie können alte und unerwünschte Wiedergabeliste löschen.</p>
29
30 <steps>
31 <title>In den <em>Wiedergabelisten</em>:</title>
32 <item>
33 <p>Wählen Sie die Wiedergabeliste aus, die Sie löschen wollen.</p>
34 </item>
35 <item>
36 <p>Klicken Sie auf den Knopf mit dem Zahnrad auf der rechten Seite.</p>
37 </item>
38 <item>
39 <p>Klicken Sie auf <gui>Löschen</gui>.</p>
40 </item>
41 </steps>
42
43</page>
044
=== added file 'help/de/playlist-remove-songs.page'
--- help/de/playlist-remove-songs.page 1970-01-01 00:00:00 +0000
+++ help/de/playlist-remove-songs.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,46 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-remove-songs" xml:lang="de">
3
4 <info>
5 <link type="guide" xref="index#delete"/>
6 <revision pkgversion="3.12" date="2014-03-09" status="review"/>
7
8 <credit type="author">
9 <name>Shobha Tyagi</name>
10 <email its:translate="no">tyagishobha@gmail.com</email>
11 <years>2014</years>
12 </credit>
13
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <desc>So löschen Sie Titel aus der Wiedergabeliste.</desc>
17
18
19 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
20 <mal:name>Christian Kirbach</mal:name>
21 <mal:email>Christian.Kirbach@gmail.com</mal:email>
22 <mal:years>2014</mal:years>
23 </mal:credit>
24 </info>
25
26 <title>Titel entfernen</title>
27
28 <p>Sie können unerwünschte Titel aus einer Wiedergabeliste entfernen.</p>
29
30 <steps>
31 <title>In den <em>Wiedergabelisten</em>:</title>
32 <item>
33 <p>Wählen Sie die Wiedergabeliste, aus der Sie Titel löschen wollen.</p>
34 </item>
35 <item>
36 <p>Klicken Sie auf den Ankreuzknopf in der Werkzeugleiste.</p>
37 </item>
38 <item>
39 <p>Wählen Sie alle Titel, die Sie entfernen wollen.</p>
40 </item>
41 <item>
42 <p>Klicken Sie auf <gui style="button">Aus der Wiedergabeliste entfernen</gui>.</p>
43 </item>
44 </steps>
45
46</page>
047
=== added file 'help/de/playlist-repeat.page'
--- help/de/playlist-repeat.page 1970-01-01 00:00:00 +0000
+++ help/de/playlist-repeat.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,38 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-repeat" xml:lang="de">
3
4 <info>
5 <link type="guide" xref="index#use"/>
6 <revision pkgversion="3.12" date="2014-03-25" status="review"/>
7
8 <credit type="author">
9 <name>Shobha Tyagi</name>
10 <email its:translate="no">tyagishobha@gmail.com</email>
11 <years>2014</years>
12 </credit>
13
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <desc>Alle Titel der Wiedergabeliste oder nur den aktuellen Titel wiederholen.</desc>
17
18
19 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
20 <mal:name>Christian Kirbach</mal:name>
21 <mal:email>Christian.Kirbach@gmail.com</mal:email>
22 <mal:years>2014</mal:years>
23 </mal:credit>
24 </info>
25
26 <title>Wie werden Titel wiederholt wiedergegeben?</title>
27
28 <list>
29 <title>Klicken Sie in der Programmleiste auf den Knopf auf der rechten Seite:</title>
30 <item>
31 <p>Wählen Sie <gui>Titel wiederholen</gui>, um einen einzelnen Titel zu wiederholen.</p>
32 </item>
33 <item>
34 <p>Wählen Sie <gui>Alle wiederholen</gui>, um alle Titel in der Wiedergabeliste zu wiederholen.</p>
35 </item>
36 </list>
37
38</page>
039
=== added file 'help/de/playlist-shuffle.page'
--- help/de/playlist-shuffle.page 1970-01-01 00:00:00 +0000
+++ help/de/playlist-shuffle.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,30 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="playlist-shuffle" xml:lang="de">
3
4 <info>
5 <link type="guide" xref="index#use"/>
6 <revision pkgversion="3.12" date="2014-03-25" status="review"/>
7
8 <credit type="author">
9 <name>Shobha Tyagi</name>
10 <email its:translate="no">tyagishobha@gmail.com</email>
11 <years>2014</years>
12 </credit>
13
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <desc>So mischen Sie die Titel der Wiedergabeliste.</desc>
17
18
19 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
20 <mal:name>Christian Kirbach</mal:name>
21 <mal:email>Christian.Kirbach@gmail.com</mal:email>
22 <mal:years>2014</mal:years>
23 </mal:credit>
24 </info>
25
26 <title>Wie mischt man eigene Titel?</title>
27
28 <p>Klicken Sie in der Programmleiste auf den Knopf auf der rechten Seite und wählen Sie <gui>Mischen</gui>.</p>
29
30</page>
031
=== added file 'help/de/search.page'
--- help/de/search.page 1970-01-01 00:00:00 +0000
+++ help/de/search.page 2015-02-14 00:18:38 +0000
@@ -0,0 +1,30 @@
1<?xml version="1.0" encoding="utf-8"?>
2<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="2column task" id="search" xml:lang="de">
3
4 <info>
5 <link type="guide" xref="index#create"/>
6 <revision pkgversion="3.12" date="2014-03-09" status="review"/>
7
8 <credit type="author">
9 <name>Shobha Tyagi</name>
10 <email its:translate="no">tyagishobha@gmail.com</email>
11 <years>2014</years>
12 </credit>
13
14 <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
15
16 <desc>Durchsuchen Sie Ihre Musiksammlung.</desc>
17
18
19 <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
20 <mal:name>Christian Kirbach</mal:name>
21 <mal:email>Christian.Kirbach@gmail.com</mal:email>
22 <mal:years>2014</mal:years>
23 </mal:credit>
24 </info>
25
26 <title>Musik suchen</title>
27
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>
29
30</page>
031
=== modified file 'libgd/Makefile.am'
--- libgd/Makefile.am 2014-05-10 03:47:53 +0000
+++ libgd/Makefile.am 2015-02-14 00:18:38 +0000
@@ -1,3 +1,4 @@
1AUTOMAKE_OPTIONS=subdir-objects
1NULL =2NULL =
2CLEANFILES =3CLEANFILES =
3MAINTAINERCLEANFILES =4MAINTAINERCLEANFILES =
45
=== modified file 'libgd/Makefile.in'
--- libgd/Makefile.in 2014-10-19 23:39:47 +0000
+++ libgd/Makefile.in 2015-02-14 00:18:38 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.14.1 from Makefile.am.1# Makefile.in generated by automake 1.13.4 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -504,6 +504,7 @@
504top_build_prefix = @top_build_prefix@504top_build_prefix = @top_build_prefix@
505top_builddir = @top_builddir@505top_builddir = @top_builddir@
506top_srcdir = @top_srcdir@506top_srcdir = @top_srcdir@
507AUTOMAKE_OPTIONS = subdir-objects
507NULL = 508NULL =
508CLEANFILES = $(am__append_34)509CLEANFILES = $(am__append_34)
509MAINTAINERCLEANFILES = $(am__append_33) $(am__append_37)510MAINTAINERCLEANFILES = $(am__append_33) $(am__append_37)
510511
=== modified file 'libgd/libgd/gd-main-icon-view.c'
--- libgd/libgd/gd-main-icon-view.c 2014-05-10 03:47:53 +0000
+++ libgd/libgd/gd-main-icon-view.c 2015-02-14 00:18:38 +0000
@@ -135,6 +135,7 @@
135 g_object_set (cell,135 g_object_set (cell,
136 "xalign", 0.5,136 "xalign", 0.5,
137 "yalign", 0.5,137 "yalign", 0.5,
138 "follow-state", TRUE,
138 NULL);139 NULL);
139 gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, FALSE);140 gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, FALSE);
140141
141142
=== modified file 'libgd/libgd/gd-main-list-view.c'
--- libgd/libgd/gd-main-list-view.c 2014-05-10 03:47:53 +0000
+++ libgd/libgd/gd-main-list-view.c 2015-02-14 00:18:38 +0000
@@ -61,7 +61,6 @@
61 GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));61 GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
62 GType icon_gtype;62 GType icon_gtype;
6363
64
65 if (!model)64 if (!model)
66 return;65 return;
6766
6867
=== modified file 'libgd/libgd/gd-main-view.c'
--- libgd/libgd/gd-main-view.c 2014-05-10 03:47:53 +0000
+++ libgd/libgd/gd-main-view.c 2015-02-14 00:18:38 +0000
@@ -25,6 +25,8 @@
25#include "gd-main-icon-view.h"25#include "gd-main-icon-view.h"
26#include "gd-main-list-view.h"26#include "gd-main-list-view.h"
2727
28#include <cairo-gobject.h>
29
28#define MAIN_VIEW_TYPE_INITIAL -130#define MAIN_VIEW_TYPE_INITIAL -1
29#define MAIN_VIEW_DND_ICON_OFFSET 2031#define MAIN_VIEW_DND_ICON_OFFSET 20
30#define MAIN_VIEW_RUBBERBAND_SELECT_TRIGGER_LENGTH 3232#define MAIN_VIEW_RUBBERBAND_SELECT_TRIGGER_LENGTH 32
@@ -231,15 +233,14 @@
231 g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);233 g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
232}234}
233235
234static GdkPixbuf *236static cairo_surface_t *
235gd_main_view_get_counter_icon (GdMainView *self,237gd_main_view_get_counter_icon (GdMainView *self,
236 GdkPixbuf *base,238 cairo_surface_t *base,
237 gint number)239 gint number)
238{240{
239 GtkStyleContext *context;241 GtkStyleContext *context;
240 cairo_t *cr, *emblem_cr;242 cairo_t *cr, *emblem_cr;
241 cairo_surface_t *surface, *emblem_surface;243 cairo_surface_t *surface, *emblem_surface;
242 GdkPixbuf *retval;
243 gint width, height;244 gint width, height;
244 gint layout_width, layout_height;245 gint layout_width, layout_height;
245 gint emblem_size;246 gint emblem_size;
@@ -255,18 +256,18 @@
255 gtk_style_context_save (context);256 gtk_style_context_save (context);
256 gtk_style_context_add_class (context, "documents-counter");257 gtk_style_context_add_class (context, "documents-counter");
257258
258 width = gdk_pixbuf_get_width (base);259 width = cairo_image_surface_get_width (base);
259 height = gdk_pixbuf_get_height (base);260 height = cairo_image_surface_get_height (base);
260261
261 surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,262 surface = cairo_surface_create_similar (base, CAIRO_CONTENT_COLOR_ALPHA,
262 width, height);263 width, height);
263 cr = cairo_create (surface);264 cr = cairo_create (surface);
264 gdk_cairo_set_source_pixbuf (cr, base, 0, 0);265 cairo_set_source_surface (cr, base, 0, 0);
265 cairo_paint (cr);266 cairo_paint (cr);
266267
267 emblem_size = MIN (width / 2, height / 2);268 emblem_size = MIN (width / 2, height / 2);
268 emblem_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,269 emblem_surface = cairo_surface_create_similar (base, CAIRO_CONTENT_COLOR_ALPHA,
269 emblem_size, emblem_size);270 emblem_size, emblem_size);
270 emblem_cr = cairo_create (emblem_surface);271 emblem_cr = cairo_create (emblem_surface);
271 gtk_render_background (context, emblem_cr,272 gtk_render_background (context, emblem_cr,
272 0, 0, emblem_size, emblem_size);273 0, 0, emblem_size, emblem_size);
@@ -315,15 +316,10 @@
315 cairo_paint (cr);316 cairo_paint (cr);
316 cairo_destroy (cr);317 cairo_destroy (cr);
317318
318 retval = gdk_pixbuf_get_from_surface (surface,
319 0, 0,
320 width, height);
321
322 cairo_surface_destroy (emblem_surface);319 cairo_surface_destroy (emblem_surface);
323 cairo_surface_destroy (surface);
324 gtk_style_context_restore (context);320 gtk_style_context_restore (context);
325321
326 return retval;322 return surface;
327}323}
328324
329static GdMainViewGeneric *325static GdMainViewGeneric *
@@ -823,6 +819,22 @@
823 return FALSE;819 return FALSE;
824}820}
825821
822static cairo_surface_t *
823copy_surface (cairo_surface_t *surface)
824{
825 cairo_surface_t *copy;
826 cairo_t *cr;
827
828 copy = cairo_surface_create_similar (surface, CAIRO_CONTENT_COLOR_ALPHA,
829 cairo_image_surface_get_width (surface),
830 cairo_image_surface_get_height (surface));
831 cr = cairo_create (copy);
832 cairo_set_source_surface (cr, surface, 0, 0);
833 cairo_paint (cr);
834 cairo_destroy (cr);
835
836 return copy;
837}
826838
827static void839static void
828on_drag_begin (GdMainViewGeneric *generic,840on_drag_begin (GdMainViewGeneric *generic,
@@ -835,41 +847,61 @@
835 {847 {
836 gboolean res;848 gboolean res;
837 GtkTreeIter iter;849 GtkTreeIter iter;
838 GdkPixbuf *icon = NULL;850 gpointer data;
851 cairo_surface_t *surface = NULL;
839 GtkTreePath *path;852 GtkTreePath *path;
853 GType column_gtype;
840854
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);
842 res = gtk_tree_model_get_iter (self->priv->model,856 res = gtk_tree_model_get_iter (self->priv->model,
843 &iter, path);857 &iter, path);
844 if (res)858 if (res)
845 gtk_tree_model_get (self->priv->model, &iter,859 gtk_tree_model_get (self->priv->model, &iter,
846 GD_MAIN_COLUMN_ICON, &icon,860 GD_MAIN_COLUMN_ICON, &data,
847 -1);861 -1);
848862
849 if (self->priv->selection_mode && 863 column_gtype = gtk_tree_model_get_column_type (self->priv->model,
850 icon != NULL)864 GD_MAIN_COLUMN_ICON);
865
866 if (column_gtype == CAIRO_GOBJECT_TYPE_SURFACE)
867 {
868 surface = copy_surface (data);
869 cairo_surface_destroy (data);
870 }
871 else if (column_gtype == GDK_TYPE_PIXBUF)
872 {
873 surface = gdk_cairo_surface_create_from_pixbuf (data, 1, NULL);
874 g_object_unref (data);
875 }
876 else
877 g_assert_not_reached ();
878
879 if (self->priv->selection_mode &&
880 surface != NULL)
851 {881 {
852 GList *selection;882 GList *selection;
853 GdkPixbuf *counter;883 cairo_surface_t *counter;
854884
855 selection = gd_main_view_get_selection (self);885 selection = gd_main_view_get_selection (self);
856886
857 if (g_list_length (selection) > 1)887 if (g_list_length (selection) > 1)
858 {888 {
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));
860 g_clear_object (&icon);890 cairo_surface_destroy (surface);
861 icon = counter;891 surface = counter;
862 }892 }
863893
864 if (selection != NULL)894 if (selection != NULL)
865 g_list_free_full (selection, (GDestroyNotify) gtk_tree_path_free);895 g_list_free_full (selection, (GDestroyNotify) gtk_tree_path_free);
866 }896 }
867897
868 if (icon != NULL)898 if (surface != NULL)
869 {899 {
870 gtk_drag_set_icon_pixbuf (drag_context, icon,900 cairo_surface_set_device_offset (surface,
871 MAIN_VIEW_DND_ICON_OFFSET, MAIN_VIEW_DND_ICON_OFFSET);901 -MAIN_VIEW_DND_ICON_OFFSET,
872 g_object_unref (icon);902 -MAIN_VIEW_DND_ICON_OFFSET);
903 gtk_drag_set_icon_surface (drag_context, surface);
904 cairo_surface_destroy (surface);
873 }905 }
874906
875 gtk_tree_path_free (path);907 gtk_tree_path_free (path);
876908
=== modified file 'libgd/libgd/gd-tagged-entry.c'
--- libgd/libgd/gd-tagged-entry.c 2014-09-22 21:20:08 +0000
+++ libgd/libgd/gd-tagged-entry.c 2015-02-14 00:18:38 +0000
@@ -35,7 +35,7 @@
35 gchar *style;35 gchar *style;
36 gboolean has_close_button;36 gboolean has_close_button;
3737
38 GdkPixbuf *close_pixbuf;38 cairo_surface_t *close_surface;
39 GtkStateFlags last_button_state;39 GtkStateFlags last_button_state;
40};40};
4141
@@ -99,28 +99,32 @@
99}99}
100100
101static void101static void
102gd_tagged_entry_tag_ensure_close_pixbuf (GdTaggedEntryTag *tag,102gd_tagged_entry_tag_ensure_close_surface (GdTaggedEntryTag *tag,
103 GtkStyleContext *context)103 GtkStyleContext *context)
104{104{
105 GtkIconInfo *info;105 GtkIconInfo *info;
106 GdkPixbuf *pixbuf;
106 gint icon_size;107 gint icon_size;
108 gint scale_factor;
107109
108 if (tag->priv->close_pixbuf != NULL)110 if (tag->priv->close_surface != NULL)
109 return;111 return;
110112
111 gtk_icon_size_lookup (GTK_ICON_SIZE_MENU,113 gtk_icon_size_lookup (GTK_ICON_SIZE_MENU,
112 &icon_size, NULL);114 &icon_size, NULL);
113115 scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (tag->priv->entry));
114 info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (),116
115 "window-close-symbolic",117 info = gtk_icon_theme_lookup_icon_for_scale (gtk_icon_theme_get_default (),
116 icon_size,118 "window-close-symbolic",
117 GTK_ICON_LOOKUP_GENERIC_FALLBACK);119 icon_size, scale_factor,
118120 GTK_ICON_LOOKUP_GENERIC_FALLBACK);
119 tag->priv->close_pixbuf =
120 gtk_icon_info_load_symbolic_for_context (info, context,
121 NULL, NULL);
122121
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 */
123 pixbuf = gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL);
124 tag->priv->close_surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale_factor, tag->priv->window);
125
126 g_object_unref (info);
127 g_object_unref (pixbuf);
124}128}
125129
126static gint130static gint
@@ -260,6 +264,7 @@
260 GtkStateFlags state;264 GtkStateFlags state;
261 gint layout_width;265 gint layout_width;
262 gint button_width;266 gint button_width;
267 gint scale_factor;
263268
264 gd_tagged_entry_tag_ensure_layout (tag, entry);269 gd_tagged_entry_tag_ensure_layout (tag, entry);
265 pango_layout_get_pixel_size (tag->priv->layout, &layout_width, NULL);270 pango_layout_get_pixel_size (tag->priv->layout, &layout_width, NULL);
@@ -271,13 +276,17 @@
271 gtk_style_context_get_border (context, state, &button_border);276 gtk_style_context_get_border (context, state, &button_border);
272 gtk_style_context_get_margin (context, state, &button_margin);277 gtk_style_context_get_margin (context, state, &button_margin);
273278
274 gd_tagged_entry_tag_ensure_close_pixbuf (tag, context);279 gd_tagged_entry_tag_ensure_close_surface (tag, context);
275280
276 g_object_unref (context);281 g_object_unref (context);
277282
278 button_width = 0;283 button_width = 0;
279 if (entry->priv->button_visible && tag->priv->has_close_button)284 if (entry->priv->button_visible && tag->priv->has_close_button)
280 button_width = gdk_pixbuf_get_width (tag->priv->close_pixbuf) + BUTTON_INTERNAL_SPACING;285 {
286 scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (entry));
287 button_width = cairo_image_surface_get_width (tag->priv->close_surface) / scale_factor +
288 BUTTON_INTERNAL_SPACING;
289 }
281290
282 return layout_width + button_padding.left + button_padding.right +291 return layout_width + button_padding.left + button_padding.right +
283 button_border.left + button_border.right +292 button_border.left + button_border.right +
@@ -313,11 +322,13 @@
313 GtkAllocation background_allocation, layout_allocation, button_allocation;322 GtkAllocation background_allocation, layout_allocation, button_allocation;
314 gint width, height, x, y, pix_width, pix_height;323 gint width, height, x, y, pix_width, pix_height;
315 gint layout_width, layout_height;324 gint layout_width, layout_height;
325 gint scale_factor;
316 GtkBorder padding, border;326 GtkBorder padding, border;
317 GtkStateFlags state;327 GtkStateFlags state;
318328
319 width = gdk_window_get_width (tag->priv->window);329 width = gdk_window_get_width (tag->priv->window);
320 height = gdk_window_get_height (tag->priv->window);330 height = gdk_window_get_height (tag->priv->window);
331 scale_factor = gdk_window_get_scale_factor (tag->priv->window);
321332
322 state = gd_tagged_entry_tag_get_state (tag, entry);333 state = gd_tagged_entry_tag_get_state (tag, entry);
323 gtk_style_context_get_margin (context, state, &padding);334 gtk_style_context_get_margin (context, state, &padding);
@@ -345,8 +356,8 @@
345356
346 if (entry->priv->button_visible && tag->priv->has_close_button)357 if (entry->priv->button_visible && tag->priv->has_close_button)
347 {358 {
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;
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;
350 }361 }
351 else362 else
352 {363 {
@@ -468,8 +479,8 @@
468 */479 */
469 if (state != tag->priv->last_button_state)480 if (state != tag->priv->last_button_state)
470 {481 {
471 g_clear_object (&tag->priv->close_pixbuf);482 g_clear_pointer (&tag->priv->close_surface, cairo_surface_destroy);
472 gd_tagged_entry_tag_ensure_close_pixbuf (tag, context);483 gd_tagged_entry_tag_ensure_close_surface (tag, context);
473484
474 tag->priv->last_button_state = state;485 tag->priv->last_button_state = state;
475 }486 }
@@ -481,9 +492,9 @@
481 button_allocation.x, button_allocation.y,492 button_allocation.x, button_allocation.y,
482 button_allocation.width, button_allocation.height);493 button_allocation.width, button_allocation.height);
483494
484 gtk_render_icon (context, cr,495 gtk_render_icon_surface (context, cr,
485 tag->priv->close_pixbuf,496 tag->priv->close_surface,
486 button_allocation.x, button_allocation.y);497 button_allocation.x, button_allocation.y);
487498
488done:499done:
489 cairo_restore (cr);500 cairo_restore (cr);
@@ -950,7 +961,7 @@
950 gd_tagged_entry_tag_unrealize (tag);961 gd_tagged_entry_tag_unrealize (tag);
951962
952 g_clear_object (&priv->layout);963 g_clear_object (&priv->layout);
953 g_clear_object (&priv->close_pixbuf);964 g_clear_pointer (&priv->close_surface, cairo_surface_destroy);
954 g_free (priv->label);965 g_free (priv->label);
955 g_free (priv->style);966 g_free (priv->style);
956967
957968
=== modified file 'libgd/libgd/gd-toggle-pixbuf-renderer.c'
--- libgd/libgd/gd-toggle-pixbuf-renderer.c 2014-10-19 23:39:47 +0000
+++ libgd/libgd/gd-toggle-pixbuf-renderer.c 2015-02-14 00:18:38 +0000
@@ -70,8 +70,14 @@
70 gtk_style_context_add_class (context, GTK_STYLE_CLASS_CHECK);70 gtk_style_context_add_class (context, GTK_STYLE_CLASS_CHECK);
7171
72 if (self->priv->active)72 if (self->priv->active)
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);
7474
75 gtk_render_background (context, cr,
76 check_x, check_y,
77 icon_size, icon_size);
78 gtk_render_frame (context, cr,
79 check_x, check_y,
80 icon_size, icon_size);
75 gtk_render_check (context, cr,81 gtk_render_check (context, cr,
76 check_x, check_y,82 check_x, check_y,
77 icon_size, icon_size);83 icon_size, icon_size);
7884
=== modified file 'libgd/libgd/gd-two-lines-renderer.c'
--- libgd/libgd/gd-two-lines-renderer.c 2014-05-10 03:47:53 +0000
+++ libgd/libgd/gd-two-lines-renderer.c 2015-02-14 00:18:38 +0000
@@ -22,6 +22,9 @@
22#include "gd-two-lines-renderer.h"22#include "gd-two-lines-renderer.h"
23#include <string.h>23#include <string.h>
2424
25#define SUBTITLE_DIM_PERCENTAGE 0.55
26#define SUBTITLE_SIZE_PERCENTAGE 0.82
27
25G_DEFINE_TYPE (GdTwoLinesRenderer, gd_two_lines_renderer, GTK_TYPE_CELL_RENDERER_TEXT)28G_DEFINE_TYPE (GdTwoLinesRenderer, gd_two_lines_renderer, GTK_TYPE_CELL_RENDERER_TEXT)
2629
27struct _GdTwoLinesRendererPrivate {30struct _GdTwoLinesRendererPrivate {
@@ -84,13 +87,32 @@
84 GtkStateFlags flags)87 GtkStateFlags flags)
85{88{
86 PangoFontDescription *desc;89 PangoFontDescription *desc;
8790 GdkRGBA rgba;
88 gtk_style_context_add_class (context, "dim-label");91 PangoAttrList *layout_attr;
89 gtk_style_context_add_class (context, "subtitle");92 PangoAttribute *attr_color;
9093
91 gtk_style_context_get (context, flags, "font", &desc, NULL);94 gtk_style_context_get (context, flags,
95 "font", &desc,
96 "color", &rgba,
97 NULL);
98
99 /* Set the font size */
100 pango_font_description_set_size (desc, pango_font_description_get_size (desc) * SUBTITLE_SIZE_PERCENTAGE);
92 pango_layout_set_font_description (layout, desc);101 pango_layout_set_font_description (layout, desc);
93 pango_font_description_free (desc);102 pango_font_description_free (desc);
103
104 /* Set the color */
105 rgba.red = CLAMP(1.0 - ((1.0 - rgba.red) * SUBTITLE_DIM_PERCENTAGE), 0.0, 1.0);
106 rgba.green = CLAMP(1.0 - ((1.0 - rgba.green) * SUBTITLE_DIM_PERCENTAGE), 0.0, 1.0);
107 rgba.blue = CLAMP(1.0 - ((1.0 - rgba.blue) * SUBTITLE_DIM_PERCENTAGE), 0.0, 1.0);
108
109 layout_attr = pango_attr_list_new ();
110 attr_color = pango_attr_foreground_new (rgba.red * 65535,
111 rgba.green * 65535,
112 rgba.blue * 65535);
113 pango_attr_list_insert (layout_attr, attr_color);
114 pango_layout_set_attributes (layout, layout_attr);
115 pango_attr_list_unref (layout_attr);
94}116}
95117
96static void118static void
97119
=== modified file 'm4/libtool.m4'
--- m4/libtool.m4 2014-10-19 23:39:47 +0000
+++ m4/libtool.m4 2015-02-14 00:18:38 +0000
@@ -1312,7 +1312,7 @@
1312 rm -rf conftest*1312 rm -rf conftest*
1313 ;;1313 ;;
13141314
1315x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \1315x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
1316s390*-*linux*|s390*-*tpf*|sparc*-*linux*)1316s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1317 # Find out which ABI we are using.1317 # Find out which ABI we are using.
1318 echo 'int i;' > conftest.$ac_ext1318 echo 'int i;' > conftest.$ac_ext
@@ -1326,10 +1326,7 @@
1326 x86_64-*linux*)1326 x86_64-*linux*)
1327 LD="${LD-ld} -m elf_i386"1327 LD="${LD-ld} -m elf_i386"
1328 ;;1328 ;;
1329 powerpc64le-*linux*)1329 ppc64-*linux*|powerpc64-*linux*)
1330 LD="${LD-ld} -m elf32lppclinux"
1331 ;;
1332 powerpc64-*linux*)
1333 LD="${LD-ld} -m elf32ppclinux"1330 LD="${LD-ld} -m elf32ppclinux"
1334 ;;1331 ;;
1335 s390x-*linux*)1332 s390x-*linux*)
@@ -1348,10 +1345,7 @@
1348 x86_64-*linux*)1345 x86_64-*linux*)
1349 LD="${LD-ld} -m elf_x86_64"1346 LD="${LD-ld} -m elf_x86_64"
1350 ;;1347 ;;
1351 powerpcle-*linux*)1348 ppc*-*linux*|powerpc*-*linux*)
1352 LD="${LD-ld} -m elf64lppc"
1353 ;;
1354 powerpc-*linux*)
1355 LD="${LD-ld} -m elf64ppc"1349 LD="${LD-ld} -m elf64ppc"
1356 ;;1350 ;;
1357 s390*-*linux*|s390*-*tpf*)1351 s390*-*linux*|s390*-*tpf*)
13581352
=== modified file 'missing'
--- missing 2014-09-22 21:20:08 +0000
+++ missing 2015-02-14 00:18:38 +0000
@@ -1,7 +1,7 @@
1#! /bin/sh1#! /bin/sh
2# Common wrapper for a few potentially missing GNU programs.2# Common wrapper for a few potentially missing GNU programs.
33
4scriptversion=2013-10-28.13; # UTC4scriptversion=2012-06-26.16; # UTC
55
6# Copyright (C) 1996-2013 Free Software Foundation, Inc.6# Copyright (C) 1996-2013 Free Software Foundation, Inc.
7# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.7# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@@ -160,7 +160,7 @@
160 ;;160 ;;
161 autom4te*)161 autom4te*)
162 echo "You might have modified some maintainer files that require"162 echo "You might have modified some maintainer files that require"
163 echo "the 'autom4te' program to be rebuilt."163 echo "the 'automa4te' program to be rebuilt."
164 program_details 'autom4te'164 program_details 'autom4te'
165 ;;165 ;;
166 bison*|yacc*)166 bison*|yacc*)
167167
=== modified file 'po/LINGUAS'
--- po/LINGUAS 2014-10-19 23:39:47 +0000
+++ po/LINGUAS 2015-02-14 00:18:38 +0000
@@ -17,6 +17,7 @@
17fa17fa
18fi18fi
19fr19fr
20fur
20ga21ga
21gl22gl
22he23he
2324
=== added file 'po/fur.po'
--- po/fur.po 1970-01-01 00:00:00 +0000
+++ po/fur.po 2015-02-14 00:18:38 +0000
@@ -0,0 +1,354 @@
1# Friulian translation for gnome-music.
2# Copyright (C) 2014 gnome-music's COPYRIGHT HOLDER
3# This file is distributed under the same license as the gnome-music package.
4# Fabio Tomat <f.t.public@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: gnome-music gnome-3-14\n"
9"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
10"music&keywords=I18N+L10N&component=general\n"
11"POT-Creation-Date: 2014-10-13 14:18+0000\n"
12"PO-Revision-Date: 2014-10-15 01:54+0100\n"
13"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
14"Language-Team: Friulian <fur@li.org>\n"
15"Language: fur\n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=2; plural=(n != 1);\n"
20"X-Generator: Poedit 1.5.4\n"
21
22#: ../data/org.gnome.Music.gschema.xml.h:1
23msgid "Window size"
24msgstr "Dimension barcon"
25
26#: ../data/org.gnome.Music.gschema.xml.h:2
27msgid "Window size (width and height)."
28msgstr "Dimension barcon (largjece e altece)."
29
30#: ../data/org.gnome.Music.gschema.xml.h:3
31msgid "Window position"
32msgstr "Posizion barcon"
33
34#: ../data/org.gnome.Music.gschema.xml.h:4
35msgid "Window position (x and y)."
36msgstr "Posizion barcon (x e y)."
37
38#: ../data/org.gnome.Music.gschema.xml.h:5
39msgid "Window maximized"
40msgstr ""
41
42#: ../data/org.gnome.Music.gschema.xml.h:6
43msgid "Window maximized state."
44msgstr ""
45
46#: ../data/org.gnome.Music.gschema.xml.h:7
47msgid "Playback repeat mode"
48msgstr "Modalitât ripetizion"
49
50#. Translators: Don't translate allowed values, just the description in the brackets
51#: ../data/org.gnome.Music.gschema.xml.h:9
52msgid ""
53"Value identifies whether to repeat or randomize playback through the "
54"collection. Allowed values are: \"none\" (repeat and shuffle are off), \"song"
55"\" (repeat current song), \"all\" (repeat playlist, no shuffle), \"shuffle"
56"\" (shuffle playlist, presumes repeat all)."
57msgstr ""
58
59#: ../data/org.gnome.Music.gschema.xml.h:10
60msgid "Search mode"
61msgstr "Modalitât di ricercje"
62
63#: ../data/org.gnome.Music.gschema.xml.h:11
64msgid "If true, the search bar is shown."
65msgstr "Se VÊR, al mostre la rie pe ricercje."
66
67#: ../data/gnome-music.desktop.in.h:1 ../gnomemusic/application.py:50
68#: ../gnomemusic/application.py:112 ../gnomemusic/window.py:62
69#: ../data/AboutDialog.ui.in.h:1
70msgid "Music"
71msgstr "Musiche"
72
73#: ../data/gnome-music.desktop.in.h:2
74msgid "Music Player"
75msgstr "Riprodutôr di Musiche"
76
77#: ../data/gnome-music.desktop.in.h:3 ../data/gnome-music.appdata.xml.in.h:2
78msgid "Play and organize your music collection"
79msgstr "Sune e ministre le tô colezion musicâl"
80
81#: ../data/gnome-music.appdata.xml.in.h:1
82msgid "GNOME Music"
83msgstr "GNOME Musiche"
84
85#: ../data/gnome-music.appdata.xml.in.h:3
86msgid "Music is the new GNOME music playing application."
87msgstr "Musiche a je le gnove aplicazion di GNOME par scoltâ le musiche."
88
89#: ../gnomemusic/albumArtCache.py:99 ../gnomemusic/albumArtCache.py:107
90msgid "Untitled"
91msgstr "Cence titul"
92
93#: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100
94#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:574
95#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1290
96msgid "Unknown Album"
97msgstr "Album no cognossût"
98
99#: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98
100#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:283
101#: ../gnomemusic/view.py:483 ../gnomemusic/view.py:717
102#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1288
103#: ../gnomemusic/view.py:1319 ../gnomemusic/widgets.py:181
104#: ../gnomemusic/widgets.py:560
105msgid "Unknown Artist"
106msgstr "Artist no cognossût"
107
108#: ../gnomemusic/notification.py:89
109msgid "Not playing"
110msgstr "No in riproduzion"
111
112#. TRANSLATORS: by refers to the artist, from to the album
113#: ../gnomemusic/notification.py:104
114#, python-format
115msgid "by %s, from %s"
116msgstr "di %s, in %s"
117
118#: ../gnomemusic/notification.py:125 ../data/PlayerToolbar.ui.h:5
119msgid "Previous"
120msgstr "Precedent"
121
122#: ../gnomemusic/notification.py:128 ../gnomemusic/player.py:348
123msgid "Pause"
124msgstr "Pause"
125
126#: ../gnomemusic/notification.py:131 ../gnomemusic/player.py:351
127#: ../data/PlayerToolbar.ui.h:6
128msgid "Play"
129msgstr "Sune"
130
131#: ../gnomemusic/notification.py:133 ../data/PlayerToolbar.ui.h:7
132msgid "Next"
133msgstr "Prossim"
134
135#: ../gnomemusic/searchbar.py:30 ../gnomemusic/searchbar.py:73
136msgid "All"
137msgstr "Ducj"
138
139#: ../gnomemusic/searchbar.py:31
140msgid "Artist"
141msgstr "Artist"
142
143#: ../gnomemusic/searchbar.py:32
144msgid "Album"
145msgstr "Album"
146
147#: ../gnomemusic/searchbar.py:33
148msgid "Track Title"
149msgstr "Titul Linie"
150
151#: ../gnomemusic/searchbar.py:74
152msgid "Local"
153msgstr "Locâl"
154
155#: ../gnomemusic/searchbar.py:176
156msgid "Sources"
157msgstr "Sorzints"
158
159#: ../gnomemusic/searchbar.py:183
160msgid "Match"
161msgstr "Corispondence"
162
163#: ../gnomemusic/view.py:198 ../gnomemusic/widgets.py:222
164#: ../gnomemusic/widgets.py:439 ../gnomemusic/window.py:284
165#, python-format
166msgid "Selected %d item"
167msgid_plural "Selected %d items"
168msgstr[0] "Selezionât %d element"
169msgstr[1] "Selezionâts %d elements"
170
171#: ../gnomemusic/view.py:200 ../gnomemusic/widgets.py:224
172#: ../gnomemusic/widgets.py:441 ../gnomemusic/window.py:288
173#: ../gnomemusic/window.py:300 ../data/headerbar.ui.h:3
174msgid "Click on items to select them"
175msgstr "Cliche sui elements par selezionâju"
176
177#: ../gnomemusic/view.py:337
178#, python-format
179msgid ""
180"No Music found!\n"
181" Put some files into the folder %s"
182msgstr ""
183"Nissune musiche cjatade!\n"
184" Cjarie cualchi file te cartele %s"
185
186#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1534
187msgid "Albums"
188msgstr "Album"
189
190#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1536
191msgid "Songs"
192msgstr "Cjançons"
193
194#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1535
195msgid "Artists"
196msgstr "Artiscj"
197
198#: ../gnomemusic/view.py:636 ../gnomemusic/view.py:638
199#: ../gnomemusic/widgets.py:448
200msgid "All Artists"
201msgstr "Ducj i Artiscj"
202
203#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1537
204msgid "Playlists"
205msgstr "Playlist"
206
207#: ../gnomemusic/view.py:1077
208#, python-format
209msgid "%d Song"
210msgid_plural "%d Songs"
211msgstr[0] "%d cjançon"
212msgstr[1] "%d cjançons"
213
214#: ../gnomemusic/widgets.py:270 ../gnomemusic/widgets.py:308
215#, python-format
216msgid "%d min"
217msgstr "%d min"
218
219#: ../gnomemusic/widgets.py:674
220msgid "New Playlist"
221msgstr "Gnove playlist"
222
223#: ../gnomemusic/window.py:232
224msgid "Empty"
225msgstr "Vueide"
226
227#: ../data/AboutDialog.ui.in.h:2
228msgid "Copyright © 2013 GNOME Music Developers"
229msgstr "Copyright © 2013 GNOME Music Developers"
230
231#: ../data/AboutDialog.ui.in.h:3
232msgid "A music player and management application for GNOME."
233msgstr "Une aplicazion GNOME par sunâ e ministrâ le proprie musiche."
234
235#: ../data/AboutDialog.ui.in.h:4
236msgid "Visit GNOME Music website"
237msgstr "Visite il sît web di GNOME Music"
238
239#: ../data/AboutDialog.ui.in.h:5
240msgid ""
241"GNOME Music is free software; you can redistribute it and/or modify it under "
242"the terms of the GNU General Public License as published by the Free "
243"Software Foundation; either version 2 of the License, or (at your option) "
244"any later version.\n"
245"\n"
246"GNOME Music is distributed in the hope that it will be useful, but WITHOUT "
247"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
248"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
249"more details.\n"
250"\n"
251"You should have received a copy of the GNU General Public License along with "
252"GNOME Music; if not, write to the Free Software Foundation, Inc., 51 "
253"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n"
254"\n"
255"The GNOME Music authors hereby grant permission for non-GPL compatible "
256"GStreamer plugins to be used and distributed together with GStreamer and "
257"GNOME Music. This permission is above and beyond the permissions granted by "
258"the GPL license by which GNOME Music is covered. If you modify this code, "
259"you may extend this exception to your version of the code, but you are not "
260"obligated to do so. If you do not wish to do so, delete this exception "
261"statement from your version."
262msgstr ""
263
264#: ../data/AlbumWidget.ui.h:1
265msgid "Released"
266msgstr "Publicât"
267
268#: ../data/AlbumWidget.ui.h:2
269msgid "Running Length"
270msgstr "Durade"
271
272#: ../data/app-menu.ui.h:1
273msgid "_New Playlist"
274msgstr "_Gnove playlist"
275
276#: ../data/app-menu.ui.h:2
277msgid "_Help"
278msgstr "_Jutori"
279
280#: ../data/app-menu.ui.h:3
281msgid "_About"
282msgstr "_Informazions"
283
284#: ../data/app-menu.ui.h:4
285msgid "_Quit"
286msgstr "_Jes"
287
288#: ../data/PlayerToolbar.ui.h:1
289msgid "Shuffle"
290msgstr "Misclice"
291
292#: ../data/PlayerToolbar.ui.h:2
293msgid "Repeat All"
294msgstr "Ripeti dut"
295
296#: ../data/PlayerToolbar.ui.h:3
297msgid "Repeat Song"
298msgstr "Ripeti cjançon"
299
300#: ../data/PlayerToolbar.ui.h:4
301msgid "Shuffle/Repeat Off"
302msgstr "Miscliçâ/Ripeti disativâts"
303
304#: ../data/NoMusic.ui.h:1
305msgid "No Music Found"
306msgstr "Nissune musiche cjatade"
307
308#: ../data/headerbar.ui.h:1
309msgid "Select All"
310msgstr "Selezione dut"
311
312#: ../data/headerbar.ui.h:2
313msgid "Select None"
314msgstr "Selezione nissun"
315
316#: ../data/headerbar.ui.h:4
317msgid "Search"
318msgstr "Cîr"
319
320#: ../data/headerbar.ui.h:5 ../data/PlaylistDialog.ui.h:3
321msgid "Select"
322msgstr "Selezione"
323
324#: ../data/headerbar.ui.h:6 ../data/PlaylistDialog.ui.h:2
325msgid "Cancel"
326msgstr "Anule"
327
328#: ../data/headerbar.ui.h:7
329msgid "Back"
330msgstr "Torne indaûr"
331
332#: ../data/SelectionToolbar.ui.h:1
333msgid "Add to Playlist"
334msgstr "Zonte inte playlist"
335
336#: ../data/SelectionToolbar.ui.h:2
337msgid "Remove from Playlist"
338msgstr "Gjave de playlist"
339
340#: ../data/PlaylistControls.ui.h:1
341msgid "_Play"
342msgstr "_Sune"
343
344#: ../data/PlaylistControls.ui.h:2
345msgid "_Delete"
346msgstr "_Elimine"
347
348#: ../data/PlaylistControls.ui.h:3
349msgid "Playlist Name"
350msgstr "Non playlist"
351
352#: ../data/PlaylistDialog.ui.h:1
353msgid "Select Playlist"
354msgstr "Selezione playlist"
0355
=== modified file 'po/pt.po'
--- po/pt.po 2014-10-19 23:39:47 +0000
+++ po/pt.po 2015-02-14 00:18:38 +0000
@@ -9,9 +9,9 @@
9"Project-Id-Version: gnome-music master\n"9"Project-Id-Version: gnome-music master\n"
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-"
11"music&keywords=I18N+L10N&component=general\n"11"music&keywords=I18N+L10N&component=general\n"
12"POT-Creation-Date: 2014-03-07 10:04+0000\n"12"POT-Creation-Date: 2014-10-06 19:05+0000\n"
13"PO-Revision-Date: 2014-03-15 01:10+0100\n"13"PO-Revision-Date: 2014-10-07 07:10+0100\n"
14"Last-Translator: Tiago S. <almosthumane@portugalmail.pt>\n"14"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
15"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"15"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
16"Language: pt\n"16"Language: pt\n"
17"MIME-Version: 1.0\n"17"MIME-Version: 1.0\n"
@@ -69,8 +69,8 @@
69msgid "If true, the search bar is shown."69msgid "If true, the search bar is shown."
70msgstr "Se verdadeiro, a barra de pesquisa é apresentada."70msgstr "Se verdadeiro, a barra de pesquisa é apresentada."
7171
72#: ../data/gnome-music.desktop.in.h:1 ../gnomemusic/application.py:4672#: ../data/gnome-music.desktop.in.h:1 ../gnomemusic/application.py:50
73#: ../gnomemusic/application.py:102 ../gnomemusic/window.py:5873#: ../gnomemusic/application.py:112 ../gnomemusic/window.py:62
74#: ../data/AboutDialog.ui.in.h:174#: ../data/AboutDialog.ui.in.h:1
75msgid "Music"75msgid "Music"
76msgstr "Música"76msgstr "Música"
@@ -91,61 +91,97 @@
91msgid "Music is the new GNOME music playing application."91msgid "Music is the new GNOME music playing application."
92msgstr "Música é a nova aplicação de reprodução de música do GNOME"92msgstr "Música é a nova aplicação de reprodução de música do GNOME"
9393
94#: ../gnomemusic/albumArtCache.py:235 ../gnomemusic/albumArtCache.py:24394#: ../gnomemusic/albumArtCache.py:99 ../gnomemusic/albumArtCache.py:107
95msgid "Untitled"95msgid "Untitled"
96msgstr "Sem nome"96msgstr "Sem nome"
9797
98#: ../gnomemusic/notification.py:7098#: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100
99#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:574
100#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1290
101msgid "Unknown Album"
102msgstr "Álbum Desconhecido"
103
104#: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98
105#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:283
106#: ../gnomemusic/view.py:483 ../gnomemusic/view.py:717
107#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1288
108#: ../gnomemusic/view.py:1319 ../gnomemusic/widgets.py:181
109#: ../gnomemusic/widgets.py:560
110msgid "Unknown Artist"
111msgstr "Artista Desconhecido"
112
113#: ../gnomemusic/notification.py:89
99msgid "Not playing"114msgid "Not playing"
100msgstr "Não está a reproduzir"115msgstr "Não está a reproduzir"
101116
102#: ../gnomemusic/notification.py:79 ../gnomemusic/player.py:365
103#: ../gnomemusic/view.py:253 ../gnomemusic/view.py:455
104#: ../gnomemusic/view.py:676 ../gnomemusic/view.py:990
105msgid "Unknown Artist"
106msgstr "Artista Desconhecido"
107
108#: ../gnomemusic/notification.py:81 ../gnomemusic/view.py:553
109msgid "Unknown Album"
110msgstr "Álbum Desconhecido"
111
112#. TRANSLATORS: by refers to the artist, from to the album117#. TRANSLATORS: by refers to the artist, from to the album
113#: ../gnomemusic/notification.py:85118#: ../gnomemusic/notification.py:104
114#, python-format119#, python-format
115msgid "by %s, from %s"120msgid "by %s, from %s"
116msgstr "por %s, de %s"121msgstr "por %s, de %s"
117122
118#: ../gnomemusic/notification.py:125123#: ../gnomemusic/notification.py:125 ../data/PlayerToolbar.ui.h:5
119msgid "Previous"124msgid "Previous"
120msgstr "Anterior"125msgstr "Anterior"
121126
122#: ../gnomemusic/notification.py:128127#: ../gnomemusic/notification.py:128 ../gnomemusic/player.py:348
123msgid "Pause"128msgid "Pause"
124msgstr "Pausa"129msgstr "Pausa"
125130
126#: ../gnomemusic/notification.py:131131#: ../gnomemusic/notification.py:131 ../gnomemusic/player.py:351
132#: ../data/PlayerToolbar.ui.h:6
127msgid "Play"133msgid "Play"
128msgstr "Reproduzir"134msgstr "Reproduzir"
129135
130#: ../gnomemusic/notification.py:133136#: ../gnomemusic/notification.py:133 ../data/PlayerToolbar.ui.h:7
131msgid "Next"137msgid "Next"
132msgstr "Próximo"138msgstr "Próximo"
133139
134#: ../gnomemusic/view.py:197 ../gnomemusic/widgets.py:261140#: ../gnomemusic/searchbar.py:30 ../gnomemusic/searchbar.py:73
135#: ../gnomemusic/window.py:244141msgid "All"
142msgstr "Todas"
143
144#: ../gnomemusic/searchbar.py:31
145#| msgid "Artists"
146msgid "Artist"
147msgstr "Artista"
148
149#: ../gnomemusic/searchbar.py:32
150#| msgid "Albums"
151msgid "Album"
152msgstr "Álbum"
153
154#: ../gnomemusic/searchbar.py:33
155msgid "Track Title"
156msgstr "Título da faixa"
157
158#: ../gnomemusic/searchbar.py:74
159msgid "Local"
160msgstr "Local"
161
162#: ../gnomemusic/searchbar.py:176
163msgid "Sources"
164msgstr "Fontes"
165
166#: ../gnomemusic/searchbar.py:183
167msgid "Match"
168msgstr "Comparar"
169
170#: ../gnomemusic/view.py:198 ../gnomemusic/widgets.py:222
171#: ../gnomemusic/widgets.py:439 ../gnomemusic/window.py:284
136#, python-format172#, python-format
137msgid "Selected %d item"173msgid "Selected %d item"
138msgid_plural "Selected %d items"174msgid_plural "Selected %d items"
139msgstr[0] "%d item selecionado"175msgstr[0] "%d item selecionado"
140msgstr[1] "%d itens selecionados"176msgstr[1] "%d itens selecionados"
141177
142#: ../gnomemusic/view.py:199 ../gnomemusic/widgets.py:263178#: ../gnomemusic/view.py:200 ../gnomemusic/widgets.py:224
143#: ../gnomemusic/window.py:248 ../gnomemusic/window.py:262179#: ../gnomemusic/widgets.py:441 ../gnomemusic/window.py:288
144#: ../data/headerbar.ui.in.h:3180#: ../gnomemusic/window.py:300 ../data/headerbar.ui.h:3
145msgid "Click on items to select them"181msgid "Click on items to select them"
146msgstr "Clique nos itens para os selecionar"182msgstr "Clique nos itens para os selecionar"
147183
148#: ../gnomemusic/view.py:322184#: ../gnomemusic/view.py:337
149#, python-format185#, python-format
150msgid ""186msgid ""
151"No Music found!\n"187"No Music found!\n"
@@ -154,47 +190,44 @@
154"Nenhuma música encontrada!\n"190"Nenhuma música encontrada!\n"
155" Coloque alguns ficheiros na pasta %s"191" Coloque alguns ficheiros na pasta %s"
156192
157#: ../gnomemusic/view.py:329193#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1534
158msgid "Albums"194msgid "Albums"
159msgstr "Álbuns"195msgstr "Álbuns"
160196
161#: ../gnomemusic/view.py:402197#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1536
162msgid "Songs"198msgid "Songs"
163msgstr "Músicas"199msgstr "Músicas"
164200
165#: ../gnomemusic/view.py:566201#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1535
166msgid "Artists"202msgid "Artists"
167msgstr "Artistas"203msgstr "Artistas"
168204
169#: ../gnomemusic/view.py:611 ../gnomemusic/view.py:613205#: ../gnomemusic/view.py:636 ../gnomemusic/view.py:638
170#: ../gnomemusic/widgets.py:451206#: ../gnomemusic/widgets.py:448
171msgid "All Artists"207msgid "All Artists"
172msgstr "Todos os Artistas"208msgstr "Todos os Artistas"
173209
174#: ../gnomemusic/view.py:743210#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1537
175msgid "Playlists"211msgid "Playlists"
176msgstr "Listas de Reprodução"212msgstr "Listas de Reprodução"
177213
178#: ../gnomemusic/view.py:1007214#: ../gnomemusic/view.py:1077
179#, python-format215#, python-format
180msgid "%d Song"216msgid "%d Song"
181msgid_plural "%d Songs"217msgid_plural "%d Songs"
182msgstr[0] "%d Música"218msgstr[0] "%d Música"
183msgstr[1] "%d Músicas"219msgstr[1] "%d Músicas"
184220
185#: ../gnomemusic/widgets.py:75 ../gnomemusic/widgets.py:95221#: ../gnomemusic/widgets.py:270 ../gnomemusic/widgets.py:308
186msgid "Load More"222#, python-format
187msgstr "Carregar Mais"223msgid "%d min"
188224msgstr "%d min"
189#: ../gnomemusic/widgets.py:85225
190msgid "Loading..."226#: ../gnomemusic/widgets.py:674
191msgstr "A carregar..."
192
193#: ../gnomemusic/widgets.py:670
194msgid "New Playlist"227msgid "New Playlist"
195msgstr "Nova Lista de Reprodução"228msgstr "Nova Lista de Reprodução"
196229
197#: ../gnomemusic/window.py:209230#: ../gnomemusic/window.py:232
198msgid "Empty"231msgid "Empty"
199msgstr "Vazio"232msgstr "Vazio"
200233
@@ -283,18 +316,31 @@
283msgid "No Music Found"316msgid "No Music Found"
284msgstr "Nenhuma Música Encontrada"317msgstr "Nenhuma Música Encontrada"
285318
286#: ../data/headerbar.ui.in.h:1319#: ../data/headerbar.ui.h:1
287msgid "Select All"320msgid "Select All"
288msgstr "Selecionar Todas"321msgstr "Selecionar Todas"
289322
290#: ../data/headerbar.ui.in.h:2323#: ../data/headerbar.ui.h:2
291msgid "Select None"324msgid "Select None"
292msgstr "Selecionar Nenhuma"325msgstr "Selecionar Nenhuma"
293326
294#: ../data/headerbar.ui.in.h:4 ../data/PlaylistDialog.ui.in.h:2327#: ../data/headerbar.ui.h:4
328#| msgid "Search mode"
329msgid "Search"
330msgstr "Procurar"
331
332#: ../data/headerbar.ui.h:5 ../data/PlaylistDialog.ui.h:3
333msgid "Select"
334msgstr "Selecionar"
335
336#: ../data/headerbar.ui.h:6 ../data/PlaylistDialog.ui.h:2
295msgid "Cancel"337msgid "Cancel"
296msgstr "Cancelar"338msgstr "Cancelar"
297339
340#: ../data/headerbar.ui.h:7
341msgid "Back"
342msgstr "Anterior"
343
298#: ../data/SelectionToolbar.ui.h:1344#: ../data/SelectionToolbar.ui.h:1
299msgid "Add to Playlist"345msgid "Add to Playlist"
300msgstr "Adicionar à Lista de Reprodução"346msgstr "Adicionar à Lista de Reprodução"
@@ -311,13 +357,20 @@
311msgid "_Delete"357msgid "_Delete"
312msgstr "_Apagar"358msgstr "_Apagar"
313359
314#: ../data/PlaylistDialog.ui.in.h:1360#: ../data/PlaylistControls.ui.h:3
361#| msgid "Playlists"
362msgid "Playlist Name"
363msgstr "Nome da lista de reprodução"
364
365#: ../data/PlaylistDialog.ui.h:1
315msgid "Select Playlist"366msgid "Select Playlist"
316msgstr "Selecionar Lista de Reprodução"367msgstr "Selecionar Lista de Reprodução"
317368
318#: ../data/PlaylistDialog.ui.in.h:3369#~ msgid "Load More"
319msgid "Select"370#~ msgstr "Carregar Mais"
320msgstr "Selecionar"371
372#~ msgid "Loading..."
373#~ msgstr "A carregar..."
321374
322#~ msgid "_Now Playing"375#~ msgid "_Now Playing"
323#~ msgstr "_Agora a Reproduzir"376#~ msgstr "_Agora a Reproduzir"
324377
=== modified file 'po/ro.po'
--- po/ro.po 2014-09-22 21:20:08 +0000
+++ po/ro.po 2015-02-14 00:18:38 +0000
@@ -2,23 +2,24 @@
2# Copyright (C) 2014 gnome-music's COPYRIGHT HOLDER2# Copyright (C) 2014 gnome-music's COPYRIGHT HOLDER
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.
4# Bogdan Mințoi <mintoi.bogdan@gmail.com>, 2014.4# Bogdan Mințoi <mintoi.bogdan@gmail.com>, 2014.
5#5# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2014.
6msgid ""6msgid ""
7msgstr ""7msgstr ""
8"Project-Id-Version: gnome-music master\n"8"Project-Id-Version: gnome-music master\n"
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-"
10"music&keywords=I18N+L10N&component=general\n"10"music&keywords=I18N+L10N&component=general\n"
11"POT-Creation-Date: 2014-07-28 06:59+0000\n"11"POT-Creation-Date: 2014-11-24 12:31+0000\n"
12"PO-Revision-Date: 2014-07-29 12:15+0300\n"12"PO-Revision-Date: 2014-12-07 18:36+0200\n"
13"Last-Translator: Bogdan Mințoi <mintoi.bogdan@gmail.com>\n"13"Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
14"Language-Team: Română <>\n"14"Language-Team: Gnome Romanian Translation Team\n"
15"Language: ro\n"15"Language: ro\n"
16"MIME-Version: 1.0\n"16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
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 < "
20"20)) ? 1 : 2);\n"20"20)) ? 1 : 2);;\n"
21"X-Generator: Gtranslator 2.91.6\n"21"X-Generator: Virtaal 0.7.1\n"
22"X-Project-Style: gnome\n"
2223
23#: ../data/org.gnome.Music.gschema.xml.h:124#: ../data/org.gnome.Music.gschema.xml.h:1
24msgid "Window size"25msgid "Window size"
@@ -92,22 +93,22 @@
92msgid "Music is the new GNOME music playing application."93msgid "Music is the new GNOME music playing application."
93msgstr "Muzică este noua aplicație GNOME pentru redare de muzică."94msgstr "Muzică este noua aplicație GNOME pentru redare de muzică."
9495
95#: ../gnomemusic/albumArtCache.py:100 ../gnomemusic/albumArtCache.py:10896#: ../gnomemusic/albumArtCache.py:99 ../gnomemusic/albumArtCache.py:107
96msgid "Untitled"97msgid "Untitled"
97msgstr "Fără titlu"98msgstr "Fără titlu"
9899
99#: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100100#: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100
100#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:577101#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:574
101#: ../gnomemusic/view.py:964 ../gnomemusic/view.py:1291102#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1291
102msgid "Unknown Album"103msgid "Unknown Album"
103msgstr "Album necunoscut"104msgstr "Album necunoscut"
104105
105#: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98106#: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98
106#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:286107#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:283
107#: ../gnomemusic/view.py:486 ../gnomemusic/view.py:720108#: ../gnomemusic/view.py:483 ../gnomemusic/view.py:717
108#: ../gnomemusic/view.py:1068 ../gnomemusic/view.py:1289109#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1289
109#: ../gnomemusic/view.py:1320 ../gnomemusic/widgets.py:184110#: ../gnomemusic/view.py:1320 ../gnomemusic/widgets.py:181
110#: ../gnomemusic/widgets.py:563111#: ../gnomemusic/widgets.py:566
111msgid "Unknown Artist"112msgid "Unknown Artist"
112msgstr "Artist necunoscut"113msgstr "Artist necunoscut"
113114
@@ -121,55 +122,53 @@
121msgid "by %s, from %s"122msgid "by %s, from %s"
122msgstr "de %s, de la %s"123msgstr "de %s, de la %s"
123124
124#: ../gnomemusic/notification.py:128 ../data/PlayerToolbar.ui.h:5125#: ../gnomemusic/notification.py:125 ../data/PlayerToolbar.ui.h:5
125msgid "Previous"126msgid "Previous"
126msgstr "Precedent"127msgstr "Precedent"
127128
128#: ../gnomemusic/notification.py:131 ../gnomemusic/player.py:348129#: ../gnomemusic/notification.py:128 ../gnomemusic/player.py:348
129msgid "Pause"130msgid "Pause"
130msgstr "Pauză"131msgstr "Pauză"
131132
132#: ../gnomemusic/notification.py:134 ../gnomemusic/player.py:351133#: ../gnomemusic/notification.py:131 ../gnomemusic/player.py:351
133#: ../data/PlayerToolbar.ui.h:6134#: ../data/PlayerToolbar.ui.h:6
134msgid "Play"135msgid "Play"
135msgstr "Redare"136msgstr "Redare"
136137
137#: ../gnomemusic/notification.py:136 ../data/PlayerToolbar.ui.h:7138#: ../gnomemusic/notification.py:133 ../data/PlayerToolbar.ui.h:7
138msgid "Next"139msgid "Next"
139msgstr "Următorul"140msgstr "Următorul"
140141
141#: ../gnomemusic/searchbar.py:30 ../gnomemusic/searchbar.py:73142#: ../gnomemusic/searchbar.py:57 ../gnomemusic/searchbar.py:100
142msgid "All"143msgid "All"
143msgstr "Toate"144msgstr "Toate"
144145
145#: ../gnomemusic/searchbar.py:31146#: ../gnomemusic/searchbar.py:58
146#| msgid "Artists"
147msgid "Artist"147msgid "Artist"
148msgstr "Artist"148msgstr "Artist"
149149
150#: ../gnomemusic/searchbar.py:32150#: ../gnomemusic/searchbar.py:59
151#| msgid "Albums"
152msgid "Album"151msgid "Album"
153msgstr "Album"152msgstr "Album"
154153
155#: ../gnomemusic/searchbar.py:33154#: ../gnomemusic/searchbar.py:60
156msgid "Track Title"155msgid "Track Title"
157msgstr "Numele melodiei"156msgstr "Numele melodiei"
158157
159#: ../gnomemusic/searchbar.py:74158#: ../gnomemusic/searchbar.py:101
160msgid "Local"159msgid "Local"
161msgstr "Local"160msgstr "Local"
162161
163#: ../gnomemusic/searchbar.py:176162#: ../gnomemusic/searchbar.py:203
164msgid "Sources"163msgid "Sources"
165msgstr "Surse"164msgstr "Surse"
166165
167#: ../gnomemusic/searchbar.py:183166#: ../gnomemusic/searchbar.py:210
168msgid "Match"167msgid "Match"
169msgstr "Potrivire"168msgstr "Potrivire"
170169
171#: ../gnomemusic/view.py:201 ../gnomemusic/widgets.py:225170#: ../gnomemusic/view.py:198 ../gnomemusic/widgets.py:222
172#: ../gnomemusic/widgets.py:442 ../gnomemusic/window.py:278171#: ../gnomemusic/widgets.py:443 ../gnomemusic/window.py:284
173#, python-format172#, python-format
174msgid "Selected %d item"173msgid "Selected %d item"
175msgid_plural "Selected %d items"174msgid_plural "Selected %d items"
@@ -177,57 +176,60 @@
177msgstr[1] "Selectat %d elemente"176msgstr[1] "Selectat %d elemente"
178msgstr[2] "Selectat %d de elemente"177msgstr[2] "Selectat %d de elemente"
179178
180#: ../gnomemusic/view.py:203 ../gnomemusic/widgets.py:227179#: ../gnomemusic/view.py:200 ../gnomemusic/widgets.py:224
181#: ../gnomemusic/widgets.py:444 ../gnomemusic/window.py:282180#: ../gnomemusic/widgets.py:445 ../gnomemusic/window.py:288
182#: ../gnomemusic/window.py:294 ../data/headerbar.ui.h:3181#: ../gnomemusic/window.py:300 ../data/headerbar.ui.h:3
183msgid "Click on items to select them"182msgid "Click on items to select them"
184msgstr "Clic pe obiecte pentru a le selecta"183msgstr "Clic pe obiecte pentru a le selecta"
185184
186#: ../gnomemusic/view.py:340185#: ../gnomemusic/view.py:337
187#, python-format186#, python-format
188msgid ""187msgid ""
189"No Music found!\n"188"No Music found!\n"
190" Put some files into the folder %s"189" Put some files into the folder %s"
191msgstr ""190msgstr ""
192"Nu s-a găsit nicio muzică!\n"191"Nu s-a găsit niciun fișier audio!\n"
193" Adăugați câteva fișiere în dosarul %s"192" Adăugați câteva fișiere în dosarul %s"
194193
195#: ../gnomemusic/view.py:348 ../gnomemusic/view.py:1535194#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1535
196msgid "Albums"195msgid "Albums"
197msgstr "Albume"196msgstr "Albume"
198197
199#: ../gnomemusic/view.py:430 ../gnomemusic/view.py:1537198#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1537
200msgid "Songs"199msgid "Songs"
201msgstr "Melodii"200msgstr "Melodii"
202201
203#: ../gnomemusic/view.py:594 ../gnomemusic/view.py:1536202#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1536
204msgid "Artists"203msgid "Artists"
205msgstr "Artiști"204msgstr "Artiști"
206205
207#: ../gnomemusic/view.py:639 ../gnomemusic/view.py:641206#: ../gnomemusic/view.py:636 ../gnomemusic/view.py:638
208#: ../gnomemusic/widgets.py:451207#: ../gnomemusic/widgets.py:452
209msgid "All Artists"208msgid "All Artists"
210msgstr "Toți artiștii"209msgstr "Toți artiștii"
211210
212#: ../gnomemusic/view.py:800 ../gnomemusic/view.py:1538211#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1538
213msgid "Playlists"212msgid "Playlists"
214msgstr "Liste de redare"213msgstr "Liste de redare"
215214
216#: ../gnomemusic/view.py:1080215#: ../gnomemusic/view.py:1077
217#, python-format216#, python-format
218#| msgid "Songs"
219msgid "%d Song"217msgid "%d Song"
220msgid_plural "%d Songs"218msgid_plural "%d Songs"
221msgstr[0] "%d melodie"219msgstr[0] "%d melodie"
222msgstr[1] "%d melodii"220msgstr[1] "%d melodii"
223msgstr[2] "%d de melodii"221msgstr[2] "%d de melodii"
224222
225#: ../gnomemusic/widgets.py:677223#: ../gnomemusic/widgets.py:270 ../gnomemusic/widgets.py:308
226#| msgid "_New Playlist"224#, python-format
225msgid "%d min"
226msgstr "%d min"
227
228#: ../gnomemusic/widgets.py:680
227msgid "New Playlist"229msgid "New Playlist"
228msgstr "Listă de redare nouă"230msgstr "Listă de redare nouă"
229231
230#: ../gnomemusic/window.py:226232#: ../gnomemusic/window.py:232
231msgid "Empty"233msgid "Empty"
232msgstr "Gol"234msgstr "Gol"
233235
@@ -342,12 +344,10 @@
342msgstr "Deselectare totală"344msgstr "Deselectare totală"
343345
344#: ../data/headerbar.ui.h:4346#: ../data/headerbar.ui.h:4
345#| msgid "Search mode"
346msgid "Search"347msgid "Search"
347msgstr "Caută"348msgstr "Caută"
348349
349#: ../data/headerbar.ui.h:5 ../data/PlaylistDialog.ui.h:3350#: ../data/headerbar.ui.h:5 ../data/PlaylistDialog.ui.h:3
350#| msgid "Select All"
351msgid "Select"351msgid "Select"
352msgstr "Selectează"352msgstr "Selectează"
353353
@@ -364,12 +364,10 @@
364msgstr "Adaugă în lista de redare"364msgstr "Adaugă în lista de redare"
365365
366#: ../data/SelectionToolbar.ui.h:2366#: ../data/SelectionToolbar.ui.h:2
367#| msgid "Add to Playlist"
368msgid "Remove from Playlist"367msgid "Remove from Playlist"
369msgstr "Elimină din lista de redare"368msgstr "Elimină din lista de redare"
370369
371#: ../data/PlaylistControls.ui.h:1370#: ../data/PlaylistControls.ui.h:1
372#| msgid "Play"
373msgid "_Play"371msgid "_Play"
374msgstr "_Redare"372msgstr "_Redare"
375373
@@ -377,8 +375,11 @@
377msgid "_Delete"375msgid "_Delete"
378msgstr "Ș_terge"376msgstr "Ș_terge"
379377
378#: ../data/PlaylistControls.ui.h:3
379msgid "Playlist Name"
380msgstr "Numele listei de redare"
381
380#: ../data/PlaylistDialog.ui.h:1382#: ../data/PlaylistDialog.ui.h:1
381#| msgid "Select All"
382msgid "Select Playlist"383msgid "Select Playlist"
383msgstr "Selectează lista de redare"384msgstr "Selectează lista de redare"
384385
385386
=== modified file 'po/sl.po'
--- po/sl.po 2014-10-19 23:39:47 +0000
+++ po/sl.po 2015-02-14 00:18:38 +0000
@@ -9,8 +9,8 @@
9"Project-Id-Version: gnome-music master\n"9"Project-Id-Version: gnome-music master\n"
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-"
11"music&keywords=I18N+L10N&component=general\n"11"music&keywords=I18N+L10N&component=general\n"
12"POT-Creation-Date: 2014-09-14 07:02+0000\n"12"POT-Creation-Date: 2014-12-25 07:57+0000\n"
13"PO-Revision-Date: 2014-09-14 19:36+0100\n"13"PO-Revision-Date: 2014-12-25 19:23+0100\n"
14"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"14"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
15"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"15"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
16"Language: sl_SI\n"16"Language: sl_SI\n"
@@ -94,22 +94,22 @@
94msgid "Music is the new GNOME music playing application."94msgid "Music is the new GNOME music playing application."
95msgstr "Glasba je nov program za predvajanje glasbe za namizje GNOME"95msgstr "Glasba je nov program za predvajanje glasbe za namizje GNOME"
9696
97#: ../gnomemusic/albumArtCache.py:100 ../gnomemusic/albumArtCache.py:10897#: ../gnomemusic/albumArtCache.py:99 ../gnomemusic/albumArtCache.py:107
98msgid "Untitled"98msgid "Untitled"
99msgstr "Neimenovano"99msgstr "Neimenovano"
100100
101#: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100101#: ../gnomemusic/mpris.py:133 ../gnomemusic/notification.py:100
102#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:574102#: ../gnomemusic/player.py:400 ../gnomemusic/view.py:574
103#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1290103#: ../gnomemusic/view.py:961 ../gnomemusic/view.py:1291
104msgid "Unknown Album"104msgid "Unknown Album"
105msgstr "Neznan album"105msgstr "Neznan album"
106106
107#: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98107#: ../gnomemusic/mpris.py:149 ../gnomemusic/notification.py:98
108#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:283108#: ../gnomemusic/player.py:391 ../gnomemusic/view.py:283
109#: ../gnomemusic/view.py:483 ../gnomemusic/view.py:717109#: ../gnomemusic/view.py:483 ../gnomemusic/view.py:717
110#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1288110#: ../gnomemusic/view.py:1065 ../gnomemusic/view.py:1289
111#: ../gnomemusic/view.py:1319 ../gnomemusic/widgets.py:181111#: ../gnomemusic/view.py:1320 ../gnomemusic/widgets.py:181
112#: ../gnomemusic/widgets.py:560112#: ../gnomemusic/widgets.py:566
113msgid "Unknown Artist"113msgid "Unknown Artist"
114msgstr "Neznan izvajalec"114msgstr "Neznan izvajalec"
115115
@@ -140,36 +140,36 @@
140msgid "Next"140msgid "Next"
141msgstr "Naslednja"141msgstr "Naslednja"
142142
143#: ../gnomemusic/searchbar.py:30 ../gnomemusic/searchbar.py:73143#: ../gnomemusic/searchbar.py:57 ../gnomemusic/searchbar.py:100
144msgid "All"144msgid "All"
145msgstr "Vse"145msgstr "Vse"
146146
147#: ../gnomemusic/searchbar.py:31147#: ../gnomemusic/searchbar.py:58
148msgid "Artist"148msgid "Artist"
149msgstr "Izvajalec"149msgstr "Izvajalec"
150150
151#: ../gnomemusic/searchbar.py:32151#: ../gnomemusic/searchbar.py:59
152msgid "Album"152msgid "Album"
153msgstr "Album"153msgstr "Album"
154154
155#: ../gnomemusic/searchbar.py:33155#: ../gnomemusic/searchbar.py:60
156msgid "Track Title"156msgid "Track Title"
157msgstr "Naslov skladbe"157msgstr "Naslov skladbe"
158158
159#: ../gnomemusic/searchbar.py:74159#: ../gnomemusic/searchbar.py:101
160msgid "Local"160msgid "Local"
161msgstr "Krajevno"161msgstr "Krajevno"
162162
163#: ../gnomemusic/searchbar.py:176163#: ../gnomemusic/searchbar.py:203
164msgid "Sources"164msgid "Sources"
165msgstr "Viri"165msgstr "Viri"
166166
167#: ../gnomemusic/searchbar.py:183167#: ../gnomemusic/searchbar.py:210
168msgid "Match"168msgid "Match"
169msgstr "Se sklada"169msgstr "Se sklada"
170170
171#: ../gnomemusic/view.py:198 ../gnomemusic/widgets.py:222171#: ../gnomemusic/view.py:198 ../gnomemusic/widgets.py:222
172#: ../gnomemusic/widgets.py:439 ../gnomemusic/window.py:278172#: ../gnomemusic/widgets.py:443 ../gnomemusic/window.py:284
173#, python-format173#, python-format
174msgid "Selected %d item"174msgid "Selected %d item"
175msgid_plural "Selected %d items"175msgid_plural "Selected %d items"
@@ -179,8 +179,8 @@
179msgstr[3] "Izbrani so %d predmeti"179msgstr[3] "Izbrani so %d predmeti"
180180
181#: ../gnomemusic/view.py:200 ../gnomemusic/widgets.py:224181#: ../gnomemusic/view.py:200 ../gnomemusic/widgets.py:224
182#: ../gnomemusic/widgets.py:441 ../gnomemusic/window.py:282182#: ../gnomemusic/widgets.py:445 ../gnomemusic/window.py:288
183#: ../gnomemusic/window.py:294 ../data/headerbar.ui.h:3183#: ../gnomemusic/window.py:300 ../data/headerbar.ui.h:3
184msgid "Click on items to select them"184msgid "Click on items to select them"
185msgstr "S klikom se predmeti izberejo."185msgstr "S klikom se predmeti izberejo."
186186
@@ -193,24 +193,24 @@
193"Posnetkov ni mogoče najti!\n"193"Posnetkov ni mogoče najti!\n"
194" Nekaj datotek je treba kopirati v mapo %s"194" Nekaj datotek je treba kopirati v mapo %s"
195195
196#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1534196#: ../gnomemusic/view.py:345 ../gnomemusic/view.py:1535
197msgid "Albums"197msgid "Albums"
198msgstr "Albumi"198msgstr "Albumi"
199199
200#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1536200#: ../gnomemusic/view.py:427 ../gnomemusic/view.py:1537
201msgid "Songs"201msgid "Songs"
202msgstr "Skladbe"202msgstr "Skladbe"
203203
204#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1535204#: ../gnomemusic/view.py:591 ../gnomemusic/view.py:1536
205msgid "Artists"205msgid "Artists"
206msgstr "Izvajalci"206msgstr "Izvajalci"
207207
208#: ../gnomemusic/view.py:636 ../gnomemusic/view.py:638208#: ../gnomemusic/view.py:636 ../gnomemusic/view.py:638
209#: ../gnomemusic/widgets.py:448209#: ../gnomemusic/widgets.py:452
210msgid "All Artists"210msgid "All Artists"
211msgstr "Vsi izvajalci"211msgstr "Vsi izvajalci"
212212
213#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1537213#: ../gnomemusic/view.py:797 ../gnomemusic/view.py:1538
214msgid "Playlists"214msgid "Playlists"
215msgstr "Seznami predvajanja"215msgstr "Seznami predvajanja"
216216
@@ -228,11 +228,11 @@
228msgid "%d min"228msgid "%d min"
229msgstr "%d min"229msgstr "%d min"
230230
231#: ../gnomemusic/widgets.py:674231#: ../gnomemusic/widgets.py:680
232msgid "New Playlist"232msgid "New Playlist"
233msgstr "Nov seznam predvajanja"233msgstr "Nov seznam predvajanja"
234234
235#: ../gnomemusic/window.py:226235#: ../gnomemusic/window.py:232
236msgid "Empty"236msgid "Empty"
237msgstr "Prazno"237msgstr "Prazno"
238238
@@ -377,6 +377,10 @@
377msgid "_Delete"377msgid "_Delete"
378msgstr "_Izbriši"378msgstr "_Izbriši"
379379
380#: ../data/PlaylistControls.ui.h:3
381msgid "Playlist Name"
382msgstr "Ime seznama predvajanja"
383
380#: ../data/PlaylistDialog.ui.h:1384#: ../data/PlaylistDialog.ui.h:1
381msgid "Select Playlist"385msgid "Select Playlist"
382msgstr "Izbor seznama predvajanja"386msgstr "Izbor seznama predvajanja"

Subscribers

People subscribed via source and target branches

to all changes: