Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1436

Timestamp:

01/19/08 15:11:57 (12 months ago)

Author:

vollmerk

Message:

fixed issue with xmlapi when no limit provided, fixed now playing refresh, fixed single item update (Thx alex2008) added some more stuff for managing shoutbox stuff, started work on implementation of CoFs system added untested search method on xmlapi

Location:

trunk

Files:

: 19 modified
: 2 copied

admin/users.php (modified) (2 diffs)
config/ampache.cfg.php.dist (modified) (1 diff)
docs/CHANGELOG (modified) (1 diff)
install.php (modified) (1 diff)
lib/class/browse.class.php (modified) (4 diffs)
lib/class/catalog.class.php (modified) (7 diffs)
lib/class/xmldata.class.php (modified) (3 diffs)
lib/install.php (modified) (1 diff)
locale/base/messages.po (modified) (53 diffs)
preferences.php (modified) (2 diffs)
server/ajax.server.php (modified) (1 diff)
server/xml.server.php (modified) (1 diff)
shout.php (modified) (1 diff)
templates/show_add_user.inc.php (modified) (2 diffs)
templates/show_edit_user.inc.php (modified) (2 diffs)
templates/show_flagged.inc.php (modified) (3 diffs)
templates/show_install_account.inc.php (modified) (1 diff)
templates/show_manage_shoutbox.inc.php (copied) (copied from trunk/templates/show_flagged.inc.php) (4 diffs)
templates/show_shoutbox.inc.php (modified) (1 diff)
templates/show_shout_row.inc.php (copied) (copied from trunk/templates/show_flag_row.inc.php) (2 diffs)
templates/sidebar_browse.inc.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/admin/users.php

r1356	r1436
33	33	case 'update_user':
34	34	if (Config::get('demo_mode')) { break; }
	35
	36	if (!$_SESSION['forms']['adminuser'] \|\| $_SESSION['forms']['adminuser'] != $_POST['formkey']) {
	37	access_denied();
	38	exit;
	39	}
35	40
36	41	/* Clean up the variables */
…	…
80	85	case 'add_user':
81	86	if (Config::get('demo_mode')) { break; }
	87
	88	if (!$_SESSION['forms']['adminuser'] \|\| $_SESSION['forms']['adminuser'] != $_POST['formkey']) {
	89	access_denied();
	90	exit;
	91	}
	92
82	93	$username = scrub_in($_REQUEST['username']);
83	94	$fullname = scrub_in($_REQUEST['fullname']);

trunk/config/ampache.cfg.php.dist

r1381	r1436
96	96	; Use Access List
97	97	; Toggle this on if you want ampache to pay attention to the access list
98		; and only allow streaming/downloading/xml-rpc from known hosts by default
99		; xml-rpc will not work without this on.
	98	; and only allow streaming/downloading/xml-rpc from known hosts xml-rpc
	99	; will not work without this on.
	100	; NOTE: Default Behavior is DENY FROM ALL
100	101	; DEFAULT: false
101	102	;access_control = "false"

trunk/docs/CHANGELOG

r1427	r1436
5	5	--------------------------------------------------------------------------
6	6	v.3.4-Beta2
	7	- Fixed Now Playing refresh
	8	- Fixed single song update (Thx alex2008)
7	9	- Added Checkbox for All Playlists filter (Admin Only) also made
8	10	filters only appear when its logical for them to be there

trunk/install.php

