po: regenerated ncmpc.pot

9 files changed, 2171 insertions, 1797 deletions

diff --git a/po/da.po b/po/da.po
index 504787334..7b0d651a0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-07 11:40+0000\n"
+"POT-Creation-Date: 2008-11-17 19:57+0100\n"
 "PO-Revision-Date: 2006-03-31 02:27+0100\n"
 "Last-Translator: Mikkel Kirkgaard Nielsen <ncmpc@mikini.dk>\n"
 "Language-Team: da <da@li.org>\n"
@@ -16,292 +16,322 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:42
+#: src/i18n.h:36
 msgid "y"
 msgstr "j"
 
-#: src/ncmpc.h:43
+#: src/i18n.h:37
 msgid "n"
 msgstr ""
 
-#: src/main.c:133 src/main.c:140
-msgid "Exiting..."
-msgstr "Afslutter..."
+#: src/main.c:211
+#, c-format
+msgid "Connecting to %s...  [Press %s to abort]"
+msgstr "Forbinder til %s... [Tryk %s for at afbryde]"
 
-#: src/main.c:290
+#: src/main.c:229
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
 msgstr ""
 "Fejl: MPD version %d.%d.%d er for gammel (mindst 0.11.0 er n�dvendig) \n"
 
-#: src/main.c:342
-#, c-format
-msgid "Connecting to %s...  [Press %s to abort]"
-msgstr "Forbinder til %s... [Tryk %s for at afbryde]"
-
-#: src/main.c:354
+#: src/main.c:242
 #, c-format
 msgid "Connected to %s!"
 msgstr "Forbundet til %s!"
 
-#: src/screen.c:224
+#: src/screen.c:137
 msgid ":Help  "
 msgstr ":Hj�lp  "
 
-#: src/screen.c:228
+#: src/screen.c:141
 msgid ":Playlist  "
 msgstr ":Afspilningsliste  "
 
-#: src/screen.c:232
+#: src/screen.c:145
 msgid ":Browse  "
 msgstr ":Gennemse  "
 
-#: src/screen.c:237
+#: src/screen.c:150
 #, fuzzy
 msgid ":Artist  "
 msgstr "Kunstner"
 
-#: src/screen.c:243
+#: src/screen.c:156
 msgid ":Search  "
 msgstr ":S�g  "
 
-#: src/screen.c:249
+#: src/screen.c:162
 #, fuzzy
 msgid ":Lyrics  "
 msgstr ":Afspilningsliste  "
 
-#: src/screen.c:254
+#: src/screen.c:168
 msgid "Volume n/a "
 msgstr "Volumen: n/a "
 
-#: src/screen.c:258
+#: src/screen.c:170
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volumen: %d%%"
 
-#: src/screen.c:338
+#: src/screen.c:277
 msgid "Playing:"
 msgstr "Afspiller:"
 
-#: src/screen.c:341
+#: src/screen.c:280
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:471 src/screen.c:580
+#: src/screen.c:400 src/screen.c:473
 #, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Fejl: Sk�rmen er for lille!\n"
 
-#: src/screen.c:732
+#: src/screen.c:596
 msgid "Repeat is on"
 msgstr "Gentag er aktiv"
 
-#: src/screen.c:733
+#: src/screen.c:597
 msgid "Repeat is off"
 msgstr "Gentag er inaktiv"
 
-#: src/screen.c:736
+#: src/screen.c:601
 msgid "Random is on"
 msgstr "Tilf�ldig er aktiv"
 
-#: src/screen.c:737
+#: src/screen.c:602
 msgid "Random is off"
 msgstr "Tilf�ldig er inaktiv"
 
-#: src/screen.c:740
+#: src/screen.c:605
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:743
+#: src/screen.c:608
 msgid "Database updated!"
 msgstr "Databasen er opdateret!"
 
-#: src/screen.c:905
+#: src/screen.c:741
 msgid "Shuffled playlist!"
 msgstr "Afspilninsglisten blandet!"
 
-#: src/screen.c:909
+#: src/screen.c:745
 msgid "Cleared playlist!"
 msgstr "Sletter afspilningslisten!"
 
-#: src/screen.c:927 src/screen_file.c:655
+#: src/screen.c:762 src/screen_file.c:254
 msgid "Database update started!"
 msgstr "Database opdatering startet!"
 
-#: src/screen.c:930 src/screen_file.c:663
+#: src/screen.c:764 src/screen_file.c:261
 msgid "Database update running..."
 msgstr "Databasen opdateres..."
 
-#: src/screen.c:943
+#: src/screen.c:800
 msgid "Find mode: Wrapped"
 msgstr "S�g (begynd forfra)"
 
-#: src/screen.c:944
+#: src/screen.c:801
 msgid "Find mode: Normal"
 msgstr "S�g normalt (start/slut)"
 
-#: src/screen.c:949
+#: src/screen.c:806
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering er aktiv"
 
-#: src/screen.c:950
+#: src/screen.c:807
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er inaktiv"
 
-#: src/screen_utils.c:38
+#: src/screen_artist.c:73
+#, fuzzy
+msgid "All tracks"
+msgstr "N�ste"
+
+#: src/screen_artist.c:376
+#, fuzzy
+msgid "All artists"
+msgstr "Kunstner"
+
+#: src/screen_artist.c:381
+#, c-format
+msgid "Albums of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:390
+#, fuzzy, c-format
+msgid "Album: %s - %s"
+msgstr "Fejl: %s - %s"
+
+#: src/screen_artist.c:394
+#, c-format
+msgid "All tracks of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:634 src/screen_file.c:238
+msgid "Screen updated!"
+msgstr "Sk�rm opdateret!"
+
+#: src/screen_browser.c:234
+#, c-format
+msgid "Loading playlist %s..."
+msgstr "Henter %s..."
+
+#: src/screen_browser.c:257 src/screen_browser.c:366 src/screen_browser.c:392
+#, c-format
+msgid "Adding '%s' to playlist\n"
+msgstr "Tilf�jer '%s' til listen...\n"
+
+#: src/screen_browser.c:311
+#, c-format
+msgid "Adding directory %s...\n"
+msgstr "Tilf�jer mappen %s...\n"
+
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "S�g: "
 
-#: src/screen_utils.c:39
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "S�g (bagl�ns): "
 
-#: src/screen_utils.c:166
+#: src/screen_utils.c:114
+msgid "Password: "
+msgstr ""
+
+#: src/screen_utils.c:207
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kan ikke finde '%s'"
 
-#: src/screen_play.c:156
+#: src/screen_play.c:187
 msgid "Save playlist as: "
 msgstr "Gem afspilningslisten som: "
 
-#: src/screen_play.c:186
+#: src/screen_play.c:220
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstat '%s' [%s/%s] ? "
 
-#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
+#: src/screen_play.c:241 src/screen_file.c:137 src/screen_keydef.c:163
 msgid "Aborted!"
 msgstr "Afbrudt!"
 
 #. success
-#: src/screen_play.c:206
+#: src/screen_play.c:249
 #, c-format
 msgid "Saved %s"
 msgstr "Gemt %s"
 
-#: src/screen_play.c:270
+#: src/screen_play.c:325
 msgid "Add: "
 msgstr "Tilf�j: "
 
-#: src/screen_play.c:325
+#: src/screen_play.c:431
 msgid "Playlist"
 msgstr "Afspilningsliste"
 
-#: src/screen_play.c:327
+#: src/screen_play.c:433
 #, c-format
 msgid "Playlist on %s"
 msgstr "Afspilningsliste p� %s"
 
-#: src/screen_file.c:256
-#, c-format
-msgid "Loading playlist %s..."
-msgstr "Henter %s..."
-
-#: src/screen_file.c:298
+#: src/screen_file.c:125
 msgid "You can only delete playlists!"
 msgstr "Du kan kun slette afspilningslister!"
 
-#: src/screen_file.c:305
+#: src/screen_file.c:132
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slet '%s' [%s/%s] ? "
 
-#: src/screen_file.c:321
+#: src/screen_file.c:144
 msgid "Playlist deleted!"
 msgstr "Afspilningslisten slettet!"
 
-#: src/screen_file.c:340 src/screen_file.c:461 src/screen_file.c:487
-#, c-format
-msgid "Adding '%s' to playlist\n"
-msgstr "Tilf�jer '%s' til listen...\n"
-
-#: src/screen_file.c:391
-#, c-format
-msgid "Adding directory %s...\n"
-msgstr "Tilf�jer mappen %s...\n"
-
-#: src/screen_file.c:552
+#: src/screen_file.c:198
 #, c-format
 msgid "Browse: %s"
 msgstr "Gennemse: %s"
 
-#: src/screen_file.c:644
-msgid "Screen updated!"
-msgstr "Sk�rm opdateret!"
-
-#: src/screen_file.c:652
+#: src/screen_file.c:250
 #, c-format
 msgid "Database update of %s started!"
 msgstr "Database opdatering af %s startet!"
 
-#: src/screen_search.c:56
+#: src/screen_search.c:41
 #, fuzzy
 msgid "artist"
 msgstr "Kunstner"
 
-#: src/screen_search.c:57
+#: src/screen_search.c:42
 msgid "album"
 msgstr ""
 
-#: src/screen_search.c:58
+#: src/screen_search.c:43
 #, fuzzy
 msgid "title"
 msgstr "Titel"
 
-#: src/screen_search.c:59
+#: src/screen_search.c:44
 #, fuzzy
 msgid "track"
 msgstr "N�ste"
 
-#: src/screen_search.c:60
+#: src/screen_search.c:45
 #, fuzzy
 msgid "name"
 msgstr "Filnavn"
 
-#: src/screen_search.c:61
+#: src/screen_search.c:46
 msgid "genre"
 msgstr ""
 
-#: src/screen_search.c:62
+#: src/screen_search.c:47
 msgid "date"
 msgstr ""
 
-#: src/screen_search.c:63
+#: src/screen_search.c:48
 msgid "composer"
 msgstr ""
 
-#: src/screen_search.c:64
+#: src/screen_search.c:49
 msgid "performer"
 msgstr ""
 
-#: src/screen_search.c:65
+#: src/screen_search.c:50
 msgid "comment"
 msgstr ""
 
-#: src/screen_search.c:66
+#: src/screen_search.c:51
 #, fuzzy
 msgid "file"
 msgstr "Titel"
 
-#: src/screen_search.c:100
+#: src/screen_search.c:81
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:101
+#: src/screen_search.c:82
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/screen_search.c:102
+#: src/screen_search.c:83
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:103
+#: src/screen_search.c:84
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/screen_search.c:244
+#: src/screen_search.c:85
+#, fuzzy
+msgid "Artist + Title"
+msgstr "Kunstner"
+
+#: src/screen_search.c:247
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
@@ -311,297 +341,299 @@ msgstr ""
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:323
+#: src/screen_search.c:311
 msgid "Search: "
 msgstr "S�g: "
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:379
+#: src/screen_search.c:371
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Tryk p� %s for en ny s�gning"
 
-#: src/screen_search.c:435
+#: src/screen_search.c:399
 #, fuzzy, c-format
 msgid "Search: %s"
 msgstr "S�g: "
 
-#: src/screen_search.c:438
+#: src/screen_search.c:402
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "S�g: Resultater for %s [%s]"
 
-#: src/screen_search.c:442
+#: src/screen_search.c:406
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Tryk p� %s for en ny s�gning [%s]"
 
-#: src/screen_search.c:476
+#: src/screen_search.c:421
 #, c-format
 msgid "Search mode: %s"
 msgstr "S�g efter: %s"
 
-#: src/screen_keydef.c:46
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "==> Anvend og gem taste bindinger"
 
-#: src/screen_keydef.c:47
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "==> Anvend taste bindinger"
 
-#: src/screen_keydef.c:76
+#: src/screen_keydef.c:70
 msgid "You have new key bindings!"
 msgstr "Taste bindinger opdaterede!"
 
-#: src/screen_keydef.c:79
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Taste bindinger u�ndrede!"
 
-#: src/screen_keydef.c:90
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Fejl: Kan ikke oprette mappen ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:100 src/screen_keydef.c:106
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fejl: %s - %s"
 
-#: src/screen_keydef.c:108
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "Skrev %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Slettet"
 
-#: src/screen_keydef.c:155
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tast for %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Tasten %s anvendes allerede til %s"
 
-#: src/screen_keydef.c:177
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Tildelt %s til %s"
 
-#: src/screen_keydef.c:220
+#: src/screen_keydef.c:216
 #, c-format
 msgid "%d. Add new key "
 msgstr "%d. Defin�r ny tast"
 
-#: src/screen_keydef.c:267
+#: src/screen_keydef.c:262
 msgid "Welcome to the key editor!"
 msgstr "Velkommen til taste editoren"
 
-#: src/screen_keydef.c:283
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Du glemte vel ikke at 'anvende' dine �ndringer?"
 
-#: src/screen_keydef.c:290
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Modificer taste bindinger"
 
-#: src/screen_keydef.c:292
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Modificer tast for '%s'"
 
-#: src/screen_clock.c:154
-msgid "Clock"
-msgstr "Ur"
-
-#: src/screen_help.c:43
+#: src/screen_help.c:38
 msgid "Keys - Movement"
 msgstr "Taster - Navigation"
 
-#: src/screen_help.c:69
+#: src/screen_help.c:61
 msgid "Keys - Global"
 msgstr "Taster - Globale"
 
-#: src/screen_help.c:96
+#: src/screen_help.c:89
 msgid "Keys - Playlist screen"
 msgstr "Taster - Afspilningsliste"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:91
 msgid "Play"
 msgstr "Afspil"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:94
 msgid "Move song up"
 msgstr "Flyt mark�ren op i afspilningslisten"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:95
 msgid "Move song down"
 msgstr "Flyt mark�ren ned i afspilningslisten"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:98
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:110
+#: src/screen_help.c:103
 msgid "Keys - Browse screen"
 msgstr "Taster - Gennemse"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:105
 msgid "Enter directory/Select and play song"
 msgstr "Skift til bibliotek/Tilf�j til afspilningslisten og afspil"
 
-#: src/screen_help.c:115
+#: src/screen_help.c:107 src/screen_help.c:122
+#, fuzzy
+msgid "Append song to playlist"
+msgstr "Slet sang fra afspilningsliste"
+
+#: src/screen_help.c:109
 msgid "Delete playlist"
 msgstr "Slet afspilningsliste"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:117
 msgid "Keys - Search screen"
 msgstr "Taster - S�ge sk�rm"
 
-#: src/screen_help.c:123
+#: src/screen_help.c:119
 msgid "Search"
 msgstr "S�g"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:120
 msgid "Select and play"
 msgstr "V�lg og afspil"
 
-#: src/screen_help.c:131
+#: src/screen_help.c:129
 #, fuzzy
 msgid "Keys - Lyrics screen"
 msgstr "Taster - Afspilningsliste"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:131
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:134
+#: src/screen_help.c:132
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:135
+#: src/screen_help.c:133
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:136
+#: src/screen_help.c:134
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:137
+#: src/screen_help.c:135
 #, fuzzy
 msgid "Save lyrics"
 msgstr "Gem afspilningslisten"
 
-#: src/screen_help.c:220
+#: src/screen_help.c:205
 msgid "Help"
 msgstr "Hj�lp"
 
-#: src/screen_lyrics.c:479
-msgid "Lyrics  [No connection]"
-msgstr ""
-
-#: src/screen_lyrics.c:480
-msgid "Lyrics  [Not found]"
-msgstr ""
-
-#: src/screen_lyrics.c:483
-msgid "Lyrics  [retrieving]"
-msgstr ""
+#: src/screen_lyrics.c:162
+#, fuzzy
+msgid "No lyrics"
+msgstr "Gem afspilningslisten"
 
-#: src/screen_lyrics.c:565
+#: src/screen_lyrics.c:316
 #, fuzzy
 msgid "Lyrics saved!"
 msgstr "Afspilningsliste"
 
-#: src/command.c:71
+#: src/command.c:67
 msgid "Key configuration screen"
 msgstr "Taste konfigurations sk�rm"
 
-#: src/command.c:74
+#: src/command.c:70
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor up"
 msgstr "Flyt mark�r op"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor down"
 msgstr "Flyt mark�r ned"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Home "
 msgstr "Flyt mark�r til start"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "End "
 msgstr "Flyt mark�r til slut"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Page up"
 msgstr "Side op"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Page down"
 msgstr "Side ned"
 
-#: src/command.c:93
+#: src/command.c:89
 msgid "Help screen"
 msgstr "Hj�lp"
 
-#: src/command.c:95
+#: src/command.c:91
 msgid "Playlist screen"
 msgstr "Afspilningsliste"
 
-#: src/command.c:97
+#: src/command.c:93
 msgid "Browse screen"
 msgstr "Gennemse"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Play/Enter directory"
 msgstr "Afspil/G� til mappe"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:106
+#: src/command.c:102
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:108
+#: src/command.c:104
+msgid "Crop"
+msgstr ""
+
+#: src/command.c:106
 msgid "Next track"
 msgstr "N�ste"
 
-#: src/command.c:110
+#: src/command.c:108
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:112
+#: src/command.c:110
 msgid "Seek forward"
 msgstr "S�g fremad"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Seek backward"
 msgstr "S�g tilbage"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Increase volume"
 msgstr "H�v volumen"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Decrease volume"
 msgstr "S�nk volumen"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Select/deselect song in playlist"
 msgstr "Marker/afmarker sang i afspilningsliste"
 
+#: src/command.c:120
+msgid "Select all listed items"
+msgstr ""
+
 #: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Slet sang fra afspilningsliste"
@@ -638,67 +670,73 @@ msgstr "Gem afspilningslisten"
 msgid "Add url/file to playlist"
 msgstr "Tilf�j URL eller fil til afspilningslisten"
 
+#: src/command.c:141
+#, fuzzy
+msgid "Go to root directory"
+msgstr "Afspil/G� til mappe"
+
 #: src/command.c:143
+#, fuzzy
+msgid "Go to parent directory"
+msgstr "Afspil/G� til mappe"
+
+#: src/command.c:147
 msgid "Move item up"
 msgstr "Flyt op"
 
-#: src/command.c:145
+#: src/command.c:149
 msgid "Move item down"
 msgstr "Flyt ned"
 
-#: src/command.c:147
+#: src/command.c:151
 msgid "Update screen"
 msgstr "Opdater sk�rm"
 
-#: src/command.c:152
+#: src/command.c:156
 msgid "Toggle find mode"
 msgstr "�ndre s�ge tilstand"
 
-#: src/command.c:154
+#: src/command.c:158
 msgid "Toggle auto center mode"
 msgstr "Aktiver/deaktiver automatisk centrering"
 
-#: src/command.c:159
+#: src/command.c:163
 msgid "Next screen"
 msgstr "N�ste sk�rm"
 
-#: src/command.c:161
+#: src/command.c:165
 msgid "Previous screen"
 msgstr "Forrige sk�rm"
 
-#: src/command.c:166
+#: src/command.c:170
 msgid "Forward find"
 msgstr "S�g"
 
-#: src/command.c:168
+#: src/command.c:172
 msgid "Forward find next"
 msgstr "Gentag s�g"
 
-#: src/command.c:170
+#: src/command.c:174
 msgid "Backward find"
 msgstr "S�g bagl�ns"
 
-#: src/command.c:172
+#: src/command.c:176
 msgid "Backward find previous"
 msgstr "Gentag s�g bagl�ns"
 
-#: src/command.c:178
+#: src/command.c:182
 #, fuzzy
 msgid "Artist screen"
 msgstr "Afspilningsliste"
 
-#: src/command.c:182
+#: src/command.c:186
 msgid "Search screen"
 msgstr "Database s�gning"
 
-#: src/command.c:184
+#: src/command.c:188
 msgid "Change search mode"
 msgstr "�ndre s�ge tilstand"
 
-#: src/command.c:189
-msgid "Clock screen"
-msgstr "Ur"
-
 #: src/command.c:193
 #, fuzzy
 msgid "Lyrics screen"
@@ -781,41 +819,47 @@ msgstr ""
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:502
+#: src/command.c:456
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr "Tast %s bundet til kommando %s og %s (tryk p� %s for at redigere)"
 
-#: src/command.c:509 src/command.c:516
+#: src/command.c:463 src/command.c:470
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Fel: Tasten %s er bundet til b�de %s og %s !!!\n"
 
-#: src/colors.c:187
+#: src/colors.c:163
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Advarsel: Ukendt farve - %s\n"
 
-#: src/colors.c:232
+#: src/colors.c:206
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Advarsel: Ukendt farve felt - %s.\n"
 
-#: src/colors.c:267
+#: src/colors.c:238
 #, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "Terminalen underst�tter ikke at �ndre farver!\n"
 
-#: src/colors.c:284
+#: src/colors.c:248
 #, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "Terminalen underst�tter ikke farver!\n"
 
-#: src/support.c:187
-#, c-format
-msgid "Error: Unable to convert characters to %s"
-msgstr "Fejl: Kan ikke konvertere karakter til %s"
+#~ msgid "Exiting..."
+#~ msgstr "Afslutter..."
+
+#~ msgid "Clock"
+#~ msgstr "Ur"
+
+#~ msgid "Clock screen"
+#~ msgstr "Ur"
+
+#~ msgid "Error: Unable to convert characters to %s"
+#~ msgstr "Fejl: Kan ikke konvertere karakter til %s"
 
-#: src/support.c:216
-msgid "Error: Unable to convert characters to UTF-8"
-msgstr "Fejl: Kan ikke konvertere karakter til UTF-8"
+#~ msgid "Error: Unable to convert characters to UTF-8"
+#~ msgstr "Fejl: Kan ikke konvertere karakter til UTF-8"
diff --git a/po/de.po b/po/de.po
index 590fb52fe..136fde905 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-07 11:40+0000\n"
+"POT-Creation-Date: 2008-11-17 19:57+0100\n"
 "PO-Revision-Date: 2004-07-08 21:16+0200\n"
 "Last-Translator: Ingmar Gebert\n"
 "Language-Team: de <de@li.org>\n"
@@ -15,292 +15,322 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:42
+#: src/i18n.h:36
 msgid "y"
 msgstr "y"
 
-#: src/ncmpc.h:43
+#: src/i18n.h:37
 msgid "n"
 msgstr "n"
 
-#: src/main.c:133 src/main.c:140
-msgid "Exiting..."
-msgstr "Beenden..."
+#: src/main.c:211
+#, c-format
+msgid "Connecting to %s...  [Press %s to abort]"
+msgstr "Verbinde mit %s...   [%s dr�cken, um abzubrechen]"
 
-#: src/main.c:290
+#: src/main.c:229
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
 msgstr "Fehler: MPD-Version %d.%d.%d ist zu alt (0.11.0 wird ben�tigt).\n"
 
-#: src/main.c:342
-#, c-format
-msgid "Connecting to %s...  [Press %s to abort]"
-msgstr "Verbinde mit %s...   [%s dr�cken, um abzubrechen]"
-
-#: src/main.c:354
+#: src/main.c:242
 #, c-format
 msgid "Connected to %s!"
 msgstr "Verbunden mit %s!"
 
-#: src/screen.c:224
+#: src/screen.c:137
 msgid ":Help  "
 msgstr ":Hilfe  "
 
-#: src/screen.c:228
+#: src/screen.c:141
 msgid ":Playlist  "
 msgstr ":Playlist  "
 
-#: src/screen.c:232
+#: src/screen.c:145
 msgid ":Browse  "
 msgstr ":St�bern  "
 
-#: src/screen.c:237
+#: src/screen.c:150
 #, fuzzy
 msgid ":Artist  "
 msgstr "K�nstler"
 
-#: src/screen.c:243
+#: src/screen.c:156
 msgid ":Search  "
 msgstr ""
 
-#: src/screen.c:249
+#: src/screen.c:162
 #, fuzzy
 msgid ":Lyrics  "
 msgstr ":Texte  "
 
-#: src/screen.c:254
+#: src/screen.c:168
 msgid "Volume n/a "
 msgstr "Lautst�rke n/a "
 
-#: src/screen.c:258
+#: src/screen.c:170
 #, c-format
 msgid " Volume %d%%"
 msgstr " Lautst�rke %d%%"
 
-#: src/screen.c:338
+#: src/screen.c:277
 msgid "Playing:"
 msgstr "Spiele:"
 
-#: src/screen.c:341
+#: src/screen.c:280
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:471 src/screen.c:580
+#: src/screen.c:400 src/screen.c:473
 #, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Fehler: Anzeige zu klein!\n"
 
