[sound-juicer] Updated Serbian translation

[ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <mirosnik src gnome org>]

commit 2cea6d1b686e9af8292da3afcd61c06d16de8975
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Fri Sep 7 22:48:01 2012 +0200

    Updated Serbian translation

 po/sr.po       |  849 ++++++++++++++++++++++++++++++++------------------------
 po/sr latin po |  849 ++++++++++++++++++++++++++++++++------------------------
 2 files changed, 986 insertions(+), 712 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 02eeca9..c3d1459 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: sound-juicer\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=sound-";
 "juicer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-10-31 14:36+0000\n"
-"PO-Revision-Date: 2012-03-01 10:15+0200\n"
+"POT-Creation-Date: 2012-09-06 18:41+0000\n"
+"PO-Revision-Date: 2012-09-07 22:43+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -22,91 +22,216 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/sound-juicer.desktop.in.in.h:1
+# ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐ = ÐÐÑÐÐÐÐÐÐ
+#: ../data/sound-juicer.desktop.in.in.h:1 ../data/sound-juicer.ui.h:1
+#: ../src/sj-main.c:143 ../src/sj-main.c:145 ../src/sj-main.c:2194
+msgid "Sound Juicer"
+msgstr "ÐÐÑÐÐÐÐÐÐ"
+
+#: ../data/sound-juicer.desktop.in.in.h:2
 msgid "Audio CD Extractor"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐ"
 
-#: ../data/sound-juicer.desktop.in.in.h:2
+#: ../data/sound-juicer.desktop.in.in.h:3
+msgid "Sound Juicer Audio CD Extractor"
+msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐÑ ÐÐÑÐÐÐÐ"
+
+#: ../data/sound-juicer.desktop.in.in.h:4
 msgid "Copy music from your CDs"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÑ ÑÐ ÐÐÑÐÑ ÐÐ-Ð"
 
-# ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐ = ÐÐÑÐÐÐÐÐÐ
-#: ../data/sound-juicer.desktop.in.in.h:3 ../data/sound-juicer.ui.h:17
-#: ../src/sj-main.c:142 ../src/sj-main.c:144 ../src/sj-main.c:1646
-msgid "Sound Juicer"
-msgstr "ÐÐÑÐÐÐÐÐÐ"
+#: ../data/sound-juicer.schemas.in.h:1
+msgid "Whether to eject the CD when finished extracting."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÐÑÑÐ ÐÐÐÐÐÑÐÑÐ?"
 
-#: ../data/sound-juicer.desktop.in.in.h:4
-#| msgid "Sound Juicer CD Extractor"
-msgid "Sound Juicer Audio CD Extractor"
-msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐÑ ÐÐÑÐÐÐÐ"
+#: ../data/sound-juicer.schemas.in.h:2
+msgid "Whether to open the target directory when finished extracting."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐÐÐÑÐÑÐ."
 
-#: ../data/sound-juicer.ui.h:1
-msgid "CD _drive:"
-msgstr "ÐÐ _ÑÑÐÑÐÑ:"
+#: ../data/sound-juicer.schemas.in.h:3
+msgid "The directory structure for the files"
+msgstr "ÐÑÑÑÐÑÑÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../data/sound-juicer.schemas.in.h:5
+#, no-c-format
+#| msgid ""
+#| "Do not specify an extension. %at -- album title %aT -- album title "
+#| "(lowercase) %aa -- album artist %aA -- album artist (lowercase) %as -- "
+#| "album artist (sortable) %aS -- album artist (sortable lowercase) %tn -- "
+#| "track number (i.e 8) %tN -- track number, zero padded (i.e 08) %tt -- "
+#| "track title %tT -- track title (lowercase) %ta -- track artist %tA -- "
+#| "track artist (lowercase) %ts -- track artist (sortable) %tS -- track "
+#| "artist (sortable lowercase) %dn -- disc and track number (i.e Disk 2 - 6, "
+#| "or 6) %dN -- disc number, zero padded (i.e d02t06, or 06)"
+msgid ""
+"%at -- album title %aT -- album title (lowercase) %aa -- album artist %aA -- "
+"album artist (lowercase) %as -- album artist (sortable) %aS -- album artist "
+"(sortable lowercase) %ac -- album composer %aC -- album composer (lowercase) "
+"%ap -- album composer (sortable) %aP -- album composer (sortable lowercase) "
+"%ay -- album year %tt -- track title %tT -- track title (lowercase) %ta -- "
+"track artist %tA -- track artist (lowercase) %ts -- track artist (sortable) "
+"%tS -- track artist (sortable lowercase) %tc -- track composer %tC -- track "
+"composer (lowercase) %tp -- track composer (sortable) %tP -- track composer "
+"(sortable lowercase)"
+msgstr ""
+"%at â ÐÐÑÐÐÐ ÐÐÐÑÐÐ %aT â ÐÐÑÐÐÐ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %aa â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ "
+"%aA â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %as â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐ ÑÐÑÐÑÐ) %aS â "
+"ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÑÐÑÐÑÐ) %ac â ÐÐÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐ %aC â "
+"ÐÐÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ap â ÐÐÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐ ÑÐÑÐÑÐ) %aP â "
+"ÐÐÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÑÐÑÐÑÐ) %ay â ÐÐÐÐÐÐ ÐÐÐÑÐÐ %tt â ÐÐÑÐÐÐ "
+"ÐÑÐÐÑÐ %tT â ÐÐÑÐÐÐ ÐÑÐÐÑÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ta â ÐÐÐÐÑÐÑ ÐÑÐÐÑÐ %tA â "
+"ÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ts â ÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐ ÑÐÑÐÑÐ) %tS â "
+"ÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÑÐÑÐÑÐ) %tc â ÐÐÐÐÐÐÐÑÐÑ ÐÑÐÐÑÐ %tC â "
+"ÐÐÐÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %tp â ÐÐÐÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐ ÑÐÑÐÑÐ) %tP â "
+"ÐÐÐÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÑÐÑÐÑÐ)"
+
+#: ../data/sound-juicer.schemas.in.h:6
+msgid "The name pattern for files"
+msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../data/sound-juicer.schemas.in.h:8
+#, no-c-format
+#| msgid ""
+#| "Do not specify an extension. %at -- album title %aT -- album title "
+#| "(lowercase) %aa -- album artist %aA -- album artist (lowercase) %as -- "
+#| "album artist (sortable) %aS -- album artist (sortable lowercase) %tn -- "
+#| "track number (i.e 8) %tN -- track number, zero padded (i.e 08) %tt -- "
+#| "track title %tT -- track title (lowercase) %ta -- track artist %tA -- "
+#| "track artist (lowercase) %ts -- track artist (sortable) %tS -- track "
+#| "artist (sortable lowercase) %dn -- disc and track number (i.e Disk 2 - 6, "
+#| "or 6) %dN -- disc number, zero padded (i.e d02t06, or 06)"
+msgid ""
+"Do not specify an extension. %at -- album title %aT -- album title "
+"(lowercase) %aa -- album artist %aA -- album artist (lowercase) %as -- album "
+"artist (sortable) %aS -- album artist (sortable lowercase) %ac -- album "
+"composer %aC -- album composer (lowercase) %ap -- album composer (sortable) "
+"%aP -- album composer (sortable lowercase) %tn -- track number (i.e 8) %tN "
+"-- track number, zero padded (i.e 08) %tt -- track title %tT -- track title "
+"(lowercase) %ta -- track artist %tA -- track artist (lowercase) %ts -- track "
+"artist (sortable) %tS -- track artist (sortable lowercase) %tc -- track "
+"composer %tC -- track composer (lowercase) %tp -- track composer (sortable) "
+"%tP -- track composer (sortable lowercase) %dn -- disc and track number, "
+"track zero padded (i.e Disk 2 - 06, or 06) %dN -- condensed disc and track "
+"number, zero padded (i.e d02t06, or 06)"
+msgstr ""
+"ÐÐ ÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ. %at â ÐÐÑÐÐÐ ÐÐÐÑÐÐ %aT â ÐÐÑÐÐÐ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) "
+"%aa â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ %aA â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %as â ÐÐÐÐÑÐÑ "
+"ÐÐÐÑÐÐ (ÐÐ ÑÐÑÐÑÐ) %aS â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÑÐÑÐÑÐ) %ac â "
+"ÐÐÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐ %aC â ÐÐÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ap â ÐÐÐÐÐÐÐÑÐÑ "
+"ÐÐÐÑÐÐ (ÐÐ ÑÐÑÐÑÐ) %aP â ÐÐÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÑÐÑÐÑÐ) %tn â "
+"ÐÑÐÑ ÐÑÐÐÑÐ (ÐÐÑ. 8) %tN â ÐÑÐÑ ÐÑÐÐÑÐ, ÑÐ ÐÑÐÐÐ ÐÑÐÑÐÐ (ÐÐÑ. 08) %tt â "
+"ÐÐÑÐÐÐ ÐÑÐÐÑÐ %tT â ÐÐÑÐÐÐ ÐÑÐÐÑÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ta â ÐÐÐÐÑÐÑ ÐÑÐÐÑÐ %tA â "
+"ÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ts â ÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐ ÑÐÑÐÑÐ) %tS â "
+"ÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÑÐÑÐÑÐ) %tc â ÐÐÐÐÐÐÐÑÐÑ ÐÑÐÐÑÐ %tC â "
+"ÐÐÐÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %tp â ÐÐÐÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐ ÑÐÑÐÑÐ) %tP â "
+"ÐÐÐÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÑÐÑÐÑÐ) %dn â ÐÑÐÑ ÐÐÑÐÐ Ð ÐÑÐÐÑÐ, "
+"ÐÑÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÑÐÐÐ (ÐÐÑ. ÐÐÑÐ 2 â 06, ÐÐÐ 06) %dN â ÐÐÐÑÐÐÐ ÐÑÐÑ ÐÐÑÐÐ Ð "
+"ÐÑÐÐÑÐ, ÐÐÐÑÑÐÐÐ ÐÑÐÐÐ (ÐÐÑ Ð02Ñ06, ÐÐÐ 06)"
+
+#: ../data/sound-juicer.schemas.in.h:9
+msgid "The paranoia mode to use"
+msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐÑ"
+
+#: ../data/sound-juicer.schemas.in.h:10
+msgid ""
+"Paranoia mode: 0) disable 2) fragment 4) overlap 8) scratch 16) repair 255) "
+"full"
+msgstr ""
+"ÐÐÐÐÐ ÐÐÑÐÐÐÑÐ: 0) ÐÑÐÑÑÑÐÐ 2) ÐÐÐÐÐÐ 4) ÐÑÐÑÐÐÐÐÑÐ 8) ÐÐÐÑÐÐÐÐÐ 16) ÐÐÐÑÐÐÐ "
+"255) ÐÑÐÐ"
+
+#: ../data/sound-juicer.schemas.in.h:11
+msgid "If to strip special characters from filenames"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÐÐÐÑ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../data/sound-juicer.schemas.in.h:12
+msgid ""
+"If enabled, special characters such as space, wildcards and backslashes will "
+"be removed from the output filename."
+msgstr ""
+"ÐÐÐ ÑÐ ÑÐÑÑÑÐÐÐ, ÐÐÑÐÐÐÐ ÐÐÐÑÐ ÐÐÐ ÑÑÐ ÑÑ ÑÐÐÐÐÐ, ÑÐÐÐÑ ÐÐÐÑÐ Ð ÐÐÑÐÑÑÐ ÐÐÑÐ "
+"ÑÑÑÐ ÐÐÑÐ ÑÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ."
+
+# andrija:  ÑÐÐÐÐÐÑÐÐ ÑÐ â... ÐÐ ÑÐÐÑÑÐÐÑâ Ð ÐÐ ÐÐÐÑÐÐÐÑÐ
+#: ../data/sound-juicer.schemas.in.h:13
+msgid "The MusicBrainz server to use"
+msgstr "ÐÐÑÐÐÑ ÐÐÐÐÐÑÐ ÐÑÐÐÐÐ"
+
+#: ../data/sound-juicer.schemas.in.h:14
+msgid "If specified, this value will override the default MusicBrainz server."
+msgstr ""
+"ÐÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐÐ, ÐÐÐ ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÐÑÑÐ ÑÐÐÑÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐ "
+"ÐÐÐÐÐÑÐ ÐÑÐÐÐÐ."
+
+#: ../data/sound-juicer.schemas.in.h:15
+msgid "(obsolete) Audio Profile with which to encode"
+msgstr "(ÐÑÐÐÐÐÐÑÐÐÐ) ÐÐÑÑÐÐ ÐÑÐÑÐÐ ÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ"
+
+#: ../data/sound-juicer.schemas.in.h:16
+msgid ""
+"This key used to store the GNOME Audio Profile with which to encode. This "
+"has been superseded by GStreamer encoding profiles, which are configured "
+"using the audio_profile_media_type key."
+msgstr ""
+"ÐÐÐÑ ÐÑÑÑ ÑÐ ÐÐÑÐÑÑÐ ÐÐ ÑÑÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐ ÑÐ ÑÐ "
+"ÐÑÑÐÑÐ ÐÐÐÐÑÐÑÐ. ÐÐÐ ÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÑÐ ÐÑÑÑÐÐÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐ, ÐÐÑÐ "
+"ÑÑ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÑÐÑÐÐ ÐÑÑÑÐ "
+"âaudio_profile_media_typeâ (ÐÑÑÑÐ_ÐÐÐÐÑÐ_ÐÐÑÑÐÐÐ_ÐÑÐÑÐÐÐ)."
+
+#: ../data/sound-juicer.schemas.in.h:17
+msgid "Media type to encode to"
+msgstr "ÐÑÑÑÐ ÐÐÐÐÑÐ Ñ ÐÐÑÐ ÐÑÑÐÑÐ ÐÐÐÐÑÐÑÐ"
+
+#: ../data/sound-juicer.schemas.in.h:18
+msgid "The GStreamer media type to encode to."
+msgstr "ÐÑÑÑÐ ÐÐÐÐÑÐ ÐÑÑÑÐÐÐÑÐ Ñ ÐÐÑÐ ÐÑÑÐÑÐ ÐÐÐÐÑÐÑÐ."
+
+#: ../data/sound-juicer.schemas.in.h:19
+msgid "Audio volume"
+msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐ"
 
 #: ../data/sound-juicer.ui.h:2
-msgid "Device"
-msgstr "ÐÑÐÑÐÑ"
+msgid "_Year:"
+msgstr "_ÐÐÐÐÐÐ:"
 
 #: ../data/sound-juicer.ui.h:3
 msgid "Disc:"
 msgstr "ÐÐÑÐ:"
 
 #: ../data/sound-juicer.ui.h:4
-msgid "Duration:"
-msgstr "ÐÑÐÑÐÑÐ:"
+msgid "_Title:"
+msgstr "_ÐÐÑÐÐÐ:"
 
 #: ../data/sound-juicer.ui.h:5
-msgid "E_ject"
-msgstr "ÐÐ_ÐÐÑÐ"
+msgid "_Artist:"
+msgstr "_ÐÐÐÐÑÐÑ:"
 
 #: ../data/sound-juicer.ui.h:6
-msgid "File _name:"
-msgstr "_ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ:"
+msgid "_Composer:"
+msgstr "_ÐÐÐÐÐÐÐÑÐÑ:"
 
 #: ../data/sound-juicer.ui.h:7
-msgid "Folder hie_rarchy:"
-msgstr "_ÐÐÑÐÑÐÑÑÐÑÐ ÐÐÑÑÐ:"
+msgid "_Genre:"
+msgstr "_ÐÐÐÑ:"
 
-# andrija: ÐÐ ÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐ ÐÐÐ âÐÐÑÐÐÑâ ?
 #: ../data/sound-juicer.ui.h:8
-msgid "Format"
-msgstr "ÐÐÑÐÐÑ"
+msgid "Duration:"
+msgstr "ÐÑÐÑÐÑÐ:"
 
+# andrija: ÐÐÐÐ ÑÐ Ñ ÐÐÑÐÑÑ *ÐÑÐÑ ÐÐÑÐÐ*
 #: ../data/sound-juicer.ui.h:9
