Skip to content

Commit 07fdbc7

Browse files
teamconsteamcons
authored
Merge branch 'main' into m3u-support
2 parents fb304ea + c2fc713 commit 07fdbc7

File tree

405 files changed

+9966
-8323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

405 files changed

+9966
-8323
lines changed

‎data/music.metainfo.xml.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
<issue url="https://github.com/elementary/music/issues/762">Search mechanism in the app</issue>
7272
<issue url="https://github.com/elementary/music/issues/777">Ctrl+Q to Quit app</issue>
7373
<issue url="https://github.com/elementary/music/issues/787">Ability to remove a track</issue>
74+
<issue url="https://github.com/elementary/music/issues/794">Search function only shows first occurrence of search term</issue>
7475
<issue url="https://github.com/elementary/music/issues/798">Gap below album cover when setting text size greater than 1</issue>
7576
<issue url="https://github.com/elementary/music/issues/803">NowPlaying area resizes when playing song with long artist name</issue>
7677
</issues>

‎meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ config_file = configure_file(
2020
)
2121

2222
adw_dep = dependency('libadwaita-1', version: '>=1.4.0')
23-
granite_dep = dependency('granite-7', version: '>=7.6.0')
23+
granite_dep = dependency('granite-7', version: '>=7.6.0') # Granite.Bin
2424
gstreamer_dep = dependency('gstreamer-1.0')
2525
gstreamer_pbutils_dep = dependency('gstreamer-pbutils-1.0')
2626
gstreamer_tag_dep = dependency('gstreamer-tag-1.0')

‎po/POTFILES‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ src/MainWindow.vala
33
src/PlaybackManager.vala
44
src/Views/NowPlayingView.vala
55
src/Widgets/AlbumImage.vala
6+
src/Widgets/SearchBar.vala
67
src/Widgets/SeekBar.vala

‎po/aa.po‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2025-08-13 16:43+0000\n"
5+
"POT-Creation-Date: 2025-08-31 20:05+0000\n"
66
"PO-Revision-Date: 2016-01-04 18:34+0000\n"
77
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
88
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -14,83 +14,88 @@ msgstr ""
1414
"X-Launchpad-Export-Date: 2017-03-07 05:51+0000\n"
1515
"X-Generator: Launchpad (build 18330)\n"
1616

17-
#: src/Application.vala:97 src/Views/NowPlayingView.vala:18
17+
#: src/Application.vala:86 src/Views/NowPlayingView.vala:18
1818
#: src/Views/NowPlayingView.vala:118
1919
msgid "Music"
2020
msgstr ""
2121

22-
#: src/MainWindow.vala:25
22+
#: src/MainWindow.vala:29
2323
msgid "Shuffle"
2424
msgstr ""
2525

26-
#: src/MainWindow.vala:31
27-
msgid "Search titles in playlist"
28-
msgstr ""
29-
30-
#: src/MainWindow.vala:50
26+
#: src/MainWindow.vala:52
3127
msgid "Queue is Empty"
3228
msgstr ""
3329

34-
#: src/MainWindow.vala:51
30+
#: src/MainWindow.vala:53
3531
msgid "Audio files opened from Files will appear here"
3632
msgstr ""
3733

38-
#: src/MainWindow.vala:75
34+
#: src/MainWindow.vala:58
35+
msgid "Try changing search terms"
36+
msgstr ""
37+
38+
#: src/MainWindow.vala:83
3939
msgid "Open Files…"
4040
msgstr ""
4141

42-
#: src/MainWindow.vala:88
42+
#: src/MainWindow.vala:100
4343
msgid "Clear Queue"
4444
msgstr ""
4545

46-
#: src/MainWindow.vala:199
46+
#: src/MainWindow.vala:218
4747
#, c-format
4848
msgid "%d invalid file was not added to the queue"
4949
msgid_plural "%d invalid files were not added to the queue"
5050
msgstr[0] ""
5151
msgstr[1] ""
5252

53-
#: src/MainWindow.vala:256
53+
#: src/MainWindow.vala:259
54+
#, c-format
55+
msgid "No Results for “%s”"
56+
msgstr ""
57+
58+
#: src/MainWindow.vala:272
5459
msgid "All files"
5560
msgstr ""
5661

57-
#: src/MainWindow.vala:261
62+
#: src/MainWindow.vala:277
5863
msgid "Music files"
5964
msgstr ""
6065

61-
#: src/MainWindow.vala:270
66+
#: src/MainWindow.vala:286
6267
msgid "Open"
6368
msgstr ""
6469

65-
#: src/MainWindow.vala:274
70+
#: src/MainWindow.vala:290
6671
msgid "Open audio files"
6772
msgstr ""
6873

69-
#: src/MainWindow.vala:294
74+
#: src/MainWindow.vala:310
7075
msgid "Couldn't add audio files"
7176
msgstr ""
7277