-#: src/screen.c:732
+#: src/screen.c:596
 msgid "Repeat is on"
 msgstr "Wiederholung ist an"
 
-#: src/screen.c:733
+#: src/screen.c:597
 msgid "Repeat is off"
 msgstr "Wiederholung ist aus"
 
-#: src/screen.c:736
+#: src/screen.c:601
 msgid "Random is on"
 msgstr "Zufallswiedergabe ist an"
 
-#: src/screen.c:737
+#: src/screen.c:602
 msgid "Random is off"
 msgstr "Zufallswiedergabe ist aus"
 
-#: src/screen.c:740
+#: src/screen.c:605
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "%d Sekunden Crossfade"
 
-#: src/screen.c:743
+#: src/screen.c:608
 msgid "Database updated!"
 msgstr "Datenbank aktualisiert!"
 
-#: src/screen.c:905
+#: src/screen.c:741
 msgid "Shuffled playlist!"
 msgstr "Playlist gemischt!"
 
-#: src/screen.c:909
+#: src/screen.c:745
 msgid "Cleared playlist!"
 msgstr "Playlist gel�scht!"
 
-#: src/screen.c:927 src/screen_file.c:655
+#: src/screen.c:762 src/screen_file.c:254
 msgid "Database update started!"
 msgstr "Datenbankaktualisierung gestartet!"
 
-#: src/screen.c:930 src/screen_file.c:663
+#: src/screen.c:764 src/screen_file.c:261
 msgid "Database update running..."
 msgstr "Datenbankaktualisierung l�uft..."
 
-#: src/screen.c:943
+#: src/screen.c:800
 msgid "Find mode: Wrapped"
 msgstr "Suchmodus: Wrapped"
 
-#: src/screen.c:944
+#: src/screen.c:801
 msgid "Find mode: Normal"
 msgstr "Suchmodus: Normal"
 
-#: src/screen.c:949
+#: src/screen.c:806
 msgid "Auto center mode: On"
 msgstr "Autozentriermodus: an"
 
-#: src/screen.c:950
+#: src/screen.c:807
 msgid "Auto center mode: Off"
 msgstr "Autozentriermodus: aus"
 
-#: src/screen_utils.c:38
+#: src/screen_artist.c:73
+#, fuzzy
+msgid "All tracks"
+msgstr "N�chstes St�ck"
+
+#: src/screen_artist.c:376
+#, fuzzy
+msgid "All artists"
+msgstr "K�nstler"
+
+#: src/screen_artist.c:381
+#, c-format
+msgid "Albums of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:390
+#, fuzzy, c-format
+msgid "Album: %s - %s"
+msgstr "Fehler: %s - %s"
+
+#: src/screen_artist.c:394
+#, c-format
+msgid "All tracks of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:634 src/screen_file.c:238
+msgid "Screen updated!"
+msgstr "Anzeige aktualisiert!"
+
+#: src/screen_browser.c:234
+#, c-format
+msgid "Loading playlist %s..."
+msgstr "Lade Playlist %s..."
+
+#: src/screen_browser.c:257 src/screen_browser.c:366 src/screen_browser.c:392
+#, c-format
+msgid "Adding '%s' to playlist\n"
+msgstr "F�ge '%s' der Playlist hinzu\n"
+
+#: src/screen_browser.c:311
+#, c-format
+msgid "Adding directory %s...\n"
+msgstr "F�ge Verzeichnis %s hinzu...\n"
+
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Suche: "
 
-#: src/screen_utils.c:39
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Suche r�ckw�rts: "
 
-#: src/screen_utils.c:166
+#: src/screen_utils.c:114
+msgid "Password: "
+msgstr ""
+
+#: src/screen_utils.c:207
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kann '%s' nicht finden"
 
-#: src/screen_play.c:156
+#: src/screen_play.c:187
 msgid "Save playlist as: "
 msgstr "Speichere Playlist als: "
 
-#: src/screen_play.c:186
+#: src/screen_play.c:220
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Ersetze %s [%s/%s] ?"
 
-#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
+#: src/screen_play.c:241 src/screen_file.c:137 src/screen_keydef.c:163
 msgid "Aborted!"
 msgstr "Abbruch!"
 
 #. success
-#: src/screen_play.c:206
+#: src/screen_play.c:249
 #, c-format
 msgid "Saved %s"
 msgstr "%s gespeichert"
 
-#: src/screen_play.c:270
+#: src/screen_play.c:325
 msgid "Add: "
 msgstr "Hinzuf�gen: "
 
-#: src/screen_play.c:325
+#: src/screen_play.c:431
 msgid "Playlist"
 msgstr "Playlist"
 
-#: src/screen_play.c:327
+#: src/screen_play.c:433
 #, c-format
 msgid "Playlist on %s"
 msgstr "Playlist auf %s"
 
-#: src/screen_file.c:256
-#, c-format
-msgid "Loading playlist %s..."
-msgstr "Lade Playlist %s..."
-
-#: src/screen_file.c:298
+#: src/screen_file.c:125
 msgid "You can only delete playlists!"
 msgstr "Du kannst nur Playlisten l�schen!"
 
-#: src/screen_file.c:305
+#: src/screen_file.c:132
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "L�sche Playlist %s [%s/%s] ? "
 
-#: src/screen_file.c:321
+#: src/screen_file.c:144
 msgid "Playlist deleted!"
 msgstr "Playlist gel�scht!"
 
-#: src/screen_file.c:340 src/screen_file.c:461 src/screen_file.c:487
-#, c-format
-msgid "Adding '%s' to playlist\n"
-msgstr "F�ge '%s' der Playlist hinzu\n"
-
-#: src/screen_file.c:391
-#, c-format
-msgid "Adding directory %s...\n"
-msgstr "F�ge Verzeichnis %s hinzu...\n"
-
-#: src/screen_file.c:552
+#: src/screen_file.c:198
 #, c-format
 msgid "Browse: %s"
 msgstr "St�bern: %s"
 
-#: src/screen_file.c:644
-msgid "Screen updated!"
-msgstr "Anzeige aktualisiert!"
-
-#: src/screen_file.c:652
+#: src/screen_file.c:250
 #, c-format
 msgid "Database update of %s started!"
 msgstr "Datenbankaktualisierung von %s gestartet!"
 
-#: src/screen_search.c:56
+#: src/screen_search.c:41
 #, fuzzy
 msgid "artist"
 msgstr "K�nstler"
 
-#: src/screen_search.c:57
+#: src/screen_search.c:42
 #, fuzzy
 msgid "album"
 msgstr "Album"
 
-#: src/screen_search.c:58
+#: src/screen_search.c:43
 #, fuzzy
 msgid "title"
 msgstr "Titel"
 
-#: src/screen_search.c:59
+#: src/screen_search.c:44
 #, fuzzy
 msgid "track"
 msgstr "N�chstes St�ck"
 
-#: src/screen_search.c:60
+#: src/screen_search.c:45
 #, fuzzy
 msgid "name"
 msgstr "Dateiname"
 
-#: src/screen_search.c:61
+#: src/screen_search.c:46
 msgid "genre"
 msgstr "Genre"
 
-#: src/screen_search.c:62
+#: src/screen_search.c:47
 msgid "date"
 msgstr "Datum"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:48
 msgid "composer"
 msgstr "Komponist"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:49
 msgid "performer"
 msgstr "Auff�hrung"
 
-#: src/screen_search.c:65
+#: src/screen_search.c:50
 msgid "comment"
 msgstr "Anmerkung"
 
-#: src/screen_search.c:66
+#: src/screen_search.c:51
 #, fuzzy
 msgid "file"
 msgstr "Datei"
 
-#: src/screen_search.c:100
+#: src/screen_search.c:81
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:101
+#: src/screen_search.c:82
 msgid "Artist"
 msgstr "K�nstler"
 
-#: src/screen_search.c:102
+#: src/screen_search.c:83
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:103
+#: src/screen_search.c:84
 msgid "Filename"
 msgstr "Dateiname"
 
-#: src/screen_search.c:244
+#: src/screen_search.c:85
+#, fuzzy
+msgid "Artist + Title"
+msgstr "K�nstler"
+
+#: src/screen_search.c:247
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Tag nicht erkannt: %s"
@@ -310,297 +340,299 @@ msgstr "Tag nicht erkannt: %s"
 msgid "No argument for search tag %s"
 msgstr "Kein Argument f�r Tag %s"
 
-#: src/screen_search.c:323
+#: src/screen_search.c:311
 msgid "Search: "
 msgstr "Suche: "
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:379
+#: src/screen_search.c:371
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Dr�cke %s f�r eine neue Suche"
 
-#: src/screen_search.c:435
+#: src/screen_search.c:399
 #, fuzzy, c-format
 msgid "Search: %s"
 msgstr "Suche: "
 
-#: src/screen_search.c:438
+#: src/screen_search.c:402
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Suche: Ergebnisse f�r %s [%s]"
 
-#: src/screen_search.c:442
+#: src/screen_search.c:406
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Suche: Dr�cke %s f�r eine neue Suche [%s]"
 
-#: src/screen_search.c:476
+#: src/screen_search.c:421
 #, c-format
 msgid "Search mode: %s"
 msgstr "Suchmodus: %s"
 
-#: src/screen_keydef.c:46
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Tastenbelegung speichern und anwenden  "
 
-#: src/screen_keydef.c:47
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Tastenbelegung anwenden "
 
-#: src/screen_keydef.c:76
+#: src/screen_keydef.c:70
 msgid "You have new key bindings!"
 msgstr "Du hast eine neue Tastenbelegung!"
 
-#: src/screen_keydef.c:79
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Tastenbelegung unver�ndert."
 
-#: src/screen_keydef.c:90
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Fehler: kann Verzeichnis ~/.ncmpc - %s nicht erstellen"
 
-#: src/screen_keydef.c:100 src/screen_keydef.c:106
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fehler: %s - %s"
 
-#: src/screen_keydef.c:108
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "%s geschrieben"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Gel�scht"
 
-#: src/screen_keydef.c:155
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Gib neue Taste f�r %s ein: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Fehler: Taste %s wird bereits benutzt f�r %s"
 
-#: src/screen_keydef.c:177
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s wurde %s zugeordnet"
 
-#: src/screen_keydef.c:220
+#: src/screen_keydef.c:216
 #, c-format
 msgid "%d. Add new key "
 msgstr "%d. F�ge neue Taste hinzu "
 
-#: src/screen_keydef.c:267
+#: src/screen_keydef.c:262
 msgid "Welcome to the key editor!"
 msgstr "Willkommen im Tasteneditor!"
 
-#: src/screen_keydef.c:283
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Tipp: Hast du vergessen, deine �nderungen 'Anzuwenden'?"
 
-#: src/screen_keydef.c:290
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Editiere Tastenbelegungen"
 
-#: src/screen_keydef.c:292
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editiere Tasten f�r %s"
 
-#: src/screen_clock.c:154
-msgid "Clock"
-msgstr "Uhr"
-
-#: src/screen_help.c:43
+#: src/screen_help.c:38
 msgid "Keys - Movement"
 msgstr "Tasten - Bewegung"
 
-#: src/screen_help.c:69
+#: src/screen_help.c:61
 msgid "Keys - Global"
 msgstr "Tasten - Global"
 
-#: src/screen_help.c:96
+#: src/screen_help.c:89
 msgid "Keys - Playlist screen"
 msgstr "Tasten - Playlistenanzeige"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:91
 msgid "Play"
 msgstr "Abspielen"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:94
 msgid "Move song up"
 msgstr "St�ck nach oben bewegen"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:95
 msgid "Move song down"
 msgstr "St�ck nach unten bewegen"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:98
 msgid "Center"
 msgstr "Zentrieren"
 
-#: src/screen_help.c:110
+#: src/screen_help.c:103
 msgid "Keys - Browse screen"
 msgstr "Tasten - St�ber-Anzeige"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:105
 msgid "Enter directory/Select and play song"
 msgstr "Verzeichnis �ffnen/St�ck ausw�hlen und abspielen"
 
-#: src/screen_help.c:115
+#: src/screen_help.c:107 src/screen_help.c:122
+#, fuzzy
+msgid "Append song to playlist"
+msgstr "L�sche Song aus der Playlist"
+
+#: src/screen_help.c:109
 msgid "Delete playlist"
 msgstr "L�sche Playlist"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:117
 msgid "Keys - Search screen"
 msgstr "Tasten - St�ber-Anzeige"
 
-#: src/screen_help.c:123
+#: src/screen_help.c:119
 msgid "Search"
 msgstr "Suche"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:120
 msgid "Select and play"
 msgstr "Ausw�hlen und abspielen"
 
-#: src/screen_help.c:131
+#: src/screen_help.c:129
 #, fuzzy
 msgid "Keys - Lyrics screen"
 msgstr "Tasten - Liedtexteanzeige"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:131
 msgid "View Lyrics"
 msgstr "Liedtext lesen"
 
-#: src/screen_help.c:134
+#: src/screen_help.c:132
 msgid "(Re)load lyrics"
 msgstr "Text (neu) laden"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:133
 msgid "Interrupt retrieval"
 msgstr "Laden unterbrechen"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:134
 msgid "Explicitly download lyrics"
 msgstr "Texte explizit herunterladen"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:135
 #, fuzzy
 msgid "Save lyrics"
 msgstr "Text speicheren "
 
-#: src/screen_help.c:220
+#: src/screen_help.c:205
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/screen_lyrics.c:479
-msgid "Lyrics  [No connection]"
-msgstr "Liedtext [keine Verbindung]"
-
-#: src/screen_lyrics.c:480
-msgid "Lyrics  [Not found]"
-msgstr "Liedtext [Text nicht gefunden]"
-
-#: src/screen_lyrics.c:483
-msgid "Lyrics  [retrieving]"
-msgstr "Liedtexte [Lade...]"
+#: src/screen_lyrics.c:162
+#, fuzzy
+msgid "No lyrics"
+msgstr "Text speicheren "
 
-#: src/screen_lyrics.c:565
+#: src/screen_lyrics.c:316
 #, fuzzy
 msgid "Lyrics saved!"
 msgstr "Text gespeichert!"
 
-#: src/command.c:71
+#: src/command.c:67
 msgid "Key configuration screen"
 msgstr "Tastenkonfigurationsanzeige"
 
-#: src/command.c:74
+#: src/command.c:70
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor up"
 msgstr "Cursor nach oben bewegen"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor down"
 msgstr "Cursor nach unten bewegen"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Home "
 msgstr "Anfang "
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "End "
 msgstr "Ende "
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Page up"
 msgstr "Bild auf"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Page down"
 msgstr "Bild ab"
 
-#: src/command.c:93
+#: src/command.c:89
 msgid "Help screen"
 msgstr "Hilfeanzeige"
 
-#: src/command.c:95
+#: src/command.c:91
 msgid "Playlist screen"
 msgstr "Playlistenanzeige"
 
-#: src/command.c:97
+#: src/command.c:93
 msgid "Browse screen"
 msgstr "Anzeige durchst�bern"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Play/Enter directory"
 msgstr "Abspielen/Verzeichnis �ffnen"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:106
+#: src/command.c:102
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:108
+#: src/command.c:104
+msgid "Crop"
+msgstr ""
+
+#: src/command.c:106
 msgid "Next track"
 msgstr "N�chstes St�ck"
 
-#: src/command.c:110
+#: src/command.c:108
 msgid "Previous track"
 msgstr "Vorheriges St�ck"
 
-#: src/command.c:112
+#: src/command.c:110
 msgid "Seek forward"
 msgstr "Vorspulen"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Seek backward"
 msgstr "Zur�ckspulen"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Increase volume"
 msgstr "Lautst�rke erh�hen"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Decrease volume"
 msgstr "Lautst�rke verringern"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Select/deselect song in playlist"
 msgstr "W�hle St�ck in der Playlist an/ab"
 
+#: src/command.c:120
+msgid "Select all listed items"
+msgstr ""
+
 #: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "L�sche Song aus der Playlist"
@@ -637,67 +669,73 @@ msgstr "Speichere Playlist"
 msgid "Add url/file to playlist"
 msgstr "F�ge eine URL/Datei der Playlist hinzu"
 
+#: src/command.c:141
+#, fuzzy
+msgid "Go to root directory"
+msgstr "Verzeichnis �ffnen"
+
 #: src/command.c:143
+#, fuzzy
+msgid "Go to parent directory"
+msgstr "Verzeichnis �ffnen"
+
+#: src/command.c:147
 msgid "Move item up"
 msgstr "Bewege es nach oben"
 
-#: src/command.c:145
+#: src/command.c:149
 msgid "Move item down"
 msgstr "Bewege es nach unten"
 
-#: src/command.c:147
+#: src/command.c:151
 msgid "Update screen"
 msgstr "Aktualisiere Anzeige"
 
-#: src/command.c:152
+#: src/command.c:156
 msgid "Toggle find mode"
 msgstr "Wechsle den Suchmodus"
 
-#: src/command.c:154
+#: src/command.c:158
 msgid "Toggle auto center mode"
 msgstr "Schalte den Autozentrier-Modus ein/aus"
 
-#: src/command.c:159
+#: src/command.c:163
 msgid "Next screen"
 msgstr "N�chste Anzeige"
 
-#: src/command.c:161
+#: src/command.c:165
 msgid "Previous screen"
 msgstr "Vorherige Anzeige"
 
-#: src/command.c:166
+#: src/command.c:170
 msgid "Forward find"
 msgstr "Vorw�rtssuche"
 
-#: src/command.c:168
+#: src/command.c:172
 msgid "Forward find next"
 msgstr "Vorw�rtssuche fortsetzen"
 
-#: src/command.c:170
+#: src/command.c:174
 msgid "Backward find"
 msgstr "R�ckw�rtssuche"
 
-#: src/command.c:172
+#: src/command.c:176
 msgid "Backward find previous"
 msgstr "R�ckw�rtssuche fortsetzen"
 
-#: src/command.c:178
+#: src/command.c:182
 #, fuzzy
 msgid "Artist screen"
 msgstr "Playlistenanzeige"
 
-#: src/command.c:182
+#: src/command.c:186
 msgid "Search screen"
 msgstr "Suchanzeige"
 
-#: src/command.c:184
+#: src/command.c:188
 msgid "Change search mode"
 msgstr "Suchmodus wechseln"
 
-#: src/command.c:189
-msgid "Clock screen"
-msgstr "Uhr-Anzeige"
-
 #: src/command.c:193
 #, fuzzy
 msgid "Lyrics screen"
@@ -780,44 +818,59 @@ msgstr "Esc"
 msgid "Insert"
 msgstr "Einfg"
 
-#: src/command.c:502
+#: src/command.c:456
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr "Taste %s ist %s und %s zugeordnet (dr�cke %s f�r den Tasteneditor)"
 
-#: src/command.c:509 src/command.c:516
+#: src/command.c:463 src/command.c:470
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Fehler: Taste %s ist %s und %s zugeordnet !!!\n"
 
-#: src/colors.c:187
+#: src/colors.c:163
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Warnung: Unbekannte Farbe - %s\n"
 
-#: src/colors.c:232
+#: src/colors.c:206
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Warnung: Unbekanntes Farbfeld - %s\n"
 
-#: src/colors.c:267
+#: src/colors.c:238
 #, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "Das Terminal unterst�tzt keine Farbwechsel!\n"
 
-#: src/colors.c:284
+#: src/colors.c:248
 #, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "Das Terminal unterst�tzt keine Farben!\n"
 
-#: src/support.c:187
-#, c-format
-msgid "Error: Unable to convert characters to %s"
-msgstr "Fehler: kann Zeichen nicht nach %s konvertieren"
+#~ msgid "Exiting..."
+#~ msgstr "Beenden..."
 
-#: src/support.c:216
-msgid "Error: Unable to convert characters to UTF-8"
-msgstr "Fehler: kann Zeichen nicht nach UTF-8 konvertieren"
+#~ msgid "Clock"
+#~ msgstr "Uhr"
+
+#~ msgid "Lyrics  [No connection]"
+#~ msgstr "Liedtext [keine Verbindung]"
+
+#~ msgid "Lyrics  [Not found]"
+#~ msgstr "Liedtext [Text nicht gefunden]"
+
+#~ msgid "Lyrics  [retrieving]"
+#~ msgstr "Liedtexte [Lade...]"
+
+#~ msgid "Clock screen"
+#~ msgstr "Uhr-Anzeige"
+
+#~ msgid "Error: Unable to convert characters to %s"
+#~ msgstr "Fehler: kann Zeichen nicht nach %s konvertieren"
+
+#~ msgid "Error: Unable to convert characters to UTF-8"
+#~ msgstr "Fehler: kann Zeichen nicht nach UTF-8 konvertieren"
 
 #~ msgid "Lyrics"
 #~ msgstr "Liedtexte"
@@ -989,6 +1042,3 @@ msgstr "Fehler: kann Zeichen nicht nach UTF-8 konvertieren"
 #, fuzzy
 #~ msgid " clock-screen"
 #~ msgstr "Uhr-Anzeige"
-
-#~ msgid "Enter directory"
-#~ msgstr "Verzeichnis �ffnen"
diff --git a/po/es.po b/po/es.po
index a6bb3eced..aa54be36f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-07 11:40+0000\n"
+"POT-Creation-Date: 2008-11-17 19:57+0100\n"
 "PO-Revision-Date: 2006-11-01 10:54+0100\n"
 "Last-Translator: Johám-Luís Miguéns Vila <galiza.ceive@gmail.com>\n"
 "Language-Team: es\n"
@@ -18,284 +18,316 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
-#: src/ncmpc.h:42
+#: src/i18n.h:36
 msgid "y"
 msgstr "s"
 
-#: src/ncmpc.h:43
+#: src/i18n.h:37
 msgid "n"
 msgstr "n"
 
-#: src/main.c:133 src/main.c:140
-msgid "Exiting..."
-msgstr "Terminando..."
-
-#: src/main.c:290
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
-msgstr "Error: La versión %d.%d.%d del MPD es demasiado antigua (necesitas por lo menos la 0.11.0).\n"
-
-#: src/main.c:342
+#: src/main.c:211
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectándose a %s... [Presiona %s para interrumpir la ejecución]"
 
-#: src/main.c:354
+#: src/main.c:229
+#, c-format
+msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
+msgstr ""
+"Error: La versión %d.%d.%d del MPD es demasiado antigua (necesitas por lo "
+"menos la 0.11.0).\n"
+
+#: src/main.c:242
 #, c-format
 msgid "Connected to %s!"
 msgstr "Conectado a %s!"
 
-#: src/screen.c:224
+#: src/screen.c:137
 msgid ":Help  "
 msgstr ":Ayuda  "
 
-#: src/screen.c:228
+#: src/screen.c:141
 msgid ":Playlist  "
 msgstr ":Lista de Canciones  "
 
-#: src/screen.c:232
+#: src/screen.c:145
 msgid ":Browse  "
 msgstr ":Navegar  "
 
-#: src/screen.c:237
+#: src/screen.c:150
 msgid ":Artist  "
 msgstr ":Artista  "
 
-#: src/screen.c:243
+#: src/screen.c:156
 msgid ":Search  "
 msgstr ":Buscar"
 
-#: src/screen.c:249
+#: src/screen.c:162
 msgid ":Lyrics  "
 msgstr ":Letras  "
 
-#: src/screen.c:254
+#: src/screen.c:168
 msgid "Volume n/a "
 msgstr "Volumen n/a "
 
-#: src/screen.c:258
+#: src/screen.c:170
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volumen %d%%"
 
-#: src/screen.c:338
+#: src/screen.c:277
 msgid "Playing:"
 msgstr "Escuchando:"
 
-#: src/screen.c:341
+#: src/screen.c:280
 msgid "[Paused]"
 msgstr "[Parado]"
 
-#: src/screen.c:471 src/screen.c:580
+#: src/screen.c:400 src/screen.c:473
 #, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Error: La ventana/pantalla es muy pequeña\n"
 
-#: src/screen.c:732
+#: src/screen.c:596
 msgid "Repeat is on"
 msgstr "Modo repetición activado"
 
-#: src/screen.c:733
+#: src/screen.c:597
 msgid "Repeat is off"
 msgstr "Modo repetición desactivado"
 
-#: src/screen.c:736
+#: src/screen.c:601
 msgid "Random is on"
 msgstr "Modo aleatorio activado"
 
