Skip to content

Commit 31c6d12

Browse files
authored
Merge branch 'main' into m3u-support
2 parents 07fdbc7 + b761818 commit 31c6d12

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

data/music.gschema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<description>An index representing the repeat mode</description>
1414
</key>
1515
<key type="as" name="previous-queue">
16-
<default>['']</default>
16+
<default>[]</default>
1717
<summary>The queue from last session to restore</summary>
1818
<description>An array of strings representing the files played last</description>
1919
</key>

data/music.metainfo.xml.in

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
<screenshots>
1717
<screenshot environment="pantheon" type="default">
1818
<caption>Quickly queue up your favorite tracks</caption>
19-
<image>https://raw.githubusercontent.com/elementary/music/8.0.0/data/screenshot.png</image>
19+
<image>https://raw.githubusercontent.com/elementary/music/8.1.0/data/screenshot.png</image>
2020
</screenshot>
2121
<screenshot environment="pantheon:dark" type="default">
2222
<caption>Quickly queue up your favorite tracks</caption>
23-
<image>https://raw.githubusercontent.com/elementary/music/8.0.0/data/screenshot-dark.png</image>
23+
<image>https://raw.githubusercontent.com/elementary/music/8.1.0/data/screenshot-dark.png</image>
2424
</screenshot>
2525
</screenshots>
2626

@@ -58,7 +58,7 @@
5858
<update_contact>contact_at_elementary.io</update_contact>
5959

6060
<releases>
61-
<release version="8.1.0" date="2025-08-13" urgency="medium">
61+
<release version="8.1.0" date="2025-09-01" urgency="medium">
6262
<description>
6363
<p>Improvements:</p>
6464
<ul>
@@ -74,6 +74,8 @@
7474
<issue url="https://github.com/elementary/music/issues/794">Search function only shows first occurrence of search term</issue>
7575
<issue url="https://github.com/elementary/music/issues/798">Gap below album cover when setting text size greater than 1</issue>
7676
<issue url="https://github.com/elementary/music/issues/803">NowPlaying area resizes when playing song with long artist name</issue>
77+
<issue url="https://github.com/elementary/music/issues/829">The toast "1 invalid file was not added to the queue" and terminal warning is shown</issue>
78+
7779
</issues>
7880
</release>
7981

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project(
22
'io.elementary.music',
33
'vala', 'c',
4-
version: '8.0.0',
4+
version: '8.1.0',
55
meson_version: '>=0.58.0'
66
)
77

po/ja.po

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: noise\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2025-08-31 20:05+0000\n"
11-
"PO-Revision-Date: 2025-08-17 12:55+0000\n"
11+
"PO-Revision-Date: 2025-09-02 12:55+0000\n"
1212
"Last-Translator: Ryo Nakano <[email protected]>\n"
1313
"Language-Team: Japanese <https://l10n.elementaryos.org/projects/music/music/"
1414
"ja/>\n"
@@ -38,10 +38,8 @@ msgid "Audio files opened from Files will appear here"
3838
msgstr "“ファイル”から開いた音声ファイルがここに表示されます"
3939

4040
#: src/MainWindow.vala:58
41-
#, fuzzy
42-
#| msgid "Try another search"
4341
msgid "Try changing search terms"
44-
msgstr "ほかの検索用語を試してみてください"
42+
msgstr "他のキーワードを試してください"
4543

4644
#: src/MainWindow.vala:83
4745
msgid "Open Files…"
@@ -58,10 +56,9 @@ msgid_plural "%d invalid files were not added to the queue"
5856
msgstr[0] "無効な %d 項目のファイルはキューに追加されませんでした"
5957

6058
#: src/MainWindow.vala:259
61-
#, fuzzy, c-format
62-
#| msgid "No Results"
59+
#, c-format
6360
msgid "No Results for “%s”"
64-
msgstr "検索結果はありません"
61+
msgstr "“%s”の結果なし"
6562

6663
#: src/MainWindow.vala:272
6764
msgid "All files"

src/PlaybackManager.vala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,10 @@ public class Music.PlaybackManager : Object {
530530
var file_last_played = File.new_for_uri (uri_last_played);
531531

532532
var last_session_uri = settings.get_strv ("previous-queue");
533+
if (last_session_uri.length == 0) {
534+
return;
535+
}
536+
533537
var last_session_files = new File[last_session_uri.length];
534538

535539
for (var i = 0; i < last_session_uri.length; i++) {

0 commit comments

Comments
 (0)