Index: podpress_admin_feed_class.php
===================================================================
--- podpress_admin_feed_class.php	(Revision 195094)
+++ podpress_admin_feed_class.php	(Arbeitskopie)
@@ -104,7 +104,7 @@
 			echo '				<td width="50%">';
 			echo '					<label for="blogname"><strong>'.__('Blog/Podcast title', 'podpress').'</strong></label>';
 			echo '					<br/>';
-			echo '					<input type="text" id="blogname" name="blogname" size="40" value="'.htmlentities(get_option('blogname'), ENT_QUOTES, $blog_charset).'" onchange="podPress_updateFeedSettings();" /><br />'.__('Used for both Blog and Podcast.', 'podpress');
+			echo '					<input type="text" id="blogname" name="blogname" size="40" value="'.htmlentities(get_option('blogname'), ENT_QUOTES, $blog_charset).'" onchange="podPress_updateFeedSettings();" /><br />'.__('Used for both Blog and Podcast.', 'podpress').' <em class="message error">'.sprintf(__('Changes here will affect %1$s!', 'podpress'),__('the blog title', 'podpress')).'</em>';
 			echo '				</td>'."\n";
 			echo '			</tr>'."\n";
 
@@ -119,7 +119,7 @@
 			echo '					<label for="blogdescription"><strong>'.__('Blog Description', 'podpress').'</strong></label>';
 			echo '					<br/>';
 			echo '					<textarea id="blogdescription" name="blogdescription" rows="4" cols="40" onchange="podPress_updateFeedSettings();">'.htmlentities(stripslashes(get_option('blogdescription')), ENT_QUOTES, $blog_charset).'</textarea>';
-			echo '					<br/>'.__('Standard feed description.', 'podpress')."\n";
+			echo '					<br/>'.__('Standard feed description.', 'podpress').' <em class="message error">'.sprintf(__('Changes here will affect %1$s!', 'podpress'),__('the blog description', 'podpress')).'</em>'."\n";
 			echo '				</td>'."\n";
 			echo '			</tr>'."\n";
 
@@ -127,7 +127,7 @@
 			echo '				<td width="50%">'."\n";
 			echo '					<label for="iTunesImage"><strong>'.__('iTunes:Image', 'podpress').'</strong></label>';
 			echo '					<br/>';
-			echo '					'.__('The iTunes image should be a square image with <a href="http://www.apple.com/itunes/podcasts/specs.html#image" target="_blank">at least 600 x 600 pixels</a> as Apple writes (2009) in "<a href="http://www.apple.com/itunes/podcasts/specs.html" target="_blank">Making a Podcast</a>" of their own Podcasting Resources. In the past 300 x 300 pixels were recommended. iTunes supports JPEG and PNG images (the file name extensions should ".jpg" or ".png").', 'podpress')."\n";
+			echo '					'.__('The iTunes image should be a square image with <a href="http://www.apple.com/itunes/podcasts/specs.html#image" target="_blank">at least 600 x 600 pixels</a> as Apple writes (01/2010) in "<a href="http://www.apple.com/itunes/podcasts/specs.html" target="_blank">Making a Podcast</a>" of their own Podcasting Resources. In the "<a href="http://www.apple.com/itunes/podcasts/creatorfaq.html" target="_blank">FAQs: For Podcast Makers</a>" 300 x 300 pixels are recommended by Apple. iTunes supports JPEG and PNG images (the file name extensions should ".jpg" or ".png").', 'podpress')."\n";
 			echo '					<br/>';
 			echo '					<input id="iTunesImage" type="text" name="iTunes[image]" value="'.$this->settings['iTunes']['image'].'" size="40" onchange="podPress_updateFeedSettings();"/>'."\n";
 			echo '					<br />';
@@ -152,7 +152,7 @@
 			echo '				<td width="50%">';
 			echo '					<label for="admin_email"><strong>'.__('Owner E-mail address', 'podpress').'</strong></label>';
 			echo '					<br/>';
-			echo '					<input name="admin_email" type="text" id="admin_email" value="'.htmlentities(stripslashes(get_option('admin_email')), ENT_QUOTES, $blog_charset).'" size="40" />';
+			echo '					<input name="admin_email" type="text" id="admin_email" value="'.htmlentities(stripslashes(get_option('admin_email')), ENT_QUOTES, $blog_charset).'" size="40" /><br /><em class="message error">'.sprintf(__('Changes here will affect %1$s!', 'podpress'),__('the email address of the blog admin', 'podpress')).'</em>';
 			echo '				</td>'."\n";
 			echo '			</tr>'."\n";
 
