--- gnome-audio-profiles.schemas	2010-08-12 08:26:02.000000000 -0400
+++ gnome-audio-profiles.schemas.new	2010-09-28 20:40:37.007024683 -0400
@@ -7,7 +7,7 @@
       <owner>gnome-media</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[cdlossy,cdlossless,aac,mp2,mp3,voicelossy,voicelossless]</default>
+      <default>[cdlossy,cdlossless,aac,mp2,cdmp3,portmp3,voicemp3,voicelossy,voicelossless]</default>
       <gettext_domain>gnome-media-2.0</gettext_domain>
       <locale name="C">
         <short>List of profiles</short>
@@ -2562,10 +2562,10 @@
       </locale>
     </schema>
 
-    <!-- MP3 -->
+    <!-- MP3, CD Quality -->
     <schema>
-      <key>/schemas/system/gstreamer/0.10/audio/profiles/mp3/name</key>
-      <applyto>/system/gstreamer/0.10/audio/profiles/mp3/name</applyto>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/cdmp3/name</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/cdmp3/name</applyto>
       <owner>gnome-media</owner>
       <type>string</type>
       <gettext_domain>gnome-media-2.0</gettext_domain>
@@ -2781,8 +2781,8 @@
     </schema>
 
     <schema>
-      <key>/schemas/system/gstreamer/0.10/audio/profiles/mp3/description</key>
-      <applyto>/system/gstreamer/0.10/audio/profiles/mp3/description</applyto>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/cdmp3/description</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/cdmp3/description</applyto>
       <owner>gnome-media</owner>
       <type>string</type>
       <gettext_domain>gnome-media-2.0</gettext_domain>
@@ -2980,8 +2980,87 @@
     </schema>
 
     <schema>
-      <key>/schemas/system/gstreamer/0.10/audio/profiles/mp3/pipeline</key>
-      <applyto>/system/gstreamer/0.10/audio/profiles/mp3/pipeline</applyto>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/cdmp3/pipeline</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/cdmp3/pipeline</applyto>
+      <owner>gnome-media</owner>
+      <type>string</type>
+      <default>audio/x-raw-int,rate=44100,channels=2 ! lamemp3enc name=enc target=0 quality=2 ! xingmux ! id3v2mux</default>
+      <gettext_domain>gnome-media-2.0</gettext_domain>
+      <locale name="C">
+        <short>The partial GStreamer pipeline used</short>
+        <long>
+          A partial GStreamer pipeline to use for this profile.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/cdmp3/extension</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/cdmp3/extension</applyto>
+      <owner>gnome-media</owner>
+      <type>string</type>
+      <default>mp3</default>
+      <gettext_domain>gnome-media-2.0</gettext_domain>
+      <locale name="C">
+        <short>The default file extension for this profile</short>
+        <long>
+          A filename extension to be used when storing files encoded
+          with this profile.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/active</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/cdmp3/active</applyto>
+      <owner>gnome-media</owner>
+      <type>bool</type>
+      <default>true</default>
+      <gettext_domain>gnome-media-2.0</gettext_domain>
+      <locale name="C">
+        <short>Whether this profile is to be used</short>
+        <long>
+          Whether to use and display this profile.
+        </long>
+      </locale>
+    </schema>
+
+    <!-- MP3, Portable MP3 Player Quality -->
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/portmp3/name</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/portmp3/name</applyto>
+      <owner>gnome-media</owner>
+      <type>string</type>
+      <gettext_domain>gnome-media-2.0</gettext_domain>
+      <locale name="C">
+        <default>Portable MP3 Player Quality, MP3</default>
+        <short>A short name for the audio profile</short>
+        <long>
+          A short name for the audio profile, to be used in selections
+          and uniquely identifying the profile.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/portmp3/description</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/portmp3/description</applyto>
+      <owner>gnome-media</owner>
+      <type>string</type>
+      <gettext_domain>gnome-media-2.0</gettext_domain>
+      <locale name="C">
+        <default>Used for preparing files for copying to portable MP3 players using the lossy MP3 codec. This preset is a trade-off between file size and quality; the quality should be acceptable for slightly noisy listening environments and non-hi-fi listening equipment. Note that using this format may be illegal in your jurisdiction; contact your lawyer for advice.</default>
+        <short>A description for the audio profile</short>
+        <long>
+          A description of the profile, containing more information and
+          describing when to use this profile.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/portmp3/pipeline</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/portmp3/pipeline</applyto>
       <owner>gnome-media</owner>
       <type>string</type>
       <default>audio/x-raw-int,rate=44100,channels=2 ! lamemp3enc name=enc target=0 quality=6 ! xingmux ! id3v2mux</default>