73-
#: src/MainWindow.vala:312
78+
#: src/MainWindow.vala:328
7479
msgid "Repeat None"
7580
msgstr ""
7681

77-
#: src/MainWindow.vala:316
82+
#: src/MainWindow.vala:332
7883
msgid "Repeat All"
7984
msgstr ""
8085

81-
#: src/MainWindow.vala:320
86+
#: src/MainWindow.vala:336
8287
msgid "Repeat One"
8388
msgstr ""
8489

85-
#: src/PlaybackManager.vala:113
90+
#: src/PlaybackManager.vala:147
8691
#, c-format
8792
msgid "%d track was added to the queue"
8893
msgid_plural "%d tracks were added to the queue"
8994
msgstr[0] ""
9095
msgstr[1] ""
9196

9297
#. Don't set artist for files without tags
93-
#: src/PlaybackManager.vala:196
98+
#: src/PlaybackManager.vala:230
9499
msgid "Unknown"
95100
msgstr ""
96101

@@ -113,3 +118,7 @@ msgstr ""
113118
#: src/Views/NowPlayingView.vala:98
114119
msgid "Pause"
115120
msgstr ""
121+
122+
#: src/Widgets/SearchBar.vala:36
123+
msgid "Search titles in playlist"
124+
msgstr ""

‎po/ab.po‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2025-08-13 16:43+0000\n"
5+
"POT-Creation-Date: 2025-08-31 20:05+0000\n"
66
"PO-Revision-Date: 2016-01-04 18:35+0000\n"
77
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
88
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -14,83 +14,88 @@ msgstr ""
1414
"X-Launchpad-Export-Date: 2017-03-07 05:51+0000\n"
1515
"X-Generator: Launchpad (build 18330)\n"
1616

17-
#: src/Application.vala:97 src/Views/NowPlayingView.vala:18
17+
#: src/Application.vala:86 src/Views/NowPlayingView.vala:18
1818
#: src/Views/NowPlayingView.vala:118
1919
msgid "Music"
2020
msgstr ""
2121

22-
#: src/MainWindow.vala:25
22+
#: src/MainWindow.vala:29
2323
msgid "Shuffle"
2424
msgstr ""
2525

26-
#: src/MainWindow.vala:31
27-
msgid "Search titles in playlist"
28-
msgstr ""
29-
30-
#: src/MainWindow.vala:50
26+
#: src/MainWindow.vala:52
3127
msgid "Queue is Empty"
3228
msgstr ""
3329

34-
#: src/MainWindow.vala:51
30+
#: src/MainWindow.vala:53
3531
msgid "Audio files opened from Files will appear here"
3632
msgstr ""
3733

38-
#: src/MainWindow.vala:75
34+
#: src/MainWindow.vala:58
35+
msgid "Try changing search terms"
36+
msgstr ""
37+
38+
#: src/MainWindow.vala:83
3939
msgid "Open Files…"
4040
msgstr ""
4141

42-
#: src/MainWindow.vala:88
42+
#: src/MainWindow.vala:100
4343
msgid "Clear Queue"
4444
msgstr ""
4545

46-
#: src/MainWindow.vala:199
46+
#: src/MainWindow.vala:218
4747
#, c-format
4848
msgid "%d invalid file was not added to the queue"
4949
msgid_plural "%d invalid files were not added to the queue"
5050
msgstr[0] ""
5151
msgstr[1] ""
5252

53-
#: src/MainWindow.vala:256
53+
#: src/MainWindow.vala:259
54+
#, c-format
55+
msgid "No Results for “%s”"
56+
msgstr ""
57+
58+
#: src/MainWindow.vala:272
5459
msgid "All files"
5560
msgstr ""
5661

57-
#: src/MainWindow.vala:261
62+
#: src/MainWindow.vala:277
5863
msgid "Music files"
5964
msgstr ""
6065

61-
#: src/MainWindow.vala:270
66+
#: src/MainWindow.vala:286
6267
msgid "Open"
6368
msgstr ""
6469

65-
#: src/MainWindow.vala:274
70+
#: src/MainWindow.vala:290
6671
msgid "Open audio files"
6772
msgstr ""
6873

69-
#: src/MainWindow.vala:294
74+
#: src/MainWindow.vala:310
7075
msgid "Couldn't add audio files"
7176
msgstr ""
7277

73-
#: src/MainWindow.vala:312
78+
#: src/MainWindow.vala:328
7479
msgid "Repeat None"
7580
msgstr ""
7681

77-
#: src/MainWindow.vala:316
82+
#: src/MainWindow.vala:332
7883
msgid "Repeat All"
7984
msgstr ""
8085

81-
#: src/MainWindow.vala:320
86+
#: src/MainWindow.vala:336
8287
msgid "Repeat One"
8388
msgstr ""
8489

85-
#: src/PlaybackManager.vala:113
90+
#: src/PlaybackManager.vala:147
8691
#, c-format
8792
msgid "%d track was added to the queue"
8893
msgid_plural "%d tracks were added to the queue"
8994
msgstr[0] ""
9095
msgstr[1] ""
9196