-msgid "Multiple Albums Found"
-msgstr "ÐÐÑÐ ÐÐÐÑÐÐ ÐÑÐÐÐÑÐÐÐ"
+msgid "Tracks"
+msgstr "ÐÑÐÐÑÐ"
 
 #: ../data/sound-juicer.ui.h:10
-msgid "Music Folder"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐ"
+msgid "Track Progress"
+msgstr "ÐÐÐ ÐÐÑÐÐ"
 
 #: ../data/sound-juicer.ui.h:11
-msgid "O_utput Format:"
-msgstr "Ð_ÐÐÐÐÐÐ ÑÐÑÐÐÑ:"
+msgid "Multiple Albums Found"
+msgstr "ÐÐÑÐ ÐÐÐÑÐÐ ÐÑÐÐÐÑÐÐÐ"
 
 #: ../data/sound-juicer.ui.h:12
-msgid "Pre_vious Track"
-msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÑÐÐ"
-
-#: ../data/sound-juicer.ui.h:13
-msgid "Preferences"
-msgstr "ÐÐÑÑÐÐÐÐ"
-
-#: ../data/sound-juicer.ui.h:14
-msgid "Select A Folder"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐ"
-
-#: ../data/sound-juicer.ui.h:15
-msgid "Skip to the next track"
-msgstr "ÐÑÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÑ"
-
-#: ../data/sound-juicer.ui.h:16
-msgid "Skip to the previous track"
-msgstr "ÐÑÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÑÐÑ"
-
-#: ../data/sound-juicer.ui.h:18
 msgid ""
 "This CD could be more than one album. Please select which album it is below "
 "and press <i>Continue</i>."
@@ -114,222 +239,112 @@ msgstr ""
 "ÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐÐÑÐÐ. ÐÑÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÐ ÑÐ ÐÐÐÑÐ Ð "
 "ÐÑÐÑÐÑÐÐÑÐ <i>ÐÐÑÑÐÐÐ</i>."
 
-#: ../data/sound-juicer.ui.h:19
-msgid "Track Names"
-msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐ"
-
-#: ../data/sound-juicer.ui.h:20
-msgid "Track Progress"
-msgstr "ÐÐÐ ÐÐÑÐÐ"
-
-# andrija: ÐÐÐÐ ÑÐ Ñ ÐÐÑÐÑÑ *ÐÑÐÑ ÐÐÑÐÐ*
-#: ../data/sound-juicer.ui.h:21
-msgid "Tracks"
-msgstr "ÐÑÐÐÑÐ"
-
-#: ../data/sound-juicer.ui.h:22
-msgid "_Artist:"
-msgstr "_ÐÐÐÐÑÐÑ:"
-
-#: ../data/sound-juicer.ui.h:23
-msgid "_Contents"
-msgstr "_ÐÐÐÑÐÐÑ"
-
-#: ../data/sound-juicer.ui.h:24 ../src/sj-main.c:234
+#: ../data/sound-juicer.ui.h:13 ../src/sj-main.c:227
 msgid "_Continue"
 msgstr "_ÐÐÑÑÐÐÐ"
 
-#: ../data/sound-juicer.ui.h:25
-msgid "_Deselect All"
-msgstr "_ÐÐÐÐÐÑÐ ÑÐÐ"
-
-#: ../data/sound-juicer.ui.h:26
-msgid "_Disc"
-msgstr "_ÐÐÑÐ"
+#: ../data/sound-juicer.ui.h:14 ../data/sound-juicer-menu.ui.h:6
+msgid "Preferences"
+msgstr "ÐÐÑÑÐÐÐÐ"
 
-#: ../data/sound-juicer.ui.h:27
-msgid "_Duplicate Disc"
-msgstr "_ÐÐÐÐÐÐ ÐÐÑÐ"
+#: ../data/sound-juicer.ui.h:15
+msgid "Device"
+msgstr "ÐÑÐÑÐÑ"
 
-#: ../data/sound-juicer.ui.h:28
-msgid "_Edit"
-msgstr "_ÐÑÐÑÐÐÐÑÐ"
+#: ../data/sound-juicer.ui.h:16
+msgid "CD _drive:"
+msgstr "ÐÐ _ÑÑÐÑÐÑ:"
 
-#: ../data/sound-juicer.ui.h:29
+#: ../data/sound-juicer.ui.h:17
 msgid "_Eject after extracting tracks"
 msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ ÐÑÐÐÑÐ"
 
-#: ../data/sound-juicer.ui.h:30
-msgid "_Folder:"
-msgstr "_ÐÐÑÑÐÐÐÐ:"
-
-#: ../data/sound-juicer.ui.h:31
-msgid "_Genre:"
-msgstr "_ÐÐÐÑ:"
-
-#: ../data/sound-juicer.ui.h:32
-msgid "_Help"
-msgstr "_ÐÐÐÐÑ"
-
-#: ../data/sound-juicer.ui.h:33
-msgid "_Next Track"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÑÐÐ"
-
-#: ../data/sound-juicer.ui.h:34
+#: ../data/sound-juicer.ui.h:18
 msgid "_Open music folder when finished"
 msgstr "_ÐÑÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÐÐÐ ÐÐÐÐ ÐÐÐÑÑÐÑ"
 
-# andrija: ÐÐÑÐÐ ÑÐÐÑÑÐÐ ÐÐÐ ÐÐ ÑÑÐÐÐÐ ÐÑÐÑÐÑÑ, ÐÐ ÑÐ ÐÐÑÐÐ ÐÐ ÑÑÐÐÐÐ
-#: ../data/sound-juicer.ui.h:35
-msgid "_Play / Pause"
-msgstr "Ð_ÑÑÑÐ / ÐÐÑÐÐÑÐÑ"
-
-#: ../data/sound-juicer.ui.h:36
-msgid "_Re-read Disc"
-msgstr "_ÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑ"
-
-#: ../data/sound-juicer.ui.h:37
-msgid "_Select All"
-msgstr "_ÐÐÐÐÐÑÐ ÑÐÐ"
-
-#: ../data/sound-juicer.ui.h:38
-msgid "_Strip special characters"
-msgstr "ÐÑÑÐÐÐ ÑÐÐÐ ÑÐÐÐÐ Ð Ð_ÑÐÑÐÐÐ"
-
-#: ../data/sound-juicer.ui.h:39
-msgid "_Submit Track Names..."
-msgstr "ÐÑÐ_ÐÐÑ ÐÐÐÐÐÐ ÐÐÑÐÐÐ..."
-
-#: ../data/sound-juicer.ui.h:40
-msgid "_Title:"
-msgstr "_ÐÐÑÐÐÐ:"
-
-#: ../data/sound-juicer.ui.h:41
-msgid "_Year:"
-msgstr "_ÐÐÐÐÐÐ:"
+#: ../data/sound-juicer.ui.h:19
+msgid "Music Folder"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐ"
 
-#: ../data/sound-juicer.schemas.in.h:2
-#, no-c-format
-msgid ""
-"%at -- album title %aT -- album title (lowercase) %aa -- album artist %aA -- "
-"album artist (lowercase) %as -- album artist (sortable) %aS -- album artist "
-"(sortable lowercase) %ay -- album year %tt -- track title %tT -- track title "
-"(lowercase) %ta -- track artist %tA -- track artist (lowercase) %ts -- track "
-"artist (sortable) %tS -- track artist (sortable lowercase)"
-msgstr ""
-"%at â ÐÐÑÐÐÐ ÐÐÐÑÐÐ %aT â ÐÐÑÐÐÐ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %aa â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ "
-"%aA â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %as â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐ ÑÐÑÐÑÐ) %aS â "
-"ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ, ÐÐ ÑÐÑÐÑÐ) %ay â ÐÐÐÐÐÐ %tt â ÐÐÑÐÐÐ ÐÐÑÐÐ %"
-"tT â ÐÐÑÐÐÐ ÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ta â ÐÐÐÐÑÐÑ ÐÐÑÐÐ %tA â ÐÐÐÐÑÐÑ ÐÐÑÐÐ "
-"(ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ts â ÐÐÐÐÑÐÑ ÐÐÑÐÐ (ÐÐ ÑÐÑÐÑÐ) %tS â ÐÐÐÐÑÐÑ ÐÐÑÐÐ (ÐÐÐÐÐ "
-"ÑÐÐÐÐÐÐ, ÐÐ ÑÐÑÐÑÐ)"
+#: ../data/sound-juicer.ui.h:20
+msgid "_Folder:"
+msgstr "_ÐÐÑÑÐÐÐÐ:"
 
-#: ../data/sound-juicer.schemas.in.h:3
-#| msgid "Audio Profile with which to encode"
-msgid "(obsolete) Audio Profile with which to encode"
-msgstr "(ÐÑÐÐÐÐÐÑÐÐÐ) ÐÐÑÑÐÐ ÐÑÐÑÐÐ ÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ"
+#: ../data/sound-juicer.ui.h:21
+msgid "Select A Folder"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐ"
 
-#: ../data/sound-juicer.schemas.in.h:4
-msgid "Audio volume"
-msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐ"
+#: ../data/sound-juicer.ui.h:22
+msgid "Track Names"
+msgstr "ÐÐÐÐÐÐ ÐÐÑÐÐÐ"
 
-#: ../data/sound-juicer.schemas.in.h:6
-#, no-c-format
-msgid ""
-"Do not specify an extension. %at -- album title %aT -- album title "
-"(lowercase) %aa -- album artist %aA -- album artist (lowercase) %as -- album "
-"artist (sortable) %aS -- album artist (sortable lowercase) %tn -- track "
-"number (i.e 8) %tN -- track number, zero padded (i.e 08) %tt -- track title %"
-"tT -- track title (lowercase) %ta -- track artist %tA -- track artist "
-"(lowercase) %ts -- track artist (sortable) %tS -- track artist (sortable "
-"lowercase) %dn -- disc and track number (i.e Disk 2 - 6, or 6) %dN -- disc "
-"number, zero padded (i.e d02t06, or 06)"
-msgstr ""
-"ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐÑÑ. %at â ÐÐÑÐÐÐ ÐÐÐÑÐÐ %aT â ÐÐÑÐÐÐ ÐÐÐÑÐÐ (ÐÐÐÐÐ "
-"ÑÐÐÐÐÐÐ) %aa â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ %aA â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %as â "
-"ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐ ÑÐÑÐÑÐ) %aS â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ, ÐÐ ÑÐÑÐÑÐ) %"
-"tn â ÐÑÐÑ ÐÐÑÐÐ (ÐÐÑ. 8) %tN â ÐÑÐÑ ÐÐÑÐÐ, ÐÐÐÑÑÐÐ ÐÑÐÐÐÐ (ÐÐÑ. 08) %tt â "
-"ÐÐÑÐÐÐ ÐÐÑÐÐ %tT â ÐÐÑÐÐÐ ÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ta â ÐÐÐÐÑÐÑ ÐÐÑÐÐ %tA â "
-"ÐÐÐÐÑÐÑ ÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ts â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐ ÑÐÑÐÑÐ) %tS â ÐÐÐÐÑÐÑ "
-"ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ, ÐÐ ÑÐÑÐÑÐ) %dn â ÐÑÐÑ ÐÐÑÐÐ Ñ ÐÑÐÐÑÐ (ÐÐÑ. ÐÐÑÐ 2 - "
-"6, ÐÐÐ 6) %dN â ÐÑÐÑ ÐÐÑÐÐ, ÐÐÐÑÑÐÐ ÐÑÐÐÐÐ (ÐÐÑ. Ð02Ñ06, ÐÐÐ 06)"
-
-#: ../data/sound-juicer.schemas.in.h:7
-msgid ""
-"If enabled, special characters such as space, wildcards and backslashes will "
-"be removed from the output filename."
-msgstr ""
-"ÐÐÐ ÑÐ ÑÐÑÑÑÐÐÐ, ÐÐÑÐÐÐÐ ÐÐÐÑÐ ÐÐÐ ÑÑÐ ÑÑ ÑÐÐÐÐÐ, ÑÐÐÐÑ ÐÐÐÑÐ Ð ÐÐÑÐÑÑÐ ÐÐÑÐ "
-"ÑÑÑÐ ÐÐÑÐ ÑÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ."
+#: ../data/sound-juicer.ui.h:23
+msgid "Folder hie_rarchy:"
+msgstr "_ÐÐÑÐÑÐÑÑÐÑÐ ÐÐÑÑÐ:"
 
-#: ../data/sound-juicer.schemas.in.h:8
-msgid "If specified, this value will override the default MusicBrainz server."
-msgstr ""
-"ÐÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐÐ, ÐÐÐ ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÐÑÑÐ ÑÐÐÑÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÑÐÑÐÐÑÐ "
-"ÐÐÐÐÐÑÐ ÐÑÐÐÐÐ."
+#: ../data/sound-juicer.ui.h:24
+msgid "File _name:"
+msgstr "_ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ:"
 
-#: ../data/sound-juicer.schemas.in.h:9
-msgid "If to strip special characters from filenames"
-msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÐÐÐÑ ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+#: ../data/sound-juicer.ui.h:25
+msgid "_Strip special characters"
+msgstr "ÐÑÑÐÐÐ ÑÐÐÐ ÑÐÐÐÐ Ð Ð_ÑÐÑÐÐÐ"
 
-#: ../data/sound-juicer.schemas.in.h:10
-msgid "Media type to encode to"
-msgstr "ÐÑÑÑÐ ÐÐÐÐÑÐ Ñ ÐÐÑÐ ÐÑÑÐÑÐ ÐÐÐÐÑÐÑÐ"
+# andrija: ÐÐ ÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐ ÐÐÐ âÐÐÑÐÐÑâ ?
+#: ../data/sound-juicer.ui.h:26
+msgid "Format"
+msgstr "ÐÐÑÐÐÑ"
 
-#: ../data/sound-juicer.schemas.in.h:11
-msgid ""
-"Paranoia mode: 0) disable 2) fragment 4) overlap 8) scratch 16) repair 255) "
-"full"
-msgstr ""
-"ÐÐÐÐÐ ÐÐÑÐÐÐÑÐ: 0) ÐÑÐÑÑÑÐÐ 2) ÐÐÐÐÐÐ 4) ÐÑÐÑÐÐÐÐÑÐ 8) ÐÐÐÑÐÐÐÐÐ 16) ÐÐÐÑÐÐÐ "
-"255) ÐÑÐÐ"
+#: ../data/sound-juicer.ui.h:27
+msgid "O_utput Format:"
+msgstr "Ð_ÐÐÐÐÐÐ ÑÐÑÐÐÑ:"
 
-#: ../data/sound-juicer.schemas.in.h:12
-msgid "The GStreamer media type to encode to."
-msgstr "ÐÑÑÑÐ ÐÐÐÐÑÐ ÐÑÑÑÐÐÐÑÐ Ñ ÐÐÑÐ ÐÑÑÐÑÐ ÐÐÐÐÑÐÑÐ."
+#: ../data/sound-juicer-menu.ui.h:1
+#| msgid "Disc:"
+msgid "Disc"
+msgstr "ÐÐÑÐ"
 
-# andrija:  ÑÐÐÐÐÐÑÐÐ ÑÐ â... ÐÐ ÑÐÐÑÑÐÐÑâ Ð ÐÐ ÐÐÐÑÐÐÐÑÐ
-#: ../data/sound-juicer.schemas.in.h:13
-msgid "The MusicBrainz server to use"
-msgstr "ÐÐÑÐÐÑ ÐÐÐÐÐÑÐ ÐÑÐÐÐÐ"
+#: ../data/sound-juicer-menu.ui.h:2
+#| msgid "_Re-read Disc"
+msgid "Re-read"
+msgstr "ÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑ"
 
-#: ../data/sound-juicer.schemas.in.h:14
-msgid "The directory structure for the files"
-msgstr "ÐÑÑÑÐÑÑÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐ"
+#: ../data/sound-juicer-menu.ui.h:3
+#| msgid "_Duplicate Disc"
+msgid "Duplicate"
+msgstr "ÐÐÐÐÐÐ ÐÐÑÐ"
 