-#: src/screen.c:737
+#: src/screen.c:602
 msgid "Random is off"
 msgstr "Modo aleatorio desactivado"
 
-#: src/screen.c:740
+#: src/screen.c:605
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d segundos"
 
-#: src/screen.c:743
+#: src/screen.c:608
 msgid "Database updated!"
 msgstr "Base de datos actualizada!"
 
-#: src/screen.c:905
+#: src/screen.c:741
 msgid "Shuffled playlist!"
 msgstr "Lista de canciones aleatorizada!"
 
-#: src/screen.c:909
+#: src/screen.c:745
 msgid "Cleared playlist!"
 msgstr "Vaciada la Lista de canciones!"
 
-#: src/screen.c:927 src/screen_file.c:655
+#: src/screen.c:762 src/screen_file.c:254
 msgid "Database update started!"
 msgstr "Ha comenzado la actualización de la BD!"
 
-#: src/screen.c:930 src/screen_file.c:663
+#: src/screen.c:764 src/screen_file.c:261
 msgid "Database update running..."
 msgstr "Actualizando la base de datos..."
 
-#: src/screen.c:943
+#: src/screen.c:800
 msgid "Find mode: Wrapped"
 msgstr "Tipo de búsqueda: Wrapped"
 
-#: src/screen.c:944
+#: src/screen.c:801
 msgid "Find mode: Normal"
 msgstr "Tipo de búsqueda: Normal"
 
-#: src/screen.c:949
+#: src/screen.c:806
 msgid "Auto center mode: On"
 msgstr "Modo autocentrado activado"
 
-#: src/screen.c:950
+#: src/screen.c:807
 msgid "Auto center mode: Off"
 msgstr "Modo autocentrado desactivado"
 
-#: src/screen_utils.c:38
+#: src/screen_artist.c:73
+#, fuzzy
+msgid "All tracks"
+msgstr "pista"
+
+#: src/screen_artist.c:376
+#, fuzzy
+msgid "All artists"
+msgstr "artista"
+
+#: src/screen_artist.c:381
+#, c-format
+msgid "Albums of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:390
+#, fuzzy, c-format
+msgid "Album: %s - %s"
+msgstr "Error: %s - %s"
+
+#: src/screen_artist.c:394
+#, c-format
+msgid "All tracks of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:634 src/screen_file.c:238
+msgid "Screen updated!"
+msgstr "Ventana actualizada!"
+
+#: src/screen_browser.c:234
+#, c-format
+msgid "Loading playlist %s..."
+msgstr "Cargando la lista %s..."
+
+#: src/screen_browser.c:257 src/screen_browser.c:366 src/screen_browser.c:392
+#, c-format
+msgid "Adding '%s' to playlist\n"
+msgstr "Añadiendo '%s' a la lista de canciones\n"
+
+#: src/screen_browser.c:311
+#, c-format
+msgid "Adding directory %s...\n"
+msgstr "Añadiendo directorio %s...\n"
+
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Buscar:"
 
-#: src/screen_utils.c:39
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Buscar hacia atrás"
 
-#: src/screen_utils.c:166
+#: src/screen_utils.c:114
+msgid "Password: "
+msgstr ""
+
+#: src/screen_utils.c:207
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "No se pudo encontrar %s"
 
-#: src/screen_play.c:156
+#: src/screen_play.c:187
 msgid "Save playlist as: "
 msgstr "Guardar la lista como: "
 
-#: src/screen_play.c:186
+#: src/screen_play.c:220
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Sustituir %s [%s%s] ? "
 
-#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
+#: src/screen_play.c:241 src/screen_file.c:137 src/screen_keydef.c:163
 msgid "Aborted!"
 msgstr "Ejecución interrumpida!"
 
 #. success
-#: src/screen_play.c:206
+#: src/screen_play.c:249
 #, c-format
 msgid "Saved %s"
 msgstr "%s Guardada"
 
-#: src/screen_play.c:270
+#: src/screen_play.c:325
 msgid "Add: "
 msgstr "Añadir: "
 
-#: src/screen_play.c:325
+#: src/screen_play.c:431
 msgid "Playlist"
 msgstr "Lista de canciones"
 
-#: src/screen_play.c:327
+#: src/screen_play.c:433
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lista de canciones en %s"
 
-#: src/screen_file.c:256
-#, c-format
-msgid "Loading playlist %s..."
-msgstr "Cargando la lista %s..."
-
-#: src/screen_file.c:298
+#: src/screen_file.c:125
 msgid "You can only delete playlists!"
 msgstr "Sólo puedes eliminar las listas!"
 
-#: src/screen_file.c:305
+#: src/screen_file.c:132
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Borrar la lista de canciones %s [%s/%s] ? "
 
-#: src/screen_file.c:321
+#: src/screen_file.c:144
 msgid "Playlist deleted!"
 msgstr "Lista de canciones borrada!"
 
-#: src/screen_file.c:340 src/screen_file.c:461 src/screen_file.c:487
-#, c-format
-msgid "Adding '%s' to playlist\n"
-msgstr "Añadiendo '%s' a la lista de canciones\n"
-
-#: src/screen_file.c:391
-#, c-format
-msgid "Adding directory %s...\n"
-msgstr "Añadiendo directorio %s...\n"
-
-#: src/screen_file.c:552
+#: src/screen_file.c:198
 #, c-format
 msgid "Browse: %s"
 msgstr "Navegando: %s"
 
-#: src/screen_file.c:644
-msgid "Screen updated!"
-msgstr "Ventana actualizada!"
-
-#: src/screen_file.c:652
+#: src/screen_file.c:250
 #, c-format
 msgid "Database update of %s started!"
 msgstr "La actualización de la BD %s ha comenzado!!"
 
-#: src/screen_search.c:56
+#: src/screen_search.c:41
 msgid "artist"
 msgstr "artista"
 
-#: src/screen_search.c:57
+#: src/screen_search.c:42
 msgid "album"
 msgstr "álbum"
 
-#: src/screen_search.c:58
+#: src/screen_search.c:43
 msgid "title"
 msgstr "título"
 
-#: src/screen_search.c:59
+#: src/screen_search.c:44
 msgid "track"
 msgstr "pista"
 
-#: src/screen_search.c:60
+#: src/screen_search.c:45
 msgid "name"
 msgstr "nombre"
 
-#: src/screen_search.c:61
+#: src/screen_search.c:46
 msgid "genre"
 msgstr "estilo"
 
-#: src/screen_search.c:62
+#: src/screen_search.c:47
 msgid "date"
 msgstr "fecha"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:48
 msgid "composer"
 msgstr "compositor"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:49
 msgid "performer"
 msgstr "intérprete"
 
-#: src/screen_search.c:65
+#: src/screen_search.c:50
 msgid "comment"
 msgstr "comentario"
 
-#: src/screen_search.c:66
+#: src/screen_search.c:51
 msgid "file"
 msgstr "fichero"
 
-#: src/screen_search.c:100
+#: src/screen_search.c:81
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:101
+#: src/screen_search.c:82
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen_search.c:102
+#: src/screen_search.c:83
 msgid "Album"
 msgstr "Álbum"
 
-#: src/screen_search.c:103
+#: src/screen_search.c:84
 msgid "Filename"
 msgstr "Nombre de fichero"
 
-#: src/screen_search.c:244
+#: src/screen_search.c:85
+#, fuzzy
+msgid "Artist + Title"
+msgstr ":Artista  "
+
+#: src/screen_search.c:247
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Etiqueta de búsqueda inválida: %s"
@@ -305,294 +337,296 @@ msgstr "Etiqueta de búsqueda inválida: %s"
 msgid "No argument for search tag %s"
 msgstr "Sin argumentos para la etiqueta de búsqueda %s"
 
-#: src/screen_search.c:323
+#: src/screen_search.c:311
 msgid "Search: "
 msgstr "Búsqueda: "
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:379
+#: src/screen_search.c:371
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Pulsa %s para una nueva búsqueda"
 
-#: src/screen_search.c:435
+#: src/screen_search.c:399
 #, c-format
 msgid "Search: %s"
 msgstr "Buscar: %s"
 
-#: src/screen_search.c:438
+#: src/screen_search.c:402
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Búsqueda: Resultados para %s [%s]"
 
-#: src/screen_search.c:442
+#: src/screen_search.c:406
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Búsqueda: Pulsar %s para una nueva búsqueda [%s]"
 
-#: src/screen_search.c:476
+#: src/screen_search.c:421
 #, c-format
 msgid "Search mode: %s"
 msgstr "Modo de búsqueda: %s"
 
-#: src/screen_keydef.c:46
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Aplicar y guardar las teclas de acceso rápido "
 
-#: src/screen_keydef.c:47
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Aplicar las teclas de acceso rápido "
 
-#: src/screen_keydef.c:76
+#: src/screen_keydef.c:70
 msgid "You have new key bindings!"
 msgstr "Has definido nuevas teclas de acceso rápido!"
 
-#: src/screen_keydef.c:79
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Las teclas de acceso rápido no han sido modificadas."
 
-#: src/screen_keydef.c:90
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Error: No se ha podido crear el directorio ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:100 src/screen_keydef.c:106
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Error: %s - %s"
 
-#: src/screen_keydef.c:108
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "%s creado"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Borrado"
 
-#: src/screen_keydef.c:155
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Introduce tecla de acceso rápido para %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Error: la tecla %s ya está asignada a %s"
 
-#: src/screen_keydef.c:177
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s asignada a %s"
 
-#: src/screen_keydef.c:220
+#: src/screen_keydef.c:216
 #, c-format
 msgid "%d. Add new key "
 msgstr "%d. Introduce una nueva tecla "
 
-#: src/screen_keydef.c:267
+#: src/screen_keydef.c:262
 msgid "Welcome to the key editor!"
 msgstr "Bienvenida/o al editor de teclas!"
 
-#: src/screen_keydef.c:283
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Has olvidado 'Aplicar' tus cambios?"
 
-#: src/screen_keydef.c:290
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Cambia las teclas de acceso rápido"
 
-#: src/screen_keydef.c:292
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Cambia las teclas para %s"
 
-#: src/screen_clock.c:154
-msgid "Clock"
-msgstr "Reloj"
-
-#: src/screen_help.c:43
+#: src/screen_help.c:38
 msgid "Keys - Movement"
 msgstr "Teclas - Navegar"
 
-#: src/screen_help.c:69
+#: src/screen_help.c:61
 msgid "Keys - Global"
 msgstr "Teclas - Global"
 
-#: src/screen_help.c:96
+#: src/screen_help.c:89
 msgid "Keys - Playlist screen"
 msgstr "Teclas - Lista de canciones"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:91
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:94
 msgid "Move song up"
 msgstr "Mover la canción arriba"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:95
 msgid "Move song down"
 msgstr "Mover la canción abajo"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:98
 msgid "Center"
 msgstr "Centro"
 
-#: src/screen_help.c:110
+#: src/screen_help.c:103
 msgid "Keys - Browse screen"
 msgstr "Teclas - Navegador"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:105
 msgid "Enter directory/Select and play song"
 msgstr "Acceder al directorio/Seleccionar y reproducir canción"
 
-#: src/screen_help.c:115
+#: src/screen_help.c:107 src/screen_help.c:122
+#, fuzzy
+msgid "Append song to playlist"
+msgstr "Borrar la canción de la lista"
+
+#: src/screen_help.c:109
 msgid "Delete playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:117
 msgid "Keys - Search screen"
 msgstr "Teclas - Búsqueda"
 
-#: src/screen_help.c:123
+#: src/screen_help.c:119
 msgid "Search"
 msgstr "Búsqueda"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:120
 msgid "Select and play"
 msgstr "Seleccionar y reproducir"
 
-#: src/screen_help.c:131
+#: src/screen_help.c:129
 msgid "Keys - Lyrics screen"
 msgstr "Teclas - Letras"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:131
 msgid "View Lyrics"
 msgstr "Ver letras"
 
-#: src/screen_help.c:134
+#: src/screen_help.c:132
 msgid "(Re)load lyrics"
 msgstr "(Re)cargar letras"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:133
 msgid "Interrupt retrieval"
 msgstr "Interrumpir la descarga"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:134
 msgid "Explicitly download lyrics"
 msgstr "Forzar la descarga de las letras"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:135
 msgid "Save lyrics"
 msgstr "Guardar las letras"
 
-#: src/screen_help.c:220
+#: src/screen_help.c:205
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/screen_lyrics.c:479
-msgid "Lyrics  [No connection]"
-msgstr "Letras [Sin conexión]"
-
-#: src/screen_lyrics.c:480
-msgid "Lyrics  [Not found]"
-msgstr "Letras [No se han encontrado]"
-
-#: src/screen_lyrics.c:483
-msgid "Lyrics  [retrieving]"
-msgstr "Letras [descargando]"
+#: src/screen_lyrics.c:162
+#, fuzzy
+msgid "No lyrics"
+msgstr "Guardar las letras"
 
-#: src/screen_lyrics.c:565
+#: src/screen_lyrics.c:316
 msgid "Lyrics saved!"
 msgstr "Letras guardadas!"
 
-#: src/command.c:71
+#: src/command.c:67
 msgid "Key configuration screen"
 msgstr "Configuración de teclas"
 
-#: src/command.c:74
+#: src/command.c:70
 msgid "Quit"
 msgstr "Salir"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor up"
 msgstr "Mover el cursor hacia arriba"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor down"
 msgstr "Mover el cursor hacia abajo"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Home "
 msgstr "Inicio"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "End "
 msgstr "Fin"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Page up"
 msgstr "Página arriba"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Page down"
 msgstr "Página abajo"
 
-#: src/command.c:93
+#: src/command.c:89
 msgid "Help screen"
 msgstr "Ayuda"
 
-#: src/command.c:95
+#: src/command.c:91
 msgid "Playlist screen"
 msgstr "Lista de canciones"
 
-#: src/command.c:97
+#: src/command.c:93
 msgid "Browse screen"
 msgstr "Navegador"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Play/Enter directory"
 msgstr "Reproducir/Entrar en el directorio"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:106
+#: src/command.c:102
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:108
+#: src/command.c:104
+msgid "Crop"
+msgstr ""
+
+#: src/command.c:106
 msgid "Next track"
 msgstr "Siguiente"
 
-#: src/command.c:110
+#: src/command.c:108
 msgid "Previous track"
 msgstr "Anterior"
 
-#: src/command.c:112
+#: src/command.c:110
 msgid "Seek forward"
 msgstr "Avanzar"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Increase volume"
 msgstr "Subir el volumen"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Decrease volume"
 msgstr "Bajar el volumen"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/Deseleccionar la canción en la lista"
 
+#: src/command.c:120
+msgid "Select all listed items"
+msgstr ""
+
 #: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Borrar la canción de la lista"
@@ -629,66 +663,72 @@ msgstr "Guardar la lista de canciones"
 msgid "Add url/file to playlist"
 msgstr "Añadir una URL o fichero a la lista"
 
+#: src/command.c:141
+#, fuzzy
+msgid "Go to root directory"
+msgstr "Entrar al directorio"
+
 #: src/command.c:143
+#, fuzzy
+msgid "Go to parent directory"
+msgstr "Entrar al directorio"
+
+#: src/command.c:147
 msgid "Move item up"
 msgstr "Moverlo arriba"
 
-#: src/command.c:145
+#: src/command.c:149
 msgid "Move item down"
 msgstr "Moverlo abajo"
 
-#: src/command.c:147
+#: src/command.c:151
 msgid "Update screen"
 msgstr "Actualizar la ventana"
 
-#: src/command.c:152
+#: src/command.c:156
 msgid "Toggle find mode"
 msgstr "Alternar modo de búsqueda"
 
-#: src/command.c:154
+#: src/command.c:158
 msgid "Toggle auto center mode"
 msgstr "Alternar centrado automático de la ventana"
 
-#: src/command.c:159
+#: src/command.c:163
 msgid "Next screen"
 msgstr "Pantalla siguiente"
 
-#: src/command.c:161
+#: src/command.c:165
 msgid "Previous screen"
 msgstr "Pantalla anterior"
 
-#: src/command.c:166
+#: src/command.c:170
 msgid "Forward find"
 msgstr "Buscar hacia adelante"
 
-#: src/command.c:168
+#: src/command.c:172
 msgid "Forward find next"
 msgstr "Buscar siguiente"
 
-#: src/command.c:170
+#: src/command.c:174
 msgid "Backward find"
 msgstr "Buscar hacia atrás"
 
-#: src/command.c:172
+#: src/command.c:176
 msgid "Backward find previous"
 msgstr "Buscar anterior"
 
-#: src/command.c:178
+#: src/command.c:182
 msgid "Artist screen"
 msgstr "Artistas"
 
-#: src/command.c:182
+#: src/command.c:186
 msgid "Search screen"
 msgstr "Búsqueda"
 
-#: src/command.c:184
+#: src/command.c:188
 msgid "Change search mode"
 msgstr "Cambiar el modo de búsqueda"
 
-#: src/command.c:189
-msgid "Clock screen"
-msgstr "Reloj"
-
 #: src/command.c:193
 msgid "Lyrics screen"
 msgstr "Letras"
@@ -769,44 +809,57 @@ msgstr "Esc"
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/command.c:502
+#: src/command.c:456
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
-msgstr "Tecla %s asignada a %s y %s (pressiona %s para accer al editor de teclas)"
+msgstr ""
+"Tecla %s asignada a %s y %s (pressiona %s para accer al editor de teclas)"
 
-#: src/command.c:509 src/command.c:516
+#: src/command.c:463 src/command.c:470
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Error: Tecla %s asignada a %s y %s !!!\n"
 
-#: src/colors.c:187
+#: src/colors.c:163
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Advertencia: Color %s - no reconocido\n"
 
-#: src/colors.c:232
+#: src/colors.c:206
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Advertencia: Propiedad del color - %s no reconocida\n"
 
-#: src/colors.c:267
+#: src/colors.c:238
 #, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "La terminal no soporta el cambio de colores!\n"
 
-#: src/colors.c:284
+#: src/colors.c:248
 #, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "La terminal no tiene la opcion de diferentes colores\n"
 
-#: src/support.c:187
-#, c-format
-msgid "Error: Unable to convert characters to %s"
-msgstr "Error: No se han podido convertir los caracteres a %s"
+#~ msgid "Exiting..."
+#~ msgstr "Terminando..."
+
+#~ msgid "Clock"
+#~ msgstr "Reloj"
+
+#~ msgid "Lyrics  [No connection]"
+#~ msgstr "Letras [Sin conexión]"
+
+#~ msgid "Lyrics  [Not found]"
+#~ msgstr "Letras [No se han encontrado]"
+
+#~ msgid "Lyrics  [retrieving]"
+#~ msgstr "Letras [descargando]"
+
+#~ msgid "Clock screen"
+#~ msgstr "Reloj"
 
-#: src/support.c:216
-msgid "Error: Unable to convert characters to UTF-8"
-msgstr "Error: No se han podido convertir los caracteres a UTF-8"
+#~ msgid "Error: Unable to convert characters to %s"
+#~ msgstr "Error: No se han podido convertir los caracteres a %s"
 
-#~ msgid "Enter directory"
-#~ msgstr "Entrar al directorio"
+#~ msgid "Error: Unable to convert characters to UTF-8"
+#~ msgstr "Error: No se han podido convertir los caracteres a UTF-8"
diff --git a/po/fr.po b/po/fr.po
index bc1f9d963..b7e8e6fe5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-07 11:40+0000\n"
+"POT-Creation-Date: 2008-11-17 19:57+0100\n"
 "PO-Revision-Date: 2005-01-19 15:15+0100\n"
 "Last-Translator: Yann C�zard <eesprit@free.fr>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -16,293 +16,323 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:42
+#: src/i18n.h:36
 msgid "y"
 msgstr "o"
 
-#: src/ncmpc.h:43
+#: src/i18n.h:37
 msgid "n"
 msgstr "n"
 
-#: src/main.c:133 src/main.c:140
-msgid "Exiting..."
-msgstr "Fin..."
+#: src/main.c:211
+#, c-format
+msgid "Connecting to %s...  [Press %s to abort]"
+msgstr "Connexion � %s...  [Appuyez sur %s pour annuler]"
 
-#: src/main.c:290
+#: src/main.c:229
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
 msgstr ""
 "Erreur: la version %d.%d.%d de MPD est trop ancienne (0.11.0 requise).\n"
 
-#: src/main.c:342
-#, c-format
-msgid "Connecting to %s...  [Press %s to abort]"
-msgstr "Connexion � %s...  [Appuyez sur %s pour annuler]"
-
-#: src/main.c:354
+#: src/main.c:242
 #, c-format
 msgid "Connected to %s!"
 msgstr "Connect� � %s!"
 
-#: src/screen.c:224
+#: src/screen.c:137
 msgid ":Help  "
 msgstr ":Aide  "
 
-#: src/screen.c:228
+#: src/screen.c:141
 msgid ":Playlist  "
 msgstr ":Liste de Lecture  "
 
-#: src/screen.c:232
+#: src/screen.c:145
 msgid ":Browse  "
 msgstr ":Parcourir  "
 
-#: src/screen.c:237
+#: src/screen.c:150
 #, fuzzy
 msgid ":Artist  "
 msgstr "Artiste"
 
-#: src/screen.c:243
+#: src/screen.c:156
 msgid ":Search  "
 msgstr ":Rechercher  "
 
-#: src/screen.c:249
+#: src/screen.c:162
 #, fuzzy
 msgid ":Lyrics  "
 msgstr ":Liste de Lecture  "
 
-#: src/screen.c:254
+#: src/screen.c:168
 msgid "Volume n/a "
 msgstr "Volume n/a "
 
-#: src/screen.c:258
+#: src/screen.c:170
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volume %d%%"
 
-#: src/screen.c:338
+#: src/screen.c:277
 msgid "Playing:"
 msgstr "En Lecture:"
 
-#: src/screen.c:341
+#: src/screen.c:280
 msgid "[Paused]"
 msgstr "[En Pause]"
 
-#: src/screen.c:471 src/screen.c:580
+#: src/screen.c:400 src/screen.c:473
 #, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Erreur: Ecran trop petit!\n"
 
-#: src/screen.c:732
+#: src/screen.c:596
 msgid "Repeat is on"
 msgstr "Mode de r�petition activ�"
 
-#: src/screen.c:733
+#: src/screen.c:597
 msgid "Repeat is off"
 msgstr "Mode de r�petition d�sactiv�"
 
-#: src/screen.c:736
+#: src/screen.c:601
 msgid "Random is on"
 msgstr "Mode Al�atoire activ�"
 
-#: src/screen.c:737
+#: src/screen.c:602
 msgid "Random is off"
 msgstr "Mode Al�atoire d�sactiv�"
 
-#: src/screen.c:740
+#: src/screen.c:605
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Fondu sur %d seconde(s)"
 
-#: src/screen.c:743
+#: src/screen.c:608
 msgid "Database updated!"
 msgstr "Base de donn�es mise � jour!"
 
-#: src/screen.c:905
+#: src/screen.c:741
 msgid "Shuffled playlist!"
 msgstr "Liste de lecture al�atoire"
 
-#: src/screen.c:909
+#: src/screen.c:745
 msgid "Cleared playlist!"
 msgstr "Liste de lecture vid�e!"
 
-#: src/screen.c:927 src/screen_file.c:655
+#: src/screen.c:762 src/screen_file.c:254
 msgid "Database update started!"
 msgstr "D�but de la mise � jour de la base de donn�es"
 
-#: src/screen.c:930 src/screen_file.c:663
+#: src/screen.c:764 src/screen_file.c:261
 msgid "Database update running..."
 msgstr "Mise � jour de la base de donn�es en cours..."
 
-#: src/screen.c:943
+#: src/screen.c:800
 msgid "Find mode: Wrapped"
 msgstr "Mode de recherche: Enveloppe"
 
-#: src/screen.c:944
+#: src/screen.c:801
 msgid "Find mode: Normal"
 msgstr "Mode de recherche: Normal"
 
-#: src/screen.c:949
+#: src/screen.c:806
 msgid "Auto center mode: On"
 msgstr "Mode d'auto-centrage: Actif"
 
-#: src/screen.c:950
+#: src/screen.c:807
 msgid "Auto center mode: Off"
 msgstr "Mode d'auto-centrage: Inactif"
 