9297
#. Don't set artist for files without tags
93-
#: src/PlaybackManager.vala:196
98+
#: src/PlaybackManager.vala:230
9499
msgid "Unknown"
95100
msgstr ""
96101

@@ -113,3 +118,7 @@ msgstr ""
113118
#: src/Views/NowPlayingView.vala:98
114119
msgid "Pause"
115120
msgstr ""
121+
122+
#: src/Widgets/SearchBar.vala:36
123+
msgid "Search titles in playlist"
124+
msgstr ""

‎po/ae.po‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,92 @@
11
msgid ""
22
msgstr ""
33
"Report-Msgid-Bugs-To: \n"
4-
"POT-Creation-Date: 2025-08-13 16:43+0000\n"
4+
"POT-Creation-Date: 2025-08-31 20:05+0000\n"
55
"MIME-Version: 1.0\n"
66
"Content-Type: text/plain; charset=UTF-8\n"
77

8-
#: src/Application.vala:97 src/Views/NowPlayingView.vala:18
8+
#: src/Application.vala:86 src/Views/NowPlayingView.vala:18
99
#: src/Views/NowPlayingView.vala:118
1010
msgid "Music"
1111
msgstr ""
1212

13-
#: src/MainWindow.vala:25
13+
#: src/MainWindow.vala:29
1414
msgid "Shuffle"
1515
msgstr ""
1616

17-
#: src/MainWindow.vala:31
18-
msgid "Search titles in playlist"
19-
msgstr ""
20-
21-
#: src/MainWindow.vala:50
17+
#: src/MainWindow.vala:52
2218
msgid "Queue is Empty"
2319
msgstr ""
2420

25-
#: src/MainWindow.vala:51
21+
#: src/MainWindow.vala:53
2622
msgid "Audio files opened from Files will appear here"
2723
msgstr ""
2824

29-
#: src/MainWindow.vala:75
25+
#: src/MainWindow.vala:58
26+
msgid "Try changing search terms"
27+
msgstr ""
28+
29+
#: src/MainWindow.vala:83
3030
msgid "Open Files…"
3131
msgstr ""
3232

33-
#: src/MainWindow.vala:88
33+
#: src/MainWindow.vala:100
3434
msgid "Clear Queue"
3535
msgstr ""
3636

37-
#: src/MainWindow.vala:199
37+
#: src/MainWindow.vala:218
3838
#, c-format
3939
msgid "%d invalid file was not added to the queue"
4040
msgid_plural "%d invalid files were not added to the queue"
4141
msgstr[0] ""
4242
msgstr[1] ""
4343

44-
#: src/MainWindow.vala:256
44+
#: src/MainWindow.vala:259
45+
#, c-format
46+
msgid "No Results for “%s”"
47+
msgstr ""
48+
49+
#: src/MainWindow.vala:272
4550
msgid "All files"
4651
msgstr ""
4752

48-
#: src/MainWindow.vala:261
53+
#: src/MainWindow.vala:277
4954
msgid "Music files"
5055
msgstr ""
5156

52-
#: src/MainWindow.vala:270
57+
#: src/MainWindow.vala:286
5358
msgid "Open"
5459
msgstr ""
5560

56-
#: src/MainWindow.vala:274
61+
#: src/MainWindow.vala:290
5762
msgid "Open audio files"
5863
msgstr ""
5964

60-
#: src/MainWindow.vala:294
65+
#: src/MainWindow.vala:310
6166
msgid "Couldn't add audio files"
6267
msgstr ""
6368

64-
#: src/MainWindow.vala:312
69+
#: src/MainWindow.vala:328
6570
msgid "Repeat None"
6671
msgstr ""
6772

68-
#: src/MainWindow.vala:316
73+
#: src/MainWindow.vala:332
6974
msgid "Repeat All"
7075
msgstr ""
7176

72-
#: src/MainWindow.vala:320
77+
#: src/MainWindow.vala:336
7378
msgid "Repeat One"
7479
msgstr ""
7580

76-
#: src/PlaybackManager.vala:113
81+
#: src/PlaybackManager.vala:147
7782
#, c-format
7883
msgid "%d track was added to the queue"
7984
msgid_plural "%d tracks were added to the queue"
8085
msgstr[0] ""
8186
msgstr[1] ""
8287

8388
#. Don't set artist for files without tags
84-
#: src/PlaybackManager.vala:196
89+
#: src/PlaybackManager.vala:230
8590
msgid "Unknown"
8691
msgstr ""
8792

@@ -104,3 +109,7 @@ msgstr ""
104109
#: src/Views/NowPlayingView.vala:98
105110
msgid "Pause"
106111
msgstr ""
112+
113+
#: src/Widgets/SearchBar.vala:36
114+
msgid "Search titles in playlist"
115+
msgstr ""

0 commit comments

Comments
 (0)