-#: ../data/sound-juicer.schemas.in.h:15
-msgid "The name pattern for files"
-msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ"
+#: ../data/sound-juicer-menu.ui.h:4
+#| msgid "_Eject"
+msgid "Eject"
+msgstr "ÐÐÐÐÑÐ"
 
-#: ../data/sound-juicer.schemas.in.h:16
-msgid "The paranoia mode to use"
-msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐÑ"
+#: ../data/sound-juicer-menu.ui.h:5
+#| msgid "_Submit Track Names..."
+msgid "Submit Track Names"
+msgstr "ÐÑÐÐÐÑ ÐÐÐÐÐÐ ÐÐÑÐÐÐ"
 
-#: ../data/sound-juicer.schemas.in.h:17
-msgid ""
-"This key used to store the GNOME Audio Profile with which to encode. This "
-"has been superseded by GStreamer encoding profiles, which are configured "
-"using the audio_profile_media_type key."
-msgstr ""
-"ÐÐÐÑ ÐÑÑÑ ÑÐ ÐÐÑÐÑÑÐ ÐÐ ÑÑÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐ ÑÐ ÐÐÑÐÐ ÑÐ ÑÐ "
-"ÐÑÑÐÑÐ ÐÐÐÐÑÐÑÐ. ÐÐÐ ÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÑÐ ÐÑÑÑÐÐÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐ, ÐÐÑÐ "
-"ÑÑ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÑÐÑÐÐ ÐÑÑÑÐ âaudio_profile_media_typeâ "
-"(ÐÑÑÑÐ_ÐÐÐÐÑÐ_ÐÐÑÑÐÐÐ_ÐÑÐÑÐÐÐ)."
+# ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐ = ÐÐÑÐÐÐÐÐÐ
+#: ../data/sound-juicer-menu.ui.h:7
+#| msgid "Sound Juicer"
+msgid "About Sound Juicer"
+msgstr "Ð ÐÐÑÐÐÐÐÐÐÑ"
 
-#: ../data/sound-juicer.schemas.in.h:18
-msgid "Whether to eject the CD when finished extracting."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÐÑÑÐ ÐÐÐÐÐÑÐÑÐ?"
+#: ../data/sound-juicer-menu.ui.h:8
+#| msgid "_Help"
+msgid "Help"
+msgstr "ÐÐÐÐÑ"
 
-#: ../data/sound-juicer.schemas.in.h:19
-msgid "Whether to open the target directory when finished extracting."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐÐÐÑÐÑÐ."
+#: ../data/sound-juicer-menu.ui.h:9
+msgid "Quit"
+msgstr "ÐÐÐÑÐ"
 
 #: ../libjuicer/sj-extractor.c:193
 msgid "Audio Profile"
 msgstr "ÐÑÐÑÐÐ ÐÐÑÐÐ"
 
 #: ../libjuicer/sj-extractor.c:194
-#| msgid "The GNOME Audio Profile used for encoding audio"
 msgid "The GStreamer Encoding Profile used for encoding audio"
 msgstr "ÐÑÑÑÐÐÐÑÐÐ ÐÑÐÑÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐÐ."
 
@@ -369,11 +384,11 @@ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÑÐÐÑ ÐÐÐÐÐÐ
 msgid "Could not link pipeline"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑ"
 
-#: ../libjuicer/sj-extractor.c:416
+#: ../libjuicer/sj-extractor.c:415
 msgid "Could not get current track position"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÐÑÑÐ ÐÐÑÐÐ"
 
-#: ../libjuicer/sj-extractor.c:445
+#: ../libjuicer/sj-extractor.c:444
 #, c-format
 msgid ""
 "Extractor object is not valid. This is bad, check your console for errors."
@@ -381,12 +396,12 @@ msgstr ""
 "ÐÐÑÐÐÐÑ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐÑÑÑÐ. ÐÐ ÑÐ ÐÐÑÐ, ÐÑÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐÐÑ "
 "ÐÐ ÐÑÐÑÐÐ."
 
-#: ../libjuicer/sj-extractor.c:653
+#: ../libjuicer/sj-extractor.c:681
 #, c-format
 msgid "The plugin necessary for CD access was not found"
 msgstr "ÐÑÐÐÑÑÑÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÑÑÑÐ ÐÐ-Ñ ÐÐÑÐ ÐÐÑÐÐ"
 
-#: ../libjuicer/sj-extractor.c:661
+#: ../libjuicer/sj-extractor.c:689
 #, c-format
 msgid "The plugin necessary for file access was not found"
 msgstr "ÐÑÐÐÑÑÑÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÑÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐÐ"
@@ -413,12 +428,8 @@ msgstr "ÐÑÐÑÐÑ â%sâ ÐÐ ÑÐÐÑÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐÑ"
 #, c-format
 msgid ""
 "Device '%s' could not be opened. Check the access permissions on the device."
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÑÐÑÐÑ â%sâ. ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÑÑÑÐÐ ÐÐ ÑÑÐÑÐÑ."
-
-#: ../libjuicer/sj-metadata-getter.c:247
-#, c-format
-msgid "Could not create CD lookup thread"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑ ÐÐ ÐÑÐÑÑÐÐÑ ÐÐ-Ð"
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÑÐÑÐÑ â%sâ. ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÑÑÑÐÐ ÐÐ ÑÑÐÑÐÑ."
 
 #: ../libjuicer/sj-metadata-gvfs.c:90
 #, c-format
@@ -430,7 +441,7 @@ msgid "Unknown Title"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐ"
 
 #: ../libjuicer/sj-metadata-gvfs.c:113 ../libjuicer/sj-metadata-gvfs.c:139
-#: ../src/egg-play-preview.c:468
+#: ../src/egg-play-preview.c:468 ../src/sj-extracting.c:986
 msgid "Unknown Artist"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑ"
 
@@ -453,7 +464,7 @@ msgstr "ÐÐÑÐÑÐ"
 msgid "The URI of the audio file"
 msgstr "ÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../src/egg-play-preview.c:179 ../src/sj-main.c:630 ../src/sj-main.c:1800
+#: ../src/egg-play-preview.c:179 ../src/sj-main.c:810 ../src/sj-main.c:2011
 msgid "Title"
 msgstr "ÐÐÑÐÐÐ"
 
@@ -461,7 +472,7 @@ msgstr "ÐÐÑÐÐÐ"
 msgid "The title of the current stream."
 msgstr "ÐÐÑÐÐÐ ÑÑÐÐÑÑÐÐÐ ÑÐÐÐ."
 
-#: ../src/egg-play-preview.c:189 ../src/sj-main.c:636 ../src/sj-main.c:1809
+#: ../src/egg-play-preview.c:189 ../src/sj-main.c:816 ../src/sj-main.c:2020
 msgid "Artist"
 msgstr "ÐÐÐÐÑÐÑ"
 
@@ -485,7 +496,7 @@ msgstr "ÐÐÐÐÐÐÑ"
 msgid "The position in the current stream in seconds."
 msgstr "ÐÐÐÐÐÐÑ Ñ ÑÑÐÐÑÑÐÐÐ ÑÐÐÑ Ñ ÑÐÐÑÐÐÐÐÐ."
 
-#: ../src/egg-play-preview.c:219 ../src/sj-main.c:1820
+#: ../src/egg-play-preview.c:219 ../src/sj-main.c:2044
 msgid "Duration"
 msgstr "ÐÑÐÑÐÑÐ"
 
@@ -493,7 +504,7 @@ msgstr "ÐÑÐÑÐÑÐ"
 msgid "The duration of the current stream in seconds."
 msgstr "ÐÑÐÑÐÑÐ ÑÑÐÐÑÑÐÐÐ ÑÐÐÐ Ñ ÑÐÐÑÐÐÐÐÐ."
 
-#: ../src/egg-play-preview.c:469
+#: ../src/egg-play-preview.c:469 ../src/sj-extracting.c:985
 msgid "Unknown Album"
 msgstr "ÐÐÐÐÐÐÐÑ ÐÐÐÑÐ"
 
@@ -514,9 +525,9 @@ msgid ""
 "any later version."
 msgstr ""
 "ÐÐÑÐÐÐÐÐÐ ÑÐ ÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑ; ÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÐÐÑÐÐÐÑÐ Ð/ÐÐÐ ÐÐÑÐÑÐ ÐÐÐ "
-"ÑÑÐÐÐÐÐÐ ÐÐÐ ÐÐÑÑÐ ÐÐÐÐÐ ÐÐÑÐÐÑÐ (GNU GPL) ÐÐÐÐ ÑÐ ÐÐÑÐÐÑÑÑÐ ÐÐÐÑÐÐÐÐÐ ÐÐ "
-"ÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÑ (FSF); ÐÐÐÐ ÐÐÑÐÐÑÐ 2 ÑÐ ÐÐÑÐÐÑÐ, ÐÐÐÐ (ÐÐ ÐÐÑÐÐ ÐÐÑÐÑÐÑÑ) "
-"ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐ ÐÐÑÐÐÑÐ."
+"ÑÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐÑÑÐ ÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÑÑÑÐ ÐÐÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐ "
+"ÑÐÑÑÐÐÑÐ; ÐÐÐÐ ÐÐÐÐÑÐ 2 ÑÐ ÐÐÐÐÐÐÐ, ÐÐÐ (ÐÑÐÐÐ ÐÐÑÐÐ ÐÐÑÐÑÐÑÑ) ÐÐÐÐ ÐÐÑÐÐ "
+"ÐÐÐÐÑÐÐ ÐÐÐÐÑÐ."
 
 #: ../src/sj-about.c:56
 msgid ""
@@ -526,8 +537,9 @@ msgid ""
 "more details."
 msgstr ""
 "ÐÐÑÐÐÐÐÐÐ ÑÐ ÑÐÑÐÐÐÐÑÑÑÐ Ñ ÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐ, ÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ "
-"ÐÐÐÐÐÐÐÐÐ; ÑÐÐ Ð ÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐÐÐ "
-"ÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ.  ÐÐÐÐÑÐ ÐÐÐ ÐÐÑÑÑ ÐÐÐÐÑ ÐÐÑÐÐÑÑ ÐÐ ÐÐÑÐ ÐÐÑÐÑÐ."
+"ÐÐÐÐÐÐÐÐÐ; ÑÐÐ Ð ÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐ "
+"ÐÐÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ.  ÐÐÐÐÐÐÐÑÑÐ ÐÐÑÐÐÑ ÐÐÑÑÑ ÑÐÐÐÑ ÐÐÐÐÐÐÑ ÐÐ "
+"ÐÐÑÐ ÐÐÑÐÑÐ."
 
 # bug: old address for FSF
 #: ../src/sj-about.c:60
@@ -536,8 +548,8 @@ msgid ""
 "Sound Juicer; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
-"ÐÑÐÐÐÐÐ ÑÐ ÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐ ÐÐÐÐÐ ÐÐÑÐÐÑÐ ÑÐ ÐÐÑÐÐÐÐÐÐ; ÐÐÐ "
-"ÐÐÑÑÐ, ÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÑ ÐÐ ÐÐÑÐÑÑ: âFree Software "
+"ÐÑÐÐÐÐÐ ÑÐ ÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐ ÐÐÑÑÐ ÑÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐ ÐÐÑÐÐÐÐÐÐ; ÐÐÐ "
+"ÐÐÑÑÐ, ÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑÐ ÐÐ ÐÐÑÐÑÑ: âFree Software "
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 "
 "USAâ"
 
@@ -560,26 +572,26 @@ msgstr ""
 "\n"
 "http://prevod.org â ÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐ ÑÐÐÐÐ."
 
-#: ../src/sj-extracting.c:152
+#: ../src/sj-extracting.c:150
 #, c-format
 msgid "Failed to get output format"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÐÐÑ"
 
-#: ../src/sj-extracting.c:177
+#: ../src/sj-extracting.c:175
 msgid "Name too long"
 msgstr "ÐÐÐÐÐ ÑÐ ÐÑÐÐÑÐÐÑÐÐ"
 
 #. TODO: find out why GTK+ needs this to work (see #364371)
-#: ../src/sj-extracting.c:236
+#: ../src/sj-extracting.c:234
 msgid "Extract"
 msgstr "ÐÐÐÑÑÐ"
 
-#: ../src/sj-extracting.c:313
+#: ../src/sj-extracting.c:315
 msgid "A file with the same name exists"
 msgstr "ÐÐÑ ÐÐÑÑÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐ ÐÐÐÐÐÐÐ"
 
 # andrija: ÐÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÑÐÐÑÐ Ð ÐÑÐÑÐÐÐÐ ÑÑ ÐÑÐÐÐÑÐ ÐÐÐÑÐÐ Ð ÐÐÐÐ ÐÐÑÐ ÐÐ ÑÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐ
-#: ../src/sj-extracting.c:315
+#: ../src/sj-extracting.c:317
 #, c-format
 msgid ""
 "A file called '%s' exists, size %s.\n"
@@ -588,62 +600,72 @@ msgstr ""
 "ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐ â%sâ ÐÐÑÑÐÑÐ, ÐÐÐÐÑÐÐÐ %s kB.\n"
 "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ ÐÐÑ ÐÐÑÐÑ ÐÐÐ ÐÐ ÑÐ ÐÑÐÑÐÐÐÐÑÐ?"
 
-#: ../src/sj-extracting.c:325
+#: ../src/sj-extracting.c:327
 msgid "_Skip"
 msgstr "_ÐÑÐÑÐÐÑÐ"
 
-#: ../src/sj-extracting.c:326
+#: ../src/sj-extracting.c:328
 msgid "S_kip All"
 msgstr "Ð_ÑÐÑÐÐÑÐ ÑÐÐ"
 
-#: ../src/sj-extracting.c:327
+#: ../src/sj-extracting.c:329
 msgid "_Overwrite"
 msgstr "ÐÑÐ_ÑÐÐÐÐ"
 
-#: ../src/sj-extracting.c:328
+#: ../src/sj-extracting.c:330
 msgid "Overwrite _All"
 msgstr "ÐÑ_ÐÑÐÐÐÐ ÑÐÐ"
 
-#: ../src/sj-extracting.c:377
+#: ../src/sj-extracting.c:379
 #, c-format
 msgid "Failed to create output directory: %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ: %s"
 
 # ÐÐ ÐÐÑÐÐÐ ÐÐÑÐÐÐÑÐ
-#: ../src/sj-extracting.c:517
+#: ../src/sj-extracting.c:519
 #, c-format
 msgid "Estimated time left: %d:%02d (at %0.1fÃ)"
 msgstr "ÐÑÐÐÑÑÐÐÐ ÐÑÐÑÐÑÐÐÐ ÐÑÐÐÐ: %d:%02d (ÐÑÐ %0.1fx)"
 
 # ÐÐ ÐÐÑÐÐÐ ÐÐÑÐÐÐÑÐ
-#: ../src/sj-extracting.c:519
+#: ../src/sj-extracting.c:521
 msgid "Estimated time left: unknown"
 msgstr "ÐÑÐÐÑÑÐÐÐ ÐÑÐÐÐ: ÐÐÐÐÐÐÐÑÐ"
 
-#: ../src/sj-extracting.c:609
+#: ../src/sj-extracting.c:611
 msgid "CD rip complete"
 msgstr "ÐÐÐÑÑÐÐÐ ÑÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐ"
 
-#: ../src/sj-extracting.c:701
+#: ../src/sj-extracting.c:703
 msgid "Sound Juicer could not extract this CD."
 msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÑÐÐ ÑÐ ÐÐÐÐ ÐÐÑÐÐ."
 
-#: ../src/sj-extracting.c:703 ../src/sj-main.c:188 ../src/sj-main.c:818
-#: ../src/sj-main.c:938 ../src/sj-main.c:1037 ../src/sj-main.c:1252
-#: ../src/sj-main.c:1607
+#: ../src/sj-extracting.c:705 ../src/sj-main.c:189 ../src/sj-main.c:472
+#: ../src/sj-main.c:510 ../src/sj-main.c:1006 ../src/sj-main.c:1129
+#: ../src/sj-main.c:1228
 msgid "Reason"
 msgstr "ÐÐÐÐÐÐ"
 
 #. Change the label to Stop while extracting
 #. TODO: find out why GTK+ needs this to work (see #364371)