r1374	r1436
123	123	Config::set_by_array($results,'1');
124	124
125		if (!install_create_account($username,$password)) {
	125	$password2 = scrub_in($_REQUEST['local_pass2']);
	126
	127	if (!install_create_account($username,$password,$password2)) {
126	128	require_once Config::get('prefix') . '/templates/show_install_account.inc.php';
127	129	break;

trunk/lib/class/browse.class.php

r1431	r1436
180	180	case 'artist':
181	181	case 'genre':
	182	case 'shoutbox':
182	183	case 'live_stream':
183	184	$_SESSION['browse']['type'] = $type;
…	…
217	218	case 'playlist':
218	219	$valid_array = array('name','user');
	220	break;
	221	case 'shoutbox':
	222	$valud_array = array('date','user','sticky');
219	223	break;
220	224	case 'live_stream':
…	…
386	390	$sql = "SELECT `flagged`.`id` FROM `flagged` ";
387	391	break;
	392	case 'shoutbox':
	393	$sql - "SELECT `user_shout`.`id` FROM `user_shout` ";
	394	break;
388	395	case 'playlist_song':
389	396	case 'song':
…	…
714	721	show_box_bottom();
715	722	break;
	723	case 'shoutbox':
	724	show_box_top(_('Shoutbox Records'),$class);
	725	require_once Config::get('prefix') . '/templates/show_manage_shoutbox.inc.php';
	726	show_box_bottom();
	727	break;
716	728	case 'flagged':
717	729	show_box_top(_('Flagged Records'),$class);

trunk/lib/class/catalog.class.php

r1422	r1436
1008	1008	flush();
1009	1009
	1010	// Make sure they don't have a trailing / or \ on their path
	1011	$path = rtrim($path,"/");
	1012	$path = rtrim($path,"\\");
	1013
1010	1014	/*
1011	1015	* Step one Add this to the catalog table if it's not
…	…
1017	1021	$catalog_id = $this->create_catalog_entry($path,$name,$key, $ren, $sort, $type);
1018	1022	}
1019
1020		~~// Make sure they don't have a trailing / or \ on their path~~
1021		~~$path = rtrim($path,"/");~~
1022		~~$path = rtrim($path,"\\");~~
1023	1023
1024	1024	/* Setup the $this with the new information */
…	…
1104	1104	break;
1105	1105	case 'song':
1106		$songs[~~0] = new Song($id);~~
	1106	$songs[] = $id;
1107	1107	break;
1108	1108	} // end switch type
…	…
1115	1115	$file = scrub_out($song->file);
1116	1116	echo "<dl>\n\t<dd>";
1117		echo "<~~b>$file " . _('Updated') . "</b~~>\n";
	1117	echo "<strong>$file " . _('Updated') . "</strong>\n";
1118	1118	echo $info['text'];
1119	1119	echo "\t</dd>\n</dl><hr align=\"left\" width=\"50%\" />";
…	…
1122	1122	else {
1123	1123	echo"<dl>\n\t<dd>";
1124		echo "<~~b>$song->file</b~~><br />" . _('No Update Needed') . "\n";
	1124	echo "<strong>" . scrub_out($song->file) . "</strong><br />" . _('No Update Needed') . "\n";
1125	1125	echo "\t</dd>\n</dl><hr align=\"left\" width=\"50%\" />";
1126	1126	flush();
…	…
1278	1278	} // add_to_catalog
1279	1279
1280
1281	1280	/**
1282	1281	* get_remote_catalog
…	…
1343	1342	}
1344	1343
1345
1346	1344	$data = php_xmlrpc_decode($response->value());
1347	1345

trunk/lib/class/xmldata.class.php

r1419	r1436
58	58	*/
59	59	public static function set_limit($limit) {
	60
	61	if (!$limit) { return false; }
60	62
61	63	$limit = intval($limit);
…	…
140	142
141	143	$final = self::_header() . $string . self::_footer();
	144
142	145	return $final;
143	146
…	…
241	244	"\t<owner><![CDATA[$playlist->f_user]]</owner>\n" .
242	245	"\t<items>$item_total</items>\n" .
	246	"\t<type>$playlist->type</type>\n" .
243	247	"</playlist>\n";
244	248

trunk/lib/install.php

r1375	r1436
228	228	* this creates your initial account and sets up the preferences for the -1 user and you
229	229	*/
230		function install_create_account($username,$password) {
	230	function install_create_account($username,$password,$password2) {
231	231
232	232	if (!strlen($username) OR !strlen($password)) {
233		Error::add('general',"No Username/Password specified");
234		return false;
235		}
	233	Error::add('general',_('No Username/Password specified'));
	234	return false;
	235	}
	236
	237	if ($password !== $password2) {
	238	Error::add('general',_('Passwords do not match'))
	239	return false;
	240	}
236	241
237	242	$dbh = Dba::dbh();

trunk/locale/base/messages.po

r1414	r1436
1		# ~~Translations Base~~.
2		# Copyright (C) ~~2008 Ampache.org~~
3		# This file is distributed under the same license as the ~~Ampache~~ package.
4		# ~~LL <LL@li.org>, 2007~~.
	1	# SOME DESCRIPTIVE TITLE.
	2	# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
	3	# This file is distributed under the same license as the PACKAGE package.
	4	# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5	5	#
6	6	#, fuzzy
…	…
9	9	"Project-Id-Version: PACKAGE VERSION\n"
10	10	"Report-Msgid-Bugs-To: \n"
11		"POT-Creation-Date: 200~~7-12-23 21:5~~9-0800\n"
	11	"POT-Creation-Date: 2008-01-19 09:19-0800\n"
12	12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
…	…
17	17	"Content-Transfer-Encoding: 8bit\n"
18	18
19		#: ../../play/index.php:72
	19	#: ../../play/index.php:67
20	20	msgid "Session Expired: please log in again at"
	21	msgstr ""
	22
	23	#: ../../lib/class/playlist.class.php:81
	24	#: ../../templates/show_playlist_edit.inc.php:40
	25	#: ../../templates/show_edit_playlist_row.inc.php:33
	26	msgid "Private"
21	27	msgstr ""
22	28
…	…
25	31	msgstr ""
26	32
27		#: ../../lib/class/album.class.php:229 ../../lib/class/browse.class.php:641
	33	#: ../../lib/class/album.class.php:229 ../../lib/class/browse.class.php:692
28	34	#: ../../lib/ui.lib.php:535 ../../templates/show_genre.inc.php:35
29	35	#: ../../templates/show_local_catalog_info.inc.php:30
…	…
36	42	msgstr ""
37	43
38		#: ../../lib/class/album.class.php:437 ../../lib/class/catalog.class.php:410
	44	#: ../../lib/class/album.class.php:445 ../../lib/class/catalog.class.php:410
39	45	#: ../../lib/class/catalog.class.php:746
40	46	msgid "Error: Unable to open"
…	…
42	48
43	49	#: ../../lib/class/access.class.php:312 ../../lib/class/access.class.php:337
44		#: ../../lib/class/browse.class.php:80 ../../lib/ui.lib.php:131
45		#: ../../lib/ui.lib.php:728 ../../templates/show_random.inc.php:38
	50	#: ../../lib/class/browse.class.php:79 ../../lib/ui.lib.php:131
	51	#: ../../lib/ui.lib.php:765 ../../templates/show_random.inc.php:38
46	52	#: ../../templates/show_admin_tools.inc.php:51
47	53	#: ../../templates/show_edit_access.inc.php:77
48	54	#: ../../templates/show_mail_users.inc.php:30
	55	#: ../../templates/show_export.inc.php:35
49	56	#: ../../templates/show_add_access.inc.php:58
50	57	msgid "All"
…	…
71	78
72	79	#: ../../lib/class/catalog.class.php:116 ../../lib/class/catalog.class.php:117
73		#: ../../lib/class/user.class.php:616 ../../lib/preferences.php:258
	80	#: ../../lib/class/user.class.php:616 ../../lib/preferences.php:260
74	81	#: ../../templates/show_user.inc.php:22 ../../templates/show_users.inc.php:53
75	82	msgid "Never"
…	…
98	105
99	106	#: ../../lib/class/catalog.class.php:275
100		#: ../../lib/class/catalog.class.php:1018
	107	#: ../../lib/class/catalog.class.php:1038
101	108	msgid "Running Remote Sync"
102	109	msgstr ""
…	…
114	121	msgstr ""
115	122
116		#: ../../lib/class/catalog.class.php:1014
	123	#: ../../lib/class/catalog.class.php:1034
117	124	msgid "Starting Catalog Build"
118	125	msgstr ""
119	126
120		#: ../../lib/class/catalog.class.php:1023
	127	#: ../../lib/class/catalog.class.php:1043
121	128	#: ../../templates/show_adds_catalog.inc.php:24
122	129	#: ../../templates/show_run_add_catalog.inc.php:24
…	…
124	131	msgstr ""
125	132
126		#: ../../lib/class/catalog.class.php:1023
127		#: ../../lib/class/catalog.class.php:1050 ../../lib/preferences.php:170
128		#: ../../lib/preferences.php:212 ../../lib/ui.lib.php:756
	133	#: ../../lib/class/catalog.class.php:1043
	134	#: ../../lib/class/catalog.class.php:1070 ../../lib/preferences.php:172
	135	#: ../../lib/preferences.php:214 ../../lib/ui.lib.php:793
	136	#: ../../templates/sidebar_localplay.inc.php:45
129	137	#: ../../templates/show_adds_catalog.inc.php:24
130		~~#: ../../templates/sidebar_localplay.inc.php:22~~
131	138	#: ../../templates/show_gather_art.inc.php:24
132	139	msgid "None"
133	140	msgstr ""
134	141
135		#: ../../lib/class/catalog.class.php:1042
136		#: ../../lib/class/catalog.class.php:1215
	142	#: ../../lib/class/catalog.class.php:1062
	143	#: ../../lib/class/catalog.class.php:1245
137	144	msgid "Added Playlist From"
138	145	msgstr ""
139	146
140		#: ../../lib/class/catalog.class.php:1049
	147	#: ../../lib/class/catalog.class.php:1069
141	148	#: ../../templates/show_gather_art.inc.php:23
142	149	msgid "Starting Album Art Search"
143	150	msgstr ""
144	151
145		#: ../../lib/class/catalog.class.php:1050
	152	#: ../../lib/class/catalog.class.php:1070
146	153	#: ../../templates/show_gather_art.inc.php:24
147	154	msgid "Searched"
148	155	msgstr ""
149	156
150		#: ../../lib/class/catalog.class.php:1060
	157	#: ../../lib/class/catalog.class.php:1080
151	158	msgid "Catalog Finished"
152	159	msgstr ""
153	160
154		#: ../../lib/class/catalog.class.php:1060
155		#: ../../lib/class/catalog.class.php:1244
	161	#: ../../lib/class/catalog.class.php:1080
	162	#: ../../lib/class/catalog.class.php:1274
156	163	msgid "Total Time"
157	164	msgstr ""
158	165
159		#: ../../lib/class/catalog.class.php:1060
160		#: ../../lib/class/catalog.class.php:1245
	166	#: ../../lib/class/catalog.class.php:1080
	167	#: ../../lib/class/catalog.class.php:1275
161	168	msgid "Total Songs"
162	169	msgstr ""
163	170
164		#: ../../lib/class/catalog.class.php:1061
165		#: ../../lib/class/catalog.class.php:1245
	171	#: ../../lib/class/catalog.class.php:1081
	172	#: ../../lib/class/catalog.class.php:1275
166	173	msgid "Songs Per Seconds"
167	174	msgstr ""
168	175
169		#: ../../lib/class/catalog.class.php:1097 ../../admin/access.php:45
	176	#: ../../lib/class/catalog.class.php:1117 ../../admin/access.php:45
170	177	#: ../../preferences.php:95
171	178	msgid "Updated"
172	179	msgstr ""
173	180
174		#: ../../lib/class/catalog.class.php:1104
	181	#: ../../lib/class/catalog.class.php:1124
175	182	msgid "No Update Needed"
176	183	msgstr ""
177	184
178		#: ../../lib/class/catalog.class.php:1188
	185	#: ../../lib/class/catalog.class.php:1218
179	186	msgid "Running Remote Update"
180	187	msgstr ""
181	188
182		#: ../../lib/class/catalog.class.php:1244
	189	#: ../../lib/class/catalog.class.php:1274
183	190	msgid "Catalog Update Finished"
184	191	msgstr ""
185	192
186		#: ../../lib/class/catalog.class.php:12~~61 ../../admin/users.php:131~~
	193	#: ../../lib/class/catalog.class.php:1291 ../../admin/users.php:142
187	194	msgid "Error"
188	195	msgstr ""
189	196
190		#: ../../lib/class/catalog.class.php:1261
	197	#: ../../lib/class/catalog.class.php:1291
191	198	msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
192	199	msgstr ""
193	200
194		#: ../../lib/class/catalog.class.php:1293
195		#: ../../lib/class/catalog.class.php:1309
196		#: ../../lib/class/catalog.class.php:1375
	201	#: ../../lib/class/catalog.class.php:1323
	202	#: ../../lib/class/catalog.class.php:1339
	203	#: ../../lib/class/catalog.class.php:1405
197	204	msgid "Error connecting to"
198	205	msgstr ""
199	206
200		#: ../../lib/class/catalog.class.php:1293
201		#: ../../lib/class/catalog.class.php:1309
202		#: ../../lib/class/catalog.class.php:1375
	207	#: ../../lib/class/catalog.class.php:1323
	208	#: ../../lib/class/catalog.class.php:1339
	209	#: ../../lib/class/catalog.class.php:1405
203	210	msgid "Code"
204	211	msgstr ""
205	212
206		#: ../../lib/class/catalog.class.php:1293
207		#: ../../lib/class/catalog.class.php:1309
208		#: ../../lib/class/catalog.class.php:1375
	213	#: ../../lib/class/catalog.class.php:1323
	214	#: ../../lib/class/catalog.class.php:1339
	215	#: ../../lib/class/catalog.class.php:1405
209	216	msgid "Reason"
210	217	msgstr ""
211	218
212		#: ../../lib/class/catalog.class.php:1339
	219	#: ../../lib/class/catalog.class.php:1369
213	220	msgid "Completed updating remote catalog(s)"
214	221	msgstr ""
215	222
216		#: ../../lib/class/catalog.class.php:1371 ../../admin/access.php:40
	223	#: ../../lib/class/catalog.class.php:1401 ../../admin/access.php:40
217	224	#: ../../templates/show_song.inc.php:77
218	225	msgid "Added"
219	226	msgstr ""
220	227
221		#: ../../lib/class/catalog.class.php:1444
	228	#: ../../lib/class/catalog.class.php:1474
222	229	msgid "Catalog Root unreadable, stopping clean"
223	230	msgstr ""
224	231
225		#: ../../lib/class/catalog.class.php:1501
	232	#: ../../lib/class/catalog.class.php:1531
226	233	msgid "Catalog Clean Done"
227	234	msgstr ""
228	235
229		#: ../../lib/class/catalog.class.php:1501
	236	#: ../../lib/class/catalog.class.php:1531
230	237	msgid "files removed"
231	238	msgstr ""
232	239
233		#: ../../lib/class/catalog.class.php:1502
	240	#: ../../lib/class/catalog.class.php:1532
234	241	msgid "Optimizing Tables"
235	242	msgstr ""
236	243
237		#: ../../lib/class/catalog.class.php:1738
	244	#: ../../lib/class/catalog.class.php:1768
238	245	msgid " FOUND"
239	246	msgstr ""
240	247
241		#: ../../lib/class/catalog.class.php:1740
	248	#: ../../lib/class/catalog.class.php:1770
242	249	msgid "Searching for new Album Art"
243	250	msgstr ""
244	251
245		#: ../../lib/class/catalog.class.php:1788
	252	#: ../../lib/class/catalog.class.php:1818
246	253	msgid "Update Finished."
247	254	msgstr ""
248	255
249		#: ../../lib/class/catalog.class.php:1788
	256	#: ../../lib/class/catalog.class.php:1818
250	257	msgid "Checked"
251	258	msgstr ""
252	259
253		#: ../../lib/class/catalog.class.php:1788
	260	#: ../../lib/class/catalog.class.php:1818
254	261	msgid "songs updated."
255	262	msgstr ""
256	263
257		#: ../../lib/class/catalog.class.php:1849
258		#: ../../lib/class/catalog.class.php:1931
259		#: ../../lib/class/catalog.class.php:2016
	264	#: ../../lib/class/catalog.class.php:1879
	265	#: ../../lib/class/catalog.class.php:1961
	266	#: ../../lib/class/catalog.class.php:2046
260	267	#: ../../templates/show_album.inc.php:31
261	268	msgid "Unknown (Orphaned)"
262	269	msgstr ""
263	270
264		#: ../../lib/class/song.class.php:333 ../../server/stats.ajax.php:84
265		#: ../../templates/show_edit_song.inc.php:31
266		#: ../../templates/show_song.inc.php:25
267		#: ../../templates/show_duplicate.inc.php:33
268		#: ../../templates/show_search.inc.php:40
269		#: ../../templates/show_disabled_songs.inc.php:34
270		#: ../../templates/show_disabled_songs.inc.php:57
271		msgid "Title"
272		msgstr ""
273
274		#: ../../lib/class/song.class.php:333 ../../lib/class/song.class.php:337
275		#: ../../lib/class/song.class.php:341 ../../lib/class/song.class.php:345
276		#: ../../lib/class/song.class.php:349 ../../lib/class/song.class.php:353
277		#: ../../lib/class/song.class.php:357 ../../lib/class/song.class.php:362
278		#: ../../lib/class/song.class.php:367 ../../lib/class/song.class.php:371
279		#: ../../lib/class/song.class.php:375 ../../lib/class/song.class.php:380
280		msgid "updated to"
281		msgstr ""
282
283		#: ../../lib/class/song.class.php:337
284		#: ../../templates/show_duplicates.inc.php:41
285		#: ../../templates/show_duplicates.inc.php:79
286		#: ../../templates/show_song.inc.php:61
287		msgid "Bitrate"
288		msgstr ""
289
290		#: ../../lib/class/song.class.php:341
291		msgid "Rate"
292		msgstr ""
293
294		#: ../../lib/class/song.class.php:345
295		msgid "Mode"
296		msgstr ""
297
298		#: ../../lib/class/song.class.php:349 ../../templates/show_songs.inc.php:46
299		#: ../../templates/show_songs.inc.php:68
300		#: ../../templates/show_democratic_playlist.inc.php:53
301		#: ../../templates/show_democratic_playlist.inc.php:88
302		#: ../../templates/show_playlist_songs.inc.php:47
303		#: ../../templates/show_playlist_songs.inc.php:68
304		msgid "Time"
305		msgstr ""
306
307		#: ../../lib/class/song.class.php:353 ../../server/stats.ajax.php:84
308		#: ../../templates/show_songs.inc.php:45 ../../templates/show_songs.inc.php:67
309		#: ../../templates/show_localplay_playlist.inc.php:31
310		#: ../../templates/show_localplay_playlist.inc.php:57
311		#: ../../templates/show_edit_song.inc.php:61
312		#: ../../templates/show_playlist_songs.inc.php:41
313		#: ../../templates/show_playlist_songs.inc.php:46
314		#: ../../templates/show_playlist_songs.inc.php:62
315		#: ../../templates/show_playlist_songs.inc.php:67
316		msgid "Track"
317		msgstr ""
318
319		#: ../../lib/class/song.class.php:357
320		msgid "Filesize"
321		msgstr ""
322
323		#: ../../lib/class/song.class.php:362 ../../server/stats.ajax.php:84
324		#: ../../templates/show_similar_artists.inc.php:33
325		#: ../../templates/show_similar_artists.inc.php:86
326		#: ../../templates/sidebar_browse.inc.php:12
327		#: ../../templates/show_artists.inc.php:35
328		#: ../../templates/show_artists.inc.php:52
329		#: ../../templates/show_songs.inc.php:42 ../../templates/show_songs.inc.php:64
330		#: ../../templates/show_edit_song.inc.php:45
331		#: ../../templates/show_recently_played.inc.php:39
332		#: ../../templates/show_recently_played.inc.php:93
333		#: ../../templates/sidebar_home.inc.php:20
334		#: ../../templates/show_now_playing_row.inc.php:59
335		#: ../../templates/show_duplicates.inc.php:38
336		#: ../../templates/show_duplicates.inc.php:76
337		#: ../../templates/show_song.inc.php:29
338		#: ../../templates/show_get_albumart.inc.php:28
339		#: ../../templates/show_play_selected.inc.php:60
340		#: ../../templates/show_albums.inc.php:43
341		#: ../../templates/show_albums.inc.php:64
342		#: ../../templates/show_search.inc.php:44
343		#: ../../templates/show_playlist_songs.inc.php:43
344		#: ../../templates/show_playlist_songs.inc.php:64
345		#: ../../templates/show_disabled_songs.inc.php:36
346		#: ../../templates/show_disabled_songs.inc.php:59
347		msgid "Artist"
348		msgstr ""
349
350		#: ../../lib/class/song.class.php:367 ../../templates/show_songs.inc.php:43
351		#: ../../templates/show_songs.inc.php:65
352		#: ../../templates/show_edit_song.inc.php:37
353		#: ../../templates/show_recently_played.inc.php:38
354		#: ../../templates/show_recently_played.inc.php:92
355		#: ../../templates/sidebar_home.inc.php:19
356		#: ../../templates/show_now_playing_row.inc.php:52
357		#: ../../templates/show_duplicates.inc.php:39
358		#: ../../templates/show_duplicates.inc.php:77
359		#: ../../templates/show_song.inc.php:33
360		#: ../../templates/show_get_albumart.inc.php:36
361		#: ../../templates/show_play_selected.inc.php:59
362		#: ../../templates/show_albums.inc.php:42
363		#: ../../templates/show_albums.inc.php:63
364		#: ../../templates/show_search.inc.php:50
365		#: ../../templates/show_playlist_songs.inc.php:44
366		#: ../../templates/show_playlist_songs.inc.php:65
367		#: ../../templates/show_disabled_songs.inc.php:35
368		#: ../../templates/show_disabled_songs.inc.php:58
369		msgid "Album"
370		msgstr ""
371
372		#: ../../lib/class/song.class.php:371
373		#: ../../templates/show_edit_album.inc.php:33
374		#: ../../templates/show_edit_song.inc.php:67
375		#: ../../templates/show_play_selected.inc.php:61
376		#: ../../templates/show_albums.inc.php:45
377		#: ../../templates/show_albums.inc.php:66
378		#: ../../templates/show_search.inc.php:60
379		msgid "Year"
380		msgstr ""
381
382		#: ../../lib/class/song.class.php:375 ../../templates/show_flag.inc.php:64
383		#: ../../templates/show_edit_song.inc.php:73
384		#: ../../templates/show_flagged.inc.php:40
385		#: ../../templates/show_flagged.inc.php:76
386		#: ../../templates/show_song.inc.php:45 ../../templates/show_search.inc.php:34
387		msgid "Comment"
388		msgstr ""
389
390		#: ../../lib/class/song.class.php:380 ../../lib/ui.lib.php:539
391		#: ../../templates/sidebar_browse.inc.php:13
	271	#: ../../lib/class/flag.cl