-#: src/screen_utils.c:38
+#: src/screen_artist.c:73
+#, fuzzy
+msgid "All tracks"
+msgstr "Piste suivante"
+
+#: src/screen_artist.c:376
+#, fuzzy
+msgid "All artists"
+msgstr "Artiste"
+
+#: src/screen_artist.c:381
+#, c-format
+msgid "Albums of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:390
+#, fuzzy, c-format
+msgid "Album: %s - %s"
+msgstr "Erreur: %s - %s"
+
+#: src/screen_artist.c:394
+#, c-format
+msgid "All tracks of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:634 src/screen_file.c:238
+msgid "Screen updated!"
+msgstr "Ecran mis � jour!"
+
+#: src/screen_browser.c:234
+#, c-format
+msgid "Loading playlist %s..."
+msgstr "Chargement de la liste de lecture %s..."
+
+#: src/screen_browser.c:257 src/screen_browser.c:366 src/screen_browser.c:392
+#, c-format
+msgid "Adding '%s' to playlist\n"
+msgstr "Ajout de '%s' � la liste de lecture\n"
+
+#: src/screen_browser.c:311
+#, c-format
+msgid "Adding directory %s...\n"
+msgstr "Ajout du r�pertoire %s...\n"
+
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Trouver: "
 
-#: src/screen_utils.c:39
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Trouver avant: "
 
-#: src/screen_utils.c:166
+#: src/screen_utils.c:114
+msgid "Password: "
+msgstr ""
+
+#: src/screen_utils.c:207
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Impossible de trouver '%s'"
 
-#: src/screen_play.c:156
+#: src/screen_play.c:187
 msgid "Save playlist as: "
 msgstr "Enregistrer la liste de lecture sous: "
 
-#: src/screen_play.c:186
+#: src/screen_play.c:220
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Remplacer %s [%s/%s] ? "
 
-#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
+#: src/screen_play.c:241 src/screen_file.c:137 src/screen_keydef.c:163
 msgid "Aborted!"
 msgstr "Annul�!"
 
 #. success
-#: src/screen_play.c:206
+#: src/screen_play.c:249
 #, c-format
 msgid "Saved %s"
 msgstr "%s enregistr�"
 
-#: src/screen_play.c:270
+#: src/screen_play.c:325
 msgid "Add: "
 msgstr "Ajouter: "
 
-#: src/screen_play.c:325
+#: src/screen_play.c:431
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: src/screen_play.c:327
+#: src/screen_play.c:433
 #, c-format
 msgid "Playlist on %s"
 msgstr "Liste de lecture sur %s"
 
-#: src/screen_file.c:256
-#, c-format
-msgid "Loading playlist %s..."
-msgstr "Chargement de la liste de lecture %s..."
-
-#: src/screen_file.c:298
+#: src/screen_file.c:125
 msgid "You can only delete playlists!"
 msgstr "Seules les listes de lecture peuvent �tre �ffac�es!"
 
-#: src/screen_file.c:305
+#: src/screen_file.c:132
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Effacer la liste de lecture %s [%s/%s] ? "
 
-#: src/screen_file.c:321
+#: src/screen_file.c:144
 msgid "Playlist deleted!"
 msgstr "Liste de lecture �ffac�e!"
 
-#: src/screen_file.c:340 src/screen_file.c:461 src/screen_file.c:487
-#, c-format
-msgid "Adding '%s' to playlist\n"
-msgstr "Ajout de '%s' � la liste de lecture\n"
-
-#: src/screen_file.c:391
-#, c-format
-msgid "Adding directory %s...\n"
-msgstr "Ajout du r�pertoire %s...\n"
-
-#: src/screen_file.c:552
+#: src/screen_file.c:198
 #, c-format
 msgid "Browse: %s"
 msgstr "Parcourir: %s"
 
-#: src/screen_file.c:644
-msgid "Screen updated!"
-msgstr "Ecran mis � jour!"
-
-#: src/screen_file.c:652
+#: src/screen_file.c:250
 #, c-format
 msgid "Database update of %s started!"
 msgstr "Mise � jour de la base de donn�es de %s commen��e!"
 
-#: src/screen_search.c:56
+#: src/screen_search.c:41
 #, fuzzy
 msgid "artist"
 msgstr "Artiste"
 
-#: src/screen_search.c:57
+#: src/screen_search.c:42
 #, fuzzy
 msgid "album"
 msgstr "Album"
 
-#: src/screen_search.c:58
+#: src/screen_search.c:43
 #, fuzzy
 msgid "title"
 msgstr "Titre"
 
-#: src/screen_search.c:59
+#: src/screen_search.c:44
 #, fuzzy
 msgid "track"
 msgstr "Piste suivante"
 
-#: src/screen_search.c:60
+#: src/screen_search.c:45
 #, fuzzy
 msgid "name"
 msgstr "Nom de fichier"
 
-#: src/screen_search.c:61
+#: src/screen_search.c:46
 msgid "genre"
 msgstr ""
 
-#: src/screen_search.c:62
+#: src/screen_search.c:47
 msgid "date"
 msgstr ""
 
-#: src/screen_search.c:63
+#: src/screen_search.c:48
 msgid "composer"
 msgstr ""
 
-#: src/screen_search.c:64
+#: src/screen_search.c:49
 msgid "performer"
 msgstr ""
 
-#: src/screen_search.c:65
+#: src/screen_search.c:50
 msgid "comment"
 msgstr ""
 
-#: src/screen_search.c:66
+#: src/screen_search.c:51
 #, fuzzy
 msgid "file"
 msgstr "Titre"
 
-#: src/screen_search.c:100
+#: src/screen_search.c:81
 msgid "Title"
 msgstr "Titre"
 
-#: src/screen_search.c:101
+#: src/screen_search.c:82
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/screen_search.c:102
+#: src/screen_search.c:83
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:103
+#: src/screen_search.c:84
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: src/screen_search.c:244
+#: src/screen_search.c:85
+#, fuzzy
+msgid "Artist + Title"
+msgstr "Artiste"
+
+#: src/screen_search.c:247
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
@@ -312,298 +342,300 @@ msgstr ""
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:323
+#: src/screen_search.c:311
 msgid "Search: "
 msgstr "Rechercher: "
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:379
+#: src/screen_search.c:371
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Appuyez sur %s pour une nouvelle recherche"
 
-#: src/screen_search.c:435
+#: src/screen_search.c:399
 #, fuzzy, c-format
 msgid "Search: %s"
 msgstr "Rechercher: "
 
-#: src/screen_search.c:438
+#: src/screen_search.c:402
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Rechercher: R�sultats pour %s [%s]"
 
-#: src/screen_search.c:442
+#: src/screen_search.c:406
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Rechercher: Appuyez sur %s pour une nouvelle recherche [%s]"
 
-#: src/screen_search.c:476
+#: src/screen_search.c:421
 #, c-format
 msgid "Search mode: %s"
 msgstr "Mode de recherche : %s"
 
-#: src/screen_keydef.c:46
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Appliquer et Enregistrer la correspondance des touches  "
 
-#: src/screen_keydef.c:47
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Appliquer la correspondance des touches "
 
-#: src/screen_keydef.c:76
+#: src/screen_keydef.c:70
 msgid "You have new key bindings!"
 msgstr "Vous avez une nouvelle correspondance de touches!"
 
-#: src/screen_keydef.c:79
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "La correspondance des touches n'a pas �t� chang�e."
 
-#: src/screen_keydef.c:90
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Erreur: Impossible de cr�er le r�pertoire ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:100 src/screen_keydef.c:106
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Erreur: %s - %s"
 
-#: src/screen_keydef.c:108
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "%s �crit"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Effac�"
 
-#: src/screen_keydef.c:155
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Entrez la nouvelle touche pour %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Erreur: la touche %s est d�ja attribu�e � %s"
 
-#: src/screen_keydef.c:177
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s assign�e � %s"
 
-#: src/screen_keydef.c:220
+#: src/screen_keydef.c:216
 #, c-format
 msgid "%d. Add new key "
 msgstr "%d. Ajouter une nouvelle touche "
 
-#: src/screen_keydef.c:267
+#: src/screen_keydef.c:262
 msgid "Welcome to the key editor!"
 msgstr "Bienvenue sur l'�diteur de touches!"
 
-#: src/screen_keydef.c:283
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Note: Auriez-vous oubli� d''Appliquer' vos changements?"
 
-#: src/screen_keydef.c:290
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Editer les correspondances de touches"
 
-#: src/screen_keydef.c:292
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editer les touches pour %s"
 
-#: src/screen_clock.c:154
-msgid "Clock"
-msgstr "Horloge"
-
-#: src/screen_help.c:43
+#: src/screen_help.c:38
 msgid "Keys - Movement"
 msgstr "Touches - D�placements"
 
-#: src/screen_help.c:69
+#: src/screen_help.c:61
 msgid "Keys - Global"
 msgstr "Touches - Globales"
 
-#: src/screen_help.c:96
+#: src/screen_help.c:89
 msgid "Keys - Playlist screen"
 msgstr "Touches - Liste de Lecture"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:91
 msgid "Play"
 msgstr "Lire"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:94
 msgid "Move song up"
 msgstr "D�placer la chanson vers le haut"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:95
 msgid "Move song down"
 msgstr "D�placer la chanson vers le bas"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:98
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:110
+#: src/screen_help.c:103
 msgid "Keys - Browse screen"
 msgstr "Touches - Ecran de Navigation"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:105
 msgid "Enter directory/Select and play song"
 msgstr "Entrer dans le r�pertoire/S�lectionner et lire la chanson"
 
-#: src/screen_help.c:115
+#: src/screen_help.c:107 src/screen_help.c:122
+#, fuzzy
+msgid "Append song to playlist"
+msgstr "Enlever la chanson de la liste de lecture"
+
+#: src/screen_help.c:109
 msgid "Delete playlist"
 msgstr "Effacer la liste de lecture"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:117
 #, fuzzy
 msgid "Keys - Search screen"
 msgstr "Touches - Ecran de Recherche"
 
-#: src/screen_help.c:123
+#: src/screen_help.c:119
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:120
 msgid "Select and play"
 msgstr "S�lectionner et Lire"
 
-#: src/screen_help.c:131
+#: src/screen_help.c:129
 #, fuzzy
 msgid "Keys - Lyrics screen"
 msgstr "Touches - Liste de Lecture"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:131
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:134
+#: src/screen_help.c:132
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:135
+#: src/screen_help.c:133
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:136
+#: src/screen_help.c:134
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:137
+#: src/screen_help.c:135
 #, fuzzy
 msgid "Save lyrics"
 msgstr "Enregistrer la liste de lecture"
 
-#: src/screen_help.c:220
+#: src/screen_help.c:205
 msgid "Help"
 msgstr "Aide"
 
-#: src/screen_lyrics.c:479
-msgid "Lyrics  [No connection]"
-msgstr ""
-
-#: src/screen_lyrics.c:480
-msgid "Lyrics  [Not found]"
-msgstr ""
-
-#: src/screen_lyrics.c:483
-msgid "Lyrics  [retrieving]"
-msgstr ""
+#: src/screen_lyrics.c:162
+#, fuzzy
+msgid "No lyrics"
+msgstr "Enregistrer la liste de lecture"
 
-#: src/screen_lyrics.c:565
+#: src/screen_lyrics.c:316
 #, fuzzy
 msgid "Lyrics saved!"
 msgstr "Ecran de Liste de lecture"
 
-#: src/command.c:71
+#: src/command.c:67
 msgid "Key configuration screen"
 msgstr "Ecran de configuration des touches"
 
-#: src/command.c:74
+#: src/command.c:70
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor up"
 msgstr "D�placer le curseur vers le haut"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor down"
 msgstr "D�placer le curseur vers le bas"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Home "
 msgstr "D�but "
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "End "
 msgstr "Fin "
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Page up"
 msgstr "Monter d'une page"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Page down"
 msgstr "Descendre d'une page"
 
-#: src/command.c:93
+#: src/command.c:89
 msgid "Help screen"
 msgstr "Ecran d'aide"
 
-#: src/command.c:95
+#: src/command.c:91
 msgid "Playlist screen"
 msgstr "Ecran de Liste de lecture"
 
-#: src/command.c:97
+#: src/command.c:93
 msgid "Browse screen"
 msgstr "Ecran de Navigation"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Play/Enter directory"
 msgstr "Jouer/Entrer dans le r�pertoire"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:106
+#: src/command.c:102
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:108
+#: src/command.c:104
+msgid "Crop"
+msgstr ""
+
+#: src/command.c:106
 msgid "Next track"
 msgstr "Piste suivante"
 
-#: src/command.c:110
+#: src/command.c:108
 msgid "Previous track"
 msgstr "Piste pr�c�dente"
 
-#: src/command.c:112
+#: src/command.c:110
 msgid "Seek forward"
 msgstr "Avancer"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Seek backward"
 msgstr "Reculer"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Increase volume"
 msgstr "Augmenter le volume"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Decrease volume"
 msgstr "Diminuer le volume"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Select/deselect song in playlist"
 msgstr "S�lectionner/D�s�lectionner la chanson dans la liste de lecture"
 
+#: src/command.c:120
+msgid "Select all listed items"
+msgstr ""
+
 #: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Enlever la chanson de la liste de lecture"
@@ -640,68 +672,74 @@ msgstr "Enregistrer la liste de lecture"
 msgid "Add url/file to playlist"
 msgstr "Ajouter une url/un fichier � la liste de lecture"
 
+#: src/command.c:141
+#, fuzzy
+msgid "Go to root directory"
+msgstr "Entrer dans le r�pertoire"
+
 #: src/command.c:143
+#, fuzzy
+msgid "Go to parent directory"
+msgstr "Entrer dans le r�pertoire"
+
+#: src/command.c:147
 msgid "Move item up"
 msgstr "D�placer l'�l�ment vers le haut"
 
-#: src/command.c:145
+#: src/command.c:149
 msgid "Move item down"
 msgstr "D�placer l'�l�ment vers le bas"
 
-#: src/command.c:147
+#: src/command.c:151
 msgid "Update screen"
 msgstr "Mettre � jour l'�cran"
 
-#: src/command.c:152
+#: src/command.c:156
 msgid "Toggle find mode"
 msgstr "Activer le mode de recherche"
 
-#: src/command.c:154
+#: src/command.c:158
 msgid "Toggle auto center mode"
 msgstr "Activer le mode d'auto-centrage"
 
-#: src/command.c:159
+#: src/command.c:163
 msgid "Next screen"
 msgstr "Ecran suivant"
 
-#: src/command.c:161
+#: src/command.c:165
 msgid "Previous screen"
 msgstr "Ecran pr�c�dent"
 
-#: src/command.c:166
+#: src/command.c:170
 msgid "Forward find"
 msgstr "Chercher apr�s"
 
-#: src/command.c:168
+#: src/command.c:172
 msgid "Forward find next"
 msgstr "Chercher apr�s/suivant"
 
-#: src/command.c:170
+#: src/command.c:174
 msgid "Backward find"
 msgstr "Chercher avant"
 
-#: src/command.c:172
+#: src/command.c:176
 msgid "Backward find previous"
 msgstr "Chercher avant/pr�c�dent"
 
-#: src/command.c:178
+#: src/command.c:182
 #, fuzzy
 msgid "Artist screen"
 msgstr "Ecran de Liste de lecture"
 
-#: src/command.c:182
+#: src/command.c:186
 #, fuzzy
 msgid "Search screen"
 msgstr "Ecran de recherche"
 
-#: src/command.c:184
+#: src/command.c:188
 msgid "Change search mode"
 msgstr "Changer le mode de recherche"
 
-#: src/command.c:189
-msgid "Clock screen"
-msgstr "Ecran d'horloge"
-
 #: src/command.c:193
 #, fuzzy
 msgid "Lyrics screen"
@@ -784,45 +822,48 @@ msgstr "Echap"
 msgid "Insert"
 msgstr "Inser"
 
-#: src/command.c:502
+#: src/command.c:456
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr ""
 "La touche %s est assign�e � %s (appuyez sur %s pour l'�diteur de touches)"
 
-#: src/command.c:509 src/command.c:516
+#: src/command.c:463 src/command.c:470
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Erreur: La touche %s est assign�e � %s et � %s !!!\n"
 
-#: src/colors.c:187
+#: src/colors.c:163
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Attention: Couleur inconnue - %s\n"
 
-#: src/colors.c:232
+#: src/colors.c:206
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Attention: Champ de couleur inconnu - %s\n"
 
-#: src/colors.c:267
+#: src/colors.c:238
 #, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "Le terminal ne supporte pas le changement de couleurs!\n"
 
-#: src/colors.c:284
+#: src/colors.c:248
 #, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "Le terminal ne dispose pas de la gestion des couleurs!\n"
 
-#: src/support.c:187
-#, c-format
-msgid "Error: Unable to convert characters to %s"
-msgstr "Erreur: Impossible de convertir les caract�res pour %s"
+#~ msgid "Exiting..."
+#~ msgstr "Fin..."
+
+#~ msgid "Clock"
+#~ msgstr "Horloge"
+
+#~ msgid "Clock screen"
+#~ msgstr "Ecran d'horloge"
 
-#: src/support.c:216
-msgid "Error: Unable to convert characters to UTF-8"
-msgstr "Erreur: Impossible de convertir les caract�res en UTF-8"
+#~ msgid "Error: Unable to convert characters to %s"
+#~ msgstr "Erreur: Impossible de convertir les caract�res pour %s"
 
-#~ msgid "Enter directory"
-#~ msgstr "Entrer dans le r�pertoire"
+#~ msgid "Error: Unable to convert characters to UTF-8"
+#~ msgstr "Erreur: Impossible de convertir les caract�res en UTF-8"
diff --git a/po/gl.po b/po/gl.po
index 159d2e9d0..56b794430 100755..100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2006
 # This file is distributed under the same license as the ncmpc package.
 # Johám-Luís Miguéns Vila <galiza.ceivet@gmail.com>, 2006.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc-tradiaz SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-07 11:40+0000\n"
+"POT-Creation-Date: 2008-11-17 19:57+0100\n"
 "PO-Revision-Date: 2006-10-25 01:30+0200\n"
 "Last-Translator: Johám-Luís Miguéns Vila <galiza.ceive@gmail.com>\n"
 "Language-Team: galician\n"
@@ -16,285 +16,315 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/ncmpc.h:42
+#: src/i18n.h:36
 msgid "y"
 msgstr "s"
 
-#: src/ncmpc.h:43
+#: src/i18n.h:37
 msgid "n"
 msgstr "n"
 
-#: src/main.c:133 src/main.c:140
-msgid "Exiting..."
-msgstr "A sair..."
+#: src/main.c:211
+#, c-format
+msgid "Connecting to %s...  [Press %s to abort]"
+msgstr "A conectar-se com %s... [Preme %s para abortar]"
 
-#: src/main.c:290
+#: src/main.c:229
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
 msgstr "Erro: a versom %d.%d.%d do MPD é demasiado antiga (cumpre a 0.11.0).\n"
 
-#: src/main.c:342
-#, c-format
-msgid "Connecting to %s...  [Press %s to abort]"
-msgstr "A conectar-se com %s... [Preme %s para abortar]"
-
-#: src/main.c:354
+#: src/main.c:242
 #, c-format
 msgid "Connected to %s!"
 msgstr "Conectado com %s!"
 
-#: src/screen.c:224
+#: src/screen.c:137
 msgid ":Help  "
 msgstr ":Ajuda "
 
-#: src/screen.c:228
+#: src/screen.c:141
 msgid ":Playlist  "
 msgstr ":Lista "
 
-#: src/screen.c:232
+#: src/screen.c:145
 msgid ":Browse  "
 msgstr ":Navegar "
 
-#: src/screen.c:237
+#: src/screen.c:150
 msgid ":Artist  "
 msgstr ":Artista"
 
-#: src/screen.c:243
+#: src/screen.c:156
 msgid ":Search  "
 msgstr ":Procurar "
 
-#: src/screen.c:249
+#: src/screen.c:162
 msgid ":Lyrics  "
 msgstr ":Letras "
 
-#: src/screen.c:254
+#: src/screen.c:168
 msgid "Volume n/a "
 msgstr "Volume n/a "
 
-#: src/screen.c:258
+#: src/screen.c:170
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volume %d%%"
 
-#: src/screen.c:338
+#: src/screen.c:277
 msgid "Playing:"
 msgstr "A tocar:"
 
-#: src/screen.c:341
+#: src/screen.c:280
 msgid "[Paused]"
 msgstr "[Em Pausa]"
 
-#: src/screen.c:471 src/screen.c:580
+#: src/screen.c:400 src/screen.c:473
 #, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Erro: O écrã é demasiado pequeno!\n"
 
-#: src/screen.c:732
+#: src/screen.c:596
 msgid "Repeat is on"
 msgstr "Repetiçom activada"
 
-#: src/screen.c:733
+#: src/screen.c:597
 msgid "Repeat is off"
 msgstr "Repetiçom desactivada"
 
-#: src/screen.c:736
+#: src/screen.c:601
 msgid "Random is on"
 msgstr "Aleatório activado"
 
-#: src/screen.c:737
+#: src/screen.c:602
 msgid "Random is off"
 msgstr "Aleatório desactivado"
 
-#: src/screen.c:740
+#: src/screen.c:605
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Esvaecemento %d segundos"
 
-#: src/screen.c:743
+#: src/screen.c:608
 msgid "Database updated!"
 msgstr "Base de dados actualizada!"
 
-#: src/screen.c:905
+#: src/screen.c:741
 msgid "Shuffled playlist!"
 msgstr "Lista aleatorizada!"
 
-#: src/screen.c:909
+#: src/screen.c:745
 msgid "Cleared playlist!"
 msgstr "Lista limpada!"
 
-#: src/screen.c:927 src/screen_file.c:655
+#: src/screen.c:762 src/screen_file.c:254
 msgid "Database update started!"
 msgstr "A actualizaçom da BD começou!"
 
-#: src/screen.c:930 src/screen_file.c:663
+#: src/screen.c:764 src/screen_file.c:261
 msgid "Database update running..."
 msgstr "A BD está-se a actualizar..."
 
 # fuzzy
-#: src/screen.c:943
+#: src/screen.c:800
 msgid "Find mode: Wrapped"
 msgstr "Modo de procura: Limitada"
 
-#: src/screen.c:944
+#: src/screen.c:801
 msgid "Find mode: Normal"
 msgstr "Modo de procura: Normal"
 
-#: src/screen.c:949
+#: src/screen.c:806
 msgid "Auto center mode: On"
 msgstr "Modo de auto-centrado: activado"
 
-#: src/screen.c:950
+#: src/screen.c:807
 msgid "Auto center mode: Off"
 msgstr "Modo de auto-centrado: desactivado"
 
-#: src/screen_utils.c:38
+#: src/screen_artist.c:73
+#, fuzzy
+msgid "All tracks"
+msgstr "pista"
+
+#: src/screen_artist.c:376
+#, fuzzy
+msgid "All artists"
+msgstr "artista"
+
+#: src/screen_artist.c:381
+#, c-format
+msgid "Albums of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:390
+#, fuzzy, c-format
+msgid "Album: %s - %s"
+msgstr "Erro: %s - %s"
+
+#: src/screen_artist.c:394
+#, c-format
+msgid "All tracks of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:634 src/screen_file.c:238
+msgid "Screen updated!"
+msgstr "Écrã actualizado!"
+
+#: src/screen_browser.c:234
+#, c-format
+msgid "Loading playlist %s..."
+msgstr "A carregar a lista %s..."
+
+#: src/screen_browser.c:257 src/screen_browser.c:366 src/screen_browser.c:392
+#, c-format
+msgid "Adding '%s' to playlist\n"
+msgstr "A engadir '%s' à lista\n"
+
+#: src/screen_browser.c:311
+#, c-format
+msgid "Adding directory %s...\n"
+msgstr "Engadindo o cartafol %s...\n"
+
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Procurar"
 
-#: src/screen_utils.c:39
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Procurar atrás"
 
-#: src/screen_utils.c:166
+#: src/screen_utils.c:114
+msgid "Password: "
+msgstr ""
+
+#: src/screen_utils.c:207
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Nom se puido atopar '%s'"
 
-#: src/screen_play.c:156
+#: src/screen_play.c:187
 msgid "Save playlist as: "
 msgstr "Guardar lista como: "
 
-#: src/screen_play.c:186
+#: src/screen_play.c:220
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Reemprazar %s [%s/%s] ?"
 