-#: ../src/sj-extracting.c:799
+#: ../src/sj-extracting.c:796
 msgid "Stop"
 msgstr "ÐÐÑÑÑÐÐÐ"
 
-#: ../src/sj-extracting.c:828 ../src/sj-extracting.c:834
+#: ../src/sj-extracting.c:825 ../src/sj-extracting.c:831
 msgid "Extracting audio from CD"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÐÑÐ ÑÐ ÐÐ-Ð"
 
+#: ../src/sj-extracting.c:987
+#| msgid "Unknown Title"
+msgid "Unknown Composer"
+msgstr "ÐÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐÑ"
+
+#: ../src/sj-extracting.c:988
+#| msgid "Unknown Title"
+msgid "Unknown Track"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÑÐ"
+
 #: ../src/sj-genres.c:34
 msgid "Ambient"
 msgstr "ÐÐÐÐÑÐÐÑÐÐÐÐ"
@@ -652,7 +674,7 @@ msgstr "ÐÐÐÐÑÐÐÑÐÐÐÐ"
 msgid "Blues"
 msgstr "ÐÐÑÐ"
 
-#: ../src/sj-genres.c:36
+#: ../src/sj-genres.c:36 ../src/sj-main.c:571
 msgid "Classical"
 msgstr "ÐÐÐÑÐÑÐÐ"
 
@@ -713,100 +735,138 @@ msgstr "ÐÐÐÐÐÐÑÐÐÐ ÑÐÑ"
 msgid "Error while saving custom genre: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÐÑÑ ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÑÐ: %s"
 
-#: ../src/sj-main.c:121
+#: ../src/sj-main.c:122
 msgid "E_xtract"
 msgstr "ÐÐ_ÐÑÑÐ"
 
-#: ../src/sj-main.c:187
+#: ../src/sj-main.c:188
 msgid "Could not start Sound Juicer"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÐÐ"
 
-#: ../src/sj-main.c:190
+#: ../src/sj-main.c:191
 msgid "Please consult the documentation for assistance."
 msgstr "ÐÐÐÐÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐÑÐÑÑ ÐÐ ÐÐÐÐÑ."
 
-#: ../src/sj-main.c:232
+#: ../src/sj-main.c:225
 msgid "You are currently extracting a CD. Do you want to quit now or continue?"
 msgstr ""
 "ÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐ ÐÐ-Ð.  ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÑÐÐÐ ÐÐÐ ÐÐ "
 "ÐÐÑÑÐÐÐÑÐ?"
 
-#: ../src/sj-main.c:292 ../src/sj-main.c:552
+#: ../src/sj-main.c:273 ../src/sj-main.c:1915 ../src/sj-main.c:1965
+#| msgid "Select A Folder"
+msgid "Select None"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÑ"
+
+#: ../src/sj-main.c:287 ../src/sj-main.c:1959
+#| msgid "_Select All"
+msgid "Select All"
+msgstr "ÐÐÐÐÐÑÐ ÑÐÐ"
+
+#: ../src/sj-main.c:308 ../src/sj-main.c:732
 msgid "(unknown)"
 msgstr "(ÐÐÐÐÐÐÐÑÐ)"
 
-#: ../src/sj-main.c:420
+#: ../src/sj-main.c:436
 msgid "S_ubmit Album"
 msgstr "ÐÐ_ÑÐÑÐ ÐÐÐÑÐ"
 
 #. Translators: title, artist
-#: ../src/sj-main.c:425
+#: ../src/sj-main.c:441
 #, c-format
 msgid "Could not find %s by %s on MusicBrainz."
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ %s ÐÐ %s ÐÐ ÐÐÐÐÐÑÑ ÐÑÐÐÐÐ."
 
-#: ../src/sj-main.c:430
+#: ../src/sj-main.c:446
 msgid "You can improve the MusicBrainz database by adding this album."
 msgstr "ÐÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÐÐÐÐÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÐ."
 
-#: ../src/sj-main.c:816 ../src/sj-main.c:934 ../src/sj-main.c:1035
+#: ../src/sj-main.c:470
+msgid "Could not open URL"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÑ"
+
+#: ../src/sj-main.c:471
+msgid "Sound Juicer could not open the submission URL"
+msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÑÐ ÐÑÐÐÐÐÐÐÑ ÐÐÑÐÑÑ"
+
+#: ../src/sj-main.c:508
+msgid "Could not duplicate disc"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐ"
+
+#: ../src/sj-main.c:509
+msgid "Sound Juicer could not duplicate the disc"
+msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÐÐÐ ÑÑÐÐÐÐÐ ÐÐÑÐ"
+
+#: ../src/sj-main.c:571
+msgid "Lieder"
+msgstr "ÐÐÐÐÐÑ"
+
+#: ../src/sj-main.c:571
+msgid "Opera"
+msgstr "ÐÐÐÑÐ"
+
+#: ../src/sj-main.c:571
+msgid "Chamber"
+msgstr "ÐÐÐÐÑÐÐ"
+
+#: ../src/sj-main.c:571
+msgid "Musical"
+msgstr "ÐÑÑÐÐÐÐ"
+
+#: ../src/sj-main.c:1004 ../src/sj-main.c:1125 ../src/sj-main.c:1226
 msgid "Could not read the CD"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÐÐ ÐÐ"
 
-#: ../src/sj-main.c:817 ../src/sj-main.c:937
+#: ../src/sj-main.c:1005 ../src/sj-main.c:1128
 msgid "Sound Juicer could not read the track listing on this CD."
 msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÑÐ ÑÐÐÑÐÐ ÐÐÑÐÐÐ ÑÐ ÐÐÐÐ ÐÐ-Ð."
 
 #. Set statusbar message
-#: ../src/sj-main.c:908
+#: ../src/sj-main.c:1099
 msgid "Retrieving track listing...please wait."
 msgstr "ÐÑÐÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑÐÐÐ... ÐÐÐÐÐ ÐÑÐÑÐÐÐÑÑÐ."
 
-#: ../src/sj-main.c:997
+#: ../src/sj-main.c:1188
 #, c-format
 msgid "Sound Juicer could not use the CD-ROM device '%s'"
 msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÑÑÐÐÐ ÐÐ ÑÑÐÑÐÑ â%sâ"
 
-#: ../src/sj-main.c:1004
+#: ../src/sj-main.c:1195
 msgid "HAL daemon may not be running."
-msgstr "ÐÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÑÑÐ."
+msgstr "ÐÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÑÑÐ."
 
-#: ../src/sj-main.c:1028
+#: ../src/sj-main.c:1219
 #, c-format
 msgid "Sound Juicer could not access the CD-ROM device '%s'"
 msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÑÑÑÐÐ ÐÐ ÑÑÐÑÐÑÑ â%sâ"
 
-#: ../src/sj-main.c:1126
+#: ../src/sj-main.c:1317
 msgid "No CD-ROM drives found"
 msgstr "ÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÑ"
 
-#: ../src/sj-main.c:1127
+#: ../src/sj-main.c:1318
 msgid "Sound Juicer could not find any CD-ROM drives to read."
 msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÑ ÐÐ ÑÐÑÐÑÐ."
 
-#: ../src/sj-main.c:1159
+#: ../src/sj-main.c:1350
 msgid ""
 "The currently selected audio profile is not available on your installation."
 msgstr "ÐÑÐÐÑÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ ÐÑÐÑÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÐ ÑÐÑÑÐÐÑ."
 
-#: ../src/sj-main.c:1161
+#: ../src/sj-main.c:1352
 msgid "_Change Profile"
 msgstr "_ÐÐÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../src/sj-main.c:1250
-msgid "Could not open URL"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÑ"
-
-#: ../src/sj-main.c:1251
-msgid "Sound Juicer could not open the submission URL"
-msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÑÐ ÐÑÐÐÐÐÐÐÑ ÐÐÑÐÑÑ"
-
-#: ../src/sj-main.c:1359
+#: ../src/sj-main.c:1534
 #, c-format
 msgid "Unknown column %d was edited"
 msgstr "ÐÐÐÐÐÐÐÑa ÐÐÐÐÐÐ %d ÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../src/sj-main.c:1500 ../src/sj-prefs.c:111
+#: ../src/sj-main.c:1634
+msgid "Unknown widget calling on_person_edit_changed."
+msgstr "ÐÐÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐÑÑ ÐÑÐÐÐ."
+
+#: ../src/sj-main.c:1735 ../src/sj-prefs.c:119
 #, c-format
 msgid ""
 "Could not display help for Sound Juicer\n"
@@ -815,48 +875,44 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐÐÐ\n"
 "%s"
 
-#: ../src/sj-main.c:1605
-msgid "Could not duplicate disc"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐ"
+#: ../src/sj-main.c:1845
+msgid "Could not create GConf client.\n"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑ ÐÐÐÑÐÐÑÐ.\n"
 
-#: ../src/sj-main.c:1606
-msgid "Sound Juicer could not duplicate the disc"
-msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐÐÐÐÐ ÑÑÐÐÐÐÐ ÐÐÑÐ"
+# andrija: ÐÐÐÐ ÑÐ Ñ ÐÐÑÐÑÑ *ÐÑÐÑ ÐÐÑÐÐ*
+#: ../src/sj-main.c:1996
+msgid "Track"
+msgstr "ÐÑÐÐÑÐ"
+
+#: ../src/sj-main.c:2031
+msgid "Composer"
+msgstr "ÐÐÐÐÐÐÐÑÐÑ"
 
-#: ../src/sj-main.c:1633
+#: ../src/sj-main.c:2182
 msgid "Start extracting immediately"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÐ"
 
-#: ../src/sj-main.c:1634
+#: ../src/sj-main.c:2183
 msgid "Start playing immediately"
 msgstr "ÐÐÐÐÑ ÐÑÑÑÐ ÐÐÑÐÑ"
 
-#: ../src/sj-main.c:1635
+#: ../src/sj-main.c:2184
 msgid "What CD device to read"
 msgstr "ÐÐÑÐ ÑÐ ÐÐ ÑÑÐÑÐÑ ÐÐ ÑÐÑÐ"
 
-#: ../src/sj-main.c:1635
+#: ../src/sj-main.c:2184
 msgid "DEVICE"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../src/sj-main.c:1636
+#: ../src/sj-main.c:2185
 msgid "URI to the CD device to read"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐ ÑÑÐÑÐÑÐ ÐÐ ÑÐÑÐÑÐ"
 
-#: ../src/sj-main.c:1649
+#: ../src/sj-main.c:2197
 msgid "- Extract music from your CDs"
 msgstr "â ÐÐÐÑÑÐÑÐ ÐÑÐÐÐÑ ÑÐ ÐÐÑÐÑ ÐÐÑÐÑÐ ÐÐÑÐÐ"
 
-#: ../src/sj-main.c:1686
-msgid "Could not create GConf client.\n"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÑ ÐÐÐÑÐÐÑÐ.\n"
-
-# andrija: ÐÐÐÐ ÑÐ Ñ ÐÐÑÐÑÑ *ÐÑÐÑ ÐÐÑÐÐ*
-#: ../src/sj-main.c:1785
-msgid "Track"
-msgstr "ÐÑÐÐÑÐ"
-
-#: ../src/sj-play.c:191 ../src/sj-play.c:463 ../src/sj-play.c:492
+#: ../src/sj-play.c:194 ../src/sj-play.c:420 ../src/sj-play.c:449
 #, c-format
 msgid ""
 "Error playing CD.\n"
@@ -868,30 +924,21 @@ msgstr ""
 "ÐÐÐÐÐÐ: %s"
 
 #. TODO: find out why GTK+ needs this to work (see #364371)
-#: ../src/sj-play.c:262
+#: ../src/sj-play.c:261
 msgid "Play"
 msgstr "ÐÑÑÑÐ"
 
 #. TODO: find out why GTK+ needs this to work (see #364371)
-#: ../src/sj-play.c:306
+#: ../src/sj-play.c:305
 msgid "Pause"
 msgstr "ÐÐÑÐÐ"
 
-#: ../src/sj-play.c:363
+#: ../src/sj-play.c:358
 #, c-format
 msgid "Failed to create CD source element"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐ-Ð"
 
-#: ../src/sj-play.c:404
-msgid "Failed to link pipeline"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐ ÐÑÐÑÐÑÐÐ ÐÐÐÐÑ"
-
-#: ../src/sj-play.c:410
-#, c-format
-msgid "Failed to create audio output"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐ ÐÐÐÐÐ"
-
-#: ../src/sj-play.c:613
+#: ../src/sj-play.c:564
 #, c-format
 msgid "Seeking to %s"
 msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ â%sâ"
@@ -933,38 +980,134 @@ msgid "Album Artist (sortable) - Album Title"
 msgstr "ÐÐÐÐÑÐÑ (ÐÐÐÐ ÑÐ ÐÐÑÐÑÐÑÐ) â ÐÐÑÐÐÐ ÐÐÐÑÐÐ"
 
 #: ../src/sj-prefs.c:63
+#| msgid "Album Artist, Album Title"
+msgid "Album Composer, Album Title"
+msgstr "ÐÐÐÐÐÐÐÑÐÑ â ÐÐÑÐÐÐ ÐÐÐÑÐÐ"
+
+#: ../src/sj-prefs.c:64
+#| msgid "Album Artist (sortable), Album Title"
+msgid "Album Composer (sortable), Album Title"
+msgstr "ÐÐÐÐÐÐÐÑÐÑ (ÐÐ ÑÐÑÐÑÐ) â ÐÐÑÐÐÐ ÐÐÐÑÐÐ"
+
+#: ../src/sj-prefs.c:65
+#| msgid "Track Artist, Album Title"
+msgid "Track Composer, Album Title"
+msgstr "ÐÐÐÐÐÐÐÑÐÑ ÐÑÐÐÑÐ â ÐÐÑÐÐÐ ÐÐÐÑÐÐ"
+
+#: ../src/sj-prefs.c:66
+#| msgid "Track Artist (sortable), Album Title"
+msgid "Track Composer (sortable), Album Title"
+msgstr "ÐÐÐÐÐÐÐÑÐÑ ÐÑÐÐÑÐ (ÐÐ ÑÐÑÐÑÐ) â ÐÐÑÐÐÐ ÐÐÐÑÐÐ"
+
+#: ../src/sj-prefs.c:67
 msgid "[none]"
 msgstr "[ÐÐÑÑÐ]"
 
-#: ../src/sj-prefs.c:68
+#: ../src/sj-prefs.c:72
 msgid "Number - Title"
 msgstr "ÐÑÐÑ â ÐÐÑÐÐÐ"
 
-#: ../src/sj-prefs.c:69
+#: ../src/sj-prefs.c:73
 msgid "Track Title"
 msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐ"
 
-#: ../src/sj-prefs.c:70
+#: ../src/sj-prefs.c:74
 msgid "Track Artist - Track Title"
 msgstr "ÐÐÐÐÑÐÑ ÐÐÑÐÐ â ÐÐÑÐÐÐ ÐÐÑÐÐ"
 
-#: ../src/sj-prefs.c:71
+#: ../src/sj-prefs.c:75
 msgid "Track Artist (sortable) - Track Title"
 msgstr "ÐÐÐÐÑÐÑ ÐÐÑÐÐ (ÐÐÐÐ ÑÐ ÐÐÑÐÑÐÑÐ) â ÐÐÑÐÐÐ ÐÐÑÐÐ"
 
-#: ../src/sj-prefs.c:72
+#: ../src/sj-prefs.c:76
 msgid "Number. Track Artist - Track Title"
 msgstr "ÐÑÐÑ. ÐÐÐÐÑÐÑ ÐÐÑÐÐ â ÐÐÑÐÐÐ ÐÐÑÐÐ"
 
 #. {N_("Number. Track Artist (sortable) - Track Title"), "%tN. %ts - %tt"},