@@ -164,13 +164,13 @@
 			echo '					<br/>'.__('Used as default Podcast Episode Title', 'podpress').' (255 '.__('characters', 'podpress').')'."\n";
 			echo '				</td>'."\n";
 			echo '				<td width="50%">';
-			echo '					<label for="rss_language"><strong>'.__('Language', 'podpress').'</strong></label>';
+			echo '					<label for="rss_language"><strong>'.__('Language of the News Feed content', 'podpress').'</strong></label>';
 			echo '					<br/>';
 			echo '					<select id="rss_language" name="rss_language" onchange="podPress_updateFeedSettings();">'."\n";
 			echo '						<optgroup label="'.__('Select Language', 'podpress').'">'."\n";
 			podPress_itunesLanguageOptions(get_option('rss_language'));
 			echo '						</optgroup>'."\n";
-			echo '					</select>'."\n";
+			echo '					</select>'."\n".'<br /><em class="message error">'.sprintf(__('Changes here will affect %1$s!', 'podpress'),__('the language of the main feeds of this blog', 'podpress')).'</em> <em>'.__('(This select box is not the only but probably the most comfortable way to change this option. So change it back if you do not want to use this plugin anymore.)', 'podpress').'</em>';
 			echo '				</td>'."\n";
 			echo '			</tr>'."\n";
 
@@ -182,13 +182,13 @@
 			echo '					<br/>('.__('Comma seperated list', 'podpress').', '.__('max 8', 'podpress').')';
 			echo '				</td>'."\n";
 			echo '				<td width="50%">';
-			echo '					<label for="rss_showlinks"><strong>'.__('Show Download Links in RSS Encoded Content', 'podpress').'</strong></label>';
-			echo '					<br/>';
-			echo '					<select name="rss_showlinks" id="rss_showlinks">'."\n";
-			echo '						<option value="yes" '; if($this->settings['rss_showlinks'] == 'yes') { echo 'selected="selected"'; } echo '>'.__('Yes', 'podpress').'</option>'."\n";
-			echo '						<option value="no" '; if($this->settings['rss_showlinks'] != 'yes') { echo 'selected="selected"'; }  echo '>'.__('No', 'podpress').'</option>'."\n";
-			echo '					</select>'."\n";
-			echo '					<br/>'.__('Yes will put download links in the RSS encoded content. That means users can download from any site displaying the link.', 'podpress')."\n";
+			//~ echo '					<label for="rss_showlinks"><strong>'.__('Show Download Links in RSS Encoded Content', 'podpress').'</strong></label>';
+			//~ echo '					<br/>';
+			//~ echo '					<select name="rss_showlinks" id="rss_showlinks">'."\n";
+			//~ echo '						<option value="yes" '; if($this->settings['rss_showlinks'] == 'yes') { echo 'selected="selected"'; } echo '>'.__('Yes', 'podpress').'</option>'."\n";
+			//~ echo '						<option value="no" '; if($this->settings['rss_showlinks'] != 'yes') { echo 'selected="selected"'; }  echo '>'.__('No', 'podpress').'</option>'."\n";
+			//~ echo '					</select>'."\n";
+			//~ echo '					<br/>'.__('Yes will put download links in the RSS encoded content. That means users can download from any site displaying the link.', 'podpress')."\n";
 			echo '				</td>'."\n";
 			echo '			</tr>'."\n";
 
@@ -229,7 +229,11 @@
 			echo '						<option value="Yes" '; if($this->settings['iTunes']['explicit'] == 'Yes') { echo 'selected="selected"'; } echo '>'.__('Yes', 'podpress').'</option>'."\n";
 			echo '						<option value="Clean" '; if($this->settings['iTunes']['explicit'] == 'Clean') { echo 'selected="selected"'; } echo '>'.__('Clean', 'podpress').'</option>'."\n";
 			echo '					</select>'."\n";