-#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
+#: src/screen_play.c:241 src/screen_file.c:137 src/screen_keydef.c:163
 msgid "Aborted!"
 msgstr "Abortado!"
 
 #. success
-#: src/screen_play.c:206
+#: src/screen_play.c:249
 #, c-format
 msgid "Saved %s"
 msgstr "Guardado %s"
 
-#: src/screen_play.c:270
+#: src/screen_play.c:325
 msgid "Add: "
 msgstr "Engadir: "
 
-#: src/screen_play.c:325
+#: src/screen_play.c:431
 msgid "Playlist"
 msgstr "Lista"
 
-#: src/screen_play.c:327
+#: src/screen_play.c:433
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lista em %s"
 
-#: src/screen_file.c:256
-#, c-format
-msgid "Loading playlist %s..."
-msgstr "A carregar a lista %s..."
-
-#: src/screen_file.c:298
+#: src/screen_file.c:125
 msgid "You can only delete playlists!"
 msgstr "Apenas podes eliminar as listas!"
 
-#: src/screen_file.c:305
+#: src/screen_file.c:132
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Eliminar a lista %s [%s/%s] ?"
 
-#: src/screen_file.c:321
+#: src/screen_file.c:144
 msgid "Playlist deleted!"
 msgstr "Lista eliminada!"
 
-#: src/screen_file.c:340 src/screen_file.c:461 src/screen_file.c:487
-#, c-format
-msgid "Adding '%s' to playlist\n"
-msgstr "A engadir '%s' à lista\n"
-
-#: src/screen_file.c:391
-#, c-format
-msgid "Adding directory %s...\n"
-msgstr "Engadindo o cartafol %s...\n"
-
-#: src/screen_file.c:552
+#: src/screen_file.c:198
 #, c-format
 msgid "Browse: %s"
 msgstr "Navegar: %s"
 
-#: src/screen_file.c:644
-msgid "Screen updated!"
-msgstr "Écrã actualizado!"
-
-#: src/screen_file.c:652
+#: src/screen_file.c:250
 #, c-format
 msgid "Database update of %s started!"
 msgstr "A actualizaçom da BD de %s começou!"
 
-#: src/screen_search.c:56
+#: src/screen_search.c:41
 msgid "artist"
 msgstr "artista"
 
-#: src/screen_search.c:57
+#: src/screen_search.c:42
 msgid "album"
 msgstr "álbum"
 
-#: src/screen_search.c:58
+#: src/screen_search.c:43
 msgid "title"
 msgstr "título"
 
-#: src/screen_search.c:59
+#: src/screen_search.c:44
 msgid "track"
 msgstr "pista"
 
-#: src/screen_search.c:60
+#: src/screen_search.c:45
 msgid "name"
 msgstr "nome do ficheiro"
 
-#: src/screen_search.c:61
+#: src/screen_search.c:46
 msgid "genre"
 msgstr "estilo"
 
-#: src/screen_search.c:62
+#: src/screen_search.c:47
 msgid "date"
 msgstr "data"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:48
 msgid "composer"
 msgstr "compositor"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:49
 msgid "performer"
 msgstr "executante"
 
-#: src/screen_search.c:65
+#: src/screen_search.c:50
 msgid "comment"
 msgstr "comentário"
 
-#: src/screen_search.c:66
+#: src/screen_search.c:51
 msgid "file"
 msgstr "ficheiro"
 
-#: src/screen_search.c:100
+#: src/screen_search.c:81
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:101
+#: src/screen_search.c:82
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen_search.c:102
+#: src/screen_search.c:83
 msgid "Album"
 msgstr "Álbum"
 
-#: src/screen_search.c:103
+#: src/screen_search.c:84
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: src/screen_search.c:244
+#: src/screen_search.c:85
+#, fuzzy
+msgid "Artist + Title"
+msgstr ":Artista"
+
+#: src/screen_search.c:247
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Tag de procura errónea %s"
@@ -304,294 +334,296 @@ msgstr "Tag de procura errónea %s"
 msgid "No argument for search tag %s"
 msgstr "Sem argumento para a procura da tag %s"
 
-#: src/screen_search.c:323
+#: src/screen_search.c:311
 msgid "Search: "
 msgstr "Procurar: "
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:379
+#: src/screen_search.c:371
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Preme %s para umha nova procura"
 
-#: src/screen_search.c:435
+#: src/screen_search.c:399
 #, c-format
 msgid "Search: %s"
 msgstr "Procurar: %s "
 
-#: src/screen_search.c:438
+#: src/screen_search.c:402
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Procura: Resultados para %s [%s]"
 
-#: src/screen_search.c:442
+#: src/screen_search.c:406
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Procura: Preme %s para umha nova procura [%s]"
 
-#: src/screen_search.c:476
+#: src/screen_search.c:421
 #, c-format
 msgid "Search mode: %s"
 msgstr "Modo da procura: %s"
 
-#: src/screen_keydef.c:46
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Aplicar e guardar os atalhos de teclado "
 
-#: src/screen_keydef.c:47
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Aplicar os atalhos de teclado "
 
-#: src/screen_keydef.c:76
+#: src/screen_keydef.c:70
 msgid "You have new key bindings!"
 msgstr "Tes novos atalhos de teclado!"
 
-#: src/screen_keydef.c:79
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Atalhos de teclado sem mudanças"
 
-#: src/screen_keydef.c:90
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Erro: impossível criar o cartafol ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:100 src/screen_keydef.c:106
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Erro: %s - %s"
 
-#: src/screen_keydef.c:108
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "Escreveu-se %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: src/screen_keydef.c:155
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Introuduz um novo atalho para %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Erro: a tecla %s já se está a utilizar por %s"
 
-#: src/screen_keydef.c:177
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Assignou-se %s a %s"
 
-#: src/screen_keydef.c:220
+#: src/screen_keydef.c:216
 #, c-format
 msgid "%d. Add new key "
 msgstr "%d. Engadir um novo atalho "
 
-#: src/screen_keydef.c:267
+#: src/screen_keydef.c:262
 msgid "Welcome to the key editor!"
 msgstr "Bem-vid@ ao editor de atalhos!"
 
-#: src/screen_keydef.c:283
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Esquecestes de 'Aplicar' as mudanças?"
 
-#: src/screen_keydef.c:290
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Editar os atalhos de teclado"
 
-#: src/screen_keydef.c:292
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editar atalhos para %s"
 
-#: src/screen_clock.c:154
-msgid "Clock"
-msgstr "Relógio"
-
-#: src/screen_help.c:43
+#: src/screen_help.c:38
 msgid "Keys - Movement"
 msgstr "Teclas - Movimento"
 
-#: src/screen_help.c:69
+#: src/screen_help.c:61
 msgid "Keys - Global"
 msgstr "Teclas - Global"
 
-#: src/screen_help.c:96
+#: src/screen_help.c:89
 msgid "Keys - Playlist screen"
 msgstr "Teclas - Écrã da lista"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:91
 msgid "Play"
 msgstr "Tocar"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:94
 msgid "Move song up"
 msgstr "Mover a cançom arriba"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:95
 msgid "Move song down"
 msgstr "Mover a cançom abaixo"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:98
 msgid "Center"
 msgstr "Centrar"
 
-#: src/screen_help.c:110
+#: src/screen_help.c:103
 msgid "Keys - Browse screen"
 msgstr "Teclas - Écrã de navegaçom"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:105
 msgid "Enter directory/Select and play song"
 msgstr "Entra no cartafol/Selecciona e toca a cançom"
 
-#: src/screen_help.c:115
+#: src/screen_help.c:107 src/screen_help.c:122
+#, fuzzy
+msgid "Append song to playlist"
+msgstr "Eliminar a cançom da lista"
+
+#: src/screen_help.c:109
 msgid "Delete playlist"
 msgstr "Eliminar lista"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:117
 msgid "Keys - Search screen"
 msgstr "Teclas - Écrã de procura"
 
-#: src/screen_help.c:123
+#: src/screen_help.c:119
 msgid "Search"
 msgstr "Procura"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:120
 msgid "Select and play"
 msgstr "Seleccionar e tocar"
 
-#: src/screen_help.c:131
+#: src/screen_help.c:129
 msgid "Keys - Lyrics screen"
 msgstr "Teclas - Écrã das letras"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:131
 msgid "View Lyrics"
 msgstr "Ver Letras"
 
-#: src/screen_help.c:134
+#: src/screen_help.c:132
 msgid "(Re)load lyrics"
 msgstr "(Re)carregar letras"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:133
 msgid "Interrupt retrieval"
 msgstr "Interromper a descarga"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:134
 msgid "Explicitly download lyrics"
 msgstr "Forçar a descarga das letras"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:135
 msgid "Save lyrics"
 msgstr "Guardar as letras"
 
-#: src/screen_help.c:220
+#: src/screen_help.c:205
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/screen_lyrics.c:479
-msgid "Lyrics  [No connection]"
-msgstr "Letras [Sem conexom]"
-
-#: src/screen_lyrics.c:480
-msgid "Lyrics  [Not found]"
-msgstr "Letras [Nom atopadas]"
-
-#: src/screen_lyrics.c:483
-msgid "Lyrics  [retrieving]"
-msgstr "Letras [a procurar]"
+#: src/screen_lyrics.c:162
+#, fuzzy
+msgid "No lyrics"
+msgstr "Guardar as letras"
 
-#: src/screen_lyrics.c:565
+#: src/screen_lyrics.c:316
 msgid "Lyrics saved!"
 msgstr "Letras guardadas!"
 
-#: src/command.c:71
+#: src/command.c:67
 msgid "Key configuration screen"
 msgstr "Écrã da configuraçom dos atalhos"
 
-#: src/command.c:74
+#: src/command.c:70
 msgid "Quit"
 msgstr "Sair"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor up"
 msgstr "Mover o cursor arriba"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor down"
 msgstr "Mover o cursor abaixo"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Home "
 msgstr "Início"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "End "
 msgstr "Fim"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Page up"
 msgstr "Avance página"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Page down"
 msgstr "Retrocesso página"
 
-#: src/command.c:93
+#: src/command.c:89
 msgid "Help screen"
 msgstr "Écrã de ajuda"
 
-#: src/command.c:95
+#: src/command.c:91
 msgid "Playlist screen"
 msgstr "Écrã da lista"
 
-#: src/command.c:97
+#: src/command.c:93
 msgid "Browse screen"
 msgstr "Écrã de navegaçom"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Play/Enter directory"
 msgstr "Tocar/Entrar num cartafol"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/command.c:106
+#: src/command.c:102
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:108
+#: src/command.c:104
+msgid "Crop"
+msgstr ""
+
+#: src/command.c:106
 msgid "Next track"
 msgstr "Seguinte"
 
-#: src/command.c:110
+#: src/command.c:108
 msgid "Previous track"
 msgstr "Anterior"
 
-#: src/command.c:112
+#: src/command.c:110
 msgid "Seek forward"
 msgstr "Avançar"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Increase volume"
 msgstr "Aumentar volume"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Decrease volume"
 msgstr "Diminuir volume"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/desseleccionar a cançom na lista"
 
+#: src/command.c:120
+msgid "Select all listed items"
+msgstr ""
+
 #: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Eliminar a cançom da lista"
@@ -628,66 +660,72 @@ msgstr "Guardar lista"
 msgid "Add url/file to playlist"
 msgstr "Engadir url/ficheiro à lista"
 
+#: src/command.c:141
+#, fuzzy
+msgid "Go to root directory"
+msgstr "Tocar/Entrar num cartafol"
+
 #: src/command.c:143
+#, fuzzy
+msgid "Go to parent directory"
+msgstr "Tocar/Entrar num cartafol"
+
+#: src/command.c:147
 msgid "Move item up"
 msgstr "Mover o elemento arriba"
 
-#: src/command.c:145
+#: src/command.c:149
 msgid "Move item down"
 msgstr "Mover o elemento abaixo"
 
-#: src/command.c:147
+#: src/command.c:151
 msgid "Update screen"
 msgstr "Actualizar o écrã"
 
-#: src/command.c:152
+#: src/command.c:156
 msgid "Toggle find mode"
 msgstr "Alternar o modo de procura"
 
-#: src/command.c:154
+#: src/command.c:158
 msgid "Toggle auto center mode"
 msgstr "Alternar o modo de auto-centrado"
 
-#: src/command.c:159
+#: src/command.c:163
 msgid "Next screen"
 msgstr "Seguinte écrã"
 
-#: src/command.c:161
+#: src/command.c:165
 msgid "Previous screen"
 msgstr "Écrã anterior"
 
-#: src/command.c:166
+#: src/command.c:170
 msgid "Forward find"
 msgstr "Procurar cara adiante"
 
-#: src/command.c:168
+#: src/command.c:172
 msgid "Forward find next"
 msgstr "Procurar para adiante, seguinte"
 
-#: src/command.c:170
+#: src/command.c:174
 msgid "Backward find"
 msgstr "Procurar cara atrás"
 
-#: src/command.c:172
+#: src/command.c:176
 msgid "Backward find previous"
 msgstr "Procurar cara atrás, anterior"
 
-#: src/command.c:178
+#: src/command.c:182
 msgid "Artist screen"
 msgstr "Navegador de Artistas"
 
-#: src/command.c:182
+#: src/command.c:186
 msgid "Search screen"
 msgstr "Écrã de procura"
 
-#: src/command.c:184
+#: src/command.c:188
 msgid "Change search mode"
 msgstr "Mudar o modo de procura"
 
-#: src/command.c:189
-msgid "Clock screen"
-msgstr "Écrã do relógio"
-
 #: src/command.c:193
 msgid "Lyrics screen"
 msgstr "Ecrã das letras"
@@ -768,42 +806,57 @@ msgstr "Esc"
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:502
+#: src/command.c:456
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr ""
 "A tecla %s assignou-se a %s e a %s (preme %s para ir ao editor de atalhos)"
 
-#: src/command.c:509 src/command.c:516
+#: src/command.c:463 src/command.c:470
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Erro: a tecla %s assignou-se a %s e a %s !!!\n"
 
-#: src/colors.c:187
+#: src/colors.c:163
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Aviso: Cor desconhecida - %s\n"
 
-#: src/colors.c:232
+#: src/colors.c:206
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Aviso: Campo de cor desconhecido - %s\n"
 
-#: src/colors.c:267
+#: src/colors.c:238
 #, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "A terminal nom tem suporte para a mudança das cores!\n"
 
-#: src/colors.c:284
+#: src/colors.c:248
 #, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "A terminal nom tem capacidades de cor!\n"
 
-#: src/support.c:187
-#, c-format
-msgid "Error: Unable to convert characters to %s"
-msgstr "Erro: Impossível converter os caracteres a %s"
+#~ msgid "Exiting..."
+#~ msgstr "A sair..."
+
+#~ msgid "Clock"
+#~ msgstr "Relógio"
+
+#~ msgid "Lyrics  [No connection]"
+#~ msgstr "Letras [Sem conexom]"
+
+#~ msgid "Lyrics  [Not found]"
+#~ msgstr "Letras [Nom atopadas]"
+
+#~ msgid "Lyrics  [retrieving]"
+#~ msgstr "Letras [a procurar]"
+
+#~ msgid "Clock screen"
+#~ msgstr "Écrã do relógio"
+
+#~ msgid "Error: Unable to convert characters to %s"
+#~ msgstr "Erro: Impossível converter os caracteres a %s"
 
-#: src/support.c:216
-msgid "Error: Unable to convert characters to UTF-8"
-msgstr "Erro: Impossível converter os caracteres a UTF-8"
+#~ msgid "Error: Unable to convert characters to UTF-8"
+#~ msgstr "Erro: Impossível converter os caracteres a UTF-8"
diff --git a/po/ncmpc.pot b/po/ncmpc.pot
index 25e0edc9f..fd450b919 100644
--- a/po/ncmpc.pot
+++ b/po/ncmpc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-08 17:12+0000\n"
+"POT-Creation-Date: 2008-11-17 19:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,288 +16,311 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:42
+#: src/i18n.h:36
 msgid "y"
 msgstr ""
 
-#: src/ncmpc.h:43
+#: src/i18n.h:37
 msgid "n"
 msgstr ""
 
-#: src/main.c:134 src/main.c:141
-msgid "Exiting..."
-msgstr ""
-
-#: src/main.c:300
+#: src/main.c:211
 #, c-format
-msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
+msgid "Connecting to %s...  [Press %s to abort]"
 msgstr ""
 
-#: src/main.c:351
+#: src/main.c:229
 #, c-format
-msgid "Connecting to %s...  [Press %s to abort]"
+msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
 msgstr ""
 
-#: src/main.c:363
+#: src/main.c:242
 #, c-format
 msgid "Connected to %s!"
 msgstr ""
 
-#: src/screen.c:224
+#: src/screen.c:137
 msgid ":Help  "
 msgstr ""
 
-#: src/screen.c:228
+#: src/screen.c:141
 msgid ":Playlist  "
 msgstr ""
 
-#: src/screen.c:232
+#: src/screen.c:145
 msgid ":Browse  "
 msgstr ""
 
-#: src/screen.c:237
+#: src/screen.c:150
 msgid ":Artist  "
 msgstr ""
 
-#: src/screen.c:243
+#: src/screen.c:156
 msgid ":Search  "
 msgstr ""
 
-#: src/screen.c:249
+#: src/screen.c:162
 msgid ":Lyrics  "
 msgstr ""
 
-#: src/screen.c:254
+#: src/screen.c:168
 msgid "Volume n/a "
 msgstr ""
 
-#: src/screen.c:258
+#: src/screen.c:170
 #, c-format
 msgid " Volume %d%%"
 msgstr ""
 
-#: src/screen.c:338
+#: src/screen.c:277
 msgid "Playing:"
 msgstr ""
 
-#: src/screen.c:341
+#: src/screen.c:280
 msgid "[Paused]"
 msgstr ""
 
-#: src/screen.c:471 src/screen.c:579
+#: src/screen.c:400 src/screen.c:473
 #, c-format
 msgid "Error: Screen to small!\n"
 msgstr ""
 
-#: src/screen.c:736
+#: src/screen.c:596
 msgid "Repeat is on"
 msgstr ""
 
-#: src/screen.c:737
+#: src/screen.c:597
 msgid "Repeat is off"
 msgstr ""
 
-#: src/screen.c:740
+#: src/screen.c:601
 msgid "Random is on"
 msgstr ""
 
-#: src/screen.c:741
+#: src/screen.c:602
 msgid "Random is off"
 msgstr ""
 
-#: src/screen.c:744
+#: src/screen.c:605
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:747
+#: src/screen.c:608
 msgid "Database updated!"
 msgstr ""
 
-#: src/screen.c:909
+#: src/screen.c:741
 msgid "Shuffled playlist!"
 msgstr ""
 
-#: src/screen.c:913
+#: src/screen.c:745
 msgid "Cleared playlist!"
 msgstr ""
 
-#: src/screen.c:931 src/screen_file.c:687
+#: src/screen.c:762 src/screen_file.c:254
 msgid "Database update started!"
 msgstr ""
 
-#: src/screen.c:934 src/screen_file.c:695
+#: src/screen.c:764 src/screen_file.c:261
 msgid "Database update running..."
 msgstr ""
 
-#: src/screen.c:947
+#: src/screen.c:800
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: src/screen.c:948
+#: src/screen.c:801
 msgid "Find mode: Normal"
 msgstr ""
 
-#: src/screen.c:953
+#: src/screen.c:806
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:954
+#: src/screen.c:807
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_utils.c:38
+#: src/screen_artist.c:73
+msgid "All tracks"
+msgstr ""
+
+#: src/screen_artist.c:376
+msgid "All artists"
+msgstr ""
+
+#: src/screen_artist.c:381
+#, c-format
+msgid "Albums of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:390
+#, c-format
+msgid "Album: %s - %s"
+msgstr ""
+
+#: src/screen_artist.c:394
+#, c-format
+msgid "All tracks of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:634 src/screen_file.c:238
+msgid "Screen updated!"
+msgstr ""
+
+#: src/screen_browser.c:234
+#, c-format
+msgid "Loading playlist %s..."
+msgstr ""
+
+#: src/screen_browser.c:257 src/screen_browser.c:366 src/screen_browser.c:392
+#, c-format
+msgid "Adding '%s' to playlist\n"
+msgstr ""
+
+#: src/screen_browser.c:311
+#, c-format
+msgid "Adding directory %s...\n"
+msgstr ""
+
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr ""
 
-#: src/screen_utils.c:39
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr ""
 
-#: src/screen_utils.c:128
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr ""
 
-#: src/screen_utils.c:214
+#: src/screen_utils.c:207
 #, c-format
 msgid "Unable to find '%s'"
 msgstr ""
 
-#: src/screen_play.c:156
+#: src/screen_play.c:187
 msgid "Save playlist as: "
 msgstr ""
 
-#: src/screen_play.c:186
+#: src/screen_play.c:220
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr ""
 
-#: src/screen_play.c:200 src/screen_file.c:326 src/screen_keydef.c:162
+#: src/screen_play.c:241 src/screen_file.c:137 src/screen_keydef.c:163
 msgid "Aborted!"
 msgstr ""
 
 #. success
-#: src/screen_play.c:206
+#: src/screen_play.c:249
 #, c-format
 msgid "Saved %s"
 msgstr ""
 
-#: src/screen_play.c:270
+#: src/screen_play.c:325
 msgid "Add: "
 msgstr ""
 
-#: src/screen_play.c:325
+#: src/screen_play.c:431
 msgid "Playlist"
 msgstr ""
 
-#: src/screen_play.c:327
+#: src/screen_play.c:433
 #, c-format
 msgid "Playlist on %s"
 msgstr ""
 
-#: src/screen_file.c:269
-#, c-format
-msgid "Loading playlist %s..."
-msgstr ""
-
-#: src/screen_file.c:311
+#: src/screen_file.c:125
 msgid "You can only delete playlists!"
 msgstr ""
 
-#: src/screen_file.c:318
+#: src/screen_file.c:132
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr ""
 
-#: src/screen_file.c:334
+#: src/screen_file.c:144
 msgid "Playlist deleted!"
 msgstr ""
 
-#: src/screen_file.c:353 src/screen_file.c:474 src/screen_file.c:500
+#: src/screen_file.c:198
 #, c-format
-msgid "Adding '%s' to playlist\n"
-msgstr ""
-
-#: src/screen_file.c:404
-#, c-format
-msgid "Adding directory %s...\n"
+msgid "Browse: %s"
 msgstr ""
 
-#: src/screen_file.c:574
-#, c-format
-msgid "Browse: %s%s%s"
-msgstr ""
-
-#: src/screen_file.c:676
-msgid "Screen updated!"
-msgstr ""
-
-#: src/screen_file.c:684
+#: src/screen_file.c:250
 #, c-format
 msgid "Database update of %s started!"
 msgstr ""
 
-#: src/screen_search.c:56
+#: src/screen_search.c:41
 msgid "artist"
 msgstr ""
 
-#: src/screen_search.c:57
+#: src/screen_search.c:42
 msgid "album"
 msgstr ""
 
-#: src/screen_search.c:58
+#: src/screen_search.c:43
 msgid "title"
 msgstr ""
 
-#: src/screen_search.c:59
+#: src/screen_search.c:44
 msgid "track"
 msgstr ""
 
-#: src/screen_search.c:60
+#: src/screen_search.c:45
 msgid "name"
 msgstr ""
 
-#: src/screen_search.c:61
+#: src/screen_search.c:46
 msgid "genre"
 msgstr ""
 
-#: src/screen_search.c:62
+#: src/screen_search.c:47
 msgid "date"
 msgstr ""
 
-#: src/screen_search.c:63
+#: src/screen_search.c:48
 msgid "composer"
 msgstr ""
 
-#: src/screen_search.c:64
+#: src/screen_search.c:49
 msgid "performer"
 msgstr ""
 
-#: src/screen_search.c:65
+#: src/screen_search.c:50
 msgid "comment"
 msgstr ""
 
-#: src/screen_search.c:66
+#: src/screen_search.c:51
 msgid "file"
 msgstr ""
 
-#: src/screen_search.c:100
+#: src/screen_search.c:81
 msgid "Title"
 msgstr ""
 
-#: src/screen_search.c:101
+#: src/screen_search.c:82
 msgid "Artist"
 msgstr ""
 
-#: src/screen_search.c:102
+#: src/screen_search.c:83
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:103
+#: src/screen_search.c:84
 msgid "Filename"
 msgstr ""
 