-#: ../src/sj-prefs.c:74
+#: ../src/sj-prefs.c:78
 msgid "Number-Track Artist-Track Title (lowercase)"
 msgstr "ÐÑÐÑ ÐÑÐÐÑÐ â ÐÐÐÐÑÐÑ ÐÐÑÐÐ â ÐÐÑÐÐÐ ÐÐÑÐÐ"
 
-#: ../src/sj-prefs.c:297
+#. {N_("Number-Track Artist (sortable)-Track Title (lowercase)"), "%tN-%tS-%tT"},
+#: ../src/sj-prefs.c:80
+#| msgid "Number. Track Artist - Track Title"
+msgid "Track Composer - Track Artist - Track Title"
+msgstr "ÐÐÐÐÐÐÐÑÐÑ â ÐÐÐÐÑÐÑ ÐÐÑÐÐ â ÐÐÑÐÐÐ ÐÐÑÐÐ"
+
+#: ../src/sj-prefs.c:81
+#| msgid "Track Artist (sortable) - Track Title"
+msgid "Track Composer (sortable) - Track Artist (sortable) - Track Title"
+msgstr "ÐÐÐÐÐÐÐÑÐÑ (ÐÐ ÑÐÑÐÑÐ) â ÐÐÐÐÑÐÑ ÐÐÑÐÐ (ÐÐ ÑÐÑÐÑÐ) â ÐÐÑÐÐÐ ÐÐÑÐÐ"
+
+#: ../src/sj-prefs.c:82
+#| msgid "Number. Track Artist - Track Title"
+msgid "Number. Track Composer - Track Artist - Track Title"
+msgstr "ÐÑÐÑ. ÐÐÐÐÐÐÐÑÐÑ â ÐÐÐÐÑÐÑ ÐÐÑÐÐ â ÐÐÑÐÐÐ ÐÐÑÐÐ"
+
+#: ../src/sj-prefs.c:83
+#| msgid "Number-Track Artist-Track Title (lowercase)"
+msgid "Number-Track Composer-Track Artist-Track Title (lowercase)"
+msgstr "ÐÑÐÑâÐÐÐÐÐÐÐÑÐÑâÐÐÐÐÑÐÑ ÐÐÑÐÐâÐÐÑÐÐÐ ÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ)"
+
+#: ../src/sj-prefs.c:307
 msgid "Example Path"
 msgstr "ÐÑÐÐÐÑ ÐÑÑÐÑÐ"
 
+#~ msgid "E_ject"
+#~ msgstr "ÐÐ_ÐÐÑÐ"
+
+#~ msgid "Pre_vious Track"
+#~ msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÑÐÐ"
+
+#~ msgid "Skip to the next track"
+#~ msgstr "ÐÑÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÑÐÑ"
+
+#~ msgid "Skip to the previous track"
+#~ msgstr "ÐÑÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÑÐÑ"
+
+#~ msgid "_Contents"
+#~ msgstr "_ÐÐÐÑÐÐÑ"
+
+#~ msgid "_Deselect All"
+#~ msgstr "_ÐÐÐÐÐÑÐ ÑÐÐ"
+
+#~ msgid "_Disc"
+#~ msgstr "_ÐÐÑÐ"
+
+#~ msgid "_Edit"
+#~ msgstr "_ÐÑÐÑÐÐÐÑÐ"
+
+#~ msgid "_Next Track"
+#~ msgstr "_ÐÐÐÐÐÑÐ ÐÐÑÐÐ"
+
+# andrija: ÐÐÑÐÐ ÑÐÐÑÑÐÐ ÐÐÐ ÐÐ ÑÑÐÐÐÐ ÐÑÐÑÐÑÑ, ÐÐ ÑÐ ÐÐÑÐÐ ÐÐ ÑÑÐÐÐÐ
+#~ msgid "_Play / Pause"
+#~ msgstr "Ð_ÑÑÑÐ / ÐÐÑÐÐÑÐÑ"
+
+#~ msgid ""
+#~ "%at -- album title %aT -- album title (lowercase) %aa -- album artist %aA "
+#~ "-- album artist (lowercase) %as -- album artist (sortable) %aS -- album "
+#~ "artist (sortable lowercase) %ay -- album year %tt -- track title %tT -- "
+#~ "track title (lowercase) %ta -- track artist %tA -- track artist "
+#~ "(lowercase) %ts -- track artist (sortable) %tS -- track artist (sortable "
+#~ "lowercase)"
+#~ msgstr ""
+#~ "%at â ÐÐÑÐÐÐ ÐÐÐÑÐÐ %aT â ÐÐÑÐÐÐ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %aa â ÐÐÐÐÑÐÑ "
+#~ "ÐÐÐÑÐÐ %aA â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %as â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐ "
+#~ "ÑÐÑÐÑÐ) %aS â ÐÐÐÐÑÐÑ ÐÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ, ÐÐ ÑÐÑÐÑÐ) %ay â ÐÐÐÐÐÐ %tt "
+#~ "â ÐÐÑÐÐÐ ÐÐÑÐÐ %tT â ÐÐÑÐÐÐ ÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ta â ÐÐÐÐÑÐÑ ÐÐÑÐÐ %tA "
+#~ "â ÐÐÐÐÑÐÑ ÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ) %ts â ÐÐÐÐÑÐÑ ÐÐÑÐÐ (ÐÐ ÑÐÑÐÑÐ) %tS â "
+#~ "ÐÐÐÐÑÐÑ ÐÐÑÐÐ (ÐÐÐÐÐ ÑÐÐÐÐÐÐ, ÐÐ ÑÐÑÐÑÐ)"
+
+#~ msgid "Could not create CD lookup thread"
+#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑ ÐÐ ÐÑÐÑÑÐÐÑ ÐÐ-Ð"
+
+#~ msgid "Failed to link pipeline"
+#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐ ÐÑÐÑÐÑÐÐ ÐÐÐÐÑ"
+
+#~ msgid "Failed to create audio output"
+#~ msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐ ÐÐÐÐÐ"
+
 #~ msgid "Edit _Profiles..."
 #~ msgstr "ÐÑÐÐÐ ÐÐÑÑÐÐ_ÐÐ..."
 
@@ -1034,9 +1177,6 @@ msgstr "ÐÑÐÐÐÑ ÐÑÑÐÑÐ"
 #~ msgid "%s has been copied successfully."
 #~ msgstr "%s ÑÐ ÑÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐÐ."
 
-#~ msgid "_Eject"
-#~ msgstr "ÐÐ_ÐÐÑÐ"
-
 #~ msgid "Could not get track start position"
 #~ msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÑÑÐÑÑÐÑ ÐÐÐÐÑÐÑÑ ÐÐÑÐÐ"
 
@@ -1281,9 +1421,6 @@ msgstr "ÐÑÐÐÐÑ ÐÑÑÐÑÐ"
 #~ msgid "Retro"
 #~ msgstr "ÐÐÑÑÐ"
 
-#~ msgid "Musical"
-#~ msgstr "ÐÑÑÐÐÐÐ"
-
 #~ msgid "Rock & Roll"
 #~ msgstr "ÐÐÐÐÐÑÐÐ"
 
diff --git a/po/sr latin po b/po/sr latin po
index ce95932..73315fa 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: sound-juicer\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=sound-";
 "juicer&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-10-31 14:36+0000\n"
-"PO-Revision-Date: 2012-03-01 10:15+0200\n"
+"POT-Creation-Date: 2012-09-06 18:41+0000\n"
+"PO-Revision-Date: 2012-09-07 22:43+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -22,91 +22,216 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/sound-juicer.desktop.in.in.h:1
+# Sokovnik za zvuk = Zvukovnik
+#: ../data/sound-juicer.desktop.in.in.h:1 ../data/sound-juicer.ui.h:1
+#: ../src/sj-main.c:143 ../src/sj-main.c:145 ../src/sj-main.c:2194
+msgid "Sound Juicer"
+msgstr "Zvukovnik"
+
+#: ../data/sound-juicer.desktop.in.in.h:2
 msgid "Audio CD Extractor"
 msgstr "IzvlaÄenje CD zvuka"
 
-#: ../data/sound-juicer.desktop.in.in.h:2
+#: ../data/sound-juicer.desktop.in.in.h:3
+msgid "Sound Juicer Audio CD Extractor"
+msgstr "Zvukovnik izvlakivaÄ zvuÄnih diskova"
+
+#: ../data/sound-juicer.desktop.in.in.h:4
 msgid "Copy music from your CDs"
 msgstr "UmnoÅite muziku sa vaÅih CD-a"
 
-# Sokovnik za zvuk = Zvukovnik
-#: ../data/sound-juicer.desktop.in.in.h:3 ../data/sound-juicer.ui.h:17
-#: ../src/sj-main.c:142 ../src/sj-main.c:144 ../src/sj-main.c:1646
-msgid "Sound Juicer"
-msgstr "Zvukovnik"
+#: ../data/sound-juicer.schemas.in.h:1
+msgid "Whether to eject the CD when finished extracting."
+msgstr "Da li da izbaci CD kada zavrÅi izvlaÄenje?"
 
-#: ../data/sound-juicer.desktop.in.in.h:4
-#| msgid "Sound Juicer CD Extractor"
-msgid "Sound Juicer Audio CD Extractor"
-msgstr "Zvukovnik izvlakivaÄ zvuÄnih diskova"
+#: ../data/sound-juicer.schemas.in.h:2
+msgid "Whether to open the target directory when finished extracting."
+msgstr "Da li da otvori direktorijum sa muzikom nakon njenog izvlaÄenja."
 
-#: ../data/sound-juicer.ui.h:1
-msgid "CD _drive:"
-msgstr "CD _ureÄaj:"
+#: ../data/sound-juicer.schemas.in.h:3
+msgid "The directory structure for the files"
+msgstr "Struktura direktorijuma za datoteke"
+
+#: ../data/sound-juicer.schemas.in.h:5
+#, no-c-format
+#| msgid ""
+#| "Do not specify an extension. %at -- album title %aT -- album title "
+#| "(lowercase) %aa -- album artist %aA -- album artist (lowercase) %as -- "
+#| "album artist (sortable) %aS -- album artist (sortable lowercase) %tn -- "
+#| "track number (i.e 8) %tN -- track number, zero padded (i.e 08) %tt -- "
+#| "track title %tT -- track title (lowercase) %ta -- track artist %tA -- "
+#| "track artist (lowercase) %ts -- track artist (sortable) %tS -- track "
+#| "artist (sortable lowercase) %dn -- disc and track number (i.e Disk 2 - 6, "
+#| "or 6) %dN -- disc number, zero padded (i.e d02t06, or 06)"
+msgid ""
+"%at -- album title %aT -- album title (lowercase) %aa -- album artist %aA -- "
+"album artist (lowercase) %as -- album artist (sortable) %aS -- album artist "
+"(sortable lowercase) %ac -- album composer %aC -- album composer (lowercase) "
+"%ap -- album composer (sortable) %aP -- album composer (sortable lowercase) "
+"%ay -- album year %tt -- track title %tT -- track title (lowercase) %ta -- "
+"track artist %tA -- track artist (lowercase) %ts -- track artist (sortable) "
+"%tS -- track artist (sortable lowercase) %tc -- track composer %tC -- track "
+"composer (lowercase) %tp -- track composer (sortable) %tP -- track composer "
+"(sortable lowercase)"
+msgstr ""
+"%at â naslov albuma %aT â naslov albuma (malim slovima) %aa â izvoÄaÄ albuma "
+"%aA â izvoÄaÄ albuma (malim slovima) %as â izvoÄaÄ albuma (za reÄanje) %aS â "
+"izvoÄaÄ albuma (malim slovima za reÄanje) %ac â kompozitor albuma %aC â "
+"kompozitor albuma (malim slovima) %ap â kompozitor albuma (za reÄanje) %aP â "
+"kompozitor albuma (malim slovima za reÄanje) %ay â godina albuma %tt â naslov "
+"numere %tT â naslov numere (malim slovima) %ta â izvoÄaÄ numere %tA â "
+"izvoÄaÄ numere (malim slovima) %ts â izvoÄaÄ numere (za reÄanje) %tS â "
+"izvoÄaÄ numere (malim slovima za reÄanje) %tc â kompozitor numere %tC â "
+"kompozitor numere (malim slovima) %tp â kompozitor numere (za reÄanje) %tP â "
+"kompozitor numere (malim slovima za reÄanje)"
+
+#: ../data/sound-juicer.schemas.in.h:6
+msgid "The name pattern for files"
+msgstr "Oblik naziva za datoteke"
+
+#: ../data/sound-juicer.schemas.in.h:8
+#, no-c-format
+#| msgid ""
+#| "Do not specify an extension. %at -- album title %aT -- album title "
+#| "(lowercase) %aa -- album artist %aA -- album artist (lowercase) %as -- "
+#| "album artist (sortable) %aS -- album artist (sortable lowercase) %tn -- "
+#| "track number (i.e 8) %tN -- track number, zero padded (i.e 08) %tt -- "
+#| "track title %tT -- track title (lowercase) %ta -- track artist %tA -- "
+#| "track artist (lowercase) %ts -- track artist (sortable) %tS -- track "
+#| "artist (sortable lowercase) %dn -- disc and track number (i.e Disk 2 - 6, "
+#| "or 6) %dN -- disc number, zero padded (i.e d02t06, or 06)"
+msgid ""
+"Do not specify an extension. %at -- album title %aT -- album title "
+"(lowercase) %aa -- album artist %aA -- album artist (lowercase) %as -- album "
+"artist (sortable) %aS -- album artist (sortable lowercase) %ac -- album "
+"composer %aC -- album composer (lowercase) %ap -- album composer (sortable) "
+"%aP -- album composer (sortable lowercase) %tn -- track number (i.e 8) %tN "
+"-- track number, zero padded (i.e 08) %tt -- track title %tT -- track title "
+"(lowercase) %ta -- track artist %tA -- track artist (lowercase) %ts -- track "
+"artist (sortable) %tS -- track artist (sortable lowercase) %tc -- track "
+"composer %tC -- track composer (lowercase) %tp -- track composer (sortable) "
+"%tP -- track composer (sortable lowercase) %dn -- disc and track number, "
+"track zero padded (i.e Disk 2 - 06, or 06) %dN -- condensed disc and track "
+"number, zero padded (i.e d02t06, or 06)"
+msgstr ""
+"Ne navodi proÅirenje. %at â naslov albuma %aT â naslov albuma (malim slovima) "
+"%aa â izvoÄaÄ albuma %aA â izvoÄaÄ albuma (malim slovima) %as â izvoÄaÄ "
+"albuma (za reÄanje) %aS â izvoÄaÄ albuma (malim slovima za reÄanje) %ac â "
+"kompozitor albuma %aC â kompozitor albuma (malim slovima) %ap â kompozitor "
+"albuma (za reÄanje) %aP â kompozitor albuma (malim slovima za reÄanje) %tn â "
+"broj numere (npr. 8) %tN â broj numere, sa nulom ispred (npr. 08) %tt â "
+"naslov numere %tT â naslov numere (malim slovima) %ta â izvoÄaÄ numere %tA â "
+"izvoÄaÄ numere (malim slovima) %ts â izvoÄaÄ numere (za reÄanje) %tS â "
+"izvoÄaÄ numere (malim slovima za reÄanje) %tc â kompozitor numere %tC â "
+"kompozitor numere (malim slovima) %tp â kompozitor numere (za reÄanje) %tP â "
+"kompozitor numere (malim slovima za reÄanje) %dn â broj diska i numere, "
+"numera dopunjena nulom (npr. Disk 2 â 06, ili 06) %dN â zbijeni broj diska i "
+"numere, dopunjeno nulom (npr d02t06, ili 06)"
+
+#: ../data/sound-juicer.schemas.in.h:9
+msgid "The paranoia mode to use"
+msgstr "ReÅim paranoje za upotrebu"
+
+#: ../data/sound-juicer.schemas.in.h:10
+msgid ""
+"Paranoia mode: 0) disable 2) fragment 4) overlap 8) scratch 16) repair 255) "
+"full"
+msgstr ""
+"ReÅim paranoje: 0) iskljuÄen 2) delovi 4) preskakanje 8) izgrebano 16) popravi "
+"255) puni"
+
+#: ../data/sound-juicer.schemas.in.h:11
+msgid "If to strip special characters from filenames"
+msgstr "Izbacivanje posebnih znakova iz naziva datoteke"
+
+#: ../data/sound-juicer.schemas.in.h:12
+msgid ""
+"If enabled, special characters such as space, wildcards and backslashes will "
+"be removed from the output filename."
+msgstr ""
+"Ako je ukljuÄeno, posebni znaci kao Åto su razmak, dÅoker znaci i obrnute kose "
+"crte biÄe uklonjeni iz izlaznog naziva datoteke."
+
+# andrija:  rogobatno je â... za upotrebuâ a ne doprinosi
+#: ../data/sound-juicer.schemas.in.h:13
+msgid "The MusicBrainz server to use"
+msgstr "Server MozgiÄa muzike"
+
+#: ../data/sound-juicer.schemas.in.h:14
+msgid "If specified, this value will override the default MusicBrainz server."
+msgstr ""
+"Ukoliko je navedena, ova vrednost se koristi umesto podrazumevanog servera "
+"MozgiÄa muzike."
+
+#: ../data/sound-juicer.schemas.in.h:15
+msgid "(obsolete) Audio Profile with which to encode"
+msgstr "(prevaziÄeno) ZvuÄni profil kojim da kodira"
+
+#: ../data/sound-juicer.schemas.in.h:16
+msgid ""
+"This key used to store the GNOME Audio Profile with which to encode. This "
+"has been superseded by GStreamer encoding profiles, which are configured "
+"using the audio_profile_media_type key."
+msgstr ""
+"Ovaj kljuÄ se koristi za Äuvanje Gnomovog zvuÄnog profila sa kojim Äe se "
+"vrÅiti kodiranje. Ovo je bilo potisnuto Gstrimerovim profilima kodiranja, koji "
+"su podeÅeni koriÅÄenjem kljuÄa "
+"âaudio_profile_media_typeâ (vrsta_medija_zvuÄnog_profila)."
+
+#: ../data/sound-juicer.schemas.in.h:17
+msgid "Media type to encode to"
+msgstr "Vrsta medija u koji vrÅiti kodiranje"
+
+#: ../data/sound-juicer.schemas.in.h:18
+msgid "The GStreamer media type to encode to."
+msgstr "Vrsta medija Gstrimera u koji vrÅiti kodiranje."
+
+#: ../data/sound-juicer.schemas.in.h:19
+msgid "Audio volume"
+msgstr "JaÄina zvuka"
 
 #: ../data/sound-juicer.ui.h:2