-			echo '					<br/>'.__('Sets the parental advisory graphic in name column.', 'podpress')."\n";
+			echo '					<br/>'.__('Setting to indicate whether or not your podcast contains explicit material', 'podpress')."\n";
+			echo '					<br/>'.__('"No" (default) - no indicator will show up', 'podpress')."\n";
+			echo '					<br/>'.__('"Yes" - an "EXPLICIT" parental advisory graphic will appear next to your podcast artwork or name in iTunes', 'podpress')."\n";
+			echo '					<br/>'.__('"Clean" - means that you are sure that no explicit language or adult content is included any of the episodes, and a "CLEAN" graphic will appear', 'podpress')."\n";
+			echo '					<p>'.__('You can also use such an option for each of your podcast episodes (in the post/page editor).', 'podpress').'</p>'."\n";
 			echo '				</td>'."\n";
 			echo '				<td width="50%">'."\n";
 			echo '					<label for="rss_copyright"><strong>'.__('Feed Copyright / license name', 'podpress').'</strong></label>';
@@ -262,7 +266,7 @@
 			echo '				<td width="50%">';
 			echo '					<label for="posts_per_rss"><strong>'.__('Show the most recent', 'podpress').'</strong></label>';
 			echo '					<br/>';
-			echo '					<input type="text" id="posts_per_rss" name="posts_per_rss" size="3" value="'.htmlentities(get_option('posts_per_rss'), ENT_QUOTES, $blog_charset).'" /> '.__('posts', 'podpress');
+			echo '					<input type="text" id="posts_per_rss" name="posts_per_rss" size="3" value="'.htmlentities(get_option('posts_per_rss'), ENT_QUOTES, $blog_charset).'" /> '.__('posts', 'podpress').'<br />'.'<em class="message error">'.sprintf(__('Changes here will affect %1$s!', 'podpress'),sprintf(__('the same value as on the %1$s page', 'podpress'), __('Reading Settings'))).'</em>';
 			echo '				</td>'."\n";
 			echo '			</tr>'."\n";
 
@@ -275,11 +279,15 @@
 			echo '						<option value="Yes" '; if($this->settings['iTunes']['block'] == 'Yes') { echo 'selected="selected"'; } echo '>'.__('Yes', 'podpress').'</option>'."\n";
 			echo '					</select>'."\n";
 			echo '					<br/>'.__('Use this if you are no longer creating a podcast and you want it removed from iTunes.', 'podpress')."\n";
+			echo '					<br/>'.__('"No" (default) - the podcast appears in the iTunes Podcast directory', 'podpress')."\n";
+			echo '					<br/>'.__('"Yes" - prevent the entire podcast from appearing in the iTunes Podcast directory', 'podpress')."\n";
+			echo '					<p>'.__('You can also use such an option for each of your podcast episodes (in the post/page editor).', 'podpress').'</p>'."\n";
+			
 			echo '				</td>'."\n";
 			echo '				<td width="50%">';
 			echo '					<label for="blog_charset"><strong>'.__('Encoding for pages and feeds', 'podpress').'</strong></label>';
 			echo '					<br/>';
-			echo '					<input type="text" id="blog_charset" name="blog_charset" size="20" value="'.htmlentities($blog_charset, ENT_QUOTES, $blog_charset).'" /><br />'.__('The character encoding you write your blog in', 'podpress').' ('.__('UTF-8 is', 'podpress').' <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html" target="_new">'.__('recommended', 'podpress').'</a>)';
+			echo '					<input type="text" id="blog_charset" name="blog_charset" size="20" value="'.htmlentities($blog_charset, ENT_QUOTES, $blog_charset).'" /><br />'.__('The character encoding you write your blog in', 'podpress').' ('.__('UTF-8 is', 'podpress').' <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html" target="_new">'.__('recommended', 'podpress').'</a>)'.' <em class="message error">'.sprintf(__('Changes here will affect %1$s!', 'podpress'),sprintf(__('the same value as on the %1$s page', 'podpress'), __('Reading Settings'))).'</em>';
 			echo '				</td>'."\n";
 			echo '			</tr>'."\n";
 
@@ -324,7 +332,7 @@
 
 				if(is_array($_POST['iTunes']['category'])) {
 					foreach ($_POST['iTunes']['category'] as $value) {
-						if($value != '#') {
+						if('#' != $value AND '[ '.__('nothing', 'podpress').' ]' != $value) {
 							$iTunesSettings['category'][] = $value;
 						}
 					}