-#: src/screen_search.c:244
+#: src/screen_search.c:85
+msgid "Artist + Title"
+msgstr ""
+
+#: src/screen_search.c:247
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
@@ -307,294 +330,294 @@ msgstr ""
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:323
+#: src/screen_search.c:311
 msgid "Search: "
 msgstr ""
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:379
+#: src/screen_search.c:371
 #, c-format
 msgid "Press %s for a new search"
 msgstr ""
 
-#: src/screen_search.c:435
+#: src/screen_search.c:399
 #, c-format
 msgid "Search: %s"
 msgstr ""
 
-#: src/screen_search.c:438
+#: src/screen_search.c:402
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr ""
 
-#: src/screen_search.c:442
+#: src/screen_search.c:406
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr ""
 
-#: src/screen_search.c:476
+#: src/screen_search.c:421
 #, c-format
 msgid "Search mode: %s"
 msgstr ""
 
-#: src/screen_keydef.c:46
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr ""
 
-#: src/screen_keydef.c:47
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr ""
 
-#: src/screen_keydef.c:76
+#: src/screen_keydef.c:70
 msgid "You have new key bindings!"
 msgstr ""
 
-#: src/screen_keydef.c:79
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr ""
 
-#: src/screen_keydef.c:90
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr ""
 
-#: src/screen_keydef.c:100 src/screen_keydef.c:106
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr ""
 
-#: src/screen_keydef.c:108
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr ""
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr ""
 
-#: src/screen_keydef.c:155
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr ""
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr ""
 
-#: src/screen_keydef.c:177
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr ""
 
-#: src/screen_keydef.c:220
+#: src/screen_keydef.c:216
 #, c-format
 msgid "%d. Add new key "
 msgstr ""
 
-#: src/screen_keydef.c:267
+#: src/screen_keydef.c:262
 msgid "Welcome to the key editor!"
 msgstr ""
 
-#: src/screen_keydef.c:283
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr ""
 
-#: src/screen_keydef.c:290
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:292
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr ""
 
-#: src/screen_clock.c:154
-msgid "Clock"
-msgstr ""
-
-#: src/screen_help.c:43
+#: src/screen_help.c:38
 msgid "Keys - Movement"
 msgstr ""
 
-#: src/screen_help.c:69
+#: src/screen_help.c:61
 msgid "Keys - Global"
 msgstr ""
 
-#: src/screen_help.c:96
+#: src/screen_help.c:89
 msgid "Keys - Playlist screen"
 msgstr ""
 
-#: src/screen_help.c:98
+#: src/screen_help.c:91
 msgid "Play"
 msgstr ""
 
-#: src/screen_help.c:101
+#: src/screen_help.c:94
 msgid "Move song up"
 msgstr ""
 
-#: src/screen_help.c:102
+#: src/screen_help.c:95
 msgid "Move song down"
 msgstr ""
 
-#: src/screen_help.c:105
+#: src/screen_help.c:98
 msgid "Center"
 msgstr ""
 
-#: src/screen_help.c:110
+#: src/screen_help.c:103
 msgid "Keys - Browse screen"
 msgstr ""
 
-#: src/screen_help.c:112
+#: src/screen_help.c:105
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: src/screen_help.c:115
+#: src/screen_help.c:107 src/screen_help.c:122
+msgid "Append song to playlist"
+msgstr ""
+
+#: src/screen_help.c:109
 msgid "Delete playlist"
 msgstr ""
 
-#: src/screen_help.c:123
+#: src/screen_help.c:117
 msgid "Keys - Search screen"
 msgstr ""
 
-#: src/screen_help.c:125
+#: src/screen_help.c:119
 msgid "Search"
 msgstr ""
 
-#: src/screen_help.c:126
+#: src/screen_help.c:120
 msgid "Select and play"
 msgstr ""
 
-#: src/screen_help.c:133
+#: src/screen_help.c:129
 msgid "Keys - Lyrics screen"
 msgstr ""
 
-#: src/screen_help.c:135
+#: src/screen_help.c:131
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:136
+#: src/screen_help.c:132
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:137
+#: src/screen_help.c:133
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:138
+#: src/screen_help.c:134
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:139
+#: src/screen_help.c:135
 msgid "Save lyrics"
 msgstr ""
 
-#: src/screen_help.c:222
+#: src/screen_help.c:205
 msgid "Help"
 msgstr ""
 
-#: src/screen_lyrics.c:482
-msgid "Lyrics  [No connection]"
+#: src/screen_lyrics.c:162
+msgid "No lyrics"
 msgstr ""
 
-#: src/screen_lyrics.c:483
-msgid "Lyrics  [Not found]"
-msgstr ""
-
-#: src/screen_lyrics.c:486
-msgid "Lyrics  [retrieving]"
-msgstr ""
-
-#: src/screen_lyrics.c:567
+#: src/screen_lyrics.c:316
 msgid "Lyrics saved!"
 msgstr ""
 
-#: src/command.c:71
+#: src/command.c:67
 msgid "Key configuration screen"
 msgstr ""
 
-#: src/command.c:74
+#: src/command.c:70
 msgid "Quit"
 msgstr ""
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor up"
 msgstr ""
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor down"
 msgstr ""
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Home "
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "End "
 msgstr ""
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Page up"
 msgstr ""
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Page down"
 msgstr ""
 
-#: src/command.c:93
+#: src/command.c:89
 msgid "Help screen"
 msgstr ""
 
-#: src/command.c:95
+#: src/command.c:91
 msgid "Playlist screen"
 msgstr ""
 
-#: src/command.c:97
+#: src/command.c:93
 msgid "Browse screen"
 msgstr ""
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Play/Enter directory"
 msgstr ""
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:106
+#: src/command.c:102
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:108
+#: src/command.c:104
+msgid "Crop"
+msgstr ""
+
+#: src/command.c:106
 msgid "Next track"
 msgstr ""
 
-#: src/command.c:110
+#: src/command.c:108
 msgid "Previous track"
 msgstr ""
 
-#: src/command.c:112
+#: src/command.c:110
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Increase volume"
 msgstr ""
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Decrease volume"
 msgstr ""
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Select/deselect song in playlist"
 msgstr ""
 
+#: src/command.c:120
+msgid "Select all listed items"
+msgstr ""
+
 #: src/command.c:122
 msgid "Delete song from playlist"
 msgstr ""
@@ -696,124 +719,111 @@ msgid "Change search mode"
 msgstr ""
 
 #: src/command.c:193
-msgid "Clock screen"
-msgstr ""
-
-#: src/command.c:197
 msgid "Lyrics screen"
 msgstr ""
 
-#: src/command.c:199
+#: src/command.c:195
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:201
+#: src/command.c:197
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:224
+#: src/command.c:220
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Space"
 msgstr ""
 
-#: src/command.c:228
+#: src/command.c:224
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:232
+#: src/command.c:228
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:234
+#: src/command.c:230
 msgid "Up"
 msgstr ""
 
-#: src/command.c:236
+#: src/command.c:232
 msgid "Down"
 msgstr ""
 
-#: src/command.c:238
+#: src/command.c:234
 msgid "Left"
 msgstr ""
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Right"
 msgstr ""
 
-#: src/command.c:242
+#: src/command.c:238
 msgid "Home"
 msgstr ""
 
-#: src/command.c:244
+#: src/command.c:240
 msgid "End"
 msgstr ""
 
-#: src/command.c:246
+#: src/command.c:242
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:248
+#: src/command.c:244
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:250
+#: src/command.c:246
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:252
+#: src/command.c:248
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:254
+#: src/command.c:250
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:256
+#: src/command.c:252
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:506
+#: src/command.c:456
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr ""
 
-#: src/command.c:513 src/command.c:520
+#: src/command.c:463 src/command.c:470
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr ""
 
-#: src/colors.c:187
+#: src/colors.c:163
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr ""
 
-#: src/colors.c:232
+#: src/colors.c:206
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr ""
 
-#: src/colors.c:267
+#: src/colors.c:238
 #, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr ""
 
-#: src/colors.c:284
+#: src/colors.c:248
 #, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr ""
-
-#: src/support.c:187
-#, c-format
-msgid "Error: Unable to convert characters to %s"
-msgstr ""
-
-#: src/support.c:216
-msgid "Error: Unable to convert characters to UTF-8"
-msgstr ""
diff --git a/po/no.po b/po/no.po
index 58d21e323..4027b61f4 100644
--- a/po/no.po
+++ b/po/no.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-07 11:40+0000\n"
+"POT-Creation-Date: 2008-11-17 19:57+0100\n"
 "PO-Revision-Date: 2004-06-05 18:16+0200\n"
 "Last-Translator: Ole R. Thorsen <ole.rth@gmail.com>\n"
 "Language-Team: no <no@li.org>\n"
@@ -16,290 +16,320 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:42
+#: src/i18n.h:36
 msgid "y"
 msgstr "j"
 
-#: src/ncmpc.h:43
+#: src/i18n.h:37
 msgid "n"
 msgstr ""
 
-#: src/main.c:133 src/main.c:140
-msgid "Exiting..."
-msgstr "Avslutter..."
+#: src/main.c:211
+#, c-format
+msgid "Connecting to %s...  [Press %s to abort]"
+msgstr "Kobler til %s... [Trykk %s for � avslutte]"
 
-#: src/main.c:290
+#: src/main.c:229
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
 msgstr "MPD versjon %d.%d.%d er for gammel - oppgrader til versjon 0.11.x \n"
 
-#: src/main.c:342
-#, c-format
-msgid "Connecting to %s...  [Press %s to abort]"
-msgstr "Kobler til %s... [Trykk %s for � avslutte]"
-
-#: src/main.c:354
+#: src/main.c:242
 #, c-format
 msgid "Connected to %s!"
 msgstr "Koblet til %s!"
 
-#: src/screen.c:224
+#: src/screen.c:137
 msgid ":Help  "
 msgstr ":Hjelp  "
 
-#: src/screen.c:228
+#: src/screen.c:141
 msgid ":Playlist  "
 msgstr ":Spilleliste  "
 
-#: src/screen.c:232
+#: src/screen.c:145
 msgid ":Browse  "
 msgstr ":Filer  "
 
-#: src/screen.c:237
+#: src/screen.c:150
 #, fuzzy
 msgid ":Artist  "
 msgstr ":Spilleliste  "
 
-#: src/screen.c:243
+#: src/screen.c:156
 msgid ":Search  "
 msgstr ":S�k  "
 
-#: src/screen.c:249
+#: src/screen.c:162
 #, fuzzy
 msgid ":Lyrics  "
 msgstr ":Spilleliste  "
 
-#: src/screen.c:254
+#: src/screen.c:168
 msgid "Volume n/a "
 msgstr "Volum: n/a "
 
-#: src/screen.c:258
+#: src/screen.c:170
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volum: %d%%"
 
-#: src/screen.c:338
+#: src/screen.c:277
 msgid "Playing:"
 msgstr "Spiller:"
 
-#: src/screen.c:341
+#: src/screen.c:280
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:471 src/screen.c:580
+#: src/screen.c:400 src/screen.c:473
 #, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Feil: Terminalen er for liten!\n"
 
-#: src/screen.c:732
+#: src/screen.c:596
 msgid "Repeat is on"
 msgstr "Repeter er p�"
 
-#: src/screen.c:733
+#: src/screen.c:597
 msgid "Repeat is off"
 msgstr "Repeter er av"
 
-#: src/screen.c:736
+#: src/screen.c:601
 msgid "Random is on"
 msgstr "Random er p�"
 
-#: src/screen.c:737
+#: src/screen.c:602
 msgid "Random is off"
 msgstr "Random er av"
 
-#: src/screen.c:740
+#: src/screen.c:605
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:743
+#: src/screen.c:608
 msgid "Database updated!"
 msgstr "Databasen er oppdatert!"
 
-#: src/screen.c:905
+#: src/screen.c:741
 msgid "Shuffled playlist!"
 msgstr "Tilfeldigjort spillelisten!"
 
-#: src/screen.c:909
+#: src/screen.c:745
 msgid "Cleared playlist!"
 msgstr "Sletter spillelisten!"
 
-#: src/screen.c:927 src/screen_file.c:655
+#: src/screen.c:762 src/screen_file.c:254
 msgid "Database update started!"
 msgstr "Oppdaterar databasen!"
 
-#: src/screen.c:930 src/screen_file.c:663
+#: src/screen.c:764 src/screen_file.c:261
 msgid "Database update running..."
 msgstr "Databasen oppdateres..."
 
-#: src/screen.c:943
+#: src/screen.c:800
 msgid "Find mode: Wrapped"
 msgstr "S�kt rundt (starter p� ny)"
 
-#: src/screen.c:944
+#: src/screen.c:801
 msgid "Find mode: Normal"
 msgstr "S�k normalt (til slutt/begynnelse)"
 
-#: src/screen.c:949
+#: src/screen.c:806
 msgid "Auto center mode: On"
 msgstr "Automatisk sentrering er p�"
 
-#: src/screen.c:950
+#: src/screen.c:807
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er av"
 
-#: src/screen_utils.c:38
+#: src/screen_artist.c:73
+#, fuzzy
+msgid "All tracks"
+msgstr "Neste"
+
+#: src/screen_artist.c:376
+#, fuzzy
+msgid "All artists"
+msgstr ":Spilleliste  "
+
+#: src/screen_artist.c:381
+#, c-format
+msgid "Albums of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:390
+#, fuzzy, c-format
+msgid "Album: %s - %s"
+msgstr "Feil: %s - %s"
+
+#: src/screen_artist.c:394
+#, c-format
+msgid "All tracks of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:634 src/screen_file.c:238
+msgid "Screen updated!"
+msgstr "pppdatert!"
+
+#: src/screen_browser.c:234
+#, c-format
+msgid "Loading playlist %s..."
+msgstr "Henter spilleliste %s..."
+
+#: src/screen_browser.c:257 src/screen_browser.c:366 src/screen_browser.c:392
+#, c-format
+msgid "Adding '%s' to playlist\n"
+msgstr "Legger '%s' til spillelisten\n"
+
+#: src/screen_browser.c:311
+#, c-format
+msgid "Adding directory %s...\n"
+msgstr "Legger til mappen %s...\n"
+
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "S�k: "
 
-#: src/screen_utils.c:39
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "S�k (bakover): "
 
-#: src/screen_utils.c:166
+#: src/screen_utils.c:114
+msgid "Password: "
+msgstr ""
+
+#: src/screen_utils.c:207
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Fant ikke '%s'"
 
-#: src/screen_play.c:156
+#: src/screen_play.c:187
 msgid "Save playlist as: "
 msgstr "Lagre spillelisten som: "
 
-#: src/screen_play.c:186
+#: src/screen_play.c:220
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstatt '%s' [%s/%s] ? "
 
-#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
+#: src/screen_play.c:241 src/screen_file.c:137 src/screen_keydef.c:163
 msgid "Aborted!"
 msgstr "Avbrutt!"
 
 #. success
-#: src/screen_play.c:206
+#: src/screen_play.c:249
 #, c-format
 msgid "Saved %s"
 msgstr "Lagret %s"
 
-#: src/screen_play.c:270
+#: src/screen_play.c:325
 msgid "Add: "
 msgstr "Legg til: "
 
-#: src/screen_play.c:325
+#: src/screen_play.c:431
 msgid "Playlist"
 msgstr "Spilleliste"
 
-#: src/screen_play.c:327
+#: src/screen_play.c:433
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spilleliste p� %s"
 
-#: src/screen_file.c:256
-#, c-format
-msgid "Loading playlist %s..."
-msgstr "Henter spilleliste %s..."
-
-#: src/screen_file.c:298
+#: src/screen_file.c:125
 msgid "You can only delete playlists!"
 msgstr "Du kan bare slette spillelister!"
 
-#: src/screen_file.c:305
+#: src/screen_file.c:132
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slette '%s' [%s/%s] ? "
 
-#: src/screen_file.c:321
+#: src/screen_file.c:144
 msgid "Playlist deleted!"
 msgstr "Spillelisten slettet!"
 
-#: src/screen_file.c:340 src/screen_file.c:461 src/screen_file.c:487
-#, c-format
-msgid "Adding '%s' to playlist\n"
-msgstr "Legger '%s' til spillelisten\n"
-
-#: src/screen_file.c:391
-#, c-format
-msgid "Adding directory %s...\n"
-msgstr "Legger til mappen %s...\n"
-
-#: src/screen_file.c:552
+#: src/screen_file.c:198
 #, c-format
 msgid "Browse: %s"
 msgstr "Filer: %s"
 
-#: src/screen_file.c:644
-msgid "Screen updated!"
-msgstr "pppdatert!"
-
-#: src/screen_file.c:652
+#: src/screen_file.c:250
 #, c-format
 msgid "Database update of %s started!"
 msgstr "oppdaterer databasen ifra %s!"
 
-#: src/screen_search.c:56
+#: src/screen_search.c:41
 msgid "artist"
 msgstr ""
 
-#: src/screen_search.c:57
+#: src/screen_search.c:42
 msgid "album"
 msgstr ""
 
-#: src/screen_search.c:58
+#: src/screen_search.c:43
 #, fuzzy
 msgid "title"
 msgstr "Tittel"
 
-#: src/screen_search.c:59
+#: src/screen_search.c:44
 #, fuzzy
 msgid "track"
 msgstr "Neste"
 
-#: src/screen_search.c:60
+#: src/screen_search.c:45
 #, fuzzy
 msgid "name"
 msgstr "Filnavn"
 
-#: src/screen_search.c:61
+#: src/screen_search.c:46
 msgid "genre"
 msgstr ""
 
-#: src/screen_search.c:62
+#: src/screen_search.c:47
 msgid "date"
 msgstr ""
 
-#: src/screen_search.c:63
+#: src/screen_search.c:48
 msgid "composer"
 msgstr ""
 
-#: src/screen_search.c:64
+#: src/screen_search.c:49
 msgid "performer"
 msgstr ""
 
-#: src/screen_search.c:65
+#: src/screen_search.c:50
 msgid "comment"
 msgstr ""
 
-#: src/screen_search.c:66
+#: src/screen_search.c:51
 #, fuzzy
 msgid "file"
 msgstr "Tittel"
 
-#: src/screen_search.c:100
+#: src/screen_search.c:81
 msgid "Title"
 msgstr "Tittel"
 
-#: src/screen_search.c:101
+#: src/screen_search.c:82
 msgid "Artist"
 msgstr ""
 
-#: src/screen_search.c:102
+#: src/screen_search.c:83
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:103
+#: src/screen_search.c:84
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/screen_search.c:244
+#: src/screen_search.c:85
+#, fuzzy
+msgid "Artist + Title"
+msgstr ":Spilleliste  "
+
+#: src/screen_search.c:247
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
@@ -309,297 +339,299 @@ msgstr ""
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:323
+#: src/screen_search.c:311
 msgid "Search: "
 msgstr "S�k: "
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:379
+#: src/screen_search.c:371
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Trykk p� %s for ett nytt s�k"
 
-#: src/screen_search.c:435
+#: src/screen_search.c:399
 #, fuzzy, c-format
 msgid "Search: %s"
 msgstr "S�k: "
 
-#: src/screen_search.c:438
+#: src/screen_search.c:402
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "S�k: Resultater %s [%s]"
 
-#: src/screen_search.c:442
+#: src/screen_search.c:406
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Trykk p� %s for ett nytt s�k [%s]"
 
-#: src/screen_search.c:476
+#: src/screen_search.c:421
 #, c-format
 msgid "Search mode: %s"
 msgstr "S�k etter: %s"
 
-#: src/screen_keydef.c:46
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "==> Bruk og Lagre snarveier"
 
-#: src/screen_keydef.c:47
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "==> Bruk snarveier"
 
-#: src/screen_keydef.c:76
+#: src/screen_keydef.c:70
 msgid "You have new key bindings!"
 msgstr "Du har nye tastatursnarveier!"
 
-#: src/screen_keydef.c:79
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Tastatursnarveier uforandret!"
 
-#: src/screen_keydef.c:90
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Feil: Kan ikke lage ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:100 src/screen_keydef.c:106
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Feil: %s - %s"
 
-#: src/screen_keydef.c:108
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "Skrev %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Slettet"
 
-#: src/screen_keydef.c:155
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tast for %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Tasten %s brukes allerede for %s"
 
-#: src/screen_keydef.c:177
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Satte %s = %s"
 
-#: src/screen_keydef.c:220
+#: src/screen_keydef.c:216
 #, c-format
 msgid "%d. Add new key "
 msgstr "%d. Legg til ny tast"
 
-#: src/screen_keydef.c:267
+#: src/screen_keydef.c:262
 msgid "Welcome to the key editor!"
 msgstr "Her kan du endre tastene"
 
-#: src/screen_keydef.c:283
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Du glemte vel ikke � legge til de nye endringene?"
 
-#: src/screen_keydef.c:290
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Endre tast"
 
-#: src/screen_keydef.c:292
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Endre taster for '%s'"
 
-#: src/screen_clock.c:154
-msgid "Clock"
-msgstr "Klokke"
-
-#: src/screen_help.c:43
+#: src/screen_help.c:38
 msgid "Keys - Movement"
 msgstr "Taster - Navigasjon"
 
-#: src/screen_help.c:69
+#: src/screen_help.c:61
 msgid "Keys - Global"
 msgstr "Taster - Globale"
 
-#: src/screen_help.c:96
+#: src/screen_help.c:89
 msgid "Keys - Playlist screen"
 msgstr "Taster - Spilliste"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:91
 msgid "Play"
 msgstr "Start/spill markert"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:94
 msgid "Move song up"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:95
 msgid "Move song down"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:98
 msgid "Center"
 msgstr "Sentrer"
 
-#: src/screen_help.c:110
+#: src/screen_help.c:103
 msgid "Keys - Browse screen"
 msgstr "Taster - Filer"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:105
 msgid "Enter directory/Select and play song"
 msgstr "Velg bibliotek/Legg til spillisten og spill sang"
 
-#: src/screen_help.c:115
+#: src/screen_help.c:107 src/screen_help.c:122
+#, fuzzy
+msgid "Append song to playlist"
+msgstr "Ta bort/slett"
+
+#: src/screen_help.c:109
 msgid "Delete playlist"
 msgstr "Slett spilleliste"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:117
 msgid "Keys - Search screen"
 msgstr "Taster - Database s�k"
 
-#: src/screen_help.c:123
+#: src/screen_help.c:119
 msgid "Search"
 msgstr "S�k"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:120
 msgid "Select and play"
 msgstr "Legg til spillelisten og spill"
 
-#: src/screen_help.c:131
+#: src/screen_help.c:129
 #, fuzzy
 msgid "Keys - Lyrics screen"
 msgstr "Taster - Spilliste"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:131
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:134
+#: src/screen_help.c:132
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:135
+#: src/screen_help.c:133
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:136
+#: src/screen_help.c:134
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:137
+#: src/screen_help.c:135
 #, fuzzy
 msgid "Save lyrics"
 msgstr "Lagre spillelisten"
 
-#: src/screen_help.c:220
+#: src/screen_help.c:205
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/screen_lyrics.c:479
-msgid "Lyrics  [No connection]"
-msgstr ""
-
-#: src/screen_lyrics.c:480
-msgid "Lyrics  [Not found]"
-msgstr ""
-
-#: src/screen_lyrics.c:483
-msgid "Lyrics  [retrieving]"
-msgstr ""
+#: src/screen_lyrics.c:162
+#, fuzzy
+msgid "No lyrics"
+msgstr "Lagre spillelisten"
 
-#: src/screen_lyrics.c:565
+#: src/screen_lyrics.c:316
 #, fuzzy
 msgid "Lyrics saved!"
 msgstr "Spilleliste"
 
-#: src/command.c:71
+#: src/command.c:67
 msgid "Key configuration screen"
 msgstr "Tastaturkonfigurasjon"
 
-#: src/command.c:74
+#: src/command.c:70
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor up"
 msgstr "Flytt mark�r opp"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor down"
 msgstr "Flytt mark�r ned"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Home "
 msgstr "Mark�ren til den f�rste raden"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "End "
 msgstr "Mark�ren til den siste raden"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Page up"
 msgstr "Mark�ren en side opp"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Page down"
 msgstr "Mark�ren en side ned"
 
-#: src/command.c:93
+#: src/command.c:89
 msgid "Help screen"
 msgstr "Hjelp"
 
