Mercurial > audlegacy-plugins

changeset 1701:c4e63a2d85aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:/home/ccr/audacious/plugins
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 11 Sep 2007 02:15:04 +0300
parents 42ea52049c76 (current diff) 48272eee788f (diff)
children cecf5f34a671
files scripts/makerelease.sh src/xspf/xspf.c
diffstat 3 files changed, 110 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/po/ja.po	Tue Sep 11 02:14:11 2007 +0300
+++ b/po/ja.po	Tue Sep 11 02:15:04 2007 +0300
@@ -14,7 +14,7 @@
 "Project-Id-Version: audacious-plugins HEAD\n"
 "Report-Msgid-Bugs-To: http://bugs.audacious-media-player.org\n"
 "POT-Creation-Date: 2007-09-05 00:28+0200\n"
-"PO-Revision-Date: 2007-09-04 20:38+0900\n"
+"PO-Revision-Date: 2007-09-10 09:42+0900\n"
 "Last-Translator: dai <d+po@vdr.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -3964,7 +3964,6 @@
 msgstr "オーバーサンプリングレート変換パスに失敗しました.\n"
 
 #: src/sid/xmms-sid.glade:8 src/sid/xs_interface.c:213
-#, fuzzy
 msgid "Audacious-SID configuration"
 msgstr "Audacious-SID 設定"
 
@@ -4272,16 +4271,15 @@
 
 #: src/sid/xmms-sid.glade:1711 src/sid/xs_interface.c:804
 msgid "Use"
-msgstr ""
+msgstr "使用"
 
 #: src/sid/xmms-sid.glade:1753 src/sid/xs_interface.c:820
 msgid "Import"
 msgstr "インポート"
 
 #: src/sid/xmms-sid.glade:1774 src/sid/xs_interface.c:828
-#, fuzzy
 msgid "Delete"
-msgstr "デフォルト"
+msgstr "削除"
 
 #: src/sid/xmms-sid.glade:1819 src/sid/xs_interface.c:842
 msgid "Filter curve:"
@@ -4378,16 +4376,15 @@
 
 #: src/sid/xmms-sid.glade:2437 src/sid/xs_interface.c:1036
 msgid "Add sub-tunes to playlist"
-msgstr ""
+msgstr "サブチューンをプレイリストに追加"
 
 #: src/sid/xmms-sid.glade:2457 src/sid/xs_interface.c:1041
 msgid "Only tunes with specified minimum length "
 msgstr "指定された最小の長さのチューンのみ"
 
 #: src/sid/xmms-sid.glade:2560 src/sid/xs_interface.c:1071
-#, fuzzy
 msgid "Sub-tune handling:"
-msgstr "サブチューンコントロール:"
+msgstr "サブチューンの取り扱い:"
 
 #: src/sid/xmms-sid.glade:2605 src/sid/xs_interface.c:1092
 msgid ""
@@ -4485,7 +4482,6 @@
 msgstr "HVSC 曲の長さデータベースを選択"
 
 #: src/sid/xmms-sid.glade:3554 src/sid/xs_interface.c:1768
-#, fuzzy
 msgid "Select STIL-database"
 msgstr "STIL データベースを選択"
 
@@ -4495,27 +4491,24 @@
 
 #: src/sid/xmms-sid.glade:3638 src/sid/xs_interface.c:1850
 msgid "Select SIDPlay2 filters file for importing"
-msgstr ""
+msgstr "インポートする SIDPlay2 フィルタファイルを選択"
 
 #: src/sid/xmms-sid.glade:3680 src/sid/xs_interface.c:1891
 msgid "Select SIDPlay2 filters file for exporting"
-msgstr ""
+msgstr "エクスポートする SIDPlay2 フィルタファイルを選択"
 
 #: src/sid/xmms-sid.glade:3721 src/sid/xmms-sid.glade:3803
 #: src/sid/xs_interface.c:1939 src/sid/xs_interface.c:1952