-msgid "Device"
-msgstr "UreÄaj"
+msgid "_Year:"
+msgstr "_Godina:"
 
 #: ../data/sound-juicer.ui.h:3
 msgid "Disc:"
 msgstr "Disk:"
 
 #: ../data/sound-juicer.ui.h:4
-msgid "Duration:"
-msgstr "Trajanje:"
+msgid "_Title:"
+msgstr "_Naslov:"
 
 #: ../data/sound-juicer.ui.h:5
-msgid "E_ject"
-msgstr "Iz_baci"
+msgid "_Artist:"
+msgstr "_IzvoÄaÄ:"
 
 #: ../data/sound-juicer.ui.h:6
-msgid "File _name:"
-msgstr "_Naziv datoteke:"
+msgid "_Composer:"
+msgstr "_Kompozitor:"
 
 #: ../data/sound-juicer.ui.h:7
-msgid "Folder hie_rarchy:"
-msgstr "_Hijerarhija mesta:"
+msgid "_Genre:"
+msgstr "_Åanr:"
 
-# andrija: da li bi ovo moglo kao âFormatâ ?
 #: ../data/sound-juicer.ui.h:8
-msgid "Format"
-msgstr "Format"
+msgid "Duration:"
+msgstr "Trajanje:"
 
+# andrija: Ovde je u pitanju *broj pesme*
 #: ../data/sound-juicer.ui.h:9
-msgid "Multiple Albums Found"
-msgstr "ViÅe albuma pronaÄeno"
+msgid "Tracks"
+msgstr "Numere"
 
 #: ../data/sound-juicer.ui.h:10
-msgid "Music Folder"
-msgstr "Fascikla sa muzikom"
+msgid "Track Progress"
+msgstr "Tok pesme"
 
 #: ../data/sound-juicer.ui.h:11
-msgid "O_utput Format:"
-msgstr "I_zlazni format:"
+msgid "Multiple Albums Found"
+msgstr "ViÅe albuma pronaÄeno"
 
 #: ../data/sound-juicer.ui.h:12
-msgid "Pre_vious Track"
-msgstr "Prethodna pesma"
-
-#: ../data/sound-juicer.ui.h:13
-msgid "Preferences"
-msgstr "Postavke"
-
-#: ../data/sound-juicer.ui.h:14
-msgid "Select A Folder"
-msgstr "Izaberite mesto"
-
-#: ../data/sound-juicer.ui.h:15
-msgid "Skip to the next track"
-msgstr "PreÄi na sledeÄu pesmu"
-
-#: ../data/sound-juicer.ui.h:16
-msgid "Skip to the previous track"
-msgstr "PreÄi na prethodnu pesmu"
-
-#: ../data/sound-juicer.ui.h:18
 msgid ""
 "This CD could be more than one album. Please select which album it is below "
 "and press <i>Continue</i>."
@@ -114,222 +239,112 @@ msgstr ""
 "Ovaj CD moÅe biti jedan od viÅe albuma. Ispod izaberite koji je album i "
 "pritisnite <i>Nastavi</i>."
 
-#: ../data/sound-juicer.ui.h:19
-msgid "Track Names"
-msgstr "Imena pesama"
-
-#: ../data/sound-juicer.ui.h:20
-msgid "Track Progress"
-msgstr "Tok pesme"
-
-# andrija: Ovde je u pitanju *broj pesme*
-#: ../data/sound-juicer.ui.h:21
-msgid "Tracks"
-msgstr "Numere"
-
-#: ../data/sound-juicer.ui.h:22
-msgid "_Artist:"
-msgstr "_IzvoÄaÄ:"
-
-#: ../data/sound-juicer.ui.h:23
-msgid "_Contents"
-msgstr "_SadrÅaj"
-
-#: ../data/sound-juicer.ui.h:24 ../src/sj-main.c:234
+#: ../data/sound-juicer.ui.h:13 ../src/sj-main.c:227
 msgid "_Continue"
 msgstr "_Nastavi"
 
-#: ../data/sound-juicer.ui.h:25
-msgid "_Deselect All"
-msgstr "_OdznaÄi sve"
-
-#: ../data/sound-juicer.ui.h:26
-msgid "_Disc"
-msgstr "_Disk"
+#: ../data/sound-juicer.ui.h:14 ../data/sound-juicer-menu.ui.h:6
+msgid "Preferences"
+msgstr "Postavke"
 
-#: ../data/sound-juicer.ui.h:27
-msgid "_Duplicate Disc"
-msgstr "_UmnoÅi disk"
+#: ../data/sound-juicer.ui.h:15
+msgid "Device"
+msgstr "UreÄaj"
 
-#: ../data/sound-juicer.ui.h:28
-msgid "_Edit"
-msgstr "_UreÄivanje"
+#: ../data/sound-juicer.ui.h:16
+msgid "CD _drive:"
+msgstr "CD _ureÄaj:"
 
-#: ../data/sound-juicer.ui.h:29
+#: ../data/sound-juicer.ui.h:17
 msgid "_Eject after extracting tracks"
 msgstr "_Izbaci nakon izvlaÄenja numera"
 
-#: ../data/sound-juicer.ui.h:30
-msgid "_Folder:"
-msgstr "_Fascikla:"
-
-#: ../data/sound-juicer.ui.h:31
-msgid "_Genre:"
-msgstr "_Åanr:"
-
-#: ../data/sound-juicer.ui.h:32
-msgid "_Help"
-msgstr "_PomoÄ"
-
-#: ../data/sound-juicer.ui.h:33
-msgid "_Next Track"
-msgstr "_SledeÄa pesma"
-
-#: ../data/sound-juicer.ui.h:34
+#: ../data/sound-juicer.ui.h:18
 msgid "_Open music folder when finished"
 msgstr "_Otvori fasciklu muzike kada zavrÅiÅ"
 
-# andrija: nisam siguran gde da stavim preÄicu, pa je nisam ni stavio
-#: ../data/sound-juicer.ui.h:35
-msgid "_Play / Pause"
-msgstr "P_usti / Pauziraj"
-
-#: ../data/sound-juicer.ui.h:36
-msgid "_Re-read Disc"
-msgstr "_Ponovo proÄitaj"
-
-#: ../data/sound-juicer.ui.h:37
-msgid "_Select All"
-msgstr "_Izaberi sve"
-
-#: ../data/sound-juicer.ui.h:38
-msgid "_Strip special characters"
-msgstr "Ostavi samo slova i b_rojeve"
-
-#: ../data/sound-juicer.ui.h:39
-msgid "_Submit Track Names..."
-msgstr "Pre_daj nazive pesama..."
-
-#: ../data/sound-juicer.ui.h:40
-msgid "_Title:"
-msgstr "_Naslov:"
-
-#: ../data/sound-juicer.ui.h:41
-msgid "_Year:"
-msgstr "_Godina:"
+#: ../data/sound-juicer.ui.h:19
+msgid "Music Folder"
+msgstr "Fascikla sa muzikom"
 
-#: ../data/sound-juicer.schemas.in.h:2
-#, no-c-format
-msgid ""
-"%at -- album title %aT -- album title (lowercase) %aa -- album artist %aA -- "
-"album artist (lowercase) %as -- album artist (sortable) %aS -- album artist "
-"(sortable lowercase) %ay -- album year %tt -- track title %tT -- track title "
-"(lowercase) %ta -- track artist %tA -- track artist (lowercase) %ts -- track "
-"artist (sortable) %tS -- track artist (sortable lowercase)"
-msgstr ""
-"%at â naslov albuma %aT â naslov albuma (malim slovima) %aa â izvoÄaÄ albuma "
-"%aA â izvoÄaÄ albuma (malim slovima) %as â izvoÄaÄ albuma (za reÄanje) %aS â "
-"izvoÄaÄ albuma (malim slovima, za reÄanje) %ay â godina %tt â naslov pesme %"
-"tT â naslov pesme (malim slovima) %ta â izvoÄaÄ pesme %tA â izvoÄaÄ pesme "
-"(malim slovima) %ts â izvoÄaÄ pesme (za reÄanje) %tS â izvoÄaÄ pesme (malim "
-"slovima, za reÄanje)"
+#: ../data/sound-juicer.ui.h:20
+msgid "_Folder:"
+msgstr "_Fascikla:"
 
-#: ../data/sound-juicer.schemas.in.h:3
-#| msgid "Audio Profile with which to encode"
-msgid "(obsolete) Audio Profile with which to encode"
-msgstr "(prevaziÄeno) ZvuÄni profil kojim da kodira"
+#: ../data/sound-juicer.ui.h:21
+msgid "Select A Folder"
+msgstr "Izaberite mesto"
 
-#: ../data/sound-juicer.schemas.in.h:4
-msgid "Audio volume"
-msgstr "JaÄina zvuka"
+#: ../data/sound-juicer.ui.h:22
+msgid "Track Names"
+msgstr "Nazivi pesama"
 
-#: ../data/sound-juicer.schemas.in.h:6
-#, no-c-format
-msgid ""
-"Do not specify an extension. %at -- album title %aT -- album title "
-"(lowercase) %aa -- album artist %aA -- album artist (lowercase) %as -- album "
-"artist (sortable) %aS -- album artist (sortable lowercase) %tn -- track "
-"number (i.e 8) %tN -- track number, zero padded (i.e 08) %tt -- track title %"
-"tT -- track title (lowercase) %ta -- track artist %tA -- track artist "
-"(lowercase) %ts -- track artist (sortable) %tS -- track artist (sortable "
-"lowercase) %dn -- disc and track number (i.e Disk 2 - 6, or 6) %dN -- disc "
-"number, zero padded (i.e d02t06, or 06)"
-msgstr ""
-"Ne navodite ekstenziju. %at â naslov albuma %aT â naslov albuma (malim "
-"slovima) %aa â izvoÄaÄ albuma %aA â izvoÄaÄ albuma (malim slovima) %as â "
-"izvoÄaÄ albuma (za reÄanje) %aS â izvoÄaÄ albuma (malim slovima, za reÄanje) %"
-"tn â broj pesme (npr. 8) %tN â broj pesme, popunjen nulama (npr. 08) %tt â "
-"naslov pesme %tT â naslov pesme (malim slovima) %ta â izvoÄaÄ pesme %tA â "
-"izvoÄaÄ pesme (malim slovima) %ts â izvoÄaÄ albuma (za reÄanje) %tS â izvoÄaÄ "
-"albuma (malim slovima, za reÄanje) %dn â broj diska u numere (npr. Disk 2 - "
-"6, ili 6) %dN â broj diska, popunjen nulama (npr. d02t06, ili 06)"
-
-#: ../data/sound-juicer.schemas.in.h:7
-msgid ""
-"If enabled, special characters such as space, wildcards and backslashes will "
-"be removed from the output filename."
-msgstr ""
-"Ako je ukljuÄeno, posebni znaci kao Åto su razmak, dÅoker znaci i obrnute kose "
-"crte biÄe uklonjeni iz izlaznog naziva datoteke."
+#: ../data/sound-juicer.ui.h:23
+msgid "Folder hie_rarchy:"
+msgstr "_Hijerarhija mesta:"
 
-#: ../data/sound-juicer.schemas.in.h:8
-msgid "If specified, this value will override the default MusicBrainz server."
-msgstr ""
-"Ukoliko je navedena, ova vrednost se koristi umesto podrazumevanog servera "
-"MozgiÄa muzike."
+#: ../data/sound-juicer.ui.h:24
+msgid "File _name:"
+msgstr "_Naziv datoteke:"
 
-#: ../data/sound-juicer.schemas.in.h:9
-msgid "If to strip special characters from filenames"
-msgstr "Izbacivanje posebnih znakova iz naziva datoteke"
+#: ../data/sound-juicer.ui.h:25
+msgid "_Strip special characters"
+msgstr "Ostavi samo slova i b_rojeve"
 
-#: ../data/sound-juicer.schemas.in.h:10
-msgid "Media type to encode to"
-msgstr "Vrsta medija u koji vrÅiti kodiranje"
+# andrija: da li bi ovo moglo kao âFormatâ ?
+#: ../data/sound-juicer.ui.h:26
+msgid "Format"
+msgstr "Format"
 
-#: ../data/sound-juicer.schemas.in.h:11
-msgid ""
-"Paranoia mode: 0) disable 2) fragment 4) overlap 8) scratch 16) repair 255) "
-"full"
-msgstr ""
-"ReÅim paranoje: 0) iskljuÄen 2) delovi 4) preskakanje 8) izgrebano 16) popravi "
-"255) puni"
+#: ../data/sound-juicer.ui.h:27
+msgid "O_utput Format:"
+msgstr "I_zlazni format:"
 
-#: ../data/sound-juicer.schemas.in.h:12
-msgid "The GStreamer media type to encode to."
-msgstr "Vrsta medija Gstrimera u koji vrÅiti kodiranje."
+#: ../data/sound-juicer-menu.ui.h:1
+#| msgid "Disc:"
+msgid "Disc"
+msgstr "Disk"
 
-# andrija:  rogobatno je â... za upotrebuâ a ne doprinosi
-#: ../data/sound-juicer.schemas.in.h:13
-msgid "The MusicBrainz server to use"
-msgstr "Server MozgiÄa muzike"
+#: ../data/sound-juicer-menu.ui.h:2
+#| msgid "_Re-read Disc"
+msgid "Re-read"
+msgstr "Ponovo proÄitaj"
 
-#: ../data/sound-juicer.schemas.in.h:14
-msgid "The directory structure for the files"
-msgstr "Struktura direktorijuma za datoteke"
+#: ../data/sound-juicer-menu.ui.h:3
+#| msgid "_Duplicate Disc"
+msgid "Duplicate"
+msgstr "UmnoÅi disk"
 