-#: src/command.c:95
+#: src/command.c:91
 msgid "Playlist screen"
 msgstr "Spilleliste"
 
-#: src/command.c:97
+#: src/command.c:93
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Play/Enter directory"
 msgstr "Spill/Velg mappe"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:106
+#: src/command.c:102
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/command.c:108
+#: src/command.c:104
+msgid "Crop"
+msgstr ""
+
+#: src/command.c:106
 msgid "Next track"
 msgstr "Neste"
 
-#: src/command.c:110
+#: src/command.c:108
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:112
+#: src/command.c:110
 msgid "Seek forward"
 msgstr "Spol/S�k framover"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Seek backward"
 msgstr "Spol/S�k tilbake"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Increase volume"
 msgstr "�k volumet"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Decrease volume"
 msgstr "Demp volumet"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Select/deselect song in playlist"
 msgstr "Legg til/Fjern fra spillelisten"
 
+#: src/command.c:120
+msgid "Select all listed items"
+msgstr ""
+
 #: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Ta bort/slett"
@@ -636,67 +668,73 @@ msgstr "Lagre spillelisten"
 msgid "Add url/file to playlist"
 msgstr "Legg til URL eller fil til spillelisten"
 
+#: src/command.c:141
+#, fuzzy
+msgid "Go to root directory"
+msgstr "Velg mappe"
+
 #: src/command.c:143
+#, fuzzy
+msgid "Go to parent directory"
+msgstr "Velg mappe"
+
+#: src/command.c:147
 msgid "Move item up"
 msgstr "Flytt opp"
 
-#: src/command.c:145
+#: src/command.c:149
 msgid "Move item down"
 msgstr "Flytt ned"
 
-#: src/command.c:147
+#: src/command.c:151
 msgid "Update screen"
 msgstr "Oppdater"
 
-#: src/command.c:152
+#: src/command.c:156
 msgid "Toggle find mode"
 msgstr "Endre s�k instillninger"
 
-#: src/command.c:154
+#: src/command.c:158
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering P�/Av"
 
-#: src/command.c:159
+#: src/command.c:163
 msgid "Next screen"
 msgstr "Neste skjerm"
 
-#: src/command.c:161
+#: src/command.c:165
 msgid "Previous screen"
 msgstr "Forrige skjerm"
 
-#: src/command.c:166
+#: src/command.c:170
 msgid "Forward find"
 msgstr "S�k"
 
-#: src/command.c:168
+#: src/command.c:172
 msgid "Forward find next"
 msgstr "Fremover S�king"
 
-#: src/command.c:170
+#: src/command.c:174
 msgid "Backward find"
 msgstr "S�k bakover"
 
-#: src/command.c:172
+#: src/command.c:176
 msgid "Backward find previous"
 msgstr "Bakover S�k forrige"
 
-#: src/command.c:178
+#: src/command.c:182
 #, fuzzy
 msgid "Artist screen"
 msgstr "Spilleliste"
 
-#: src/command.c:182
+#: src/command.c:186
 msgid "Search screen"
 msgstr "Database s�k"
 
-#: src/command.c:184
+#: src/command.c:188
 msgid "Change search mode"
 msgstr "Endre s�kemodus"
 
-#: src/command.c:189
-msgid "Clock screen"
-msgstr "Klokke"
-
 #: src/command.c:193
 #, fuzzy
 msgid "Lyrics screen"
@@ -779,44 +817,47 @@ msgstr ""
 msgid "Insert"
 msgstr "Ins"
 
-#: src/command.c:502
+#: src/command.c:456
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr "%s tildelt kommandoen %s og %s (trykk %s for � rette)"
 
-#: src/command.c:509 src/command.c:516
+#: src/command.c:463 src/command.c:470
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Feil: Tasten %s er tildelt b�de %s og %s !!!\n"
 
-#: src/colors.c:187
+#: src/colors.c:163
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Advarsel: Kjenner ikke til fargen %s\n"
 
-#: src/colors.c:232
+#: src/colors.c:206
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Advarsel: %s er ikke definert.\n"
 
-#: src/colors.c:267
+#: src/colors.c:238
 #, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "Terminalen mangler st�tte for omdefinering av farger!\n"
 
-#: src/colors.c:284
+#: src/colors.c:248
 #, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "Terminalen mangler st�tte for farger!\n"
 
-#: src/support.c:187
-#, c-format
-msgid "Error: Unable to convert characters to %s"
-msgstr "Feil ved konvertering av tegn fra UTF-8 til %s"
+#~ msgid "Exiting..."
+#~ msgstr "Avslutter..."
+
+#~ msgid "Clock"
+#~ msgstr "Klokke"
+
+#~ msgid "Clock screen"
+#~ msgstr "Klokke"
 
-#: src/support.c:216
-msgid "Error: Unable to convert characters to UTF-8"
-msgstr "Feil ved konvertering av tegn til UTF-8"
+#~ msgid "Error: Unable to convert characters to %s"
+#~ msgstr "Feil ved konvertering av tegn fra UTF-8 til %s"
 
-#~ msgid "Enter directory"
-#~ msgstr "Velg mappe"
+#~ msgid "Error: Unable to convert characters to UTF-8"
+#~ msgstr "Feil ved konvertering av tegn til UTF-8"
diff --git a/po/ru.po b/po/ru.po
index 25c72917f..8e2e49d17 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-07 11:40+0000\n"
+"POT-Creation-Date: 2008-11-17 19:57+0100\n"
 "PO-Revision-Date: 2008-11-17 19:02+0100\n"
 "Last-Translator: Max Arnold <amv_cbxl@mail.ru>\n"
 "Language-Team: ru <ru@li.org>\n"
@@ -16,292 +16,322 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:42
+#: src/i18n.h:36
 msgid "y"
 msgstr "y"
 
-#: src/ncmpc.h:43
+#: src/i18n.h:37
 msgid "n"
 msgstr "n"
 
-#: src/main.c:133 src/main.c:140
-msgid "Exiting..."
-msgstr "�����..."
+#: src/main.c:211
+#, c-format
+msgid "Connecting to %s...  [Press %s to abort]"
+msgstr "����������� � %s...  [������� %s ��� ������]"
 
-#: src/main.c:290
+#: src/main.c:229
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
 msgstr "������: MPD ������ %d.%d.%d ������� (��������� 0.11.0).\n"
 
-#: src/main.c:342
-#, c-format
-msgid "Connecting to %s...  [Press %s to abort]"
-msgstr "����������� � %s...  [������� %s ��� ������]"
-
-#: src/main.c:354
+#: src/main.c:242
 #, c-format
 msgid "Connected to %s!"
 msgstr "���������� � %s!"
 
-#: src/screen.c:224
+#: src/screen.c:137
 msgid ":Help  "
 msgstr ":������  "
 
-#: src/screen.c:228
+#: src/screen.c:141
 msgid ":Playlist  "
 msgstr ":��������  "
 
-#: src/screen.c:232
+#: src/screen.c:145
 msgid ":Browse  "
 msgstr ":��������  "
 
-#: src/screen.c:237
+#: src/screen.c:150
 #, fuzzy
 msgid ":Artist  "
 msgstr "�����"
 
-#: src/screen.c:243
+#: src/screen.c:156
 msgid ":Search  "
 msgstr ":�����  "
 
-#: src/screen.c:249
+#: src/screen.c:162
 #, fuzzy
 msgid ":Lyrics  "
 msgstr ":��������  "
 
-#: src/screen.c:254
+#: src/screen.c:168
 msgid "Volume n/a "
 msgstr "��������� �/� "
 
-#: src/screen.c:258
+#: src/screen.c:170
 #, c-format
 msgid " Volume %d%%"
 msgstr " ��������� %d%%"
 
-#: src/screen.c:338
+#: src/screen.c:277
 msgid "Playing:"
 msgstr "�������������:"
 
-#: src/screen.c:341
+#: src/screen.c:280
 msgid "[Paused]"
 msgstr "[�����]"
 
-#: src/screen.c:471 src/screen.c:580
+#: src/screen.c:400 src/screen.c:473
 #, c-format
 msgid "Error: Screen to small!\n"
 msgstr "������: ����� ������� ���!\n"
 
-#: src/screen.c:732
+#: src/screen.c:596
 msgid "Repeat is on"
 msgstr "������ �������"
 
-#: src/screen.c:733
+#: src/screen.c:597
 msgid "Repeat is off"
 msgstr "������ ��������"
 
-#: src/screen.c:736
+#: src/screen.c:601
 msgid "Random is on"
 msgstr "�������� ����� �������"
 
-#: src/screen.c:737
+#: src/screen.c:602
 msgid "Random is off"
 msgstr "��������� ����� ��������"
 
-#: src/screen.c:740
+#: src/screen.c:605
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "������� ������� %d ������"
 
-#: src/screen.c:743
+#: src/screen.c:608
 msgid "Database updated!"
 msgstr "���� ���������!"
 
-#: src/screen.c:905
+#: src/screen.c:741
 msgid "Shuffled playlist!"
 msgstr "�������� ���������!"
 
-#: src/screen.c:909
+#: src/screen.c:745
 msgid "Cleared playlist!"
 msgstr "�������� ������!"
 
-#: src/screen.c:927 src/screen_file.c:655
+#: src/screen.c:762 src/screen_file.c:254
 msgid "Database update started!"
 msgstr "������ ���������� ����!"
 
-#: src/screen.c:930 src/screen_file.c:663
+#: src/screen.c:764 src/screen_file.c:261
 msgid "Database update running..."
 msgstr "���� ���������� ����..."
 
-#: src/screen.c:943
+#: src/screen.c:800
 msgid "Find mode: Wrapped"
 msgstr "����� ������: �����������"
 
-#: src/screen.c:944
+#: src/screen.c:801
 msgid "Find mode: Normal"
 msgstr "����� ������: ����������"
 
-#: src/screen.c:949
+#: src/screen.c:806
 msgid "Auto center mode: On"
 msgstr "����� �����������������: ���."
 
-#: src/screen.c:950
+#: src/screen.c:807
 msgid "Auto center mode: Off"
 msgstr "����� �����������������: ����."
 
-#: src/screen_utils.c:38
+#: src/screen_artist.c:73
+#, fuzzy
+msgid "All tracks"
+msgstr "��������� ����"
+
+#: src/screen_artist.c:376
+#, fuzzy
+msgid "All artists"
+msgstr "�����"
+
+#: src/screen_artist.c:381
+#, c-format
+msgid "Albums of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:390
+#, fuzzy, c-format
+msgid "Album: %s - %s"
+msgstr "������: %s - %s"
+
+#: src/screen_artist.c:394
+#, c-format
+msgid "All tracks of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:634 src/screen_file.c:238
+msgid "Screen updated!"
+msgstr "����� �����̣�!"
+
+#: src/screen_browser.c:234
+#, c-format
+msgid "Loading playlist %s..."
+msgstr "�������� �������� %s..."
+
+#: src/screen_browser.c:257 src/screen_browser.c:366 src/screen_browser.c:392
+#, c-format
+msgid "Adding '%s' to playlist\n"
+msgstr "����������� '%s' � ��������\n"
+
+#: src/screen_browser.c:311
+#, c-format
+msgid "Adding directory %s...\n"
+msgstr "����������� ���������� %s...\n"
+
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "�����: "
 
-#: src/screen_utils.c:39
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "����� �����: "
 
-#: src/screen_utils.c:166
+#: src/screen_utils.c:114
+msgid "Password: "
+msgstr ""
+
+#: src/screen_utils.c:207
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "�� ������� ����� '%s'"
 
-#: src/screen_play.c:156
+#: src/screen_play.c:187
 msgid "Save playlist as: "
 msgstr "��������� �������� ���: "
 
-#: src/screen_play.c:186
+#: src/screen_play.c:220
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "�������� %s [%s/%s] ? "
 
-#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
+#: src/screen_play.c:241 src/screen_file.c:137 src/screen_keydef.c:163
 msgid "Aborted!"
 msgstr "��������!"
 
 #. success
-#: src/screen_play.c:206
+#: src/screen_play.c:249
 #, c-format
 msgid "Saved %s"
 msgstr "��������� � %s"
 
-#: src/screen_play.c:270
+#: src/screen_play.c:325
 msgid "Add: "
 msgstr "��������: "
 
-#: src/screen_play.c:325
+#: src/screen_play.c:431
 msgid "Playlist"
 msgstr "��������"
 
-#: src/screen_play.c:327
+#: src/screen_play.c:433
 #, c-format
 msgid "Playlist on %s"
 msgstr "�������� �� %s"
 
-#: src/screen_file.c:256
-#, c-format
-msgid "Loading playlist %s..."
-msgstr "�������� �������� %s..."
-
-#: src/screen_file.c:298
+#: src/screen_file.c:125
 msgid "You can only delete playlists!"
 msgstr "��������� ����� ������ �������!"
 
-#: src/screen_file.c:305
+#: src/screen_file.c:132
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "������� �������� %s [%s/%s] ? "
 
-#: src/screen_file.c:321
+#: src/screen_file.c:144
 msgid "Playlist deleted!"
 msgstr "�������� ������!"
 
-#: src/screen_file.c:340 src/screen_file.c:461 src/screen_file.c:487
-#, c-format
-msgid "Adding '%s' to playlist\n"
-msgstr "����������� '%s' � ��������\n"
-
-#: src/screen_file.c:391
-#, c-format
-msgid "Adding directory %s...\n"
-msgstr "����������� ���������� %s...\n"
-
-#: src/screen_file.c:552
+#: src/screen_file.c:198
 #, c-format
 msgid "Browse: %s"
 msgstr "��������: %s"
 
-#: src/screen_file.c:644
-msgid "Screen updated!"
-msgstr "����� �����̣�!"
-
-#: src/screen_file.c:652
+#: src/screen_file.c:250
 #, c-format
 msgid "Database update of %s started!"
 msgstr "���������� ���� %s ������!"
 
-#: src/screen_search.c:56
+#: src/screen_search.c:41
 #, fuzzy
 msgid "artist"
 msgstr "�����"
 
-#: src/screen_search.c:57
+#: src/screen_search.c:42
 #, fuzzy
 msgid "album"
 msgstr "������"
 
-#: src/screen_search.c:58
+#: src/screen_search.c:43
 #, fuzzy
 msgid "title"
 msgstr "��������"
 
-#: src/screen_search.c:59
+#: src/screen_search.c:44
 #, fuzzy
 msgid "track"
 msgstr "��������� ����"
 
-#: src/screen_search.c:60
+#: src/screen_search.c:45
 #, fuzzy
 msgid "name"
 msgstr "��� �����"
 
-#: src/screen_search.c:61
+#: src/screen_search.c:46
 msgid "genre"
 msgstr ""
 
-#: src/screen_search.c:62
+#: src/screen_search.c:47
 msgid "date"
 msgstr ""
 
-#: src/screen_search.c:63
+#: src/screen_search.c:48
 msgid "composer"
 msgstr ""
 
-#: src/screen_search.c:64
+#: src/screen_search.c:49
 msgid "performer"
 msgstr ""
 
-#: src/screen_search.c:65
+#: src/screen_search.c:50
 msgid "comment"
 msgstr ""
 
-#: src/screen_search.c:66
+#: src/screen_search.c:51
 #, fuzzy
 msgid "file"
 msgstr "��������"
 
-#: src/screen_search.c:100
+#: src/screen_search.c:81
 msgid "Title"
 msgstr "��������"
 
-#: src/screen_search.c:101
+#: src/screen_search.c:82
 msgid "Artist"
 msgstr "�����"
 
-#: src/screen_search.c:102
+#: src/screen_search.c:83
 msgid "Album"
 msgstr "������"
 
-#: src/screen_search.c:103
+#: src/screen_search.c:84
 msgid "Filename"
 msgstr "��� �����"
 
-#: src/screen_search.c:244
+#: src/screen_search.c:85
+#, fuzzy
+msgid "Artist + Title"
+msgstr "�����"
+
+#: src/screen_search.c:247
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
@@ -311,297 +341,299 @@ msgstr ""
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:323
+#: src/screen_search.c:311
 msgid "Search: "
 msgstr "�����: "
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:379
+#: src/screen_search.c:371
 #, c-format
 msgid "Press %s for a new search"
 msgstr "������� %s ��� ������ ������"
 
-#: src/screen_search.c:435
+#: src/screen_search.c:399
 #, fuzzy, c-format
 msgid "Search: %s"
 msgstr "�����: "
 
-#: src/screen_search.c:438
+#: src/screen_search.c:402
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "�����: ���������� ������ �� %s [%s]"
 
-#: src/screen_search.c:442
+#: src/screen_search.c:406
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "�����: ������� %s ��� ������ ������ [%s]"
 
-#: src/screen_search.c:476
+#: src/screen_search.c:421
 #, c-format
 msgid "Search mode: %s"
 msgstr "����� ������: %s"
 
-#: src/screen_keydef.c:46
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> ��������� � ��������� ������������ ����������  "
 
-#: src/screen_keydef.c:47
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> ��������� ������������ ���������� "
 
-#: src/screen_keydef.c:76
+#: src/screen_keydef.c:70
 msgid "You have new key bindings!"
 msgstr "����� ������������ ���������� �������������!"
 
-#: src/screen_keydef.c:79
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "������������ ���������� �� ����������."
 
-#: src/screen_keydef.c:90
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "������: �� ������� ������� ���������� ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:100 src/screen_keydef.c:106
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "������: %s - %s"
 
-#: src/screen_keydef.c:108
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "�������� %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "�������"
 
-#: src/screen_keydef.c:155
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "������� ����� ������� ��� %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "������: ������� %s ��� ������������ ��� %s"
 
-#: src/screen_keydef.c:177
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "��������� %s ��� %s"
 
-#: src/screen_keydef.c:220
+#: src/screen_keydef.c:216
 #, c-format
 msgid "%d. Add new key "
 msgstr "%d. �������� ����� ������� "
 
-#: src/screen_keydef.c:267
+#: src/screen_keydef.c:262
 msgid "Welcome to the key editor!"
 msgstr "����� ���������� � �������� ������������ ����������!"
 
-#: src/screen_keydef.c:283
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "��������: �� �� ������ ��������� ��������� ���������?"
 
-#: src/screen_keydef.c:290
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "��������� ������������ ����������"
 
-#: src/screen_keydef.c:292
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "��������� ������������ ���������� ��� %s"
 
-#: src/screen_clock.c:154
-msgid "Clock"
-msgstr "����"
-
-#: src/screen_help.c:43
+#: src/screen_help.c:38
 msgid "Keys - Movement"
 msgstr "������� - �����������"
 
-#: src/screen_help.c:69
+#: src/screen_help.c:61
 msgid "Keys - Global"
 msgstr "������� - ����������"
 
-#: src/screen_help.c:96
+#: src/screen_help.c:89
 msgid "Keys - Playlist screen"
 msgstr "������� - ����� ���������"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:91
 msgid "Play"
 msgstr "���������������"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:94
 msgid "Move song up"
 msgstr "����������� ���������� �����"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:95
 msgid "Move song down"
 msgstr "����������� ���������� ����"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:98
 msgid "Center"
 msgstr "������������"
 
-#: src/screen_help.c:110
+#: src/screen_help.c:103
 msgid "Keys - Browse screen"
 msgstr "������� - ����� ���������"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:105
 msgid "Enter directory/Select and play song"
 msgstr "������� � ����������/������� � ��������� ����������"
 
-#: src/screen_help.c:115
+#: src/screen_help.c:107 src/screen_help.c:122
+#, fuzzy
+msgid "Append song to playlist"
+msgstr "������� ���������� �� ���������"
+
+#: src/screen_help.c:109
 msgid "Delete playlist"
 msgstr "������� ��������"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:117
 msgid "Keys - Search screen"
 msgstr "������� - ����� ������"
 
-#: src/screen_help.c:123
+#: src/screen_help.c:119
 msgid "Search"
 msgstr "�����"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:120
 msgid "Select and play"
 msgstr "������� � ���������"
 
-#: src/screen_help.c:131
+#: src/screen_help.c:129
 #, fuzzy
 msgid "Keys - Lyrics screen"
 msgstr "������� - ����� ���������"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:131
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:134
+#: src/screen_help.c:132
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:135
+#: src/screen_help.c:133
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:136
+#: src/screen_help.c:134
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:137
+#: src/screen_help.c:135
 #, fuzzy
 msgid "Save lyrics"
 msgstr "��������� ��������"
 
-#: src/screen_help.c:220
+#: src/screen_help.c:205
 msgid "Help"
 msgstr "������"
 
-#: src/screen_lyrics.c:479
-msgid "Lyrics  [No connection]"
-msgstr ""
-
-#: src/screen_lyrics.c:480
-msgid "Lyrics  [Not found]"
-msgstr ""
-
-#: src/screen_lyrics.c:483
-msgid "Lyrics  [retrieving]"
-msgstr ""
+#: src/screen_lyrics.c:162
+#, fuzzy
+msgid "No lyrics"
+msgstr "��������� ��������"
 
-#: src/screen_lyrics.c:565
+#: src/screen_lyrics.c:316
 #, fuzzy
 msgid "Lyrics saved!"
 msgstr "����� ���������"
 
-#: src/command.c:71
+#: src/command.c:67
 msgid "Key configuration screen"
 msgstr "����� ������������ ����������"
 
-#: src/command.c:74
+#: src/command.c:70
 msgid "Quit"
 msgstr "�����"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor up"
 msgstr "������ �����"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor down"
 msgstr "������ ����"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Home "
 msgstr "� ������ "
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "End "
 msgstr "� ����� "
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Page up"
 msgstr "�� �������� �����"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Page down"
 msgstr "�� �������� ����"
 
-#: src/command.c:93
+#: src/command.c:89
 msgid "Help screen"
 msgstr "����� ������"
 
-#: src/command.c:95
+#: src/command.c:91
 msgid "Playlist screen"
 msgstr "����� ���������"
 
-#: src/command.c:97
+#: src/command.c:93
 msgid "Browse screen"
 msgstr "����� ���������"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Play/Enter directory"
 msgstr "�������������/������� � ����������"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Pause"
 msgstr "�����"
 
-#: src/command.c:106
+#: src/command.c:102
 msgid "Stop"
 msgstr "����"
 
-#: src/command.c:108
+#: src/command.c:104
+msgid "Crop"
+msgstr ""
+
+#: src/command.c:106
 msgid "Next track"
 msgstr "��������� ����������"
 
-#: src/command.c:110
+#: src/command.c:108
 msgid "Previous track"
 msgstr "���������� ����������"
 
-#: src/command.c:112
+#: src/command.c:110
 msgid "Seek forward"
 msgstr "��������� ������"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Seek backward"
 msgstr "��������� �����"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Increase volume"
 msgstr "��������� ���������"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Decrease volume"
 msgstr "��������� ���������"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Select/deselect song in playlist"
 msgstr "��������/������ ������� � ����������"
 
+#: src/command.c:120
+msgid "Select all listed items"
+msgstr ""
+
 #: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "������� ���������� �� ���������"
@@ -638,67 +670,73 @@ msgstr "��������� ��������"
 msgid "Add url/file to playlist"
 msgstr "�������� url/���� � ��������"
 
+#: src/command.c:141
+#, fuzzy
+msgid "Go to root directory"
+msgstr "������� ����������"
+
 #: src/command.c:143
+#, fuzzy
+msgid "Go to parent directory"
+msgstr "������� ����������"
+
+#: src/command.c:147
 msgid "Move item up"
 msgstr "����������� �����"
 
-#: src/command.c:145
+#: src/command.c:149
 msgid "Move item down"
 msgstr "����������� ����"
 
-#: src/command.c:147
+#: src/command.c:151
 msgid "Update screen"
 msgstr "�������� �����"
 
-#: src/command.c:152
+#: src/command.c:156
 msgid "Toggle find mode"
 msgstr "����������� ����� ������"
 
-#: src/command.c:154
+#: src/command.c:158
 msgid "Toggle auto center mode"
 msgstr "���/���� ����� �����������������"
 
-#: src/command.c:159
+#: src/command.c:163
 msgid "Next screen"
 msgstr "��������� �����"
 
-#: src/command.c:161
+#: src/command.c:165
 msgid "Previous screen"
 msgstr "���������� �����"
 
-#: src/command.c:166
+#: src/command.c:170
 msgid "Forward find"
 msgstr "����� ������"
 
-#: src/command.c:168
+#: src/command.c:172
 msgid "Forward find next"
 msgstr "������ ���������"
 