-#, fuzzy
 msgid "Confirm selected action"
-msgstr "フォーマット選択"
+msgstr "選択されたアクションの確認"
 
 #: src/sid/xmms-sid.glade:3759 src/sid/xs_interface.c:1969
-#, fuzzy
 msgid "Yes"
 msgstr "はい"
 
 #: src/sid/xmms-sid.glade:3771 src/sid/xs_interface.c:1975
-#, fuzzy
 msgid "No"
-msgstr "なし"
+msgstr "いいえ"
 
 #: src/sid/xs_fileinfo.c:238
 msgid "General info"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/makerelease.sh	Tue Sep 11 02:15:04 2007 +0300
@@ -0,0 +1,100 @@
+#!/bin/sh
+# mkrelease.sh: Creates a release suitable for distfiles.atheme.org.
+#
+# Copyright (c) 2007 atheme.org
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+if [ "x$1" = "x" ]; then
+	echo "usage: $0 releasename [--automatic]"
+	exit
+else
+	RELEASENAME="$1"
+fi
+
+if [ "x$2" = "x--automatic" ]; then
+	AUTOMATIC="yes"
+fi
+
+TIP=`hg tip --template "#rev#:#node|short#"`
+
+WRKDIR=`pwd`
+
+if [ -d $RELEASENAME ]; then
+	echo "Deleting previous release named $RELEASENAME."
+	rm -rf $WRKDIR/$RELEASENAME/
+fi
+
+echo "Making release named $RELEASENAME (tip $TIP)"
+
+echo
+echo "Building root: $RELEASENAME/"
+hg archive $RELEASENAME
+cd $RELEASENAME
+sh autogen.sh
+rm -rf autogen.sh autom4te.cache
+
+# Run application specific instructions here.
+if [ -x "$WRKDIR/application.sh" ]; then
+	source $WRKDIR/application.sh
+fi
+
+cd ..
+
+echo "Building $RELEASENAME.tgz from $RELEASENAME/"
+tar zcf $RELEASENAME.tgz $RELEASENAME/
+
+echo "Building $RELEASENAME.tbz2 from $RELEASENAME/"
+tar jcf $RELEASENAME.tbz2 $RELEASENAME/
+
+PUBLISH="yes"
+
+ok="0"
+if [ "x$AUTOMATIC" != "xyes" ]; then
+	echo
+	echo "Would you like to publish these releases now?"
+	while [ $ok -eq 0 ]; do
+		echo -n "[$PUBLISH] "
+
+		read INPUT
+		case $INPUT in
+			[Yy]*)
+				PUBLISH="yes"
+				ok=1
+				;;
+			[Nn]*)
+				PUBLISH="no"
+				ok=1
+				;;
+		esac
+	done
+fi
+
+if [ "x$PUBLISH" = "xyes" ]; then
+	scp $RELEASENAME.tgz sidhe.atheme.org:/var/www/distfiles/htdocs
+	scp $RELEASENAME.tbz2 sidhe.atheme.org:/var/www/distfiles/htdocs
+
+	echo
+	echo "The releases have been published, and will be available to the entire"
+	echo "distribution network within 15 minutes."
+fi
+
+echo
+echo "Done. If you have any bugs to report, report them against"
+echo "the distfiles.atheme.org component at http://bugzilla.atheme.org"
+echo "Thanks!"
+echo
--- a/src/xspf/xspf.c	Tue Sep 11 02:14:11 2007 +0300
+++ b/src/xspf/xspf.c	Tue Sep 11 02:15:04 2007 +0300
@@ -302,9 +302,7 @@
                     xmlChar *title = xmlNodeGetContent(nptr2);
                     
                     if (title && *title) {
-                        gchar *old = plist->title;
-                        plist->title = g_strdup((gchar*)title);
-                        g_free(old);
+                        playlist_set_current_name(plist, (gchar*)title);
                     }
                     xmlFree(title);
                 } else