-#: ../data/sound-juicer.schemas.in.h:15
-msgid "The name pattern for files"
-msgstr "Oblik naziva za datoteke"
+#: ../data/sound-juicer-menu.ui.h:4
+#| msgid "_Eject"
+msgid "Eject"
+msgstr "Izbaci"
 
-#: ../data/sound-juicer.schemas.in.h:16
-msgid "The paranoia mode to use"
-msgstr "ReÅim paranoje za upotrebu"
+#: ../data/sound-juicer-menu.ui.h:5
+#| msgid "_Submit Track Names..."
+msgid "Submit Track Names"
+msgstr "Predaj nazive pesama"
 
-#: ../data/sound-juicer.schemas.in.h:17
-msgid ""
-"This key used to store the GNOME Audio Profile with which to encode. This "
-"has been superseded by GStreamer encoding profiles, which are configured "
-"using the audio_profile_media_type key."
-msgstr ""
-"Ovaj kljuÄ se koristi za Äuvanje Gnomovog zvuÄnog profila sa kojim Äe se "
-"vrÅiti kodiranje. Ovo je bilo potisnuto Gstrimerovim profilima kodiranja, koji "
-"su podeÅeni koriÅÄenjem kljuÄa âaudio_profile_media_typeâ "
-"(vrsta_medija_zvuÄnog_profila)."
+# Sokovnik za zvuk = Zvukovnik
+#: ../data/sound-juicer-menu.ui.h:7
+#| msgid "Sound Juicer"
+msgid "About Sound Juicer"
+msgstr "O Zvukovniku"
 
-#: ../data/sound-juicer.schemas.in.h:18
-msgid "Whether to eject the CD when finished extracting."
-msgstr "Da li da izbaci CD kada zavrÅi izvlaÄenje?"
+#: ../data/sound-juicer-menu.ui.h:8
+#| msgid "_Help"
+msgid "Help"
+msgstr "PomoÄ"
 
-#: ../data/sound-juicer.schemas.in.h:19
-msgid "Whether to open the target directory when finished extracting."
-msgstr "Da li da otvori direktorijum sa muzikom nakon njenog izvlaÄenja."
+#: ../data/sound-juicer-menu.ui.h:9
+msgid "Quit"
+msgstr "IzaÄi"
 
 #: ../libjuicer/sj-extractor.c:193
 msgid "Audio Profile"
 msgstr "Profil zvuka"
 
 #: ../libjuicer/sj-extractor.c:194
-#| msgid "The GNOME Audio Profile used for encoding audio"
 msgid "The GStreamer Encoding Profile used for encoding audio"
 msgstr "Gstrimerov profil kodiranja koriÅÄen za kodiranje zvuka."
 
@@ -369,11 +384,11 @@ msgstr "Ne mogu da napravim GStrimerovu izlaznu datoteku"
 msgid "Could not link pipeline"
 msgstr "Ne mogu da uveÅem pocesni lanac"
 
-#: ../libjuicer/sj-extractor.c:416
+#: ../libjuicer/sj-extractor.c:415
 msgid "Could not get current track position"
 msgstr "Ne mogu da dobavim poloÅaj tekuÄe pesme"
 
-#: ../libjuicer/sj-extractor.c:445
+#: ../libjuicer/sj-extractor.c:444
 #, c-format
 msgid ""
 "Extractor object is not valid. This is bad, check your console for errors."
@@ -381,12 +396,12 @@ msgstr ""
 "Objekat za izvlaÄenje nije odgovarajuÄi. To je loÅe, proverite vaÅu konzolu "
 "za greÅke."
 
-#: ../libjuicer/sj-extractor.c:653
+#: ../libjuicer/sj-extractor.c:681
 #, c-format
 msgid "The plugin necessary for CD access was not found"
 msgstr "PrikljuÄak neophodan za pristup CD-u nije naÄen"
 
-#: ../libjuicer/sj-extractor.c:661
+#: ../libjuicer/sj-extractor.c:689
 #, c-format
 msgid "The plugin necessary for file access was not found"
 msgstr "PrikljuÄak neophodan za pristup datoteci nije naÄen"
@@ -413,12 +428,8 @@ msgstr "UreÄaj â%sâ ne sadrÅi nijedan medij"
 #, c-format
 msgid ""
 "Device '%s' could not be opened. Check the access permissions on the device."
-msgstr "Ne mogu da otvorim ureÄaj â%sâ. Proverite ovlaÅÄenja pristupa za ureÄaj."
-
-#: ../libjuicer/sj-metadata-getter.c:247
-#, c-format
-msgid "Could not create CD lookup thread"
-msgstr "Ne mogu da napravim nit za pretragu CD-a"
+msgstr ""
+"Ne mogu da otvorim ureÄaj â%sâ. Proverite ovlaÅÄenja pristupa za ureÄaj."
 
 #: ../libjuicer/sj-metadata-gvfs.c:90
 #, c-format
@@ -430,7 +441,7 @@ msgid "Unknown Title"
 msgstr "Nepoznat naslov"
 
 #: ../libjuicer/sj-metadata-gvfs.c:113 ../libjuicer/sj-metadata-gvfs.c:139
-#: ../src/egg-play-preview.c:468
+#: ../src/egg-play-preview.c:468 ../src/sj-extracting.c:986
 msgid "Unknown Artist"
 msgstr "Nepoznati izvoÄaÄ"
 
@@ -453,7 +464,7 @@ msgstr "Adresa"
 msgid "The URI of the audio file"
 msgstr "Adresa zvuÄne datoteke"
 
-#: ../src/egg-play-preview.c:179 ../src/sj-main.c:630 ../src/sj-main.c:1800
+#: ../src/egg-play-preview.c:179 ../src/sj-main.c:810 ../src/sj-main.c:2011
 msgid "Title"
 msgstr "Naslov"
 
@@ -461,7 +472,7 @@ msgstr "Naslov"
 msgid "The title of the current stream."
 msgstr "Naslov trenutnog toka."
 
-#: ../src/egg-play-preview.c:189 ../src/sj-main.c:636 ../src/sj-main.c:1809
+#: ../src/egg-play-preview.c:189 ../src/sj-main.c:816 ../src/sj-main.c:2020
 msgid "Artist"
 msgstr "IzvoÄaÄ"
 
@@ -485,7 +496,7 @@ msgstr "PoloÅaj"
 msgid "The position in the current stream in seconds."
 msgstr "PoloÅaj u trenutnom toku u sekundama."
 
-#: ../src/egg-play-preview.c:219 ../src/sj-main.c:1820
+#: ../src/egg-play-preview.c:219 ../src/sj-main.c:2044
 msgid "Duration"
 msgstr "Trajanje"
 
@@ -493,7 +504,7 @@ msgstr "Trajanje"
 msgid "The duration of the current stream in seconds."
 msgstr "Trajanje trenutnog toka u sekundama."
 
-#: ../src/egg-play-preview.c:469
+#: ../src/egg-play-preview.c:469 ../src/sj-extracting.c:985
 msgid "Unknown Album"
 msgstr "Nepoznat album"
 
@@ -514,9 +525,9 @@ msgid ""
 "any later version."
 msgstr ""
 "Zvukovnik je slobodan softver; moÅete ga raspodeljivati i/ili menjati pod "
-"uslovima GNU OpÅte Javne Licence (GNU GPL) kako je objavljuje ZaduÅbina za "
-"Slobodni Softver (FSF); bilo verzije 2 te Licence, bilo (po vaÅem nahoÄenju) "
-"bilo koje novije verzije."
+"uslovima Gnuove opÅte javne dozvole kako je objavljuje ZaduÅbina slobodnog "
+"softvera; bilo izdanja 2 te dozvole, ili (prema vaÅem nahoÄenju) bilo kojeg "
+"novijeg izdanja."
 
 #: ../src/sj-about.c:56
 msgid ""
@@ -526,8 +537,9 @@ msgid ""
 "more details."
 msgstr ""
 "Zvukovnik se raspodeljuje u nadi da Äe biti od koristi, ali BEZ IKAKVIH "
-"GARANCIJA; Äak i bez podrazumevane garancije KORISNOSTI ili PRILAGOÄENOSTI "
-"ODREÄENOJ NAMENI.  Vidite GNU OpÅtu Javnu Licencu za viÅe detalja."
+"GARANCIJA; Äak i bez podrazumevane garancije TRÅIÅNE VREDNOSTI ili "
+"PRILAGOÄENOSTI ODREÄENOJ NAMENI.  Pogledajte Gnuovu opÅtu javnu dozvolu za "
+"viÅe detalja."
 
 # bug: old address for FSF
 #: ../src/sj-about.c:60
@@ -536,8 +548,8 @@ msgid ""
 "Sound Juicer; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
-"Trebalo je da primite primerak GNU OpÅte Javne Licence uz Zvukovnik; ako "
-"niste, piÅite ZaduÅbini za Slobodni Softver na adresu: âFree Software "
+"Trebalo je da primite primerak Gnuove opÅte javne dozvole uz Zvukovnik; ako "
+"niste, piÅite ZaduÅbini slobodnog softvera na adresu: âFree Software "
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 "
 "USAâ"
 
@@ -560,26 +572,26 @@ msgstr ""
 "\n"
 "http://prevod.org â prevod na srpski jezik."
 
-#: ../src/sj-extracting.c:152
+#: ../src/sj-extracting.c:150
 #, c-format
 msgid "Failed to get output format"
 msgstr "Ne mogu da dobavim izlazni format"
 
-#: ../src/sj-extracting.c:177
+#: ../src/sj-extracting.c:175
 msgid "Name too long"
 msgstr "Naziv je predugaÄak"
 
 #. TODO: find out why GTK+ needs this to work (see #364371)
-#: ../src/sj-extracting.c:236
+#: ../src/sj-extracting.c:234
 msgid "Extract"
 msgstr "Izvuci"
 
-#: ../src/sj-extracting.c:313
+#: ../src/sj-extracting.c:315
 msgid "A file with the same name exists"
 msgstr "VeÄ postoji datoteka sa ovim nazivom"
 
 # andrija: Doslovniji prevod preskoÄi i presnimi su previÅe bliski i moÅe doÄi do sluÄajnog meÅanja
-#: ../src/sj-extracting.c:315
+#: ../src/sj-extracting.c:317
 #, c-format
 msgid ""
 "A file called '%s' exists, size %s.\n"
@@ -588,62 +600,72 @@ msgstr ""
 "Datoteka sa nazivom â%sâ postoji, veliÄine %s kB.\n"
 "Da li Åelite da preskoÄite ovu pesmu ili da je presnimite?"
 
-#: ../src/sj-extracting.c:325
+#: ../src/sj-extracting.c:327
 msgid "_Skip"
 msgstr "_PreskoÄi"
 
-#: ../src/sj-extracting.c:326
+#: ../src/sj-extracting.c:328
 msgid "S_kip All"
 msgstr "P_reskoÄi sve"
 
-#: ../src/sj-extracting.c:327
+#: ../src/sj-extracting.c:329
 msgid "_Overwrite"
 msgstr "Pre_snimi"
 
-#: ../src/sj-extracting.c:328
+#: ../src/sj-extracting.c:330
 msgid "Overwrite _All"
 msgstr "Pr_esnimi sve"
 
-#: ../src/sj-extracting.c:377
+#: ../src/sj-extracting.c:379
 #, c-format
 msgid "Failed to create output directory: %s"
 msgstr "Ne mogu da napravim izlazni direktorijum: %s"
 
 # Ne moramo doslovce
-#: ../src/sj-extracting.c:517
+#: ../src/sj-extracting.c:519
 #, c-format
 msgid "Estimated time left: %d:%02d (at %0.1fÃ)"
 msgstr "Preostalo procenjeno vreme: %d:%02d (pri %0.1fx)"
 
 # Ne moramo doslovce
-#: ../src/sj-extracting.c:519
+#: ../src/sj-extracting.c:521
 msgid "Estimated time left: unknown"
 msgstr "Preostalo vreme: nepoznato"
 
-#: ../src/sj-extracting.c:609
+#: ../src/sj-extracting.c:611
 msgid "CD rip complete"
 msgstr "ZavrÅeno je izvlaÄenje zvuka"
 
-#: ../src/sj-extracting.c:701
+#: ../src/sj-extracting.c:703
 msgid "Sound Juicer could not extract this CD."
 msgstr "Zvukovnik ne moÅe da izvuÄe pesme sa ovog diska."
 
-#: ../src/sj-extracting.c:703 ../src/sj-main.c:188 ../src/sj-main.c:818
-#: ../src/sj-main.c:938 ../src/sj-main.c:1037 ../src/sj-main.c:1252
-#: ../src/sj-main.c:1607
+#: ../src/sj-extracting.c:705 ../src/sj-main.c:189 ../src/sj-main.c:472
+#: ../src/sj-main.c:510 ../src/sj-main.c:1006 ../src/sj-main.c:1129
+#: ../src/sj-main.c:1228
 msgid "Reason"
 msgstr "Razlog"
 
 #. Change the label to Stop while extracting
 #. TODO: find out why GTK+ needs this to work (see #364371)
-#: ../src/sj-extracting.c:799
+#: ../src/sj-extracting.c:796
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: ../src/sj-extracting.c:828 ../src/sj-extracting.c:834
+#: ../src/sj-extracting.c:825 ../src/sj-extracting.c:831
 msgid "Extracting audio from CD"
 msgstr "IzvlaÄim zvuk sa CD-a"
 
+#: ../src/sj-extracting.c:987
+#| msgid "Unknown Title"
+msgid "Unknown Composer"
+msgstr "Nepoznat kompozitor"
+
+#: ../src/sj-extracting.c:988
+#| msgid "Unknown Title"
+msgid "Unknown Track"
+msgstr "Nepoznata numera"
+
 #: ../src/sj-genres.c:34
 msgid "Ambient"
 msgstr "Ambijentalna"
@@ -652,7 +674,7 @@ msgstr "Ambijentalna"
 msgid "Blues"
 msgstr "Bluz"
 
-#: ../src/sj-genres.c:36
+#: ../src/sj-genres.c:36 ../src/sj-main.c:571
 msgid "Classical"
 msgstr "KlasiÄna"
 
@@ -713,100 +735,138 @@ msgstr "Izgovorena reÄ"
 msgid "Error while saving custom genre: %s"
 msgstr "GreÅka pri Äuvanju proizvoljnog Åanra: %s"
 
-#: ../src/sj-main.c:121
+#: ../src/sj-main.c:122
 msgid "E_xtract"
 msgstr "Iz_vuci"
 
-#: ../src/sj-main.c:187
+#: ../src/sj-main.c:188
 msgid "Could not start Sound Juicer"
 msgstr "Ne mogu da pokrenem Zvukovnik"
 
-#: ../src/sj-main.c:190
+#: ../src/sj-main.c:191
 msgid "Please consult the documentation for assistance."
 msgstr "Pogledajte dokumentaciju za pomoÄ."
 
-#: ../src/sj-main.c:232
+#: ../src/sj-main.c:225
 msgid "You are currently extracting a CD. Do you want to quit now or continue?"
 msgstr ""
 "Vi trenutno izvlaÄite sa CD-a.  Da li Åelite da prekinete sada ili da "
 "nastavite?"
 
-#: ../src/sj-main.c:292 ../src/sj-main.c:552
+#: ../src/sj-main.c:273 ../src/sj-main.c:1915 ../src/sj-main.c:1965
+#| msgid "Select A Folder"
+msgid "Select None"
+msgstr "PoniÅti izbor"
+
+#: ../src/sj-main.c:287 ../src/sj-main.c:1959
+#| msgid "_Select All"
+msgid "Select All"
+msgstr "Izaberi sve"
+
+#: ../src/sj-main.c:308 ../src/sj-main.c:732
 msgid "(unknown)"
 msgstr "(nepoznato)"
 
-#: ../src/sj-main.c:420
+#: ../src/sj-main.c:436
 msgid "S_ubmit Album"
 msgstr "Po_Åalji album"
 
 #. Translators: title, artist