-#: src/command.c:170
+#: src/command.c:174
 msgid "Backward find"
 msgstr "����� �����"
 
-#: src/command.c:172
+#: src/command.c:176
 msgid "Backward find previous"
 msgstr "������ ����������"
 
-#: src/command.c:178
+#: src/command.c:182
 #, fuzzy
 msgid "Artist screen"
 msgstr "����� ���������"
 
-#: src/command.c:182
+#: src/command.c:186
 msgid "Search screen"
 msgstr "����� ������"
 
-#: src/command.c:184
+#: src/command.c:188
 msgid "Change search mode"
 msgstr "�������� ����� ������"
 
-#: src/command.c:189
-msgid "Clock screen"
-msgstr "����� �����"
-
 #: src/command.c:193
 #, fuzzy
 msgid "Lyrics screen"
@@ -781,44 +819,47 @@ msgstr "Esc"
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:502
+#: src/command.c:456
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr "������� %s ��������� ��� %s � %s (%s - �������� ������)"
 
-#: src/command.c:509 src/command.c:516
+#: src/command.c:463 src/command.c:470
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "������: ������� %s ��������� ��� %s � %s !!!\n"
 
-#: src/colors.c:187
+#: src/colors.c:163
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "��������: ����������� ���� - %s\n"
 
-#: src/colors.c:232
+#: src/colors.c:206
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "��������: ����������� �������� ���� - %s\n"
 
-#: src/colors.c:267
+#: src/colors.c:238
 #, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "�������� �� ������������ ����� ������!\n"
 
-#: src/colors.c:284
+#: src/colors.c:248
 #, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "�������� �� ������������ �����!\n"
 
-#: src/support.c:187
-#, c-format
-msgid "Error: Unable to convert characters to %s"
-msgstr "������: �� ������� �������������� ������� � %s"
+#~ msgid "Exiting..."
+#~ msgstr "�����..."
+
+#~ msgid "Clock"
+#~ msgstr "����"
+
+#~ msgid "Clock screen"
+#~ msgstr "����� �����"
 
-#: src/support.c:216
-msgid "Error: Unable to convert characters to UTF-8"
-msgstr "������: �� ������� �������������� ������� � UTF-8"
+#~ msgid "Error: Unable to convert characters to %s"
+#~ msgstr "������: �� ������� �������������� ������� � %s"
 
-#~ msgid "Enter directory"
-#~ msgstr "������� ����������"
+#~ msgid "Error: Unable to convert characters to UTF-8"
+#~ msgstr "������: �� ������� �������������� ������� � UTF-8"
diff --git a/po/sv.po b/po/sv.po
index ac3889a7e..a66fe3b01 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-07 11:40+0000\n"
+"POT-Creation-Date: 2008-11-17 19:57+0100\n"
 "PO-Revision-Date: 2004-06-05 18:16+0200\n"
 "Last-Translator: Kalle Wallin <kaw@linux.se>\n"
 "Language-Team: sv <sv@li.org>\n"
@@ -16,290 +16,320 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:42
+#: src/i18n.h:36
 msgid "y"
 msgstr "j"
 
-#: src/ncmpc.h:43
+#: src/i18n.h:37
 msgid "n"
 msgstr ""
 
-#: src/main.c:133 src/main.c:140
-msgid "Exiting..."
-msgstr "Avslutar..."
+#: src/main.c:211
+#, c-format
+msgid "Connecting to %s...  [Press %s to abort]"
+msgstr "Ansluter till %s... [Tryck %s f�r att avbryta]"
 
-#: src/main.c:290
+#: src/main.c:229
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
 msgstr "MPD version %d.%d.%d �r f�r gammal - uppgradera till version 0.11.x \n"
 
-#: src/main.c:342
-#, c-format
-msgid "Connecting to %s...  [Press %s to abort]"
-msgstr "Ansluter till %s... [Tryck %s f�r att avbryta]"
-
-#: src/main.c:354
+#: src/main.c:242
 #, c-format
 msgid "Connected to %s!"
 msgstr "Ansluten till %s!"
 
-#: src/screen.c:224
+#: src/screen.c:137
 msgid ":Help  "
 msgstr ":Hj�lp  "
 
-#: src/screen.c:228
+#: src/screen.c:141
 msgid ":Playlist  "
 msgstr ":Spellista  "
 
-#: src/screen.c:232
+#: src/screen.c:145
 msgid ":Browse  "
 msgstr ":Filer  "
 
-#: src/screen.c:237
+#: src/screen.c:150
 #, fuzzy
 msgid ":Artist  "
 msgstr ":Spellista  "
 
-#: src/screen.c:243
+#: src/screen.c:156
 msgid ":Search  "
 msgstr ":S�k  "
 
-#: src/screen.c:249
+#: src/screen.c:162
 #, fuzzy
 msgid ":Lyrics  "
 msgstr ":Spellista  "
 
-#: src/screen.c:254
+#: src/screen.c:168
 msgid "Volume n/a "
 msgstr "Volym: n/a "
 
-#: src/screen.c:258
+#: src/screen.c:170
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volym: %d%%"
 
-#: src/screen.c:338
+#: src/screen.c:277
 msgid "Playing:"
 msgstr "Spelar:"
 
-#: src/screen.c:341
+#: src/screen.c:280
 msgid "[Paused]"
 msgstr "[Pausad]"
 
-#: src/screen.c:471 src/screen.c:580
+#: src/screen.c:400 src/screen.c:473
 #, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Fel: Terminal �r f�r liten!\n"
 
-#: src/screen.c:732
+#: src/screen.c:596
 msgid "Repeat is on"
 msgstr "Repeat �r p�"
 
-#: src/screen.c:733
+#: src/screen.c:597
 msgid "Repeat is off"
 msgstr "Repeat �r av"
 
-#: src/screen.c:736
+#: src/screen.c:601
 msgid "Random is on"
 msgstr "Random �r p�"
 
-#: src/screen.c:737
+#: src/screen.c:602
 msgid "Random is off"
 msgstr "Random �r av"
 
-#: src/screen.c:740
+#: src/screen.c:605
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:743
+#: src/screen.c:608
 msgid "Database updated!"
 msgstr "Databasen �r uppdaterad!"
 
-#: src/screen.c:905
+#: src/screen.c:741
 msgid "Shuffled playlist!"
 msgstr "Slumpsorterat spellistan!"
 
-#: src/screen.c:909
+#: src/screen.c:745
 msgid "Cleared playlist!"
 msgstr "Rensar spellistan!"
 
-#: src/screen.c:927 src/screen_file.c:655
+#: src/screen.c:762 src/screen_file.c:254
 msgid "Database update started!"
 msgstr "Uppdaterar databasen!"
 
-#: src/screen.c:930 src/screen_file.c:663
+#: src/screen.c:764 src/screen_file.c:261
 msgid "Database update running..."
 msgstr "Databasen uppdateras..."
 
-#: src/screen.c:943
+#: src/screen.c:800
 msgid "Find mode: Wrapped"
 msgstr "S�k runt (b�rja om)"
 
-#: src/screen.c:944
+#: src/screen.c:801
 msgid "Find mode: Normal"
 msgstr "S�k normalt (till slut/b�rjan)"
 
-#: src/screen.c:949
+#: src/screen.c:806
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering �r p�"
 
-#: src/screen.c:950
+#: src/screen.c:807
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering �r av"
 
-#: src/screen_utils.c:38
+#: src/screen_artist.c:73
+#, fuzzy
+msgid "All tracks"
+msgstr "N�sta"
+
+#: src/screen_artist.c:376
+#, fuzzy
+msgid "All artists"
+msgstr ":Spellista  "
+
+#: src/screen_artist.c:381
+#, c-format
+msgid "Albums of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:390
+#, fuzzy, c-format
+msgid "Album: %s - %s"
+msgstr "Fel: %s - %s"
+
+#: src/screen_artist.c:394
+#, c-format
+msgid "All tracks of artist: %s"
+msgstr ""
+
+#: src/screen_artist.c:634 src/screen_file.c:238
+msgid "Screen updated!"
+msgstr "Uppdaterat!"
+
+#: src/screen_browser.c:234
+#, c-format
+msgid "Loading playlist %s..."
+msgstr "Laddar %s..."
+
+#: src/screen_browser.c:257 src/screen_browser.c:366 src/screen_browser.c:392
+#, c-format
+msgid "Adding '%s' to playlist\n"
+msgstr "L�gger till '%s'...\n"
+
+#: src/screen_browser.c:311
+#, c-format
+msgid "Adding directory %s...\n"
+msgstr "L�gger till alla filer i %s...\n"
+
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "S�k: "
 
-#: src/screen_utils.c:39
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "S�k (bak�t): "
 
-#: src/screen_utils.c:166
+#: src/screen_utils.c:114
+msgid "Password: "
+msgstr ""
+
+#: src/screen_utils.c:207
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Hittar inte '%s'"
 
-#: src/screen_play.c:156
+#: src/screen_play.c:187
 msgid "Save playlist as: "
 msgstr "Spara spellistan som: "
 
-#: src/screen_play.c:186
+#: src/screen_play.c:220
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Ers�tt '%s' [%s/%s] ? "
 
-#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
+#: src/screen_play.c:241 src/screen_file.c:137 src/screen_keydef.c:163
 msgid "Aborted!"
 msgstr "Avbr�t!"
 
 #. success
-#: src/screen_play.c:206
+#: src/screen_play.c:249
 #, c-format
 msgid "Saved %s"
 msgstr "Sparat %s"
 
-#: src/screen_play.c:270
+#: src/screen_play.c:325
 msgid "Add: "
 msgstr "L�gg till: "
 
-#: src/screen_play.c:325
+#: src/screen_play.c:431
 msgid "Playlist"
 msgstr "Spellista"
 
-#: src/screen_play.c:327
+#: src/screen_play.c:433
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spellista p� %s"
 
-#: src/screen_file.c:256
-#, c-format
-msgid "Loading playlist %s..."
-msgstr "Laddar %s..."
-
-#: src/screen_file.c:298
+#: src/screen_file.c:125
 msgid "You can only delete playlists!"
 msgstr "Du kan endast radera spellistor!"
 
-#: src/screen_file.c:305
+#: src/screen_file.c:132
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Radera '%s' [%s/%s] ? "
 
-#: src/screen_file.c:321
+#: src/screen_file.c:144
 msgid "Playlist deleted!"
 msgstr "Spellistan raderad!"
 
-#: src/screen_file.c:340 src/screen_file.c:461 src/screen_file.c:487
-#, c-format
-msgid "Adding '%s' to playlist\n"
-msgstr "L�gger till '%s'...\n"
-
-#: src/screen_file.c:391
-#, c-format
-msgid "Adding directory %s...\n"
-msgstr "L�gger till alla filer i %s...\n"
-
-#: src/screen_file.c:552
+#: src/screen_file.c:198
 #, c-format
 msgid "Browse: %s"
 msgstr "Filer: %s"
 
-#: src/screen_file.c:644
-msgid "Screen updated!"
-msgstr "Uppdaterat!"
-
-#: src/screen_file.c:652
+#: src/screen_file.c:250
 #, c-format
 msgid "Database update of %s started!"
 msgstr "Uppdaterar databasen ifr�n %s!"
 
-#: src/screen_search.c:56
+#: src/screen_search.c:41
 msgid "artist"
 msgstr ""
 
-#: src/screen_search.c:57
+#: src/screen_search.c:42
 msgid "album"
 msgstr ""
 
-#: src/screen_search.c:58
+#: src/screen_search.c:43
 #, fuzzy
 msgid "title"
 msgstr "Titel"
 
-#: src/screen_search.c:59
+#: src/screen_search.c:44
 #, fuzzy
 msgid "track"
 msgstr "N�sta"
 
-#: src/screen_search.c:60
+#: src/screen_search.c:45
 #, fuzzy
 msgid "name"
 msgstr "Filnamn"
 
-#: src/screen_search.c:61
+#: src/screen_search.c:46
 msgid "genre"
 msgstr ""
 
-#: src/screen_search.c:62
+#: src/screen_search.c:47
 msgid "date"
 msgstr ""
 
-#: src/screen_search.c:63
+#: src/screen_search.c:48
 msgid "composer"
 msgstr ""
 
-#: src/screen_search.c:64
+#: src/screen_search.c:49
 msgid "performer"
 msgstr ""
 
-#: src/screen_search.c:65
+#: src/screen_search.c:50
 msgid "comment"
 msgstr ""
 
-#: src/screen_search.c:66
+#: src/screen_search.c:51
 #, fuzzy
 msgid "file"
 msgstr "Titel"
 
-#: src/screen_search.c:100
+#: src/screen_search.c:81
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:101
+#: src/screen_search.c:82
 msgid "Artist"
 msgstr ""
 
-#: src/screen_search.c:102
+#: src/screen_search.c:83
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:103
+#: src/screen_search.c:84
 msgid "Filename"
 msgstr "Filnamn"
 
-#: src/screen_search.c:244
+#: src/screen_search.c:85
+#, fuzzy
+msgid "Artist + Title"
+msgstr ":Spellista  "
+
+#: src/screen_search.c:247
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
@@ -309,297 +339,299 @@ msgstr ""
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:323
+#: src/screen_search.c:311
 msgid "Search: "
 msgstr "S�k: "
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:379
+#: src/screen_search.c:371
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Tryck p� %s f�r en ny s�kning"
 
-#: src/screen_search.c:435
+#: src/screen_search.c:399
 #, fuzzy, c-format
 msgid "Search: %s"
 msgstr "S�k: "
 
-#: src/screen_search.c:438
+#: src/screen_search.c:402
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "S�k: %s [%s]"
 
-#: src/screen_search.c:442
+#: src/screen_search.c:406
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Tryck p� %s f�r en ny s�kning [%s]"
 
-#: src/screen_search.c:476
+#: src/screen_search.c:421
 #, c-format
 msgid "Search mode: %s"
 msgstr "S�k efter: %s"
 
-#: src/screen_keydef.c:46
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "==> Verkst�ll och Spara"
 
-#: src/screen_keydef.c:47
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "==> Verkst�ll"
 
-#: src/screen_keydef.c:76
+#: src/screen_keydef.c:70
 msgid "You have new key bindings!"
 msgstr "Tangentdefinitioner uppdaterade!"
 
-#: src/screen_keydef.c:79
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Tangentdefinitioner of�r�ndrade!"
 
-#: src/screen_keydef.c:90
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Fel: Kan inte skapa ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:100 src/screen_keydef.c:106
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fel: %s - %s"
 
-#: src/screen_keydef.c:108
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "Sparade %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Raderad"
 
-#: src/screen_keydef.c:155
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tangent f�r %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Tangenten %s anv�nds redan f�r %s"
 
-#: src/screen_keydef.c:177
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s = %s"
 
-#: src/screen_keydef.c:220
+#: src/screen_keydef.c:216
 #, c-format
 msgid "%d. Add new key "
 msgstr "%d. L�gg till ny tangent"
 
-#: src/screen_keydef.c:267
+#: src/screen_keydef.c:262
 msgid "Welcome to the key editor!"
 msgstr "H�r kan du �ndra tangentdefinitioner"
 
-#: src/screen_keydef.c:283
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Du gl�mde v�l inte att Verkst�lla?"
 
-#: src/screen_keydef.c:290
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "�ndra tangentdefinitioner"
 
-#: src/screen_keydef.c:292
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "�ndra tangenter f�r kommandot '%s'"
 
-#: src/screen_clock.c:154
-msgid "Clock"
-msgstr "Klocka"
-
-#: src/screen_help.c:43
+#: src/screen_help.c:38
 msgid "Keys - Movement"
 msgstr "Tangenter - Navigation"
 
-#: src/screen_help.c:69
+#: src/screen_help.c:61
 msgid "Keys - Global"
 msgstr "Tangenter - Globala"
 
-#: src/screen_help.c:96
+#: src/screen_help.c:89
 msgid "Keys - Playlist screen"
 msgstr "Tangenter - Spellista"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:91
 msgid "Play"
 msgstr "Starta/Spela markerad"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:94
 msgid "Move song up"
 msgstr "Flytta markerad upp�t i spellistan"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:95
 msgid "Move song down"
 msgstr "Flytta markerad ned�t i spellistan"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:98
 msgid "Center"
 msgstr "Centrera"
 
-#: src/screen_help.c:110
+#: src/screen_help.c:103
 msgid "Keys - Browse screen"
 msgstr "Tangenter - Filer"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:105
 msgid "Enter directory/Select and play song"
 msgstr "V�lj bibliotek/L�gg till spellistan och spela"
 
-#: src/screen_help.c:115
+#: src/screen_help.c:107 src/screen_help.c:122
+#, fuzzy
+msgid "Append song to playlist"
+msgstr "Ta bort/Radera"
+
+#: src/screen_help.c:109
 msgid "Delete playlist"
 msgstr "Radera spellista"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:117
 msgid "Keys - Search screen"
 msgstr "Tangenter - Databas s�kning"
 
-#: src/screen_help.c:123
+#: src/screen_help.c:119
 msgid "Search"
 msgstr "S�k"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:120
 msgid "Select and play"
 msgstr "L�gg till spellistan och spela"
 
-#: src/screen_help.c:131
+#: src/screen_help.c:129
 #, fuzzy
 msgid "Keys - Lyrics screen"
 msgstr "Tangenter - Spellista"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:131
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:134
+#: src/screen_help.c:132
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:135
+#: src/screen_help.c:133
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:136
+#: src/screen_help.c:134
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:137
+#: src/screen_help.c:135
 #, fuzzy
 msgid "Save lyrics"
 msgstr "Spara spellista"
 
-#: src/screen_help.c:220
+#: src/screen_help.c:205
 msgid "Help"
 msgstr "Hj�lp"
 
-#: src/screen_lyrics.c:479
-msgid "Lyrics  [No connection]"
-msgstr ""
-
-#: src/screen_lyrics.c:480
-msgid "Lyrics  [Not found]"
-msgstr ""
-
-#: src/screen_lyrics.c:483
-msgid "Lyrics  [retrieving]"
-msgstr ""
+#: src/screen_lyrics.c:162
+#, fuzzy
+msgid "No lyrics"
+msgstr "Spara spellista"
 
-#: src/screen_lyrics.c:565
+#: src/screen_lyrics.c:316
 #, fuzzy
 msgid "Lyrics saved!"
 msgstr "Spellista"
 
-#: src/command.c:71
+#: src/command.c:67
 msgid "Key configuration screen"
 msgstr "Tangentdefinitioner"
 
-#: src/command.c:74
+#: src/command.c:70
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor up"
 msgstr "Mark�r ned�t"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor down"
 msgstr "Mark�r upp�t"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Home "
 msgstr "Mark�ren till den f�rsta raden"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "End "
 msgstr "Mark�ren till den sista raden"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Page up"
 msgstr "Mark�ren en sk�rm upp�t"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Page down"
 msgstr "Mark�ren en sk�rm ned�t"
 
-#: src/command.c:93
+#: src/command.c:89
 msgid "Help screen"
 msgstr "Hj�lp"
 
-#: src/command.c:95
+#: src/command.c:91
 msgid "Playlist screen"
 msgstr "Spellista"
 
-#: src/command.c:97
+#: src/command.c:93
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Play/Enter directory"
 msgstr "Spela/V�lj"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Pause"
 msgstr "Paus"
 
-#: src/command.c:106
+#: src/command.c:102
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/command.c:108
+#: src/command.c:104
+msgid "Crop"
+msgstr ""
+
+#: src/command.c:106
 msgid "Next track"
 msgstr "N�sta"
 
-#: src/command.c:110
+#: src/command.c:108
 msgid "Previous track"
 msgstr "F�reg�nde"
 
-#: src/command.c:112
+#: src/command.c:110
 msgid "Seek forward"
 msgstr "Spola/S�k fram�t"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Seek backward"
 msgstr "Spola/S�k tillbaka"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Increase volume"
 msgstr "�ka volymen"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Decrease volume"
 msgstr "Minska volymen"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Select/deselect song in playlist"
 msgstr "L�gg till/Ta bort ifr�n spellistan"
 
+#: src/command.c:120
+msgid "Select all listed items"
+msgstr ""
+
 #: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Ta bort/Radera"
@@ -636,67 +668,73 @@ msgstr "Spara spellista"
 msgid "Add url/file to playlist"
 msgstr "L�gger till url eller fil till spellistan"
 
+#: src/command.c:141
+#, fuzzy
+msgid "Go to root directory"
+msgstr "V�lj bibliotek"
+
 #: src/command.c:143
+#, fuzzy
+msgid "Go to parent directory"
+msgstr "V�lj bibliotek"
+
+#: src/command.c:147
 msgid "Move item up"
 msgstr "Flytta upp"
 
-#: src/command.c:145
+#: src/command.c:149
 msgid "Move item down"
 msgstr "Flytta ner"
 
-#: src/command.c:147
+#: src/command.c:151
 msgid "Update screen"
 msgstr "Updatera"
 
-#: src/command.c:152
+#: src/command.c:156
 msgid "Toggle find mode"
 msgstr "�ndra s�k inst�llningar"
 
-#: src/command.c:154
+#: src/command.c:158
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering P�/Av"
 
-#: src/command.c:159
+#: src/command.c:163
 msgid "Next screen"
 msgstr "N�sta sk�rm"
 
-#: src/command.c:161
+#: src/command.c:165
 msgid "Previous screen"
 msgstr "Tidigare sk�rm"
 
-#: src/command.c:166
+#: src/command.c:170
 msgid "Forward find"
 msgstr "S�k"
 
-#: src/command.c:168
+#: src/command.c:172
 msgid "Forward find next"
 msgstr "Upprepa S�kning"
 
-#: src/command.c:170
+#: src/command.c:174
 msgid "Backward find"
 msgstr "S�k bak�t"
 
-#: src/command.c:172
+#: src/command.c:176
 msgid "Backward find previous"
 msgstr "Upprepa S�kning bak�t"
 
-#: src/command.c:178
+#: src/command.c:182
 #, fuzzy
 msgid "Artist screen"
 msgstr "Spellista"
 
-#: src/command.c:182
+#: src/command.c:186
 msgid "Search screen"
 msgstr "Databas s�kning"
 
-#: src/command.c:184
+#: src/command.c:188
 msgid "Change search mode"
 msgstr "�ndra m�ltyp f�r databas s�kning"
 
-#: src/command.c:189
-msgid "Clock screen"
-msgstr "Klocka"
-
 #: src/command.c:193
 #, fuzzy
 msgid "Lyrics screen"
@@ -779,44 +817,47 @@ msgstr ""
 msgid "Insert"
 msgstr "Ins"
 
-#: src/command.c:502
+#: src/command.c:456
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr "%s tilldelat kommandona %s och %s (tryck p� %s och korrigera)"
 
-#: src/command.c:509 src/command.c:516
+#: src/command.c:463 src/command.c:470
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Fel: Tangenten %s �r tilldelad b�de %s och %s !!!\n"
 
-#: src/colors.c:187
+#: src/colors.c:163
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Varning: K�nner inte till f�rgen %s\n"
 
-#: src/colors.c:232
+#: src/colors.c:206
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Varning: %s ej definerad.\n"
 
-#: src/colors.c:267
+#: src/colors.c:238
 #, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "Terminalen saknar st�d f�r omdefinition av f�rger!\n"
 
-#: src/colors.c:284
+#: src/colors.c:248
 #, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "Terminalen saknar st�d f�r f�rger!\n"
 
-#: src/support.c:187
-#, c-format
-msgid "Error: Unable to convert characters to %s"
-msgstr "Fel vid konvertering av tecken fr�n UTF-8 till %s"
+#~ msgid "Exiting..."
+#~ msgstr "Avslutar..."
+
+#~ msgid "Clock"
+#~ msgstr "Klocka"
+
+#~ msgid "Clock screen"
+#~ msgstr "Klocka"
 
-#: src/support.c:216
-msgid "Error: Unable to convert characters to UTF-8"
-msgstr "Fel vid konvertering av tecken till UTF-8"
+#~ msgid "Error: Unable to convert characters to %s"
+#~ msgstr "Fel vid konvertering av tecken fr�n UTF-8 till %s"
 
-#~ msgid "Enter directory"
-#~ msgstr "V�lj bibliotek"
+#~ msgid "Error: Unable to convert characters to UTF-8"
+#~ msgstr "Fel vid konvertering av tecken till UTF-8"