@@ -2995,8 +3074,87 @@
     </schema>
 
     <schema>
-      <key>/schemas/system/gstreamer/0.10/audio/profiles/mp3/extension</key>
-      <applyto>/system/gstreamer/0.10/audio/profiles/mp3/extension</applyto>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/portmp3/extension</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/portmp3/extension</applyto>
+      <owner>gnome-media</owner>
+      <type>string</type>
+      <default>mp3</default>
+      <gettext_domain>gnome-media-2.0</gettext_domain>
+      <locale name="C">
+        <short>The default file extension for this profile</short>
+        <long>
+          A filename extension to be used when storing files encoded
+          with this profile.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/active</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/portmp3/active</applyto>
+      <owner>gnome-media</owner>
+      <type>bool</type>
+      <default>true</default>
+      <gettext_domain>gnome-media-2.0</gettext_domain>
+      <locale name="C">
+        <short>Whether this profile is to be used</short>
+        <long>
+          Whether to use and display this profile.
+        </long>
+      </locale>
+    </schema>
+
+    <!-- MP3, Voice Quality -->
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/voicemp3/name</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/voicemp3/name</applyto>
+      <owner>gnome-media</owner>
+      <type>string</type>
+      <gettext_domain>gnome-media-2.0</gettext_domain>
+      <locale name="C">
+        <default>Voice Quality, MP3</default>
+        <short>A short name for the audio profile</short>
+        <long>
+          A short name for the audio profile, to be used in selections
+          and uniquely identifying the profile.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/voicemp3/description</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/voicemp3/description</applyto>
+      <owner>gnome-media</owner>
+      <type>string</type>
+      <gettext_domain>gnome-media-2.0</gettext_domain>
+      <locale name="C">
+        <default>Used for preparing files for copying to devices that only support the MP3 codec, if file size / bit rate should be kept as low as possible and quality is not important. Note that using this format may be illegal in your jurisdiction; contact your lawyer for advice.</default>
+        <short>A description for the audio profile</short>
+        <long>
+          A description of the profile, containing more information and
+          describing when to use this profile.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/voicemp3/pipeline</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/voicemp3/pipeline</applyto>
+      <owner>gnome-media</owner>
+      <type>string</type>
+      <default>audio/x-raw-int,rate=44100,channels=2 ! lamemp3enc name=enc target=1 bitrate=56 mono=true ! xingmux ! id3v2mux</default>
+      <gettext_domain>gnome-media-2.0</gettext_domain>
+      <locale name="C">
+        <short>The partial GStreamer pipeline used</short>
+        <long>
+          A partial GStreamer pipeline to use for this profile.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/system/gstreamer/0.10/audio/profiles/voicemp3/extension</key>
+      <applyto>/system/gstreamer/0.10/audio/profiles/voicemp3/extension</applyto>
       <owner>gnome-media</owner>
       <type>string</type>
       <default>mp3</default>
@@ -3012,7 +3170,7 @@
 
     <schema>
       <key>/schemas/system/gstreamer/0.10/audio/profiles/active</key>
-      <applyto>/system/gstreamer/0.10/audio/profiles/mp3/active</applyto>
+      <applyto>/system/gstreamer/0.10/audio/profiles/voicemp3/active</applyto>
       <owner>gnome-media</owner>
       <type>bool</type>
       <default>true</default>