-#: ../src/sj-main.c:425
+#: ../src/sj-main.c:441
 #, c-format
 msgid "Could not find %s by %s on MusicBrainz."
 msgstr "Ne mogu da naÄem %s od %s na MozgiÄu muzike."
 
-#: ../src/sj-main.c:430
+#: ../src/sj-main.c:446
 msgid "You can improve the MusicBrainz database by adding this album."
 msgstr "MoÅete unaprediti bazu MozgiÄa muzike dodavanjem ovog albuma."
 
-#: ../src/sj-main.c:816 ../src/sj-main.c:934 ../src/sj-main.c:1035
+#: ../src/sj-main.c:470
+msgid "Could not open URL"
+msgstr "Ne mogu da otvorim adresu"
+
+#: ../src/sj-main.c:471
+msgid "Sound Juicer could not open the submission URL"
+msgstr "Zvukovnik ne moÅe da otvori priloÅenu adresu"
+
+#: ../src/sj-main.c:508
+msgid "Could not duplicate disc"
+msgstr "Ne mogu da umnoÅim disk"
+
+#: ../src/sj-main.c:509
+msgid "Sound Juicer could not duplicate the disc"
+msgstr "Zvukovnik ne moÅe da umnoÅi traÅeni disk"
+
+#: ../src/sj-main.c:571
+msgid "Lieder"
+msgstr "Lieder"
+
+#: ../src/sj-main.c:571
+msgid "Opera"
+msgstr "Opera"
+
+#: ../src/sj-main.c:571
+msgid "Chamber"
+msgstr "Kamerna"
+
+#: ../src/sj-main.c:571
+msgid "Musical"
+msgstr "Mjuzikl"
+
+#: ../src/sj-main.c:1004 ../src/sj-main.c:1125 ../src/sj-main.c:1226
 msgid "Could not read the CD"
 msgstr "Ne mogu da Äitam CD"
 
-#: ../src/sj-main.c:817 ../src/sj-main.c:937
+#: ../src/sj-main.c:1005 ../src/sj-main.c:1128
 msgid "Sound Juicer could not read the track listing on this CD."
 msgstr "Zvukovnik ne moÅe da Äita spisak pesama sa ovog CD-a."
 
 #. Set statusbar message
-#: ../src/sj-main.c:908
+#: ../src/sj-main.c:1099
 msgid "Retrieving track listing...please wait."
 msgstr "Preuzimam spisak pesama... Molim priÄekajte."
 
-#: ../src/sj-main.c:997
+#: ../src/sj-main.c:1188
 #, c-format
 msgid "Sound Juicer could not use the CD-ROM device '%s'"
 msgstr "Zvukovnik ne moÅe da upotrebi CD ureÄaj â%sâ"
 
-#: ../src/sj-main.c:1004
+#: ../src/sj-main.c:1195
 msgid "HAL daemon may not be running."
-msgstr "HAL usluga moÅada nije pokrenuta."
+msgstr "HAL usluga moÅda nije pokrenuta."
 
-#: ../src/sj-main.c:1028
+#: ../src/sj-main.c:1219
 #, c-format
 msgid "Sound Juicer could not access the CD-ROM device '%s'"
 msgstr "Zvukovnik ne moÅe da pristupi CD ureÄaju â%sâ"
 
-#: ../src/sj-main.c:1126
+#: ../src/sj-main.c:1317
 msgid "No CD-ROM drives found"
 msgstr "Nije pronaÄen nijedan CD ureÄaj"
 
-#: ../src/sj-main.c:1127
+#: ../src/sj-main.c:1318
 msgid "Sound Juicer could not find any CD-ROM drives to read."
 msgstr "Zvukovnik ne moÅe da pronaÄe nijedan CD ureÄaj za Äitanje."
 
-#: ../src/sj-main.c:1159
+#: ../src/sj-main.c:1350
 msgid ""
 "The currently selected audio profile is not available on your installation."
 msgstr "Trenutno izabrani zvuÄni profil nije dostupan na vaÅem sistemu."
 
-#: ../src/sj-main.c:1161
+#: ../src/sj-main.c:1352
 msgid "_Change Profile"
 msgstr "_Izmeni profil"
 
-#: ../src/sj-main.c:1250
-msgid "Could not open URL"
-msgstr "Ne mogu da otvorim adresu"
-
-#: ../src/sj-main.c:1251
-msgid "Sound Juicer could not open the submission URL"
-msgstr "Zvukovnik ne moÅe da otvori priloÅenu adresu"
-
-#: ../src/sj-main.c:1359
+#: ../src/sj-main.c:1534
 #, c-format
 msgid "Unknown column %d was edited"
 msgstr "Nepoznata kolona %d je izmenjena"
 
-#: ../src/sj-main.c:1500 ../src/sj-prefs.c:111
+#: ../src/sj-main.c:1634
+msgid "Unknown widget calling on_person_edit_changed."
+msgstr "Nepoznat poziv elementa na izmenjenom ureÄivanju osobe."
+
+#: ../src/sj-main.c:1735 ../src/sj-prefs.c:119
 #, c-format
 msgid ""
 "Could not display help for Sound Juicer\n"
@@ -815,48 +875,44 @@ msgstr ""
 "Ne mogu da prikaÅem pomoÄ za Zvukovnik\n"
 "%s"
 
-#: ../src/sj-main.c:1605
-msgid "Could not duplicate disc"
-msgstr "Ne mogu da umnoÅim disk"
+#: ../src/sj-main.c:1845
+msgid "Could not create GConf client.\n"
+msgstr "Ne mogu da napravim GKonf klijenta.\n"
 
-#: ../src/sj-main.c:1606
-msgid "Sound Juicer could not duplicate the disc"
-msgstr "Zvukovnik ne moÅe da umnoÅi traÅeni disk"
+# andrija: Ovde je u pitanju *broj pesme*
+#: ../src/sj-main.c:1996
+msgid "Track"
+msgstr "Numera"
+
+#: ../src/sj-main.c:2031
+msgid "Composer"
+msgstr "Kompozitor"
 
-#: ../src/sj-main.c:1633
+#: ../src/sj-main.c:2182
 msgid "Start extracting immediately"
 msgstr "Odmah poÄinje sa izvlaÄenjem pesama"
 
-#: ../src/sj-main.c:1634
+#: ../src/sj-main.c:2183
 msgid "Start playing immediately"
 msgstr "Odmah puÅta pesmu"
 
-#: ../src/sj-main.c:1635
+#: ../src/sj-main.c:2184
 msgid "What CD device to read"
 msgstr "Koji Äe CD ureÄaj da Äita"
 
-#: ../src/sj-main.c:1635
+#: ../src/sj-main.c:2184
 msgid "DEVICE"
 msgstr "UREÄAJ"
 
-#: ../src/sj-main.c:1636
+#: ../src/sj-main.c:2185
 msgid "URI to the CD device to read"
 msgstr "Adresa do CD ureÄaja za Äitanje"
 
-#: ../src/sj-main.c:1649
+#: ../src/sj-main.c:2197
 msgid "- Extract music from your CDs"
 msgstr "â izvucite muziku sa vaÅih nosaÄa zvuka"
 
-#: ../src/sj-main.c:1686
-msgid "Could not create GConf client.\n"
-msgstr "Ne mogu da napravim GKonf klijenta.\n"
-
-# andrija: Ovde je u pitanju *broj pesme*
-#: ../src/sj-main.c:1785
-msgid "Track"
-msgstr "Numera"
-
-#: ../src/sj-play.c:191 ../src/sj-play.c:463 ../src/sj-play.c:492
+#: ../src/sj-play.c:194 ../src/sj-play.c:420 ../src/sj-play.c:449
 #, c-format
 msgid ""
 "Error playing CD.\n"
@@ -868,30 +924,21 @@ msgstr ""
 "Razlog: %s"
 
 #. TODO: find out why GTK+ needs this to work (see #364371)
-#: ../src/sj-play.c:262
+#: ../src/sj-play.c:261
 msgid "Play"
 msgstr "Pusti"
 
 #. TODO: find out why GTK+ needs this to work (see #364371)
-#: ../src/sj-play.c:306
+#: ../src/sj-play.c:305
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/sj-play.c:363
+#: ../src/sj-play.c:358
 #, c-format
 msgid "Failed to create CD source element"
 msgstr "Ne mogu da napravim element izvornog CD-a"
 
-#: ../src/sj-play.c:404
-msgid "Failed to link pipeline"
-msgstr "Ne mogu da uveÅem procesni lanac"
-
-#: ../src/sj-play.c:410
-#, c-format
-msgid "Failed to create audio output"
-msgstr "Ne mogu da napravim audio izlaz"
-
-#: ../src/sj-play.c:613
+#: ../src/sj-play.c:564
 #, c-format
 msgid "Seeking to %s"
 msgstr "Premotavam na â%sâ"
@@ -933,38 +980,134 @@ msgid "Album Artist (sortable) - Album Title"
 msgstr "IzvoÄaÄ (moÅe se poreÄati) â Naslov albuma"
 
 #: ../src/sj-prefs.c:63
+#| msgid "Album Artist, Album Title"
+msgid "Album Composer, Album Title"
+msgstr "Kompozitor â Naslov albuma"
+
+#: ../src/sj-prefs.c:64
+#| msgid "Album Artist (sortable), Album Title"
+msgid "Album Composer (sortable), Album Title"
+msgstr "Kompozitor (za reÄanje) â Naslov albuma"
+
+#: ../src/sj-prefs.c:65
+#| msgid "Track Artist, Album Title"
+msgid "Track Composer, Album Title"
+msgstr "Kompozitor numere â Naslov albuma"
+
+#: ../src/sj-prefs.c:66
+#| msgid "Track Artist (sortable), Album Title"
+msgid "Track Composer (sortable), Album Title"
+msgstr "Kompozitor numere (za reÄanje) â Naslov albuma"
+
+#: ../src/sj-prefs.c:67
 msgid "[none]"
 msgstr "[niÅta]"
 
-#: ../src/sj-prefs.c:68
+#: ../src/sj-prefs.c:72
 msgid "Number - Title"
 msgstr "Broj â Naslov"
 
-#: ../src/sj-prefs.c:69
+#: ../src/sj-prefs.c:73
 msgid "Track Title"
 msgstr "Naslov pesme"
 
-#: ../src/sj-prefs.c:70
+#: ../src/sj-prefs.c:74
 msgid "Track Artist - Track Title"
 msgstr "IzvoÄaÄ pesme â Naslov pesme"
 
-#: ../src/sj-prefs.c:71
+#: ../src/sj-prefs.c:75
 msgid "Track Artist (sortable) - Track Title"
 msgstr "IzvoÄaÄ pesme (moÅe se poreÄati) â Naslov pesme"
 
-#: ../src/sj-prefs.c:72
+#: ../src/sj-prefs.c:76
 msgid "Number. Track Artist - Track Title"
 msgstr "Broj. IzvoÄaÄ pesme â Naslov pesme"
 
 #. {N_("Number. Track Artist (sortable) - Track Title"), "%tN. %ts - %tt"},
-#: ../src/sj-prefs.c:74
+#: ../src/sj-prefs.c:78
 msgid "Number-Track Artist-Track Title (lowercase)"
 msgstr "Broj numere â IzvoÄaÄ pesme â Naslov pesme"
 
-#: ../src/sj-prefs.c:297
+#. {N_("Number-Track Artist (sortable)-Track Title (lowercase)"), "%tN-%tS-%tT"},
+#: ../src/sj-prefs.c:80
+#| msgid "Number. Track Artist - Track Title"
+msgid "Track Composer - Track Artist - Track Title"
+msgstr "Kompozitor â IzvoÄaÄ pesme â Naslov pesme"
+
+#: ../src/sj-prefs.c:81
+#| msgid "Track Artist (sortable) - Track Title"
+msgid "Track Composer (sortable) - Track Artist (sortable) - Track Title"
+msgstr "Kompozitor (za reÄanje) â IzvoÄaÄ pesme (za reÄanje) â Naslov pesme"
+
+#: ../src/sj-prefs.c:82
+#| msgid "Number. Track Artist - Track Title"
+msgid "Number. Track Composer - Track Artist - Track Title"
+msgstr "Broj. Kompozitor â IzvoÄaÄ pesme â Naslov pesme"
+
+#: ../src/sj-prefs.c:83
+#| msgid "Number-Track Artist-Track Title (lowercase)"
+msgid "Number-Track Composer-Track Artist-Track Title (lowercase)"
+msgstr "BrojâKompozitorâIzvoÄaÄ pesmeâNaslov pesme (malim slovima)"
+
+#: ../src/sj-prefs.c:307
 msgid "Example Path"
 msgstr "Primer putanje"
 
+#~ msgid "E_ject"
+#~ msgstr "Iz_baci"
+
+#~ msgid "Pre_vious Track"
+#~ msgstr "Prethodna pesma"
+
+#~ msgid "Skip to the next track"
+#~ msgstr "PreÄi na sledeÄu pesmu"
+
+#~ msgid "Skip to the previous track"
+#~ msgstr "PreÄi na prethodnu pesmu"
+
+#~ msgid "_Contents"
+#~ msgstr "_SadrÅaj"
+
+#~ msgid "_Deselect All"
+#~ msgstr "_OdznaÄi sve"
+
+#~ msgid "_Disc"
+#~ msgstr "_Disk"
+
+#~ msgid "_Edit"
+#~ msgstr "_UreÄivanje"
+
+#~ msgid "_Next Track"
+#~ msgstr "_SledeÄa pesma"
+
+# andrija: nisam siguran gde da stavim preÄicu, pa je nisam ni stavio
+#~ msgid "_Play / Pause"
+#~ msgstr "P_usti / Pauziraj"
+
+#~ msgid ""
+#~ "%at -- album title %aT -- album title (lowercase) %aa -- album artist %aA "
+#~ "-- album artist (lowercase) %as -- album artist (sortable) %aS -- album "
+#~ "artist (sortable lowercase) %ay -- album year %tt -- track title %tT -- "
+#~ "track title (lowercase) %ta -- track artist %tA -- track artist "
+#~ "(lowercase) %ts -- track artist (sortable) %tS -- track artist (sortable "
+#~ "lowercase)"
+#~ msgstr ""
+#~ "%at â naslov albuma %aT â naslov albuma (malim slovima) %aa â izvoÄaÄ "
+#~ "albuma %aA â izvoÄaÄ albuma (malim slovima) %as â izvoÄaÄ albuma (za "
+#~ "reÄanje) %aS â izvoÄaÄ albuma (malim slovima, za reÄanje) %ay â godina %tt "
+#~ "â naslov pesme %tT â naslov pesme (malim slovima) %ta â izvoÄaÄ pesme %tA "
+#~ "â izvoÄaÄ pesme (malim slovima) %ts â izvoÄaÄ pesme (za reÄanje) %tS â "
+#~ "izvoÄaÄ pesme (malim slovima, za reÄanje)"
+
+#~ msgid "Could not create CD lookup thread"
+#~ msgstr "Ne mogu da napravim nit za pretragu CD-a"
+
+#~ msgid "Failed to link pipeline"
+#~ msgstr "Ne mogu da uveÅem procesni lanac"
+
+#~ msgid "Failed to create audio output"
+#~ msgstr "Ne mogu da napravim audio izlaz"
+
 #~ msgid "Edit _Profiles..."
 #~ msgstr "Uredi postav_ke..."
 
@@ -1034,9 +1177,6 @@ msgstr "Primer putanje"
 #~ msgid "%s has been copied successfully."
 #~ msgstr "%s je uspeÅno prebaÄena."
 
-#~ msgid "_Eject"
-#~ msgstr "Iz_baci"
-
 #~ msgid "Could not get track start position"
 #~ msgstr "Ne moÅe da dobije startnu poziciju pesme"
 
@@ -1281,9 +1421,6 @@ msgstr "Primer putanje"
 #~ msgid "Retro"
 #~ msgstr "Retro"
 
-#~ msgid "Musical"
-#~ msgstr "Mjuzikl"
-
 #~ msgid "Rock & Roll"
 #~ msgstr "Rokenrol"