interruption of lyrics loading + po blabla

git-svn-id: https://svn.musicpd.org/ncmpc/branches/tradiaz@4567 09075e82-0dd4-0310-85a5-a0d7c8717e4f

14 files changed, 2471 insertions, 1612 deletions

diff --git a/ChangeLog b/ChangeLog
index 81a796757..c429c5ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
         * german lyrics- and search-screen translation added
         * avuton has fixed a lot of warnings
 	* fixed a problem with compiling on Arch Linux
+	* Added a way to interrupt retrieval of lyrics (ESC)
+	 +update of .po files
 
 2006-09-4 Anderas Obergrusberger <tradiaz@yahoo.de>
         * tradiaz is temporary maintainer of a special branch of ncmpc now
diff --git a/po/da.po b/po/da.po
index 399f78fbc..e275604d6 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: 2005-01-04 21:55+0100\n"
+"POT-Creation-Date: 2006-08-05 20:19+0000\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,125 +16,136 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:36
+#: src/ncmpc.h:42
 msgid "y"
 msgstr "j"
 
-#: src/ncmpc.h:37
+#: src/ncmpc.h:43
 msgid "n"
 msgstr ""
 
-#: src/main.c:133
+#: src/main.c:133 src/main.c:140
 msgid "Exiting..."
 msgstr "Afslutter..."
 
-#: src/main.c:266
+#: src/main.c:290
 #, 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"
-
+msgstr ""
+"Fejl: MPD version %d.%d.%d er for gammel (mindst 0.11.0 er n�dvendig) \n"
 
-#: src/main.c:318
+#: 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:330
+#: src/main.c:354
 #, c-format
 msgid "Connected to %s!"
 msgstr "Forbundet til %s!"
 
-#: src/screen.c:170
+#: src/screen.c:224
 msgid ":Help  "
 msgstr ":Hj�lp  "
 
-#: src/screen.c:174
+#: src/screen.c:228
 msgid ":Playlist  "
 msgstr ":Afspilningsliste  "
 
-#: src/screen.c:178
+#: src/screen.c:232
 msgid ":Browse  "
 msgstr ":Gennemse  "
 
-#: src/screen.c:183
+#: src/screen.c:237
+#, fuzzy
+msgid ":Artist  "
+msgstr "Kunstner"
+
+#: src/screen.c:243
 msgid ":Search  "
 msgstr ":S�g  "
 
-#: src/screen.c:188
+#: src/screen.c:249
+#, fuzzy
+msgid ":Lyrics  "
+msgstr ":Afspilningsliste  "
+
+#: src/screen.c:254
 msgid "Volume n/a "
 msgstr "Volumen: n/a "
 
-#: src/screen.c:192
+#: src/screen.c:258
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volumen: %d%%"
 
-#: src/screen.c:271
+#: src/screen.c:338
 msgid "Playing:"
 msgstr "Afspiller:"
 
-#: src/screen.c:274
+#: src/screen.c:341
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:390 src/screen.c:499
+#: src/screen.c:471 src/screen.c:580
+#, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Fejl: Sk�rmen er for lille!\n"
 
-#: src/screen.c:644
+#: src/screen.c:732
 msgid "Repeat is on"
 msgstr "Gentag er aktiv"
 
-#: src/screen.c:645
+#: src/screen.c:733
 msgid "Repeat is off"
 msgstr "Gentag er inaktiv"
 
-#: src/screen.c:648
+#: src/screen.c:736
 msgid "Random is on"
 msgstr "Tilf�ldig er aktiv"
 
-#: src/screen.c:649
+#: src/screen.c:737
 msgid "Random is off"
 msgstr "Tilf�ldig er inaktiv"
 
-#: src/screen.c:652
+#: src/screen.c:740
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:655
+#: src/screen.c:743
 msgid "Database updated!"
 msgstr "Databasen er opdateret!"
 
-#: src/screen.c:817
+#: src/screen.c:905
 msgid "Shuffled playlist!"
 msgstr "Afspilninsglisten blandet!"
 
-#: src/screen.c:821
+#: src/screen.c:909
 msgid "Cleared playlist!"
 msgstr "Sletter afspilningslisten!"
 
-#: src/screen.c:839
+#: src/screen.c:927 src/screen_file.c:655
 msgid "Database update started!"
 msgstr "Database opdatering startet!"
 
-#: src/screen.c:842 src/screen_file.c:673
+#: src/screen.c:930 src/screen_file.c:663
 msgid "Database update running..."
 msgstr "Databasen opdateres..."
 
-#: src/screen.c:855
+#: src/screen.c:943
 msgid "Find mode: Wrapped"
 msgstr "S�g (begynd forfra)"
 
-#: src/screen.c:856
+#: src/screen.c:944
 msgid "Find mode: Normal"
 msgstr "S�g normalt (start/slut)"
 
-#: src/screen.c:861
+#: src/screen.c:949
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering er aktiv"
 
-#: src/screen.c:862
+#: src/screen.c:950
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er inaktiv"
 
@@ -146,121 +157,188 @@ msgstr "S�g: "
 msgid "Find backward: "
 msgstr "S�g (bagl�ns): "
 
-#: src/screen_utils.c:165
+#: src/screen_utils.c:166
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kan ikke finde '%s'"
 
-#: src/screen_play.c:155
+#: src/screen_play.c:156
 msgid "Save playlist as: "
 msgstr "Gem afspilningslisten som: "
 
-#: src/screen_play.c:185
+#: src/screen_play.c:186
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstat '%s' [%s/%s] ? "
 
-#: src/screen_play.c:199 src/screen_file.c:319 src/screen_keydef.c:162
+#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
 msgid "Aborted!"
 msgstr "Afbrudt!"
 
 #. success
-#: src/screen_play.c:205
+#: src/screen_play.c:206
 #, c-format
 msgid "Saved %s"
 msgstr "Gemt %s"
 
-#: src/screen_play.c:269
+#: src/screen_play.c:270
 msgid "Add: "
 msgstr "Tilf�j: "
 
-#: src/screen_play.c:324
+#: src/screen_play.c:325
 msgid "Playlist"
 msgstr "Afspilningsliste"
 
-#: src/screen_play.c:326
+#: src/screen_play.c:327
 #, c-format
 msgid "Playlist on %s"
 msgstr "Afspilningsliste p� %s"
 
-#: src/screen_file.c:282
+#: src/screen_file.c:256
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Henter %s..."
 
-#: src/screen_file.c:304
+#: src/screen_file.c:298
 msgid "You can only delete playlists!"
 msgstr "Du kan kun slette afspilningslister!"
 
-#: src/screen_file.c:311
+#: src/screen_file.c:305
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slet '%s' [%s/%s] ? "
 
-#: src/screen_file.c:327
+#: src/screen_file.c:321
 msgid "Playlist deleted!"
 msgstr "Afspilningslisten slettet!"
 
-#: src/screen_file.c:346 src/screen_file.c:467 src/screen_file.c:493
+#: 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:397
+#: src/screen_file.c:391
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Tilf�jer mappen %s...\n"
 
-#: src/screen_file.c:569
+#: src/screen_file.c:552
 #, c-format
 msgid "Browse: %s"
 msgstr "Gennemse: %s"
 
-#: src/screen_file.c:658
+#: src/screen_file.c:644
 msgid "Screen updated!"
 msgstr "Sk�rm opdateret!"
 
-#: src/screen_file.c:665
+#: src/screen_file.c:652
 #, c-format
 msgid "Database update of %s started!"
 msgstr "Database opdatering af %s startet!"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:56
+#, fuzzy
+msgid "artist"
+msgstr "Kunstner"
+
+#: src/screen_search.c:57
+msgid "album"
+msgstr ""
+
+#: src/screen_search.c:58
+#, fuzzy
+msgid "title"
+msgstr "Titel"
+
+#: src/screen_search.c:59
+#, fuzzy
+msgid "track"
+msgstr "N�ste"
+
+#: src/screen_search.c:60
+#, fuzzy
+msgid "name"
+msgstr "Filnavn"
+
+#: src/screen_search.c:61
+msgid "genre"
+msgstr ""
+
+#: src/screen_search.c:62
+msgid "date"
+msgstr ""
+
+#: src/screen_search.c:63
+msgid "composer"
+msgstr ""
+
+#: src/screen_search.c:64
+msgid "performer"
+msgstr ""
+
+#: src/screen_search.c:65
+msgid "comment"
+msgstr ""
+
+#: src/screen_search.c:66
+#, fuzzy
+msgid "file"
+msgstr "Titel"
+
+#: src/screen_search.c:100
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:101
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:102
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:53
+#: src/screen_search.c:103
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/screen_search.c:114
+#: src/screen_search.c:244
+#, c-format
+msgid "Bad search tag %s"
+msgstr ""
+
+#: src/screen_search.c:251
+#, c-format
+msgid "No argument for search tag %s"
+msgstr ""
+
+#: src/screen_search.c:323
 msgid "Search: "
 msgstr "S�g: "
 
-#: src/screen_search.c:162
+#. if( pattern==NULL )
+#. search_new(screen, c);
+#. else
+#: src/screen_search.c:379
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Tryk p� %s for en ny s�gning"
 
-#: src/screen_search.c:214
+#: src/screen_search.c:435
+#, fuzzy, c-format
+msgid "Search: %s"
+msgstr "S�g: "
+
+#: src/screen_search.c:438
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "S�g: Resultater for %s [%s]"
 
-#: src/screen_search.c:218
+#: src/screen_search.c:442
 #, 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:252
+#: src/screen_search.c:476
 #, c-format
 msgid "Search mode: %s"
 msgstr "S�g efter: %s"
@@ -345,308 +423,351 @@ msgstr "Ur"
 msgid "Keys - Movement"
 msgstr "Taster - Navigation"
 
-#: src/screen_help.c:68
+#: src/screen_help.c:69
 msgid "Keys - Global"
 msgstr "Taster - Globale"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Keys - Playlist screen"
 msgstr "Taster - Afspilningsliste"
 
-#: src/screen_help.c:97
+#: src/screen_help.c:98
 msgid "Play"
 msgstr "Afspil"
 
-#: src/screen_help.c:100
+#: src/screen_help.c:101
 msgid "Move song up"
 msgstr "Flyt mark�ren op i afspilningslisten"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:102
 msgid "Move song down"
 msgstr "Flyt mark�ren ned i afspilningslisten"
 
-#: src/screen_help.c:104
+#: src/screen_help.c:105
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Keys - Browse screen"
 msgstr "Taster - Gennemse"
 
-#: src/screen_help.c:111
+#: src/screen_help.c:112
 msgid "Enter directory/Select and play song"
 msgstr "Skift til bibliotek/Tilf�j til afspilningslisten og afspil"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:115
 msgid "Delete playlist"
 msgstr "Slet afspilningsliste"
 
-#: src/screen_help.c:119
+#: src/screen_help.c:121
 msgid "Keys - Search screen"
 msgstr "Taster - S�ge sk�rm"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:123
 msgid "Search"
 msgstr "S�g"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:124
 msgid "Select and play"
 msgstr "V�lg og afspil"
 
-#: src/screen_help.c:208
+#: src/screen_help.c:131
+#, fuzzy
+msgid "Keys - Lyrics screen"
+msgstr "Taster - Afspilningsliste"
+
+#: src/screen_help.c:133
+msgid "View Lyrics"
+msgstr ""
+
+#: src/screen_help.c:134
+msgid "(Re)load lyrics"
+msgstr ""
+
+#: src/screen_help.c:135
+msgid "Interrupt retrieval"
+msgstr ""
+
+#: src/screen_help.c:218
 msgid "Help"
 msgstr "Hj�lp"
 
-#: src/command.c:70
+#: src/screen_lyrics.c:421
+msgid "Lyrics  [No connection]"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+msgid "Lyrics  [Not found]"
+msgstr ""
+
+#: src/screen_lyrics.c:423
+msgid "Lyrics  [retrieving]"
+msgstr ""
+
+#: src/command.c:71
 msgid "Key configuration screen"
 msgstr "Taste konfigurations sk�rm"
 
-#: src/command.c:73
+#: src/command.c:74
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor up"
 msgstr "Flyt mark�r op"
 
-#: src/command.c:79
+#: src/command.c:80
 msgid "Move cursor down"
 msgstr "Flyt mark�r ned"
 
-#: src/command.c:81
+#: src/command.c:82
 msgid "Home "
 msgstr "Flyt mark�r til start"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "End "
 msgstr "Flyt mark�r til slut"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page up"
 msgstr "Side op"
 
-#: src/command.c:87
+#: src/command.c:88
 msgid "Page down"
 msgstr "Side ned"
 
-#: src/command.c:92
+#: src/command.c:93
 msgid "Help screen"
 msgstr "Hj�lp"
 
-#: src/command.c:94
+#: src/command.c:95
 msgid "Playlist screen"
 msgstr "Afspilningsliste"
 
-#: src/command.c:96
+#: src/command.c:97
 msgid "Browse screen"
 msgstr "Gennemse"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Play/Enter directory"
 msgstr "Afspil/G� til mappe"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "N�ste"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "S�g fremad"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "S�g tilbage"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "H�v volumen"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "S�nk volumen"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Marker/afmarker sang i afspilningsliste"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Slet sang fra afspilningsliste"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Shuffle playlist"
 msgstr "Bland r�kkef�lgen i afspilningslisten"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Clear playlist"
 msgstr "Slet afspilningslisten"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Toggle repeat mode"
 msgstr "Aktiver/deaktiver gentag"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle random mode"
 msgstr "Aktiver/deaktiver tilf�ldigt valg"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle crossfade mode"
 msgstr "Aktiver/deaktiver crossfade mellem sange"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Start a music database update"
 msgstr "Opdater databasen"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Save playlist"
 msgstr "Gem afspilningslisten"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Add url/file to playlist"
 msgstr "Tilf�j URL eller fil til afspilningslisten"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Move item up"
 msgstr "Flyt op"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Move item down"
 msgstr "Flyt ned"
 
-#: src/command.c:146
+#: src/command.c:147
 msgid "Update screen"
 msgstr "Opdater sk�rm"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Toggle find mode"
 msgstr "�ndre s�ge tilstand"
 
-#: src/command.c:153
+#: src/command.c:154
 msgid "Toggle auto center mode"
 msgstr "Aktiver/deaktiver automatisk centrering"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Next screen"
 msgstr "N�ste sk�rm"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Previous screen"
 msgstr "Forrige sk�rm"
 
-#: src/command.c:165
+#: src/command.c:166
 msgid "Forward find"
 msgstr "S�g"
 
-#: src/command.c:167
+#: src/command.c:168
 msgid "Forward find next"
 msgstr "Gentag s�g"
 
-#: src/command.c:169
+#: src/command.c:170
 msgid "Backward find"
 msgstr "S�g bagl�ns"
 
-#: src/command.c:171
+#: src/command.c:172
 msgid "Backward find previous"
 msgstr "Gentag s�g bagl�ns"
 
-#: src/command.c:177
+#: src/command.c:178
+#, fuzzy
+msgid "Artist screen"
+msgstr "Afspilningsliste"
+
+#: src/command.c:182
 msgid "Search screen"
 msgstr "Database s�gning"
 
-#: src/command.c:179
+#: src/command.c:184
 msgid "Change search mode"
 msgstr "�ndre s�ge tilstand"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Clock screen"
 msgstr "Ur"
 
-#: src/command.c:206
+#: src/command.c:193
+#, fuzzy
+msgid "Lyrics screen"
+msgstr "Afspilningsliste"
+
+#: src/command.c:195
+msgid "Interrupt action"
+msgstr ""
+
+#: src/command.c:218
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: src/command.c:208
+#: src/command.c:220
 msgid "Space"
 msgstr "Mellemrum"
 
-#: src/command.c:210
+#: src/command.c:222
 msgid "Enter"
 msgstr "Retur"
 
-#: src/command.c:212
+#: src/command.c:224
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:214
+#: src/command.c:226
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:216
-msgid "Op"
+#: src/command.c:228
+msgid "Up"
 msgstr ""
 
-#: src/command.c:218
+#: src/command.c:230
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:220
+#: src/command.c:232
 msgid "Left"
 msgstr "Venstre"
 
-#: src/command.c:222
+#: src/command.c:234
 msgid "Right"
 msgstr "H�jre"
 
-#: src/command.c:224
+#: src/command.c:236
 msgid "Home"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:238
 msgid "End"
 msgstr ""
 
-#: src/command.c:228
+#: src/command.c:240
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:230
+#: src/command.c:242
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:232
+#: src/command.c:244
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:234
+#: src/command.c:246
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:236
+#: src/command.c:248
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:238
+#: src/command.c:250
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:488
+#: src/command.c:500
 #, 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:495 src/command.c:502
+#: src/command.c:507 src/command.c:514
 #, 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"
@@ -662,18 +783,20 @@ msgid "Warning: Unknown color field - %s\n"
 msgstr "Advarsel: Ukendt farve felt - %s.\n"
 
 #: src/colors.c:267
+#, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "Terminalen underst�tter ikke at �ndre farver!\n"
 
 #: src/colors.c:284
+#, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "Terminalen underst�tter ikke farver!\n"
 
-#: src/support.c:168
+#: src/support.c:187
 #, c-format
 msgid "Error: Unable to convert characters to %s"
 msgstr "Fejl: Kan ikke konvertere karakter til %s"
 
-#: src/support.c:197
+#: src/support.c:216
 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 e6d91ffdf..f7f278c02 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-05 11:00+0000\n"
+"POT-Creation-Date: 2006-08-05 20:19+0000\n"
 "PO-Revision-Date: 2004-07-08 21:16+0200\n"
 "Last-Translator: Ingmar Gebert\n"
 "Language-Team: de <de@li.org>\n"
@@ -234,110 +234,110 @@ msgstr "Anzeige aktualisiert!"
 msgid "Database update of %s started!"
 msgstr "Datenbankaktualisierung von %s gestartet!"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:56
 #, fuzzy
 msgid "artist"
 msgstr "K�nstler"
 
-#: src/screen_search.c:55
+#: src/screen_search.c:57
 #, fuzzy
 msgid "album"
 msgstr "Album"
 
-#: src/screen_search.c:56
+#: src/screen_search.c:58
 #, fuzzy
 msgid "title"
 msgstr "Titel"
 
-#: src/screen_search.c:57
+#: src/screen_search.c:59
 #, fuzzy
 msgid "track"
 msgstr "N�chstes St�ck"
 
-#: src/screen_search.c:58
+#: src/screen_search.c:60
 #, fuzzy
 msgid "name"
 msgstr "Dateiname"
 
-#: src/screen_search.c:59
+#: src/screen_search.c:61
 msgid "genre"
 msgstr "Genre"
 
-#: src/screen_search.c:60
+#: src/screen_search.c:62
 msgid "date"
 msgstr "Datum"
 
-#: src/screen_search.c:61
+#: src/screen_search.c:63
 msgid "composer"
 msgstr "Komponist"
 
-#: src/screen_search.c:62
+#: src/screen_search.c:64
 msgid "performer"
 msgstr "Auff�hrung"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:65
 msgid "comment"
 msgstr "Anmerkung"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:66
 #, fuzzy
 msgid "file"
 msgstr "Datei"
 
-#: src/screen_search.c:98
+#: src/screen_search.c:100
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:99
+#: src/screen_search.c:101
 msgid "Artist"
 msgstr "K�nstler"
 
-#: src/screen_search.c:100
+#: src/screen_search.c:102
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:101
+#: src/screen_search.c:103
 msgid "Filename"
 msgstr "Dateiname"
 
-#: src/screen_search.c:242
+#: src/screen_search.c:244
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Tag nicht erkannt: %s"
 
-#: src/screen_search.c:249
+#: src/screen_search.c:251
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Kein Argument f�r Tag %s"
 
-#: src/screen_search.c:321
+#: src/screen_search.c:323
 msgid "Search: "
 msgstr "Suche: "
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:377
+#: src/screen_search.c:379
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Dr�cke %s f�r eine neue Suche"
 
-#: src/screen_search.c:433
+#: src/screen_search.c:435
 #, fuzzy, c-format
 msgid "Search: %s"
 msgstr "Suche: "
 
-#: src/screen_search.c:436
+#: src/screen_search.c:438
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Suche: Ergebnisse f�r %s [%s]"
 
-#: src/screen_search.c:440
+#: src/screen_search.c:442
 #, 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:474
+#: src/screen_search.c:476
 #, c-format
 msgid "Search mode: %s"
 msgstr "Suchmodus: %s"
@@ -483,36 +483,26 @@ msgstr "Liedtext lesen"
 msgid "(Re)load lyrics"
 msgstr "Text (neu) laden"
 
-#: src/screen_help.c:217
+#: src/screen_help.c:135
+msgid "Interrupt retrieval"
+msgstr "Laden unterbrechen"
+
+#: src/screen_help.c:218
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:421
 msgid "Lyrics  [No connection]"
 msgstr "Liedtext [keine Verbindung]"
 
-#: src/screen_lyrics.c:423
+#: src/screen_lyrics.c:422
 msgid "Lyrics  [Not found]"
 msgstr "Liedtext [Text nicht gefunden]"
 
-#: src/screen_lyrics.c:424
+#: src/screen_lyrics.c:423
 msgid "Lyrics  [retrieving]"
 msgstr "Liedtexte [Lade...]"
 
-#. if(lyr_text.lines->len > 2)
-#. {
-#. static char buf[512];
-#. char artist[512];
-#. char title[512];
-#. get_text_line(&lyr_text, 0, artist, 512);
-#. get_text_line(&lyr_text, 1, artist, 512);
-#. snprintf(buf, 512, "Lyrics  %s - %s", artist, title);
-#. return buf;
-#. }
-#: src/screen_lyrics.c:436
-msgid "Lyrics"
-msgstr "Liedtexte"
-
 #: src/command.c:71
 msgid "Key configuration screen"
 msgstr "Tastenkonfigurationsanzeige"
@@ -699,80 +689,84 @@ msgstr "Uhr-Anzeige"
 msgid "Lyrics screen"
 msgstr "Liedtextanzeige"
 
-#: src/command.c:216
+#: src/command.c:195
+msgid "Interrupt action"
+msgstr "Kommando Unterbrechen"
+
+#: src/command.c:218
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: src/command.c:218
+#: src/command.c:220
 msgid "Space"
 msgstr "Leertaste"
 
-#: src/command.c:220
+#: src/command.c:222
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:222
+#: src/command.c:224
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:224
+#: src/command.c:226
 msgid "Delete"
 msgstr "Entf"
 
-#: src/command.c:226
+#: src/command.c:228
 msgid "Up"
 msgstr "Oben"
 
-#: src/command.c:228
+#: src/command.c:230
 msgid "Down"
 msgstr "Unten"
 
-#: src/command.c:230
+#: src/command.c:232
 msgid "Left"
 msgstr "Links"
 
-#: src/command.c:232
+#: src/command.c:234
 msgid "Right"
 msgstr "Rechts"
 
-#: src/command.c:234
+#: src/command.c:236
 msgid "Home"
 msgstr "Pos1"
 
-#: src/command.c:236
+#: src/command.c:238
 msgid "End"
 msgstr "Ende"
 
-#: src/command.c:238
+#: src/command.c:240
 msgid "PageDown"
 msgstr "Bild ab"
 
-#: src/command.c:240
+#: src/command.c:242
 msgid "PageUp"
 msgstr "Bild auf"
 
-#: src/command.c:242
+#: src/command.c:244
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:244
+#: src/command.c:246
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:246
+#: src/command.c:248
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:248
+#: src/command.c:250
 msgid "Insert"
 msgstr "Einfg"
 
-#: src/command.c:498
+#: src/command.c:500
 #, 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:505 src/command.c:512
+#: src/command.c:507 src/command.c:514
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Fehler: Taste %s ist %s und %s zugeordnet !!!\n"
@@ -806,6 +800,9 @@ 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"
+
 #, fuzzy
 #~ msgid "playlist browse"
 #~ msgstr "Playlist auf %s"
diff --git a/po/es.po b/po/es.po
index 57b27aafe..4d1d12547 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 21:55+0100\n"
+"POT-Creation-Date: 2006-08-05 20:19+0000\n"
 "PO-Revision-Date: 2004-07-15 05:28+0200\n"
 "Last-Translator: Jose Cedeno <cedenoj@gmail.com>\n"
 "Language-Team: es <es@li.org>\n"
@@ -15,124 +15,135 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:36
+#: src/ncmpc.h:42
 msgid "y"
 msgstr "s"
 
-#: src/ncmpc.h:37
+#: src/ncmpc.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:133
+#: src/main.c:133 src/main.c:140
 msgid "Exiting..."
 msgstr "Terminar"
 
-#: src/main.c:266
+#: src/main.c:290
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
 msgstr "Error: La version %d.%d.%d de MPD es muy vieja (necesitas 0.11.0).\n"
 
-#: src/main.c:318
+#: src/main.c:342
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectandose a %s... [Presiona %s para interrurpir la ejecucion]"
 
-#: src/main.c:330
+#: src/main.c:354
 #, c-format
 msgid "Connected to %s!"
 msgstr "Conectado a %s!"
 
-#: src/screen.c:170
+#: src/screen.c:224
 msgid ":Help  "
 msgstr ":Ayuda  "
 
-#: src/screen.c:174
+#: src/screen.c:228
 msgid ":Playlist  "
 msgstr ":Lista de Canciones  "
 
-#: src/screen.c:178
+#: src/screen.c:232
 msgid ":Browse  "
 msgstr ":Navegar  "
 
-#: src/screen.c:183
+#: src/screen.c:237
+#, fuzzy
+msgid ":Artist  "
+msgstr ":Lista de Canciones  "
+
+#: src/screen.c:243
 msgid ":Search  "
 msgstr ""
 
-#: src/screen.c:188
+#: src/screen.c:249
+#, fuzzy
+msgid ":Lyrics  "
+msgstr ":Lista de Canciones  "
+
+#: src/screen.c:254
 msgid "Volume n/a "
 msgstr "Volumen n/a "
 
-#: src/screen.c:192
+#: src/screen.c:258
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volumen %d%%"
 
-#: src/screen.c:271
+#: src/screen.c:338
 msgid "Playing:"
 msgstr "Escuchando:"
 
-#: src/screen.c:274
+#: src/screen.c:341
 msgid "[Paused]"
 msgstr "[Pausado]"
 
-#: src/screen.c:390 src/screen.c:499
+#: src/screen.c:471 src/screen.c:580
+#, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Error: La ventana es muy pequena\n"
 
-#: src/screen.c:644
+#: src/screen.c:732
 msgid "Repeat is on"
 msgstr "Repetir esta seleccionado"
 
-#: src/screen.c:645
+#: src/screen.c:733
 msgid "Repeat is off"
 msgstr "Repetir no esta seleccionado"
 
-#: src/screen.c:648
+#: src/screen.c:736
 msgid "Random is on"
 msgstr "Random esta seleccionado"
 
-#: src/screen.c:649
+#: src/screen.c:737
 msgid "Random is off"
 msgstr "Random no esta seleccionado"
 
-#: src/screen.c:652
+#: src/screen.c:740
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d segundos"
 
-#: src/screen.c:655
+#: src/screen.c:743
 msgid "Database updated!"
 msgstr "Base de datos esta actualizada"
 
-#: src/screen.c:817
+#: src/screen.c:905
 msgid "Shuffled playlist!"
 msgstr "La lista de canciones esta mezclada"
 
-#: src/screen.c:821
+#: src/screen.c:909
 msgid "Cleared playlist!"
 msgstr "Lista de canciones esta vacia!"
 
-#: src/screen.c:839
+#: src/screen.c:927 src/screen_file.c:655
 msgid "Database update started!"
 msgstr "La actualizacion de la base de datos ha empezado!"
 
-#: src/screen.c:842 src/screen_file.c:673
+#: src/screen.c:930 src/screen_file.c:663
 msgid "Database update running..."
 msgstr "Actualizando la base de datos"
 
-#: src/screen.c:855
+#: src/screen.c:943
 msgid "Find mode: Wrapped"
 msgstr "Tipo de busqueda: Wrapped"
 
-#: src/screen.c:856
+#: src/screen.c:944
 msgid "Find mode: Normal"
 msgstr "Tipo de busqueda: Normal"
 
-#: src/screen.c:861
+#: src/screen.c:949
 msgid "Auto center mode: On"
 msgstr "Auto center mode: On"
 
-#: src/screen.c:862
+#: src/screen.c:950
 msgid "Auto center mode: Off"
 msgstr "Auto center mode: Off"
 
@@ -144,121 +155,184 @@ msgstr "Buscar:"
 msgid "Find backward: "
 msgstr "Buscar hacia atras"
 
-#: src/screen_utils.c:165
+#: src/screen_utils.c:166
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "No encontre %s"
 
-#: src/screen_play.c:155
+#: src/screen_play.c:156
 msgid "Save playlist as: "
 msgstr "Guardar la lista de caciones: "
 
-#: src/screen_play.c:185
+#: src/screen_play.c:186
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Sustituir %s [%s%s] ? "
 
-#: src/screen_play.c:199 src/screen_file.c:319 src/screen_keydef.c:162
+#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
 msgid "Aborted!"
 msgstr "Ejecucion interruptida!"
 
 #. success
-#: src/screen_play.c:205
+#: src/screen_play.c:206
 #, c-format
 msgid "Saved %s"
 msgstr "Guardad %s"
 
-#: src/screen_play.c:269
+#: src/screen_play.c:270
 msgid "Add: "
 msgstr "Agregar: "
 
-#: src/screen_play.c:324
+#: src/screen_play.c:325
 msgid "Playlist"
 msgstr "Lista de canciones"
 
-#: src/screen_play.c:326
+#: src/screen_play.c:327
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lista de caiones en %s"
 
-#: src/screen_file.c:282
+#: src/screen_file.c:256
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Anadiendo la lista de caciones %s..."
 
-#: src/screen_file.c:304
+#: src/screen_file.c:298
 msgid "You can only delete playlists!"
 msgstr "Puedes borrar unicamente las listas de canciones!"
 
-#: src/screen_file.c:311
+#: src/screen_file.c:305
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Borrar la lista de canciones %s [%%s] ? "
 
-#: src/screen_file.c:327
+#: src/screen_file.c:321
 msgid "Playlist deleted!"
 msgstr "Lista de canciones borrada!"
 
-#: src/screen_file.c:346 src/screen_file.c:467 src/screen_file.c:493
+#: src/screen_file.c:340 src/screen_file.c:461 src/screen_file.c:487
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "Anadiendo '%s' a la lista de caciones\n"
 
-#: src/screen_file.c:397
+#: src/screen_file.c:391
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Agregando directorio %s...\n"
 
-#: src/screen_file.c:569
+#: src/screen_file.c:552
 #, c-format
 msgid "Browse: %s"
 msgstr "Navegando: %s"
 
-#: src/screen_file.c:658
+#: src/screen_file.c:644
 msgid "Screen updated!"
 msgstr "La informacion presentada esta al dia!"
 
-#: src/screen_file.c:665
+#: src/screen_file.c:652
 #, c-format
 msgid "Database update of %s started!"
 msgstr "Actualizacion de la Base de datos de %s empezo!"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:56
+msgid "artist"
+msgstr ""
+
+#: src/screen_search.c:57
+msgid "album"
+msgstr ""
+
+#: src/screen_search.c:58
+msgid "title"
+msgstr ""
+
+#: src/screen_search.c:59
+#, fuzzy
+msgid "track"
+msgstr "Next track"
+
+#: src/screen_search.c:60
+msgid "name"
+msgstr ""
+
+#: src/screen_search.c:61
+msgid "genre"
+msgstr ""
+
+#: src/screen_search.c:62
+msgid "date"
+msgstr ""
+
+#: src/screen_search.c:63
+msgid "composer"
+msgstr ""
+
+#: src/screen_search.c:64
+msgid "performer"
+msgstr ""
+
+#: src/screen_search.c:65
+msgid "comment"
+msgstr ""
+
+#: src/screen_search.c:66
+msgid "file"
+msgstr ""
+
+#: src/screen_search.c:100
 msgid "Title"
 msgstr ""
 
-#: src/screen_search.c:51
+#: src/screen_search.c:101
 msgid "Artist"
 msgstr ""
 
-#: src/screen_search.c:52
+#: src/screen_search.c:102
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:53
+#: src/screen_search.c:103
 msgid "Filename"
 msgstr ""
 
-#: src/screen_search.c:114
+#: src/screen_search.c:244
+#, c-format
+msgid "Bad search tag %s"
+msgstr ""
+
+#: src/screen_search.c:251
+#, c-format
+msgid "No argument for search tag %s"
+msgstr ""
+
+#: src/screen_search.c:323
 msgid "Search: "
 msgstr ""
 
-#: src/screen_search.c:162
+#. if( pattern==NULL )
+#. search_new(screen, c);
+#. else
+#: src/screen_search.c:379
 #, c-format
 msgid "Press %s for a new search"
 msgstr ""
 
-#: src/screen_search.c:214
+#: src/screen_search.c:435
+#, fuzzy, c-format
+msgid "Search: %s"
+msgstr "Pagina siguiente"
+
+#: src/screen_search.c:438
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr ""
 
-#: src/screen_search.c:218
+#: src/screen_search.c:442
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr ""
 
-#: src/screen_search.c:252
+#: src/screen_search.c:476
 #, c-format
 msgid "Search mode: %s"
 msgstr ""
@@ -343,310 +417,353 @@ msgstr "reloj"
 msgid "Keys - Movement"
 msgstr "Teclas - Navegar"
 
-#: src/screen_help.c:68
+#: src/screen_help.c:69
 msgid "Keys - Global"
 msgstr "Telcas - Global"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Keys - Playlist screen"
 msgstr "Teclas - Navegar lista de canciones"
 
-#: src/screen_help.c:97
+#: src/screen_help.c:98
 msgid "Play"
 msgstr "Play"
 
-#: src/screen_help.c:100
+#: src/screen_help.c:101
 msgid "Move song up"
 msgstr "Mover la cancion hacia arriba"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:102
 msgid "Move song down"
 msgstr "Mover la cancion hacia abajo"
 
-#: src/screen_help.c:104
+#: src/screen_help.c:105
 msgid "Center"
 msgstr "Centro la ventana"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Keys - Browse screen"
 msgstr "Teclas - Ventana para navegar la lista de canciones"
 
-#: src/screen_help.c:111
+#: src/screen_help.c:112
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: src/screen_help.c:113
+#: src/screen_help.c:115
 msgid "Delete playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/screen_help.c:119
+#: src/screen_help.c:121
 #, fuzzy
 msgid "Keys - Search screen"
 msgstr "Teclas - Ventana para navegar la lista de canciones"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:123
 msgid "Search"
 msgstr ""
 
-#: src/screen_help.c:122
+#: src/screen_help.c:124
 msgid "Select and play"
 msgstr ""
 
-#: src/screen_help.c:208
+#: src/screen_help.c:131
+#, fuzzy
+msgid "Keys - Lyrics screen"
+msgstr "Teclas - Navegar lista de canciones"
+
+#: src/screen_help.c:133
+msgid "View Lyrics"
+msgstr ""
+
+#: src/screen_help.c:134
+msgid "(Re)load lyrics"
+msgstr ""
+
+#: src/screen_help.c:135
+msgid "Interrupt retrieval"
+msgstr ""
+
+#: src/screen_help.c:218
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/command.c:70
+#: src/screen_lyrics.c:421
+msgid "Lyrics  [No connection]"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+msgid "Lyrics  [Not found]"
+msgstr ""
+
+#: src/screen_lyrics.c:423
+msgid "Lyrics  [retrieving]"
+msgstr ""
+
+#: src/command.c:71
 msgid "Key configuration screen"
 msgstr "Ventana para configurar combinaciones de teclas"
 
-#: src/command.c:73
+#: src/command.c:74
 msgid "Quit"
 msgstr "Cerrar ncmpc"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor up"
 msgstr "Mover el cursor hacia arriba"
 
-#: src/command.c:79
+#: src/command.c:80
 msgid "Move cursor down"
 msgstr "Mover el cursor hacia abajo"
 
-#: src/command.c:81
+#: src/command.c:82
 msgid "Home "
 msgstr "Inicio"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "End "
 msgstr "Fin"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page up"
 msgstr "Pagina arriba"
 
-#: src/command.c:87
+#: src/command.c:88
 msgid "Page down"
 msgstr "Pagina abajo"
 
-#: src/command.c:92
+#: src/command.c:93
 msgid "Help screen"
 msgstr "Ventana de ayuda"
 
-#: src/command.c:94
+#: src/command.c:95
 msgid "Playlist screen"
 msgstr "Ventana de lista de canciones"
 
-#: src/command.c:96
+#: src/command.c:97
 msgid "Browse screen"
 msgstr "Navegar la lista de canciones"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Play/Enter directory"
 msgstr "Play/Enter directorio"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Next track"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Previous track"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Seek forward"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Seek backward"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Subir el volumen"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Bajar el volumen"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/Deseleccionar la cancion en la lista"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Borrar la cancion en la lista"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Shuffle playlist"
 msgstr "Mezclar lista de canciones"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Clear playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Toggle repeat mode"
 msgstr "On/Off repeat mode"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle random mode"
 msgstr "On/Off random mode "
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle crossfade mode"
 msgstr "On/Off crossfade mode"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Start a music database update"
 msgstr "Empezar la actualizacion de la base de datos musical"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Save playlist"
 msgstr "Guardar la lista de canciones"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Add url/file to playlist"
 msgstr "Agregar un url/archivo a la lista de canciones"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Move item up"
 msgstr "Moverlo arriba"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Move item down"
 msgstr "Moverlo abajo"
 
-#: src/command.c:146
+#: src/command.c:147
 msgid "Update screen"
 msgstr "Actualizar la ventana"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Toggle find mode"
 msgstr "On/Off modo de de busqueda"
 
-#: src/command.c:153
+#: src/command.c:154
 msgid "Toggle auto center mode"
 msgstr "On/Off Centrar la ventana automaticamente"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Next screen"
 msgstr "Pagina siguiente"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Previous screen"
 msgstr "Pagina anterior"
 
-#: src/command.c:165
+#: src/command.c:166
 msgid "Forward find"
 msgstr "Buscar hacia adelante"
 
-#: src/command.c:167
+#: src/command.c:168
 msgid "Forward find next"
 msgstr "Buscar hacia adelante otra vez"
 
-#: src/command.c:169
+#: src/command.c:170
 msgid "Backward find"
 msgstr "Buscar hacia arriba"
 
-#: src/command.c:171
+#: src/command.c:172
 msgid "Backward find previous"
 msgstr "Buscar hacia arriba otra vez"
 
-#: src/command.c:177
+#: src/command.c:178
+#, fuzzy
+msgid "Artist screen"
+msgstr "Ventana de lista de canciones"
+
+#: src/command.c:182
 #, fuzzy
 msgid "Search screen"
 msgstr "Pagina siguiente"
 
-#: src/command.c:179
+#: src/command.c:184
 msgid "Change search mode"
 msgstr ""
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Clock screen"
 msgstr "Ventana de Reloj"
 
-#: src/command.c:206
+#: src/command.c:193
+#, fuzzy
+msgid "Lyrics screen"
+msgstr "Ventana de lista de canciones"
+
+#: src/command.c:195
+msgid "Interrupt action"
+msgstr ""
+
+#: src/command.c:218
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: src/command.c:208
+#: src/command.c:220
 msgid "Space"
 msgstr "Space"
 
-#: src/command.c:210
+#: src/command.c:222
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:212
+#: src/command.c:224
 msgid "Backspace"
 msgstr "backspace"
 
-#: src/command.c:214
+#: src/command.c:226
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/command.c:216
+#: src/command.c:228
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:218
+#: src/command.c:230
 msgid "Down"
 msgstr "Abajo"
 
-#: src/command.c:220
+#: src/command.c:232
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/command.c:222
+#: src/command.c:234
 msgid "Right"
 msgstr "Derecha"
 
-#: src/command.c:224
+#: src/command.c:236
 msgid "Home"
 msgstr "Inicio"
 
-#: src/command.c:226
+#: src/command.c:238
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:228
+#: src/command.c:240
 msgid "PageDown"
 msgstr "Pagina siguiente"
 
-#: src/command.c:230
+#: src/command.c:242
 msgid "PageUp"
 msgstr "Pagina anterior"
 
-#: src/command.c:232
+#: src/command.c:244
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:234
+#: src/command.c:246
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:236
+#: src/command.c:248
 msgid "Esc"
 msgstr "Exc"
 
-#: src/command.c:238
+#: src/command.c:250
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:488
+#: src/command.c:500
 #, 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 el editor de teclas)"
 
-#: src/command.c:495 src/command.c:502
+#: src/command.c:507 src/command.c:514
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Error: Tecla %s asignada a %s y %s !!!\n"
@@ -662,19 +779,21 @@ msgid "Warning: Unknown color field - %s\n"
 msgstr "Advertencia: Propiedad del color - %s no reconozida\n"
 
 #: src/colors.c:267
+#, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "La terminal no tiene la opcion de cambiar los colores\n"
 
 #: src/colors.c:284
+#, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "La terminal no tiene la opcion de diferentes colores\n"
 
-#: src/support.c:168
+#: src/support.c:187
 #, c-format
 msgid "Error: Unable to convert characters to %s"
 msgstr "Error: No pude convertir los caracteres a %s"
 
-#: src/support.c:197
+#: src/support.c:216
 msgid "Error: Unable to convert characters to UTF-8"
 msgstr "Error: No pude convertir los caracteres a UTF-8"
 
diff --git a/po/fr.po b/po/fr.po
index 00c0c5d10..a75c193ba 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: 2005-01-04 21:55+0100\n"
+"POT-Creation-Date: 2006-08-05 20:19+0000\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,124 +16,136 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:36
+#: src/ncmpc.h:42
 msgid "y"
 msgstr "o"
 
-#: src/ncmpc.h:37
+#: src/ncmpc.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:133
+#: src/main.c:133 src/main.c:140
 msgid "Exiting..."
 msgstr "Fin..."
 
-#: src/main.c:266
+#: src/main.c:290
 #, 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"
+msgstr ""
+"Erreur: la version %d.%d.%d de MPD est trop ancienne (0.11.0 requise).\n"
 
-#: src/main.c:318
+#: 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:330
+#: src/main.c:354
 #, c-format
 msgid "Connected to %s!"
 msgstr "Connect� � %s!"
 
-#: src/screen.c:170
+#: src/screen.c:224
 msgid ":Help  "
 msgstr ":Aide  "
 
-#: src/screen.c:174
+#: src/screen.c:228
 msgid ":Playlist  "
 msgstr ":Liste de Lecture  "
 
-#: src/screen.c:178
+#: src/screen.c:232
 msgid ":Browse  "
 msgstr ":Parcourir  "
 
-#: src/screen.c:183
+#: src/screen.c:237
+#, fuzzy
+msgid ":Artist  "
+msgstr "Artiste"
+
+#: src/screen.c:243
 msgid ":Search  "
 msgstr ":Rechercher  "
 
-#: src/screen.c:188
+#: src/screen.c:249
+#, fuzzy
+msgid ":Lyrics  "
+msgstr ":Liste de Lecture  "
+
+#: src/screen.c:254
 msgid "Volume n/a "
 msgstr "Volume n/a "
 
-#: src/screen.c:192
+#: src/screen.c:258
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volume %d%%"
 
-#: src/screen.c:271
+#: src/screen.c:338
 msgid "Playing:"
 msgstr "En Lecture:"
 
-#: src/screen.c:274
+#: src/screen.c:341
 msgid "[Paused]"
 msgstr "[En Pause]"
 
-#: src/screen.c:390 src/screen.c:499
+#: src/screen.c:471 src/screen.c:580
+#, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Erreur: Ecran trop petit!\n"
 
-#: src/screen.c:644
+#: src/screen.c:732
 msgid "Repeat is on"
 msgstr "Mode de r�petition activ�"
 
-#: src/screen.c:645
+#: src/screen.c:733
 msgid "Repeat is off"
 msgstr "Mode de r�petition d�sactiv�"
 
-#: src/screen.c:648
+#: src/screen.c:736
 msgid "Random is on"
 msgstr "Mode Al�atoire activ�"
 
-#: src/screen.c:649
+#: src/screen.c:737
 msgid "Random is off"
 msgstr "Mode Al�atoire d�sactiv�"
 
-#: src/screen.c:652
+#: src/screen.c:740
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Fondu sur %d seconde(s)"
 
-#: src/screen.c:655
+#: src/screen.c:743
 msgid "Database updated!"
 msgstr "Base de donn�es mise � jour!"
 
-#: src/screen.c:817
+#: src/screen.c:905
 msgid "Shuffled playlist!"
 msgstr "Liste de lecture al�atoire"
 
-#: src/screen.c:821
+#: src/screen.c:909
 msgid "Cleared playlist!"
 msgstr "Liste de lecture vid�e!"
 
-#: src/screen.c:839
+#: src/screen.c:927 src/screen_file.c:655
 msgid "Database update started!"
 msgstr "D�but de la mise � jour de la base de donn�es"
 
-#: src/screen.c:842 src/screen_file.c:673
+#: src/screen.c:930 src/screen_file.c:663
 msgid "Database update running..."
 msgstr "Mise � jour de la base de donn�es en cours..."
 
-#: src/screen.c:855
+#: src/screen.c:943
 msgid "Find mode: Wrapped"
 msgstr "Mode de recherche: Enveloppe"
 
-#: src/screen.c:856
+#: src/screen.c:944
 msgid "Find mode: Normal"
 msgstr "Mode de recherche: Normal"
 
-#: src/screen.c:861
+#: src/screen.c:949
 msgid "Auto center mode: On"
 msgstr "Mode d'auto-centrage: Actif"
 
-#: src/screen.c:862
+#: src/screen.c:950
 msgid "Auto center mode: Off"
 msgstr "Mode d'auto-centrage: Inactif"
 
@@ -145,121 +157,189 @@ msgstr "Trouver: "
 msgid "Find backward: "
 msgstr "Trouver avant: "
 
-#: src/screen_utils.c:165
+#: src/screen_utils.c:166
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Impossible de trouver '%s'"
 
-#: src/screen_play.c:155
+#: src/screen_play.c:156
 msgid "Save playlist as: "
 msgstr "Enregistrer la liste de lecture sous: "
 
-#: src/screen_play.c:185
+#: src/screen_play.c:186
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Remplacer %s [%s/%s] ? "
 
-#: src/screen_play.c:199 src/screen_file.c:319 src/screen_keydef.c:162
+#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
 msgid "Aborted!"
 msgstr "Annul�!"
 
 #. success
-#: src/screen_play.c:205
+#: src/screen_play.c:206
 #, c-format
 msgid "Saved %s"
 msgstr "%s enregistr�"
 
-#: src/screen_play.c:269
+#: src/screen_play.c:270
 msgid "Add: "
 msgstr "Ajouter: "
 
-#: src/screen_play.c:324
+#: src/screen_play.c:325
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: src/screen_play.c:326
+#: src/screen_play.c:327
 #, c-format
 msgid "Playlist on %s"
 msgstr "Liste de lecture sur %s"
 
-#: src/screen_file.c:282
+#: src/screen_file.c:256
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Chargement de la liste de lecture %s..."
 
-#: src/screen_file.c:304
+#: src/screen_file.c:298
 msgid "You can only delete playlists!"
 msgstr "Seules les listes de lecture peuvent �tre �ffac�es!"
 
-#: src/screen_file.c:311
+#: src/screen_file.c:305
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Effacer la liste de lecture %s [%s/%s] ? "
 
-#: src/screen_file.c:327
+#: src/screen_file.c:321
 msgid "Playlist deleted!"
 msgstr "Liste de lecture �ffac�e!"
 
-#: src/screen_file.c:346 src/screen_file.c:467 src/screen_file.c:493
+#: 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:397
+#: src/screen_file.c:391
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Ajout du r�pertoire %s...\n"
 
-#: src/screen_file.c:569
+#: src/screen_file.c:552
 #, c-format
 msgid "Browse: %s"
 msgstr "Parcourir: %s"
 
-#: src/screen_file.c:658
+#: src/screen_file.c:644
 msgid "Screen updated!"
 msgstr "Ecran mis � jour!"
 
-#: src/screen_file.c:665
+#: src/screen_file.c:652
 #, 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:50
+#: src/screen_search.c:56
+#, fuzzy
+msgid "artist"
+msgstr "Artiste"
+
+#: src/screen_search.c:57
+#, fuzzy
+msgid "album"
+msgstr "Album"
+
+#: src/screen_search.c:58
+#, fuzzy
+msgid "title"
+msgstr "Titre"
+
+#: src/screen_search.c:59
+#, fuzzy
+msgid "track"
+msgstr "Piste suivante"
+
+#: src/screen_search.c:60
+#, fuzzy
+msgid "name"
+msgstr "Nom de fichier"
+
+#: src/screen_search.c:61
+msgid "genre"
+msgstr ""
+
+#: src/screen_search.c:62
+msgid "date"
+msgstr ""
+
+#: src/screen_search.c:63
+msgid "composer"
+msgstr ""
+
+#: src/screen_search.c:64
+msgid "performer"
+msgstr ""
+
+#: src/screen_search.c:65
+msgid "comment"
+msgstr ""
+
+#: src/screen_search.c:66
+#, fuzzy
+msgid "file"
+msgstr "Titre"
+
+#: src/screen_search.c:100
 msgid "Title"
 msgstr "Titre"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:101
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:102
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:103
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: src/screen_search.c:114
+#: src/screen_search.c:244
+#, c-format
+msgid "Bad search tag %s"
+msgstr ""
+
+#: src/screen_search.c:251
+#, c-format
+msgid "No argument for search tag %s"
+msgstr ""
+
+#: src/screen_search.c:323
 msgid "Search: "
 msgstr "Rechercher: "
 
-#: src/screen_search.c:162
+#. if( pattern==NULL )
+#. search_new(screen, c);
+#. else
+#: src/screen_search.c:379
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Appuyez sur %s pour une nouvelle recherche"
 
-#: src/screen_search.c:214
+#: src/screen_search.c:435
+#, fuzzy, c-format
+msgid "Search: %s"
+msgstr "Rechercher: "
+
+#: src/screen_search.c:438
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Rechercher: R�sultats pour %s [%s]"
 
-#: src/screen_search.c:218
+#: src/screen_search.c:442
 #, 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:252
+#: src/screen_search.c:476
 #, c-format
 msgid "Search mode: %s"
 msgstr "Mode de recherche : %s"
@@ -344,310 +424,354 @@ msgstr "Horloge"
 msgid "Keys - Movement"
 msgstr "Touches - D�placements"
 
-#: src/screen_help.c:68
+#: src/screen_help.c:69
 msgid "Keys - Global"
 msgstr "Touches - Globales"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Keys - Playlist screen"
 msgstr "Touches - Liste de Lecture"
 
-#: src/screen_help.c:97
+#: src/screen_help.c:98
 msgid "Play"
 msgstr "Lire"
 
-#: src/screen_help.c:100
+#: src/screen_help.c:101
 msgid "Move song up"
 msgstr "D�placer la chanson vers le haut"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:102
 msgid "Move song down"
 msgstr "D�placer la chanson vers le bas"
 
-#: src/screen_help.c:104
+#: src/screen_help.c:105
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Keys - Browse screen"
 msgstr "Touches - Ecran de Navigation"
 
-#: src/screen_help.c:111
+#: src/screen_help.c:112
 msgid "Enter directory/Select and play song"
 msgstr "Entrer dans le r�pertoire/S�lectionner et lire la chanson"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:115
 msgid "Delete playlist"
 msgstr "Effacer la liste de lecture"
 
-#: src/screen_help.c:119
+#: src/screen_help.c:121
 #, fuzzy
 msgid "Keys - Search screen"
 msgstr "Touches - Ecran de Recherche"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:123
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:124
 msgid "Select and play"
 msgstr "S�lectionner et Lire"
 
-#: src/screen_help.c:208
+#: src/screen_help.c:131
+#, fuzzy
+msgid "Keys - Lyrics screen"
+msgstr "Touches - Liste de Lecture"
+
+#: src/screen_help.c:133
+msgid "View Lyrics"
+msgstr ""
+
+#: src/screen_help.c:134
+msgid "(Re)load lyrics"
+msgstr ""
+
+#: src/screen_help.c:135
+msgid "Interrupt retrieval"
+msgstr ""
+
+#: src/screen_help.c:218
 msgid "Help"
 msgstr "Aide"
 
-#: src/command.c:70
+#: src/screen_lyrics.c:421
+msgid "Lyrics  [No connection]"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+msgid "Lyrics  [Not found]"
+msgstr ""
+
+#: src/screen_lyrics.c:423
+msgid "Lyrics  [retrieving]"
+msgstr ""
+
+#: src/command.c:71
 msgid "Key configuration screen"
 msgstr "Ecran de configuration des touches"
 
-#: src/command.c:73
+#: src/command.c:74
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor up"
 msgstr "D�placer le curseur vers le haut"
 
-#: src/command.c:79
+#: src/command.c:80
 msgid "Move cursor down"
 msgstr "D�placer le curseur vers le bas"
 
-#: src/command.c:81
+#: src/command.c:82
 msgid "Home "
 msgstr "D�but "
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "End "
 msgstr "Fin "
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page up"
 msgstr "Monter d'une page"
 
-#: src/command.c:87
+#: src/command.c:88
 msgid "Page down"
 msgstr "Descendre d'une page"
 
-#: src/command.c:92
+#: src/command.c:93
 msgid "Help screen"
 msgstr "Ecran d'aide"
 
-#: src/command.c:94
+#: src/command.c:95
 msgid "Playlist screen"
 msgstr "Ecran de Liste de lecture"
 
-#: src/command.c:96
+#: src/command.c:97
 msgid "Browse screen"
 msgstr "Ecran de Navigation"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Play/Enter directory"
 msgstr "Jouer/Entrer dans le r�pertoire"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Piste suivante"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Piste pr�c�dente"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Avancer"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Reculer"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Augmenter le volume"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Diminuer le volume"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "S�lectionner/D�s�lectionner la chanson dans la liste de lecture"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Enlever la chanson de la liste de lecture"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Shuffle playlist"
 msgstr "Liste de lecture al�atoire"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Clear playlist"
 msgstr "Vider la liste de lecture"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Toggle repeat mode"
 msgstr "Activer/d�sactiver le mode r�p�tition"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle random mode"
 msgstr "Activer/d�sactiver le mode al�atoire"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle crossfade mode"
 msgstr "Activer/d�sactiver le mode de fondu"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Start a music database update"
 msgstr "Mettre � jour la base de donn�es musicale"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Save playlist"
 msgstr "Enregistrer la liste de lecture"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Add url/file to playlist"
 msgstr "Ajouter une url/un fichier � la liste de lecture"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Move item up"
 msgstr "D�placer l'�l�ment vers le haut"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Move item down"
 msgstr "D�placer l'�l�ment vers le bas"
 
-#: src/command.c:146
+#: src/command.c:147
 msgid "Update screen"
 msgstr "Mettre � jour l'�cran"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Toggle find mode"
 msgstr "Activer le mode de recherche"
 
-#: src/command.c:153
+#: src/command.c:154
 msgid "Toggle auto center mode"
 msgstr "Activer le mode d'auto-centrage"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Next screen"
 msgstr "Ecran suivant"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Previous screen"
 msgstr "Ecran pr�c�dent"
 
-#: src/command.c:165
+#: src/command.c:166
 msgid "Forward find"
 msgstr "Chercher apr�s"
 
-#: src/command.c:167
+#: src/command.c:168
 msgid "Forward find next"
 msgstr "Chercher apr�s/suivant"
 
-#: src/command.c:169
+#: src/command.c:170
 msgid "Backward find"
 msgstr "Chercher avant"
 
-#: src/command.c:171
+#: src/command.c:172
 msgid "Backward find previous"
 msgstr "Chercher avant/pr�c�dent"
 
-#: src/command.c:177
+#: src/command.c:178
+#, fuzzy
+msgid "Artist screen"
+msgstr "Ecran de Liste de lecture"
+
+#: src/command.c:182
 #, fuzzy
 msgid "Search screen"
 msgstr "Ecran de recherche"
 
-#: src/command.c:179
+#: src/command.c:184
 msgid "Change search mode"
 msgstr "Changer le mode de recherche"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Clock screen"
 msgstr "Ecran d'horloge"
 
-#: src/command.c:206
+#: src/command.c:193
+#, fuzzy
+msgid "Lyrics screen"
+msgstr "Ecran de Liste de lecture"
+
+#: src/command.c:195
+msgid "Interrupt action"
+msgstr ""
+
+#: src/command.c:218
 msgid "Undefined"
 msgstr "Ind�fini"
 
-#: src/command.c:208
+#: src/command.c:220
 msgid "Space"
 msgstr "Espace"
 
-#: src/command.c:210
+#: src/command.c:222
 msgid "Enter"
 msgstr "Entr�e"
 
-#: src/command.c:212
+#: src/command.c:224
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:214
+#: src/command.c:226
 msgid "Delete"
 msgstr "Suppr"
 
-#: src/command.c:216
+#: src/command.c:228
 msgid "Up"
 msgstr "Haut"
 
-#: src/command.c:218
+#: src/command.c:230
 msgid "Down"
 msgstr "Bas"
 
-#: src/command.c:220
+#: src/command.c:232
 msgid "Left"
 msgstr "Gauche"
 
-#: src/command.c:222
+#: src/command.c:234
 msgid "Right"
 msgstr "Droite"
 
-#: src/command.c:224
+#: src/command.c:236
 msgid "Home"
 msgstr "D�but"
 
-#: src/command.c:226
+#: src/command.c:238
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:228
+#: src/command.c:240
 msgid "PageDown"
 msgstr "PageBas"
 
-#: src/command.c:230
+#: src/command.c:242
 msgid "PageUp"
 msgstr "PageHaut"
 
-#: src/command.c:232
+#: src/command.c:244
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:234
+#: src/command.c:246
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:236
+#: src/command.c:248
 msgid "Esc"
 msgstr "Echap"
 
-#: src/command.c:238
+#: src/command.c:250
 msgid "Insert"
 msgstr "Inser"
 
-#: src/command.c:488
+#: src/command.c:500
 #, 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)"
+msgstr ""
+"La touche %s est assign�e � %s (appuyez sur %s pour l'�diteur de touches)"
 
-#: src/command.c:495 src/command.c:502
+#: src/command.c:507 src/command.c:514
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Erreur: La touche %s est assign�e � %s et � %s !!!\n"
@@ -663,19 +787,21 @@ msgid "Warning: Unknown color field - %s\n"
 msgstr "Attention: Champ de couleur inconnu - %s\n"
 
 #: src/colors.c:267
+#, 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
+#, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "Le terminal ne dispose pas de la gestion des couleurs!\n"
 
-#: src/support.c:168
+#: src/support.c:187
 #, c-format
 msgid "Error: Unable to convert characters to %s"
 msgstr "Erreur: Impossible de convertir les caract�res pour %s"
 
-#: src/support.c:197
+#: src/support.c:216
 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 8e0de1b5d..d020e16b5 100755
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,678 +2,803 @@
 # 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 SVN\n"

-"Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-01-04 21:55+0100\n"

-"PO-Revision-Date: 2006-02-26 23:13+0100\n"

-"Last-Translator: Johám-Luís Miguéns Vila <galiza.ceive@gmail.com>\n"

-"Language-Team: galician\n"

-"MIME-Version: 1.0\n"

-"Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=n != 1;\n"

-

-#: src/ncmpc.h:36

-msgid "y"

-msgstr "s"

-

-#: src/ncmpc.h:37

-msgid "n"

-msgstr "n"

-

-#: src/main.c:133

-msgid "Exiting..."

-msgstr "A sair..."

-

-#: src/main.c:266

-#, 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:318

-#, c-format

-msgid "Connecting to %s...  [Press %s to abort]"

-msgstr "A conectar-se com %s... [Preme %s para abortar]"

-

-#: src/main.c:330

-#, c-format

-msgid "Connected to %s!"

-msgstr "Conectado com %s!"

-

-#: src/screen.c:170

-msgid ":Help  "

-msgstr ":Ajuda "

-

-#: src/screen.c:174

-msgid ":Playlist  "

-msgstr ":Lista "

-

-#: src/screen.c:178

-msgid ":Browse  "

-msgstr ":Navegar "

-

-#: src/screen.c:183

-msgid ":Search  "

-msgstr ":Procurar "

-

-#: src/screen.c:188

-msgid "Volume n/a "

-msgstr "Volume n/a "

-

-#: src/screen.c:192

-#, c-format

-msgid " Volume %d%%"

-msgstr " Volume %d%%"

-

-#: src/screen.c:271

-msgid "Playing:"

-msgstr "A tocar:"

-

-#: src/screen.c:274

-msgid "[Paused]"

-msgstr "[Em Pausa]"

-

-#: src/screen.c:390 src/screen.c:499

-msgid "Error: Screen to small!\n"

-msgstr "Erro: O écrã é demasiado pequeno!\n"

-

-#: src/screen.c:644

-msgid "Repeat is on"

-msgstr "Repetiçom activada"

-

-#: src/screen.c:645

-msgid "Repeat is off"

-msgstr "Repetiçom desactivada"

-

-#: src/screen.c:648

-msgid "Random is on"

-msgstr "Aleatório activado"

-

-#: src/screen.c:649

-msgid "Random is off"

-msgstr "Aleatório desactivado"

-

-#: src/screen.c:652

-#, c-format

-msgid "Crossfade %d seconds"

-msgstr "Esvaecemento %d segundos"

-

-#: src/screen.c:655

-msgid "Database updated!"

-msgstr "Base de dados actualizada!"

-

-#: src/screen.c:817

-msgid "Shuffled playlist!"

-msgstr "Lista aleatorizada!"

-

-#: src/screen.c:821

-msgid "Cleared playlist!"

-msgstr "Lista limpada!"

-

-#: src/screen.c:839

-msgid "Database update started!"

-msgstr "A actualizaçom da BD começou!"

-

-#: src/screen.c:842 src/screen_file.c:673

-msgid "Database update running..."

-msgstr "A BD está-se a actualizar..."

-

-#: src/screen.c:855

+# 

+msgid ""
+msgstr ""
+"Project-Id-Version: ncmpc SVN\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-05 20:19+0000\n"
+"PO-Revision-Date: 2006-02-26 23:13+0100\n"
+"Last-Translator: Johám-Luís Miguéns Vila <galiza.ceive@gmail.com>\n"
+"Language-Team: galician\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: src/ncmpc.h:42
+msgid "y"
+msgstr "s"
+
+#: src/ncmpc.h:43
+msgid "n"
+msgstr "n"
+
+#: src/main.c:133 src/main.c:140
+msgid "Exiting..."
+msgstr "A sair..."
+
+#: src/main.c:290
+#, 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
+#, c-format
+msgid "Connected to %s!"
+msgstr "Conectado com %s!"
+
+#: src/screen.c:224
+msgid ":Help  "
+msgstr ":Ajuda "
+
+#: src/screen.c:228
+msgid ":Playlist  "
+msgstr ":Lista "
+
+#: src/screen.c:232
+msgid ":Browse  "
+msgstr ":Navegar "
+
+#: src/screen.c:237
+#, fuzzy
+msgid ":Artist  "
+msgstr "Artista"
+
+#: src/screen.c:243
+msgid ":Search  "
+msgstr ":Procurar "
+
+#: src/screen.c:249
+#, fuzzy
+msgid ":Lyrics  "
+msgstr ":Lista "
+
+#: src/screen.c:254
+msgid "Volume n/a "
+msgstr "Volume n/a "
+
+#: src/screen.c:258
+#, c-format
+msgid " Volume %d%%"
+msgstr " Volume %d%%"
+
+#: src/screen.c:338
+msgid "Playing:"
+msgstr "A tocar:"
+
+#: src/screen.c:341
+msgid "[Paused]"
+msgstr "[Em Pausa]"
+
+#: src/screen.c:471 src/screen.c:580
+#, c-format
+msgid "Error: Screen to small!\n"
+msgstr "Erro: O écrã é demasiado pequeno!\n"
+
+#: src/screen.c:732
+msgid "Repeat is on"
+msgstr "Repetiçom activada"
+
+#: src/screen.c:733
+msgid "Repeat is off"
+msgstr "Repetiçom desactivada"
+
+#: src/screen.c:736
+msgid "Random is on"
+msgstr "Aleatório activado"
+
+#: src/screen.c:737
+msgid "Random is off"
+msgstr "Aleatório desactivado"
+
+#: src/screen.c:740
+#, c-format
+msgid "Crossfade %d seconds"
+msgstr "Esvaecemento %d segundos"
+
+#: src/screen.c:743
+msgid "Database updated!"
+msgstr "Base de dados actualizada!"
+
+#: src/screen.c:905
+msgid "Shuffled playlist!"
+msgstr "Lista aleatorizada!"
+
+#: src/screen.c:909
+msgid "Cleared playlist!"
+msgstr "Lista limpada!"
+
+#: src/screen.c:927 src/screen_file.c:655
+msgid "Database update started!"
+msgstr "A actualizaçom da BD começou!"
+
+#: src/screen.c:930 src/screen_file.c:663
+msgid "Database update running..."
+msgstr "A BD está-se a actualizar..."
+
 # fuzzy

-msgid "Find mode: Wrapped"

-msgstr "Modo de procura: Limitada"

-

-#: src/screen.c:856

-msgid "Find mode: Normal"

-msgstr "Modo de procura: Normal"

-

-#: src/screen.c:861

-msgid "Auto center mode: On"

-msgstr "Modo de auto-centrado: activado"

-

-#: src/screen.c:862

-msgid "Auto center mode: Off"

-msgstr "Modo de auto-centrado: desactivado"

-

-#: src/screen_utils.c:38

-msgid "Find: "

-msgstr "Procurar"

-

-#: src/screen_utils.c:39

-msgid "Find backward: "

-msgstr "Procurar atrás"

-

-#: src/screen_utils.c:165

-#, c-format

-msgid "Unable to find '%s'"

-msgstr "Nom se puido atopar '%s'"

-

-#: src/screen_play.c:155

-msgid "Save playlist as: "

-msgstr "Guardar lista como: "

-

-#: src/screen_play.c:185

-#, c-format

-msgid "Replace %s [%s/%s] ? "

-msgstr "Reemprazar %s [%s/%s] ?"

-

-#: src/screen_play.c:199 src/screen_file.c:319 src/screen_keydef.c:162

-msgid "Aborted!"

-msgstr "Abortado!"

-

-#. success

-#: src/screen_play.c:205

-#, c-format

-msgid "Saved %s"

-msgstr "Guardado %s"

-

-#: src/screen_play.c:269

-msgid "Add: "

-msgstr "Engadir: "

-

-#: src/screen_play.c:324

-msgid "Playlist"

-msgstr "Lista"

-

-#: src/screen_play.c:326

-#, c-format

-msgid "Playlist on %s"

-msgstr "Lista em %s"

-

-#: src/screen_file.c:282

-#, c-format

-msgid "Loading playlist %s..."

-msgstr "A carregar a lista %s..."

-

-#: src/screen_file.c:304

-msgid "You can only delete playlists!"

-msgstr "Apenas podes eliminar as listas!"

-

-#: src/screen_file.c:311

-#, c-format

-msgid "Delete playlist %s [%s/%s] ? "

-msgstr "Eliminar a lista %s [%s/%s] ?"

-

-#: src/screen_file.c:327

-msgid "Playlist deleted!"

-msgstr "Lista eliminada!"

-

-#: src/screen_file.c:346 src/screen_file.c:467 src/screen_file.c:493

-#, c-format

-msgid "Adding '%s' to playlist\n"

-msgstr "A engadir '%s' à lista\n"

-

-#: src/screen_file.c:397

-#, c-format

-msgid "Adding directory %s...\n"

-msgstr "Engadindo o cartafol %s...\n"

-

-#: src/screen_file.c:569

-#, c-format

-msgid "Browse: %s"

-msgstr "Navegar: %s"

-

-#: src/screen_file.c:658

-msgid "Screen updated!"

-msgstr "Écrã actualizado!"

-

-#: src/screen_file.c:665

-#, c-format

-msgid "Database update of %s started!"

-msgstr "A actualizaçom da BD de %s começou!"

-

-#: src/screen_search.c:50

-msgid "Title"

-msgstr "Título"

-

-#: src/screen_search.c:51

-msgid "Artist"

-msgstr "Artista"

-

-#: src/screen_search.c:52

-msgid "Album"

-msgstr "Álbum"

-

-#: src/screen_search.c:53

-msgid "Filename"

-msgstr "Nome do ficheiro"

-

-#: src/screen_search.c:114

-msgid "Search: "

-msgstr "Procurar: "

-

-#: src/screen_search.c:162

-#, c-format

-msgid "Press %s for a new search"

-msgstr "Preme %s para umha nova procura"

-

-#: src/screen_search.c:214

-#, c-format

-msgid "Search: Results for %s [%s]"

-msgstr "Procura: Resultados para %s [%s]"

-

-#: src/screen_search.c:218

-#, c-format

-msgid "Search: Press %s for a new search [%s]"

-msgstr "Procura: Preme %s para umha nova procura [%s]"

-

-#: src/screen_search.c:252

-#, c-format

-msgid "Search mode: %s"

-msgstr "Modo da procura: %s"

-

-#: src/screen_keydef.c:46

-msgid "===> Apply & Save key bindings  "

-msgstr "===> Aplicar e guardar os atalhos de teclado "

-

-#: src/screen_keydef.c:47

-msgid "===> Apply key bindings "

-msgstr "===> Aplicar os atalhos de teclado "

-

-#: src/screen_keydef.c:76

-msgid "You have new key bindings!"

-msgstr "Tes novos atalhos de teclado!"

-

-#: src/screen_keydef.c:79

-msgid "Keybindings unchanged."

-msgstr "Atalhos de teclado sem mudanças"

-

-#: src/screen_keydef.c:90

-#, 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

-#, c-format

-msgid "Error: %s - %s"

-msgstr "Erro: %s - %s"

-

-#: src/screen_keydef.c:108

-#, c-format

-msgid "Wrote %s"

-msgstr "Escreveu-se %s"

-

-#: src/screen_keydef.c:136

-msgid "Deleted"

-msgstr "Eliminado"

-

-#: src/screen_keydef.c:155

-#, c-format

-msgid "Enter new key for %s: "

-msgstr "Introuduz um novo atalho para %s: "

-

-#: src/screen_keydef.c:168

-#, 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

-#, c-format

-msgid "Assigned %s to %s"

-msgstr "Assignou-se %s a %s"

-

-#: src/screen_keydef.c:220

-#, c-format

-msgid "%d. Add new key "

-msgstr "%d. Engadir um novo atalho "

-

-#: src/screen_keydef.c:267

-msgid "Welcome to the key editor!"

-msgstr "Bem-vid@ ao editor de atalhos!"

-

-#: src/screen_keydef.c:283

-msgid "Note: Did you forget to 'Apply' your changes?"

-msgstr "Nota: Esquecestes de 'Aplicar' as mudanças?"

-

-#: src/screen_keydef.c:290

-msgid "Edit key bindings"

-msgstr "Editar os atalhos de teclado"

-

-#: src/screen_keydef.c:292

-#, 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

-msgid "Keys - Movement"

-msgstr "Teclas - Movimento"

-

-#: src/screen_help.c:68

-msgid "Keys - Global"

-msgstr "Teclas - Global"

-

-#: src/screen_help.c:95

-msgid "Keys - Playlist screen"

-msgstr "Teclas - Écrã da lista"

-

-#: src/screen_help.c:97

-msgid "Play"

-msgstr "Tocar"

-

-#: src/screen_help.c:100

-msgid "Move song up"

-msgstr "Mover a cançom arriba"

-

-#: src/screen_help.c:101

-msgid "Move song down"

-msgstr "Mover a cançom abaixo"

-

-#: src/screen_help.c:104

-msgid "Center"

-msgstr "Centrar"

-

-#: src/screen_help.c:109

-msgid "Keys - Browse screen"

-msgstr "Teclas - Écrã de navegaçom"

-

-#: src/screen_help.c:111

-msgid "Enter directory/Select and play song"

-msgstr "Entra no cartafol/Selecciona e toca a cançom"

-

-#: src/screen_help.c:113

-msgid "Delete playlist"

-msgstr "Eliminar lista"

-

-#: src/screen_help.c:119

-msgid "Keys - Search screen"

-msgstr "Teclas - Écrã de procura"

-

-#: src/screen_help.c:121

-msgid "Search"

-msgstr "Procura"

-

-#: src/screen_help.c:122

-msgid "Select and play"

-msgstr "Seleccionar e tocar"

-

-#: src/screen_help.c:208

-msgid "Help"

-msgstr "Ajuda"

-

-#: src/command.c:70

-msgid "Key configuration screen"

-msgstr "Écrã da configuraçom dos atalhos"

-

-#: src/command.c:73

-msgid "Quit"

-msgstr "Sair"

-

-#: src/command.c:77

-msgid "Move cursor up"

-msgstr "Mover o cursor arriba"

-

-#: src/command.c:79

-msgid "Move cursor down"

-msgstr "Mover o cursor abaixo"

-

-#: src/command.c:81

-msgid "Home "

-msgstr "Início"

-

-#: src/command.c:83

-msgid "End "

-msgstr "Fim"

-

-#: src/command.c:85

-msgid "Page up"

-msgstr "Avance página"

-

-#: src/command.c:87

-msgid "Page down"

-msgstr "Retrocesso página"

-

-#: src/command.c:92

-msgid "Help screen"

-msgstr "Écrã de ajuda"

-

-#: src/command.c:94

-msgid "Playlist screen"

-msgstr "Écrã da lista"

-

-#: src/command.c:96

-msgid "Browse screen"

-msgstr "Écrã de navegaçom"

-

-#: src/command.c:101

-msgid "Play/Enter directory"

-msgstr "Tocar/Entrar num cartafol"

-

-#: src/command.c:103

-msgid "Pause"

-msgstr "Pausar"

-

-#: src/command.c:105

-msgid "Stop"

-msgstr "Parar"

-

-#: src/command.c:107

-msgid "Next track"

-msgstr "Seguinte"

-

-#: src/command.c:109

-msgid "Previous track"

-msgstr "Anterior"

-

-#: src/command.c:111

-msgid "Seek forward"

-msgstr "Avançar"

-

-#: src/command.c:113

-msgid "Seek backward"

-msgstr "Retroceder"

-

-#: src/command.c:115

-msgid "Increase volume"

-msgstr "Aumentar volume"

-

-#: src/command.c:117

-msgid "Decrease volume"

-msgstr "Diminuir volume"

-

-#: src/command.c:119

-msgid "Select/deselect song in playlist"

-msgstr "Seleccionar/desseleccionar a cançom na lista"

-

-#: src/command.c:121

-msgid "Delete song from playlist"

-msgstr "Eliminar a cançom da lista"

-

-#: src/command.c:123

-msgid "Shuffle playlist"

-msgstr "Aleatorizar a lista"

-

-#: src/command.c:125

-msgid "Clear playlist"

-msgstr "Limpar a lista"

-

-#: src/command.c:127

-msgid "Toggle repeat mode"

-msgstr "Activar/desactivar o modo repetiçom"

-

-#: src/command.c:129

-msgid "Toggle random mode"

-msgstr "Activar/desactivar o modo aleatório"

-

-#: src/command.c:131

-msgid "Toggle crossfade mode"

-msgstr "Activar/desactivar o modo esvaecimento"

-

-#: src/command.c:133

-msgid "Start a music database update"

-msgstr "Começar umha actualizaçom da BD"

-

-#: src/command.c:135

-msgid "Save playlist"

-msgstr "Guardar lista"

-

-#: src/command.c:137

-msgid "Add url/file to playlist"

-msgstr "Engadir url/ficheiro à lista"

-

-#: src/command.c:142

-msgid "Move item up"

-msgstr "Mover o elemento arriba"

-

-#: src/command.c:144

-msgid "Move item down"

-msgstr "Mover o elemento abaixo"

-

-#: src/command.c:146

-msgid "Update screen"

-msgstr "Actualizar o écrã"

-

-#: src/command.c:151

-msgid "Toggle find mode"

-msgstr "Alternar o modo de procura"

-

-#: src/command.c:153

-msgid "Toggle auto center mode"

-msgstr "Alternar o modo de auto-centrado"

-

-#: src/command.c:158

-msgid "Next screen"

-msgstr "Seguinte écrã"

-

-#: src/command.c:160

-msgid "Previous screen"

-msgstr "Écrã anterior"

-

-#: src/command.c:165

-msgid "Forward find"

-msgstr "Procurar cara adiante"

-

-#: src/command.c:167

-msgid "Forward find next"

-msgstr "Procurar para adiante, seguinte"

-

-#: src/command.c:169

-msgid "Backward find"

-msgstr "Procurar cara atrás"

-

-#: src/command.c:171

-msgid "Backward find previous"

-msgstr "Procurar cara atrás, anterior"

-

-#: src/command.c:177

-msgid "Search screen"

-msgstr "Écrã de procura"

-

-#: src/command.c:179

-msgid "Change search mode"

-msgstr "Mudar o modo de procura"

-

-#: src/command.c:184

-msgid "Clock screen"

-msgstr "Écrã do relógio"

-

-#: src/command.c:206

-msgid "Undefined"

-msgstr "Nom definido"

-

-#: src/command.c:208

-msgid "Space"

-msgstr "Espaço"

-

-#: src/command.c:210

-msgid "Enter"

-msgstr "Enter"

-

-#: src/command.c:212

-msgid "Backspace"

-msgstr "Backspace"

-

-#: src/command.c:214

-msgid "Delete"

-msgstr "Supr"

-

-#: src/command.c:216

-msgid "Up"

-msgstr "Arriba"

-

-#: src/command.c:218

-msgid "Down"

-msgstr "Abaixo"

-

-#: src/command.c:220

-msgid "Left"

-msgstr "Esquerda"

-

-#: src/command.c:222

-msgid "Right"

-msgstr "Direita"

-

-#: src/command.c:224

-msgid "Home"

-msgstr "Home"

-

-#: src/command.c:226

-msgid "End"

-msgstr "Fim"

-

-#: src/command.c:228

-msgid "PageDown"

-msgstr "Re. Pág."

-

-#: src/command.c:230

-msgid "PageUp"

-msgstr "Av. Pág."

-

-#: src/command.c:232

-msgid "Tab"

-msgstr "Tab"

-

-#: src/command.c:234

-msgid "Shift+Tab"

-msgstr "Shift+Tab"

-

-#: src/command.c:236

-msgid "Esc"

-msgstr "Esc"

-

-#: src/command.c:238

-msgid "Insert"

-msgstr "Insert"

-

-#: src/command.c:488

-#, 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:495 src/command.c:502

-#, 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

-#, c-format

-msgid "Warning: Unknown color - %s\n"

-msgstr "Aviso: Cor desconhecida - %s\n"

-

-#: src/colors.c:232

-#, c-format

-msgid "Warning: Unknown color field - %s\n"

-msgstr "Aviso: Campo de cor desconhecido - %s\n"

-

-#: src/colors.c:267

-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

-msgid "Terminal lacks color capabilities!\n"

-msgstr "A terminal nom tem capacidades de cor!\n"

-

-#: src/support.c:168

-#, c-format

-msgid "Error: Unable to convert characters to %s"

-msgstr "Erro: Impossível converter os caracteres a %s"

-

-#: src/support.c:197

-msgid "Error: Unable to convert characters to UTF-8"

-msgstr "Erro: Impossível converter os caracteres a UTF-8"

+#: src/screen.c:943
+msgid "Find mode: Wrapped"
+msgstr "Modo de procura: Limitada"
+
+#: src/screen.c:944
+msgid "Find mode: Normal"
+msgstr "Modo de procura: Normal"
+
+#: src/screen.c:949
+msgid "Auto center mode: On"
+msgstr "Modo de auto-centrado: activado"
+
+#: src/screen.c:950
+msgid "Auto center mode: Off"
+msgstr "Modo de auto-centrado: desactivado"
+
+#: src/screen_utils.c:38
+msgid "Find: "
+msgstr "Procurar"
+
+#: src/screen_utils.c:39
+msgid "Find backward: "
+msgstr "Procurar atrás"
+
+#: src/screen_utils.c:166
+#, c-format
+msgid "Unable to find '%s'"
+msgstr "Nom se puido atopar '%s'"
+
+#: src/screen_play.c:156
+msgid "Save playlist as: "
+msgstr "Guardar lista como: "
+
+#: src/screen_play.c:186
+#, 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
+msgid "Aborted!"
+msgstr "Abortado!"
+
+#. success
+#: src/screen_play.c:206
+#, c-format
+msgid "Saved %s"
+msgstr "Guardado %s"
+
+#: src/screen_play.c:270
+msgid "Add: "
+msgstr "Engadir: "
+
+#: src/screen_play.c:325
+msgid "Playlist"
+msgstr "Lista"
+
+#: src/screen_play.c:327
+#, 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
+msgid "You can only delete playlists!"
+msgstr "Apenas podes eliminar as listas!"
+
+#: src/screen_file.c:305
+#, c-format
+msgid "Delete playlist %s [%s/%s] ? "
+msgstr "Eliminar a lista %s [%s/%s] ?"
+
+#: src/screen_file.c:321
+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
+#, c-format
+msgid "Browse: %s"
+msgstr "Navegar: %s"
+
+#: src/screen_file.c:644
+msgid "Screen updated!"
+msgstr "Écrã actualizado!"
+
+#: src/screen_file.c:652
+#, c-format
+msgid "Database update of %s started!"
+msgstr "A actualizaçom da BD de %s começou!"
+
+#: src/screen_search.c:56
+#, fuzzy
+msgid "artist"
+msgstr "Artista"
+
+#: src/screen_search.c:57
+#, fuzzy
+msgid "album"
+msgstr "Álbum"
+
+#: src/screen_search.c:58
+#, fuzzy
+msgid "title"
+msgstr "Título"
+
+#: src/screen_search.c:59
+#, fuzzy
+msgid "track"
+msgstr "Seguinte"
+
+#: src/screen_search.c:60
+#, fuzzy
+msgid "name"
+msgstr "Nome do ficheiro"
+
+#: src/screen_search.c:61
+msgid "genre"
+msgstr ""
+
+#: src/screen_search.c:62
+msgid "date"
+msgstr ""
+
+#: src/screen_search.c:63
+msgid "composer"
+msgstr ""
+
+#: src/screen_search.c:64
+msgid "performer"
+msgstr ""
+
+#: src/screen_search.c:65
+msgid "comment"
+msgstr ""
+
+#: src/screen_search.c:66
+#, fuzzy
+msgid "file"
+msgstr "Título"
+
+#: src/screen_search.c:100
+msgid "Title"
+msgstr "Título"
+
+#: src/screen_search.c:101
+msgid "Artist"
+msgstr "Artista"
+
+#: src/screen_search.c:102
+msgid "Album"
+msgstr "Álbum"
+
+#: src/screen_search.c:103
+msgid "Filename"
+msgstr "Nome do ficheiro"
+
+#: src/screen_search.c:244
+#, c-format
+msgid "Bad search tag %s"
+msgstr ""
+
+#: src/screen_search.c:251
+#, c-format
+msgid "No argument for search tag %s"
+msgstr ""
+
+#: src/screen_search.c:323
+msgid "Search: "
+msgstr "Procurar: "
+
+#. if( pattern==NULL )
+#. search_new(screen, c);
+#. else
+#: src/screen_search.c:379
+#, c-format
+msgid "Press %s for a new search"
+msgstr "Preme %s para umha nova procura"
+
+#: src/screen_search.c:435
+#, fuzzy, c-format
+msgid "Search: %s"
+msgstr "Procurar: "
+
+#: src/screen_search.c:438
+#, c-format
+msgid "Search: Results for %s [%s]"
+msgstr "Procura: Resultados para %s [%s]"
+
+#: src/screen_search.c:442
+#, 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
+#, c-format
+msgid "Search mode: %s"
+msgstr "Modo da procura: %s"
+
+#: src/screen_keydef.c:46
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Aplicar e guardar os atalhos de teclado "
+
+#: src/screen_keydef.c:47
+msgid "===> Apply key bindings "
+msgstr "===> Aplicar os atalhos de teclado "
+
+#: src/screen_keydef.c:76
+msgid "You have new key bindings!"
+msgstr "Tes novos atalhos de teclado!"
+
+#: src/screen_keydef.c:79
+msgid "Keybindings unchanged."
+msgstr "Atalhos de teclado sem mudanças"
+
+#: src/screen_keydef.c:90
+#, 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
+#, c-format
+msgid "Error: %s - %s"
+msgstr "Erro: %s - %s"
+
+#: src/screen_keydef.c:108
+#, c-format
+msgid "Wrote %s"
+msgstr "Escreveu-se %s"
+
+#: src/screen_keydef.c:136
+msgid "Deleted"
+msgstr "Eliminado"
+
+#: src/screen_keydef.c:155
+#, c-format
+msgid "Enter new key for %s: "
+msgstr "Introuduz um novo atalho para %s: "
+
+#: src/screen_keydef.c:168
+#, 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
+#, c-format
+msgid "Assigned %s to %s"
+msgstr "Assignou-se %s a %s"
+
+#: src/screen_keydef.c:220
+#, c-format
+msgid "%d. Add new key "
+msgstr "%d. Engadir um novo atalho "
+
+#: src/screen_keydef.c:267
+msgid "Welcome to the key editor!"
+msgstr "Bem-vid@ ao editor de atalhos!"
+
+#: src/screen_keydef.c:283
+msgid "Note: Did you forget to 'Apply' your changes?"
+msgstr "Nota: Esquecestes de 'Aplicar' as mudanças?"
+
+#: src/screen_keydef.c:290
+msgid "Edit key bindings"
+msgstr "Editar os atalhos de teclado"
+
+#: src/screen_keydef.c:292
+#, 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
+msgid "Keys - Movement"
+msgstr "Teclas - Movimento"
+
+#: src/screen_help.c:69
+msgid "Keys - Global"
+msgstr "Teclas - Global"
+
+#: src/screen_help.c:96
+msgid "Keys - Playlist screen"
+msgstr "Teclas - Écrã da lista"
+
+#: src/screen_help.c:98
+msgid "Play"
+msgstr "Tocar"
+
+#: src/screen_help.c:101
+msgid "Move song up"
+msgstr "Mover a cançom arriba"
+
+#: src/screen_help.c:102
+msgid "Move song down"
+msgstr "Mover a cançom abaixo"
+
+#: src/screen_help.c:105
+msgid "Center"
+msgstr "Centrar"
+
+#: src/screen_help.c:110
+msgid "Keys - Browse screen"
+msgstr "Teclas - Écrã de navegaçom"
+
+#: src/screen_help.c:112
+msgid "Enter directory/Select and play song"
+msgstr "Entra no cartafol/Selecciona e toca a cançom"
+
+#: src/screen_help.c:115
+msgid "Delete playlist"
+msgstr "Eliminar lista"
+
+#: src/screen_help.c:121
+msgid "Keys - Search screen"
+msgstr "Teclas - Écrã de procura"
+
+#: src/screen_help.c:123
+msgid "Search"
+msgstr "Procura"
+
+#: src/screen_help.c:124
+msgid "Select and play"
+msgstr "Seleccionar e tocar"
+
+#: src/screen_help.c:131
+#, fuzzy
+msgid "Keys - Lyrics screen"
+msgstr "Teclas - Écrã da lista"
+
+#: src/screen_help.c:133
+msgid "View Lyrics"
+msgstr ""
+
+#: src/screen_help.c:134
+msgid "(Re)load lyrics"
+msgstr ""
+
+#: src/screen_help.c:135
+msgid "Interrupt retrieval"
+msgstr ""
+
+#: src/screen_help.c:218
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/screen_lyrics.c:421
+msgid "Lyrics  [No connection]"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+msgid "Lyrics  [Not found]"
+msgstr ""
+
+#: src/screen_lyrics.c:423
+msgid "Lyrics  [retrieving]"
+msgstr ""
+
+#: src/command.c:71
+msgid "Key configuration screen"
+msgstr "Écrã da configuraçom dos atalhos"
+
+#: src/command.c:74
+msgid "Quit"
+msgstr "Sair"
+
+#: src/command.c:78
+msgid "Move cursor up"
+msgstr "Mover o cursor arriba"
+
+#: src/command.c:80
+msgid "Move cursor down"
+msgstr "Mover o cursor abaixo"
+
+#: src/command.c:82
+msgid "Home "
+msgstr "Início"
+
+#: src/command.c:84
+msgid "End "
+msgstr "Fim"
+
+#: src/command.c:86
+msgid "Page up"
+msgstr "Avance página"
+
+#: src/command.c:88
+msgid "Page down"
+msgstr "Retrocesso página"
+
+#: src/command.c:93
+msgid "Help screen"
+msgstr "Écrã de ajuda"
+
+#: src/command.c:95
+msgid "Playlist screen"
+msgstr "Écrã da lista"
+
+#: src/command.c:97
+msgid "Browse screen"
+msgstr "Écrã de navegaçom"
+
+#: src/command.c:102
+msgid "Play/Enter directory"
+msgstr "Tocar/Entrar num cartafol"
+
+#: src/command.c:104
+msgid "Pause"
+msgstr "Pausar"
+
+#: src/command.c:106
+msgid "Stop"
+msgstr "Parar"
+
+#: src/command.c:108
+msgid "Next track"
+msgstr "Seguinte"
+
+#: src/command.c:110
+msgid "Previous track"
+msgstr "Anterior"
+
+#: src/command.c:112
+msgid "Seek forward"
+msgstr "Avançar"
+
+#: src/command.c:114
+msgid "Seek backward"
+msgstr "Retroceder"
+
+#: src/command.c:116
+msgid "Increase volume"
+msgstr "Aumentar volume"
+
+#: src/command.c:118
+msgid "Decrease volume"
+msgstr "Diminuir volume"
+
+#: src/command.c:120
+msgid "Select/deselect song in playlist"
+msgstr "Seleccionar/desseleccionar a cançom na lista"
+
+#: src/command.c:122
+msgid "Delete song from playlist"
+msgstr "Eliminar a cançom da lista"
+
+#: src/command.c:124
+msgid "Shuffle playlist"
+msgstr "Aleatorizar a lista"
+
+#: src/command.c:126
+msgid "Clear playlist"
+msgstr "Limpar a lista"
+
+#: src/command.c:128
+msgid "Toggle repeat mode"
+msgstr "Activar/desactivar o modo repetiçom"
+
+#: src/command.c:130
+msgid "Toggle random mode"
+msgstr "Activar/desactivar o modo aleatório"
+
+#: src/command.c:132
+msgid "Toggle crossfade mode"
+msgstr "Activar/desactivar o modo esvaecimento"
+
+#: src/command.c:134
+msgid "Start a music database update"
+msgstr "Começar umha actualizaçom da BD"
+
+#: src/command.c:136
+msgid "Save playlist"
+msgstr "Guardar lista"
+
+#: src/command.c:138
+msgid "Add url/file to playlist"
+msgstr "Engadir url/ficheiro à lista"
+
+#: src/command.c:143
+msgid "Move item up"
+msgstr "Mover o elemento arriba"
+
+#: src/command.c:145
+msgid "Move item down"
+msgstr "Mover o elemento abaixo"
+
+#: src/command.c:147
+msgid "Update screen"
+msgstr "Actualizar o écrã"
+
+#: src/command.c:152
+msgid "Toggle find mode"
+msgstr "Alternar o modo de procura"
+
+#: src/command.c:154
+msgid "Toggle auto center mode"
+msgstr "Alternar o modo de auto-centrado"
+
+#: src/command.c:159
+msgid "Next screen"
+msgstr "Seguinte écrã"
+
+#: src/command.c:161
+msgid "Previous screen"
+msgstr "Écrã anterior"
+
+#: src/command.c:166
+msgid "Forward find"
+msgstr "Procurar cara adiante"
+
+#: src/command.c:168
+msgid "Forward find next"
+msgstr "Procurar para adiante, seguinte"
+
+#: src/command.c:170
+msgid "Backward find"
+msgstr "Procurar cara atrás"
+
+#: src/command.c:172
+msgid "Backward find previous"
+msgstr "Procurar cara atrás, anterior"
+
+#: src/command.c:178
+#, fuzzy
+msgid "Artist screen"
+msgstr "Écrã da lista"
+
+#: src/command.c:182
+msgid "Search screen"
+msgstr "Écrã de procura"
+
+#: src/command.c:184
+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
+#, fuzzy
+msgid "Lyrics screen"
+msgstr "Écrã da lista"
+
+#: src/command.c:195
+msgid "Interrupt action"
+msgstr ""
+
+#: src/command.c:218
+msgid "Undefined"
+msgstr "Nom definido"
+
+#: src/command.c:220
+msgid "Space"
+msgstr "Espaço"
+
+#: src/command.c:222
+msgid "Enter"
+msgstr "Enter"
+
+#: src/command.c:224
+msgid "Backspace"
+msgstr "Backspace"
+
+#: src/command.c:226
+msgid "Delete"
+msgstr "Supr"
+
+#: src/command.c:228
+msgid "Up"
+msgstr "Arriba"
+
+#: src/command.c:230
+msgid "Down"
+msgstr "Abaixo"
+
+#: src/command.c:232
+msgid "Left"
+msgstr "Esquerda"
+
+#: src/command.c:234
+msgid "Right"
+msgstr "Direita"
+
+#: src/command.c:236
+msgid "Home"
+msgstr "Home"
+
+#: src/command.c:238
+msgid "End"
+msgstr "Fim"
+
+#: src/command.c:240
+msgid "PageDown"
+msgstr "Re. Pág."
+
+#: src/command.c:242
+msgid "PageUp"
+msgstr "Av. Pág."
+
+#: src/command.c:244
+msgid "Tab"
+msgstr "Tab"
+
+#: src/command.c:246
+msgid "Shift+Tab"
+msgstr "Shift+Tab"
+
+#: src/command.c:248
+msgid "Esc"
+msgstr "Esc"
+
+#: src/command.c:250
+msgid "Insert"
+msgstr "Insert"
+
+#: src/command.c:500
+#, 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:507 src/command.c:514
+#, 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
+#, c-format
+msgid "Warning: Unknown color - %s\n"
+msgstr "Aviso: Cor desconhecida - %s\n"
+
+#: src/colors.c:232
+#, c-format
+msgid "Warning: Unknown color field - %s\n"
+msgstr "Aviso: Campo de cor desconhecido - %s\n"
+
+#: src/colors.c:267
+#, 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
+#, 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"
+
+#: src/support.c:216
+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 1d58b15b0..db6d909ff 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-08-05 11:00+0000\n"
+"POT-Creation-Date: 2006-08-05 20:19+0000\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"
@@ -233,104 +233,104 @@ msgstr ""
 msgid "Database update of %s started!"
 msgstr ""
 
-#: src/screen_search.c:54
+#: src/screen_search.c:56
 msgid "artist"
 msgstr ""
 
-#: src/screen_search.c:55
+#: src/screen_search.c:57
 msgid "album"
 msgstr ""
 
-#: src/screen_search.c:56
+#: src/screen_search.c:58
 msgid "title"
 msgstr ""
 
-#: src/screen_search.c:57
+#: src/screen_search.c:59
 msgid "track"
 msgstr ""
 
-#: src/screen_search.c:58
+#: src/screen_search.c:60
 msgid "name"
 msgstr ""
 
-#: src/screen_search.c:59
+#: src/screen_search.c:61
 msgid "genre"
 msgstr ""
 
-#: src/screen_search.c:60
+#: src/screen_search.c:62
 msgid "date"
 msgstr ""
 
-#: src/screen_search.c:61
+#: src/screen_search.c:63
 msgid "composer"
 msgstr ""
 
-#: src/screen_search.c:62
+#: src/screen_search.c:64
 msgid "performer"
 msgstr ""
 
-#: src/screen_search.c:63
+#: src/screen_search.c:65
 msgid "comment"
 msgstr ""
 
-#: src/screen_search.c:64
+#: src/screen_search.c:66
 msgid "file"
 msgstr ""
 
-#: src/screen_search.c:98
+#: src/screen_search.c:100
 msgid "Title"
 msgstr ""
 
-#: src/screen_search.c:99
+#: src/screen_search.c:101
 msgid "Artist"
 msgstr ""
 
-#: src/screen_search.c:100
+#: src/screen_search.c:102
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:101
+#: src/screen_search.c:103
 msgid "Filename"
 msgstr ""
 
-#: src/screen_search.c:242
+#: src/screen_search.c:244
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: src/screen_search.c:249
+#: src/screen_search.c:251
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:321
+#: src/screen_search.c:323
 msgid "Search: "
 msgstr ""
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:377
+#: src/screen_search.c:379
 #, c-format
 msgid "Press %s for a new search"
 msgstr ""
 
-#: src/screen_search.c:433
+#: src/screen_search.c:435
 #, c-format
 msgid "Search: %s"
 msgstr ""
 
-#: src/screen_search.c:436
+#: src/screen_search.c:438
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr ""
 
-#: src/screen_search.c:440
+#: src/screen_search.c:442
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr ""
 
-#: src/screen_search.c:474
+#: src/screen_search.c:476
 #, c-format
 msgid "Search mode: %s"
 msgstr ""
@@ -475,36 +475,26 @@ msgstr ""
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:217
+#: src/screen_help.c:135
+msgid "Interrupt retrieval"
+msgstr ""
+
+#: src/screen_help.c:218
 msgid "Help"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:421
 msgid "Lyrics  [No connection]"
 msgstr ""
 
-#: src/screen_lyrics.c:423
+#: src/screen_lyrics.c:422
 msgid "Lyrics  [Not found]"
 msgstr ""
 
-#: src/screen_lyrics.c:424
+#: src/screen_lyrics.c:423
 msgid "Lyrics  [retrieving]"
 msgstr ""
 
-#. if(lyr_text.lines->len > 2)
-#. {
-#. static char buf[512];
-#. char artist[512];
-#. char title[512];
-#. get_text_line(&lyr_text, 0, artist, 512);
-#. get_text_line(&lyr_text, 1, artist, 512);
-#. snprintf(buf, 512, "Lyrics  %s - %s", artist, title);
-#. return buf;
-#. }
-#: src/screen_lyrics.c:436
-msgid "Lyrics"
-msgstr ""
-
 #: src/command.c:71
 msgid "Key configuration screen"
 msgstr ""
@@ -689,80 +679,84 @@ msgstr ""
 msgid "Lyrics screen"
 msgstr ""
 
-#: src/command.c:216
-msgid "Undefined"
+#: src/command.c:195
+msgid "Interrupt action"
 msgstr ""
 
 #: src/command.c:218
-msgid "Space"
+msgid "Undefined"
 msgstr ""
 
 #: src/command.c:220
-msgid "Enter"
+msgid "Space"
 msgstr ""
 
 #: src/command.c:222
-msgid "Backspace"
+msgid "Enter"
 msgstr ""
 
 #: src/command.c:224
-msgid "Delete"
+msgid "Backspace"
 msgstr ""
 
 #: src/command.c:226
-msgid "Up"
+msgid "Delete"
 msgstr ""
 
 #: src/command.c:228
-msgid "Down"
+msgid "Up"
 msgstr ""
 
 #: src/command.c:230
-msgid "Left"
+msgid "Down"
 msgstr ""
 
 #: src/command.c:232
-msgid "Right"
+msgid "Left"
 msgstr ""
 
 #: src/command.c:234
-msgid "Home"
+msgid "Right"
 msgstr ""
 
 #: src/command.c:236
-msgid "End"
+msgid "Home"
 msgstr ""
 
 #: src/command.c:238
-msgid "PageDown"
+msgid "End"
 msgstr ""
 
 #: src/command.c:240
-msgid "PageUp"
+msgid "PageDown"
 msgstr ""
 
 #: src/command.c:242
-msgid "Tab"
+msgid "PageUp"
 msgstr ""
 
 #: src/command.c:244
-msgid "Shift+Tab"
+msgid "Tab"
 msgstr ""
 
 #: src/command.c:246
-msgid "Esc"
+msgid "Shift+Tab"
 msgstr ""
 
 #: src/command.c:248
+msgid "Esc"
+msgstr ""
+
+#: src/command.c:250
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:498
+#: src/command.c:500
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr ""
 
-#: src/command.c:505 src/command.c:512
+#: src/command.c:507 src/command.c:514
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 9ad676466..fd9be2b6e 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: 2005-01-04 21:55+0100\n"
+"POT-Creation-Date: 2006-08-05 20:19+0000\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,124 +16,135 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:36
+#: src/ncmpc.h:42
 msgid "y"
 msgstr "j"
 
-#: src/ncmpc.h:37
+#: src/ncmpc.h:43
 msgid "n"
 msgstr ""
 
-#: src/main.c:133
+#: src/main.c:133 src/main.c:140
 msgid "Exiting..."
 msgstr "Avslutter..."
 
-#: src/main.c:266
+#: src/main.c:290
 #, 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:318
+#: 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:330
+#: src/main.c:354
 #, c-format
 msgid "Connected to %s!"
 msgstr "Koblet til %s!"
 
-#: src/screen.c:170
+#: src/screen.c:224
 msgid ":Help  "
 msgstr ":Hjelp  "
 
-#: src/screen.c:174
+#: src/screen.c:228
 msgid ":Playlist  "
 msgstr ":Spilleliste  "
 
-#: src/screen.c:178
+#: src/screen.c:232
 msgid ":Browse  "
 msgstr ":Filer  "
 
-#: src/screen.c:183
+#: src/screen.c:237
+#, fuzzy
+msgid ":Artist  "
+msgstr ":Spilleliste  "
+
+#: src/screen.c:243
 msgid ":Search  "
 msgstr ":S�k  "
 
-#: src/screen.c:188
+#: src/screen.c:249
+#, fuzzy
+msgid ":Lyrics  "
+msgstr ":Spilleliste  "
+
+#: src/screen.c:254
 msgid "Volume n/a "
 msgstr "Volum: n/a "
 
-#: src/screen.c:192
+#: src/screen.c:258
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volum: %d%%"
 
-#: src/screen.c:271
+#: src/screen.c:338
 msgid "Playing:"
 msgstr "Spiller:"
 
-#: src/screen.c:274
+#: src/screen.c:341
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:390 src/screen.c:499
+#: src/screen.c:471 src/screen.c:580
+#, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Feil: Terminalen er for liten!\n"
 
-#: src/screen.c:644
+#: src/screen.c:732
 msgid "Repeat is on"
 msgstr "Repeter er p�"
 
-#: src/screen.c:645
+#: src/screen.c:733
 msgid "Repeat is off"
 msgstr "Repeter er av"
 
-#: src/screen.c:648
+#: src/screen.c:736
 msgid "Random is on"
 msgstr "Random er p�"
 
-#: src/screen.c:649
+#: src/screen.c:737
 msgid "Random is off"
 msgstr "Random er av"
 
-#: src/screen.c:652
+#: src/screen.c:740
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:655
+#: src/screen.c:743
 msgid "Database updated!"
 msgstr "Databasen er oppdatert!"
 
-#: src/screen.c:817
+#: src/screen.c:905
 msgid "Shuffled playlist!"
 msgstr "Tilfeldigjort spillelisten!"
 
-#: src/screen.c:821
+#: src/screen.c:909
 msgid "Cleared playlist!"
 msgstr "Sletter spillelisten!"
 
-#: src/screen.c:839
+#: src/screen.c:927 src/screen_file.c:655
 msgid "Database update started!"
 msgstr "Oppdaterar databasen!"
 
-#: src/screen.c:842 src/screen_file.c:673
+#: src/screen.c:930 src/screen_file.c:663
 msgid "Database update running..."
 msgstr "Databasen oppdateres..."
 
-#: src/screen.c:855
+#: src/screen.c:943
 msgid "Find mode: Wrapped"
 msgstr "S�kt rundt (starter p� ny)"
 
-#: src/screen.c:856
+#: src/screen.c:944
 msgid "Find mode: Normal"
 msgstr "S�k normalt (til slutt/begynnelse)"
 
-#: src/screen.c:861
+#: src/screen.c:949
 msgid "Auto center mode: On"
 msgstr "Automatisk sentrering er p�"
 
-#: src/screen.c:862
+#: src/screen.c:950
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er av"
 
@@ -145,121 +156,187 @@ msgstr "S�k: "
 msgid "Find backward: "
 msgstr "S�k (bakover): "
 
-#: src/screen_utils.c:165
+#: src/screen_utils.c:166
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Fant ikke '%s'"
 
-#: src/screen_play.c:155
+#: src/screen_play.c:156
 msgid "Save playlist as: "
 msgstr "Lagre spillelisten som: "
 
-#: src/screen_play.c:185
+#: src/screen_play.c:186
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstatt '%s' [%s/%s] ? "
 
-#: src/screen_play.c:199 src/screen_file.c:319 src/screen_keydef.c:162
+#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
 msgid "Aborted!"
 msgstr "Avbrutt!"
 
 #. success
-#: src/screen_play.c:205
+#: src/screen_play.c:206
 #, c-format
 msgid "Saved %s"
 msgstr "Lagret %s"
 
-#: src/screen_play.c:269
+#: src/screen_play.c:270
 msgid "Add: "
 msgstr "Legg til: "
 
-#: src/screen_play.c:324
+#: src/screen_play.c:325
 msgid "Playlist"
 msgstr "Spilleliste"
 
-#: src/screen_play.c:326
+#: src/screen_play.c:327
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spilleliste p� %s"
 
-#: src/screen_file.c:282
+#: src/screen_file.c:256
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Henter spilleliste %s..."
 
-#: src/screen_file.c:304
+#: src/screen_file.c:298
 msgid "You can only delete playlists!"
 msgstr "Du kan bare slette spillelister!"
 
-#: src/screen_file.c:311
+#: src/screen_file.c:305
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slette '%s' [%s/%s] ? "
 
-#: src/screen_file.c:327
+#: src/screen_file.c:321
 msgid "Playlist deleted!"
 msgstr "Spillelisten slettet!"
 
-#: src/screen_file.c:346 src/screen_file.c:467 src/screen_file.c:493
+#: 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:397
+#: src/screen_file.c:391
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Legger til mappen %s...\n"
 
-#: src/screen_file.c:569
+#: src/screen_file.c:552
 #, c-format
 msgid "Browse: %s"
 msgstr "Filer: %s"
 
-#: src/screen_file.c:658
+#: src/screen_file.c:644
 msgid "Screen updated!"
 msgstr "pppdatert!"
 
-#: src/screen_file.c:665
+#: src/screen_file.c:652
 #, c-format
 msgid "Database update of %s started!"
 msgstr "oppdaterer databasen ifra %s!"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:56
+msgid "artist"
+msgstr ""
+
+#: src/screen_search.c:57
+msgid "album"
+msgstr ""
+
+#: src/screen_search.c:58
+#, fuzzy
+msgid "title"
+msgstr "Tittel"
+
+#: src/screen_search.c:59
+#, fuzzy
+msgid "track"
+msgstr "Neste"
+
+#: src/screen_search.c:60
+#, fuzzy
+msgid "name"
+msgstr "Filnavn"
+
+#: src/screen_search.c:61
+msgid "genre"
+msgstr ""
+
+#: src/screen_search.c:62
+msgid "date"
+msgstr ""
+
+#: src/screen_search.c:63
+msgid "composer"
+msgstr ""
+
+#: src/screen_search.c:64
+msgid "performer"
+msgstr ""
+
+#: src/screen_search.c:65
+msgid "comment"
+msgstr ""
+
+#: src/screen_search.c:66
+#, fuzzy
+msgid "file"
+msgstr "Tittel"
+
+#: src/screen_search.c:100
 msgid "Title"
 msgstr "Tittel"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:101
 msgid "Artist"
 msgstr ""
 
-#: src/screen_search.c:52
+#: src/screen_search.c:102
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:53
+#: src/screen_search.c:103
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/screen_search.c:114
+#: src/screen_search.c:244
+#, c-format
+msgid "Bad search tag %s"
+msgstr ""
+
+#: src/screen_search.c:251
+#, c-format
+msgid "No argument for search tag %s"
+msgstr ""
+
+#: src/screen_search.c:323
 msgid "Search: "
 msgstr "S�k: "
 
-#: src/screen_search.c:162
+#. if( pattern==NULL )
+#. search_new(screen, c);
+#. else
+#: src/screen_search.c:379
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Trykk p� %s for ett nytt s�k"
 
-#: src/screen_search.c:214
+#: src/screen_search.c:435
+#, fuzzy, c-format
+msgid "Search: %s"
+msgstr "S�k: "
+
+#: src/screen_search.c:438
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "S�k: Resultater %s [%s]"
 
-#: src/screen_search.c:218
+#: src/screen_search.c:442
 #, 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:252
+#: src/screen_search.c:476
 #, c-format
 msgid "Search mode: %s"
 msgstr "S�k etter: %s"
@@ -344,308 +421,351 @@ msgstr "Klokke"
 msgid "Keys - Movement"
 msgstr "Taster - Navigasjon"
 
-#: src/screen_help.c:68
+#: src/screen_help.c:69
 msgid "Keys - Global"
 msgstr "Taster - Globale"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Keys - Playlist screen"
 msgstr "Taster - Spilliste"
 
-#: src/screen_help.c:97
+#: src/screen_help.c:98
 msgid "Play"
 msgstr "Start/spill markert"
 
-#: src/screen_help.c:100
+#: src/screen_help.c:101
 msgid "Move song up"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:102
 msgid "Move song down"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:104
+#: src/screen_help.c:105
 msgid "Center"
 msgstr "Sentrer"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Keys - Browse screen"
 msgstr "Taster - Filer"
 
-#: src/screen_help.c:111
+#: src/screen_help.c:112
 msgid "Enter directory/Select and play song"
 msgstr "Velg bibliotek/Legg til spillisten og spill sang"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:115
 msgid "Delete playlist"
 msgstr "Slett spilleliste"
 
-#: src/screen_help.c:119
+#: src/screen_help.c:121
 msgid "Keys - Search screen"
 msgstr "Taster - Database s�k"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:123
 msgid "Search"
 msgstr "S�k"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Legg til spillelisten og spill"
 
-#: src/screen_help.c:208
+#: src/screen_help.c:131
+#, fuzzy
+msgid "Keys - Lyrics screen"
+msgstr "Taster - Spilliste"
+
+#: src/screen_help.c:133
+msgid "View Lyrics"
+msgstr ""
+
+#: src/screen_help.c:134
+msgid "(Re)load lyrics"
+msgstr ""
+
+#: src/screen_help.c:135
+msgid "Interrupt retrieval"
+msgstr ""
+
+#: src/screen_help.c:218
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/command.c:70
+#: src/screen_lyrics.c:421
+msgid "Lyrics  [No connection]"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+msgid "Lyrics  [Not found]"
+msgstr ""
+
+#: src/screen_lyrics.c:423
+msgid "Lyrics  [retrieving]"
+msgstr ""
+
+#: src/command.c:71
 msgid "Key configuration screen"
 msgstr "Tastaturkonfigurasjon"
 
-#: src/command.c:73
+#: src/command.c:74
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor up"
 msgstr "Flytt mark�r opp"
 
-#: src/command.c:79
+#: src/command.c:80
 msgid "Move cursor down"
 msgstr "Flytt mark�r ned"
 
-#: src/command.c:81
+#: src/command.c:82
 msgid "Home "
 msgstr "Mark�ren til den f�rste raden"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "End "
 msgstr "Mark�ren til den siste raden"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page up"
 msgstr "Mark�ren en side opp"
 
-#: src/command.c:87
+#: src/command.c:88
 msgid "Page down"
 msgstr "Mark�ren en side ned"
 
-#: src/command.c:92
+#: src/command.c:93
 msgid "Help screen"
 msgstr "Hjelp"
 
-#: src/command.c:94
+#: src/command.c:95
 msgid "Playlist screen"
 msgstr "Spilleliste"
 
-#: src/command.c:96
+#: src/command.c:97
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Play/Enter directory"
 msgstr "Spill/Velg mappe"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Neste"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Spol/S�k framover"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Spol/S�k tilbake"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "�k volumet"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Demp volumet"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Legg til/Fjern fra spillelisten"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Ta bort/slett"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Shuffle playlist"
 msgstr "Tilfeldiggj�r spilleliste"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Clear playlist"
 msgstr "T�m spillelisten"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Toggle repeat mode"
 msgstr "Repeat P�/Av"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle random mode"
 msgstr "Random P�/Av"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle crossfade mode"
 msgstr "Crossfade P�/Av"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Start a music database update"
 msgstr "Oppdater databasen"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Save playlist"
 msgstr "Lagre spillelisten"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Add url/file to playlist"
 msgstr "Legg til URL eller fil til spillelisten"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Move item up"
 msgstr "Flytt opp"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Move item down"
 msgstr "Flytt ned"
 
-#: src/command.c:146
+#: src/command.c:147
 msgid "Update screen"
 msgstr "Oppdater"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Toggle find mode"
 msgstr "Endre s�k instillninger"
 
-#: src/command.c:153
+#: src/command.c:154
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering P�/Av"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Next screen"
 msgstr "Neste skjerm"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Previous screen"
 msgstr "Forrige skjerm"
 
-#: src/command.c:165
+#: src/command.c:166
 msgid "Forward find"
 msgstr "S�k"
 
-#: src/command.c:167
+#: src/command.c:168
 msgid "Forward find next"
 msgstr "Fremover S�king"
 
-#: src/command.c:169
+#: src/command.c:170
 msgid "Backward find"
 msgstr "S�k bakover"
 
-#: src/command.c:171
+#: src/command.c:172
 msgid "Backward find previous"
 msgstr "Bakover S�k forrige"
 
-#: src/command.c:177
+#: src/command.c:178
+#, fuzzy
+msgid "Artist screen"
+msgstr "Spilleliste"
+
+#: src/command.c:182
 msgid "Search screen"
 msgstr "Database s�k"
 
-#: src/command.c:179
+#: src/command.c:184
 msgid "Change search mode"
 msgstr "Endre s�kemodus"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Clock screen"
 msgstr "Klokke"
 
-#: src/command.c:206
+#: src/command.c:193
+#, fuzzy
+msgid "Lyrics screen"
+msgstr "Spilleliste"
+
+#: src/command.c:195
+msgid "Interrupt action"
+msgstr ""
+
+#: src/command.c:218
 msgid "Undefined"
 msgstr "Ikke Definert"
 
-#: src/command.c:208
+#: src/command.c:220
 msgid "Space"
 msgstr "Mellomrom"
 
-#: src/command.c:210
+#: src/command.c:222
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:212
+#: src/command.c:224
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:214
+#: src/command.c:226
 msgid "Delete"
 msgstr "Del"
 
-#: src/command.c:216
+#: src/command.c:228
 msgid "Up"
 msgstr "Opp"
 
-#: src/command.c:218
+#: src/command.c:230
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:220
+#: src/command.c:232
 msgid "Left"
 msgstr "Venstrepil"
 
-#: src/command.c:222
+#: src/command.c:234
 msgid "Right"
 msgstr "H�yrepil"
 
-#: src/command.c:224
+#: src/command.c:236
 msgid "Home"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:238
 msgid "End"
 msgstr ""
 
-#: src/command.c:228
+#: src/command.c:240
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:230
+#: src/command.c:242
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:232
+#: src/command.c:244
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:234
+#: src/command.c:246
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:236
+#: src/command.c:248
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:238
+#: src/command.c:250
 msgid "Insert"
 msgstr "Ins"
 
-#: src/command.c:488
+#: src/command.c:500
 #, 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:495 src/command.c:502
+#: src/command.c:507 src/command.c:514
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Feil: Tasten %s er tildelt b�de %s og %s !!!\n"
@@ -661,21 +781,23 @@ msgid "Warning: Unknown color field - %s\n"
 msgstr "Advarsel: %s er ikke definert.\n"
 
 #: src/colors.c:267
+#, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "Terminalen mangler st�tte for omdefinering av farger!\n"
 
 #: src/colors.c:284
+#, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "Terminalen mangler st�tte for farger!\n"
 
-#: src/support.c:168
+#: 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"
 
-#: src/support.c:197
+#: src/support.c:216
 msgid "Error: Unable to convert characters to UTF-8"
 msgstr "Feil ved konvertering av tegn til UTF-8"
 
-msgid "Enter directory"
-msgstr "Velg mappe"
+#~ msgid "Enter directory"
+#~ msgstr "Velg mappe"
diff --git a/po/ru.po b/po/ru.po
index 71f7c03b0..3b0e9550c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2004 Kalle Wallin 
 # This file is distributed under the same license as the ncmpc package.
 # Nikolay Pavlov <quetzal@roks.biz>, 2004.
-#, fuzzy
 # Modified by Alexey Ivanov aka LexxTheFox <lexx@orenubrg.rfn.ru>
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 21:55+0100\n"
+"POT-Creation-Date: 2006-08-05 20:19+0000\n"
 "PO-Revision-Date: 2004-12-29 09:40+0200\n"
 "Last-Translator: Alexey Ivanov aka LexxTheFox <lexx@orenubrg.rfn.ru>\n"
 "Language-Team: ru <ru@li.org>\n"
@@ -16,124 +16,135 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:36
+#: src/ncmpc.h:42
 msgid "y"
 msgstr "y"
 
-#: src/ncmpc.h:37
+#: src/ncmpc.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:133
+#: src/main.c:133 src/main.c:140
 msgid "Exiting..."
 msgstr "������..."
 
-#: src/main.c:266
+#: src/main.c:290
 #, 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:318
+#: src/main.c:342
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "����������� � %s...  [������� %s ��� ������]"
 
-#: src/main.c:330
+#: src/main.c:354
 #, c-format
 msgid "Connected to %s!"
 msgstr "��������� � %s!"
 
-#: src/screen.c:170
+#: src/screen.c:224
 msgid ":Help  "
 msgstr ":������  "
 
-#: src/screen.c:174
+#: src/screen.c:228
 msgid ":Playlist  "
 msgstr ":��������  "
 
-#: src/screen.c:178
+#: src/screen.c:232
 msgid ":Browse  "
 msgstr ":��������  "
 
-#: src/screen.c:183
+#: src/screen.c:237
+#, fuzzy
+msgid ":Artist  "
+msgstr "�����"
+
+#: src/screen.c:243
 msgid ":Search  "
 msgstr ":�����  "
 
-#: src/screen.c:188
+#: src/screen.c:249
+#, fuzzy
+msgid ":Lyrics  "
+msgstr ":��������  "
+
+#: src/screen.c:254
 msgid "Volume n/a "
 msgstr "��������� �/� "
 
-#: src/screen.c:192
+#: src/screen.c:258
 #, c-format
 msgid " Volume %d%%"
 msgstr " ��������� %d%%"
 
-#: src/screen.c:271
+#: src/screen.c:338
 msgid "Playing:"
 msgstr "�������������:"
 
-#: src/screen.c:274
+#: src/screen.c:341
 msgid "[Paused]"
 msgstr "[�����]"
 
-#: src/screen.c:390 src/screen.c:499
+#: src/screen.c:471 src/screen.c:580
+#, c-format
 msgid "Error: Screen to small!\n"
 msgstr "������: ����� ������� ���!\n"
 
-#: src/screen.c:644
+#: src/screen.c:732
 msgid "Repeat is on"
 msgstr "������ �������"
 
-#: src/screen.c:645
+#: src/screen.c:733
 msgid "Repeat is off"
 msgstr "������ ��������"
 
-#: src/screen.c:648
+#: src/screen.c:736
 msgid "Random is on"
 msgstr "�������� ����� �������"
 
-#: src/screen.c:649
+#: src/screen.c:737
 msgid "Random is off"
 msgstr "��������� ����� ��������"
 
-#: src/screen.c:652
+#: src/screen.c:740
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "��������� %d ������"
 
-#: src/screen.c:655
+#: src/screen.c:743
 msgid "Database updated!"
 msgstr "���� ���������!"
 
-#: src/screen.c:817
+#: src/screen.c:905
 msgid "Shuffled playlist!"
 msgstr "�������� ���������!"
 
-#: src/screen.c:821
+#: src/screen.c:909
 msgid "Cleared playlist!"
 msgstr "�������� ������!"
 
-#: src/screen.c:839
+#: src/screen.c:927 src/screen_file.c:655
 msgid "Database update started!"
 msgstr "������ ���������� ����!"
 
-#: src/screen.c:842 src/screen_file.c:673
+#: src/screen.c:930 src/screen_file.c:663
 msgid "Database update running..."
 msgstr "���������� ����..."
 
-#: src/screen.c:855
+#: src/screen.c:943
 msgid "Find mode: Wrapped"
 msgstr "����� ������: �����������"
 
-#: src/screen.c:856
+#: src/screen.c:944
 msgid "Find mode: Normal"
 msgstr "����� ������: ����������"
 
-#: src/screen.c:861
+#: src/screen.c:949
 msgid "Auto center mode: On"
 msgstr "����� �����������������: ���."
 
-#: src/screen.c:862
+#: src/screen.c:950
 msgid "Auto center mode: Off"
 msgstr "����� �����������������: ����."
 
@@ -145,121 +156,189 @@ msgstr "������: "
 msgid "Find backward: "
 msgstr "������ �����: "
 
-#: src/screen_utils.c:165
+#: src/screen_utils.c:166
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "�� ������� ����� '%s'"
 
-#: src/screen_play.c:155
+#: src/screen_play.c:156
 msgid "Save playlist as: "
 msgstr "��������� �������� ���: "
 
-#: src/screen_play.c:185
+#: src/screen_play.c:186
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "�������� %s [%s/%s] ? "
 
-#: src/screen_play.c:199 src/screen_file.c:319 src/screen_keydef.c:162
+#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
 msgid "Aborted!"
 msgstr "��������!"
 
 #. success
-#: src/screen_play.c:205
+#: src/screen_play.c:206
 #, c-format
 msgid "Saved %s"
 msgstr "��������� %s"
 
-#: src/screen_play.c:269
+#: src/screen_play.c:270
 msgid "Add: "
 msgstr "��������: "
 
-#: src/screen_play.c:324
+#: src/screen_play.c:325
 msgid "Playlist"
 msgstr "��������"
 
-#: src/screen_play.c:326
+#: src/screen_play.c:327
 #, c-format
 msgid "Playlist on %s"
 msgstr "�������� � %s"
 
-#: src/screen_file.c:282
+#: src/screen_file.c:256
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "�������� �������� %s..."
 
-#: src/screen_file.c:304
+#: src/screen_file.c:298
 msgid "You can only delete playlists!"
 msgstr "�� ������ ������ ������� ��������!"
 
-#: src/screen_file.c:311
+#: src/screen_file.c:305
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "������� �������� %s [%s/%s] ? "
 
-#: src/screen_file.c:327
+#: src/screen_file.c:321
 msgid "Playlist deleted!"
 msgstr "�������� ������!"
 
-#: src/screen_file.c:346 src/screen_file.c:467 src/screen_file.c:493
+#: 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:397
+#: src/screen_file.c:391
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "�������� ���������� %s...\n"
 
-#: src/screen_file.c:569
+#: src/screen_file.c:552
 #, c-format
 msgid "Browse: %s"
 msgstr "��������: %s"
 
-#: src/screen_file.c:658
+#: src/screen_file.c:644
 msgid "Screen updated!"
 msgstr "����� �����������!"
 
-#: src/screen_file.c:665
+#: src/screen_file.c:652
 #, c-format
 msgid "Database update of %s started!"
 msgstr "������ ���������� ���� � %s "
 
-#: src/screen_search.c:50
+#: src/screen_search.c:56
+#, fuzzy
+msgid "artist"
+msgstr "�����"
+
+#: src/screen_search.c:57
+#, fuzzy
+msgid "album"
+msgstr "������"
+
+#: src/screen_search.c:58
+#, fuzzy
+msgid "title"
+msgstr "��������"
+
+#: src/screen_search.c:59
+#, fuzzy
+msgid "track"
+msgstr "��������� ����"
+
+#: src/screen_search.c:60
+#, fuzzy
+msgid "name"
+msgstr "��� �����"
+
+#: src/screen_search.c:61
+msgid "genre"
+msgstr ""
+
+#: src/screen_search.c:62
+msgid "date"
+msgstr ""
+
+#: src/screen_search.c:63
+msgid "composer"
+msgstr ""
+
+#: src/screen_search.c:64
+msgid "performer"
+msgstr ""
+
+#: src/screen_search.c:65
+msgid "comment"
+msgstr ""
+
+#: src/screen_search.c:66
+#, fuzzy
+msgid "file"
+msgstr "��������"
+
+#: src/screen_search.c:100
 msgid "Title"
 msgstr "��������"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:101
 msgid "Artist"
 msgstr "�����"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:102
 msgid "Album"
 msgstr "������"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:103
 msgid "Filename"
 msgstr "��� �����"
 
-#: src/screen_search.c:114
+#: src/screen_search.c:244
+#, c-format
+msgid "Bad search tag %s"
+msgstr ""
+
+#: src/screen_search.c:251
+#, c-format
+msgid "No argument for search tag %s"
+msgstr ""
+
+#: src/screen_search.c:323
 msgid "Search: "
 msgstr "�����: "
 
-#: src/screen_search.c:162
+#. if( pattern==NULL )
+#. search_new(screen, c);
+#. else
+#: src/screen_search.c:379
 #, c-format
 msgid "Press %s for a new search"
 msgstr "������� %s ����� ������ ����� �����"
 
-#: src/screen_search.c:214
+#: src/screen_search.c:435
+#, fuzzy, c-format
+msgid "Search: %s"
+msgstr "�����: "
+
+#: src/screen_search.c:438
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "���������� ������ $s [$s]"
 
-#: src/screen_search.c:218
+#: src/screen_search.c:442
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "�����: ������� %s ��� ������ ������ [%s]"
 
-#: src/screen_search.c:252
+#: src/screen_search.c:476
 #, c-format
 msgid "Search mode: %s"
 msgstr "����� ������: %s"
@@ -344,308 +423,351 @@ msgstr "����"
 msgid "Keys - Movement"
 msgstr "������� - �����������"
 
-#: src/screen_help.c:68
+#: src/screen_help.c:69
 msgid "Keys - Global"
 msgstr "������� - ����������"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Keys - Playlist screen"
 msgstr "������� - ����� ���������"
 
-#: src/screen_help.c:97
+#: src/screen_help.c:98
 msgid "Play"
 msgstr "���������������"
 
-#: src/screen_help.c:100
+#: src/screen_help.c:101
 msgid "Move song up"
 msgstr "����������� ���������� �����"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:102
 msgid "Move song down"
 msgstr "����������� ���������� ����"
 
-#: src/screen_help.c:104
+#: src/screen_help.c:105
 msgid "Center"
 msgstr "������������"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Keys - Browse screen"
 msgstr "������� - ����� ���������"
 
-#: src/screen_help.c:111
+#: src/screen_help.c:112
 msgid "Enter directory/Select and play song"
 msgstr "������� � ����������/������� � ��������� ����������"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:115
 msgid "Delete playlist"
 msgstr "������� ��������"
 
-#: src/screen_help.c:119
+#: src/screen_help.c:121
 msgid "Keys - Search screen"
 msgstr "������� - ����� ������"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:123
 msgid "Search"
 msgstr "�����"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:124
 msgid "Select and play"
 msgstr "������� � ���������"
 
-#: src/screen_help.c:208
+#: src/screen_help.c:131
+#, fuzzy
+msgid "Keys - Lyrics screen"
+msgstr "������� - ����� ���������"
+
+#: src/screen_help.c:133
+msgid "View Lyrics"
+msgstr ""
+
+#: src/screen_help.c:134
+msgid "(Re)load lyrics"
+msgstr ""
+
+#: src/screen_help.c:135
+msgid "Interrupt retrieval"
+msgstr ""
+
+#: src/screen_help.c:218
 msgid "Help"
 msgstr "������"
 
-#: src/command.c:70
+#: src/screen_lyrics.c:421
+msgid "Lyrics  [No connection]"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+msgid "Lyrics  [Not found]"
+msgstr ""
+
+#: src/screen_lyrics.c:423
+msgid "Lyrics  [retrieving]"
+msgstr ""
+
+#: src/command.c:71
 msgid "Key configuration screen"
 msgstr "����� ��������� ������"
 
-#: src/command.c:73
+#: src/command.c:74
 msgid "Quit"
 msgstr "�����"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor up"
 msgstr "������ �����"
 
-#: src/command.c:79
+#: src/command.c:80
 msgid "Move cursor down"
 msgstr "������ ����"
 
-#: src/command.c:81
+#: src/command.c:82
 msgid "Home "
 msgstr "� ������ "
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "End "
 msgstr "� ����� "
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page up"
 msgstr "�� �������� �����"
 
-#: src/command.c:87
+#: src/command.c:88
 msgid "Page down"
 msgstr "�� �������� ����"
 
-#: src/command.c:92
+#: src/command.c:93
 msgid "Help screen"
 msgstr "����� ������"
 
-#: src/command.c:94
+#: src/command.c:95
 msgid "Playlist screen"
 msgstr "����� ���������"
 
-#: src/command.c:96
+#: src/command.c:97
 msgid "Browse screen"
 msgstr "����� ���������"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Play/Enter directory"
 msgstr "�������������/������ � ����������"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Pause"
 msgstr "�����"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Stop"
 msgstr "����"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "��������� ����"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "���������� ����"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "������ ������"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "������ �����"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "��������� ���������"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "��������� ���������"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "��������/������ ������� � ����������"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "������� ���������� �� ���������"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Shuffle playlist"
 msgstr "���������� ��������"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Clear playlist"
 msgstr "�������� ��������"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Toggle repeat mode"
 msgstr "���/���� ����� �������"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle random mode"
 msgstr "���/���� ��������� �����"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle crossfade mode"
 msgstr "���/���� ����� ������������"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Start a music database update"
 msgstr "������ ���������� ����������� ����"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Save playlist"
 msgstr "��������� ��������"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Add url/file to playlist"
 msgstr "�������� url/���� � ��������"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Move item up"
 msgstr "����������� �����"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Move item down"
 msgstr "����������� ����"
 
-#: src/command.c:146
+#: src/command.c:147
 msgid "Update screen"
 msgstr "�������� �����"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Toggle find mode"
 msgstr "����������� ����� ������"
 
-#: src/command.c:153
+#: src/command.c:154
 msgid "Toggle auto center mode"
 msgstr "���/���� ����� �����������������"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Next screen"
 msgstr "��������� �����"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Previous screen"
 msgstr "���������� �����"
 
-#: src/command.c:165
+#: src/command.c:166
 msgid "Forward find"
 msgstr "����� ������"
 
-#: src/command.c:167
+#: src/command.c:168
 msgid "Forward find next"
 msgstr "������ ���������"
 
-#: src/command.c:169
+#: src/command.c:170
 msgid "Backward find"
 msgstr "����� �����"
 
-#: src/command.c:171
+#: src/command.c:172
 msgid "Backward find previous"
 msgstr "������ ����������"
 
-#: src/command.c:177
+#: src/command.c:178
+#, fuzzy
+msgid "Artist screen"
+msgstr "����� ���������"
+
+#: src/command.c:182
 msgid "Search screen"
 msgstr "����� ������"
 
-#: src/command.c:179
+#: src/command.c:184
 msgid "Change search mode"
 msgstr "�������� ����� ������"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Clock screen"
 msgstr "����� �����"
 
-#: src/command.c:206
+#: src/command.c:193
+#, fuzzy
+msgid "Lyrics screen"
+msgstr "����� ���������"
+
+#: src/command.c:195
+msgid "Interrupt action"
+msgstr ""
+
+#: src/command.c:218
 msgid "Undefined"
 msgstr "�� ������"
 
-#: src/command.c:208
+#: src/command.c:220
 msgid "Space"
 msgstr "������"
 
-#: src/command.c:210
+#: src/command.c:222
 msgid "Enter"
 msgstr "����"
 
-#: src/command.c:212
+#: src/command.c:224
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:214
+#: src/command.c:226
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:216
+#: src/command.c:228
 msgid "Up"
 msgstr "�����"
 
-#: src/command.c:218
+#: src/command.c:230
 msgid "Down"
 msgstr "����"
 
-#: src/command.c:220
+#: src/command.c:232
 msgid "Left"
 msgstr "�����"
 
-#: src/command.c:222
+#: src/command.c:234
 msgid "Right"
 msgstr "������"
 
-#: src/command.c:224
+#: src/command.c:236
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:226
+#: src/command.c:238
 msgid "End"
 msgstr "End"
 
-#: src/command.c:228
+#: src/command.c:240
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:230
+#: src/command.c:242
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:232
+#: src/command.c:244
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:234
+#: src/command.c:246
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:236
+#: src/command.c:248
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:238
+#: src/command.c:250
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:488
+#: src/command.c:500
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr "������� %s ��������� ��� %s � %s (%s - �������� ������)"
 
-#: src/command.c:495 src/command.c:502
+#: src/command.c:507 src/command.c:514
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "������: ������� %s ��������� ��� %s � %s !!!\n"
@@ -661,19 +783,21 @@ msgid "Warning: Unknown color field - %s\n"
 msgstr "��������: ����������� �������� ���� - %s\n"
 
 #: src/colors.c:267
+#, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "�������� �� ������������ ����� ������!\n"
 
 #: src/colors.c:284
+#, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "�������� �� ������������ �����!\n"
 
-#: src/support.c:168
+#: src/support.c:187
 #, c-format
 msgid "Error: Unable to convert characters to %s"
 msgstr "������: �� ������� �������������� ������� � %s"
 
-#: src/support.c:197
+#: src/support.c:216
 msgid "Error: Unable to convert characters to UTF-8"
 msgstr "������: �� ������� �������������� ������� � UTF-8"
 
diff --git a/po/sv.po b/po/sv.po
index 3be426e79..d84e4c6c1 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: 2005-01-04 21:55+0100\n"
+"POT-Creation-Date: 2006-08-05 20:19+0000\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,124 +16,135 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:36
+#: src/ncmpc.h:42
 msgid "y"
 msgstr "j"
 
-#: src/ncmpc.h:37
+#: src/ncmpc.h:43
 msgid "n"
 msgstr ""
 
-#: src/main.c:133
+#: src/main.c:133 src/main.c:140
 msgid "Exiting..."
 msgstr "Avslutar..."
 
-#: src/main.c:266
+#: src/main.c:290
 #, 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:318
+#: 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:330
+#: src/main.c:354
 #, c-format
 msgid "Connected to %s!"
 msgstr "Ansluten till %s!"
 
-#: src/screen.c:170
+#: src/screen.c:224
 msgid ":Help  "
 msgstr ":Hj�lp  "
 
-#: src/screen.c:174
+#: src/screen.c:228
 msgid ":Playlist  "
 msgstr ":Spellista  "
 
-#: src/screen.c:178
+#: src/screen.c:232
 msgid ":Browse  "
 msgstr ":Filer  "
 
-#: src/screen.c:183
+#: src/screen.c:237
+#, fuzzy
+msgid ":Artist  "
+msgstr ":Spellista  "
+
+#: src/screen.c:243
 msgid ":Search  "
 msgstr ":S�k  "
 
-#: src/screen.c:188
+#: src/screen.c:249
+#, fuzzy
+msgid ":Lyrics  "
+msgstr ":Spellista  "
+
+#: src/screen.c:254
 msgid "Volume n/a "
 msgstr "Volym: n/a "
 
-#: src/screen.c:192
+#: src/screen.c:258
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volym: %d%%"
 
-#: src/screen.c:271
+#: src/screen.c:338
 msgid "Playing:"
 msgstr "Spelar:"
 
-#: src/screen.c:274
+#: src/screen.c:341
 msgid "[Paused]"
 msgstr "[Pausad]"
 
-#: src/screen.c:390 src/screen.c:499
+#: src/screen.c:471 src/screen.c:580
+#, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Fel: Terminal �r f�r liten!\n"
 
-#: src/screen.c:644
+#: src/screen.c:732
 msgid "Repeat is on"
 msgstr "Repeat �r p�"
 
-#: src/screen.c:645
+#: src/screen.c:733
 msgid "Repeat is off"
 msgstr "Repeat �r av"
 
-#: src/screen.c:648
+#: src/screen.c:736
 msgid "Random is on"
 msgstr "Random �r p�"
 
-#: src/screen.c:649
+#: src/screen.c:737
 msgid "Random is off"
 msgstr "Random �r av"
 
-#: src/screen.c:652
+#: src/screen.c:740
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:655
+#: src/screen.c:743
 msgid "Database updated!"
 msgstr "Databasen �r uppdaterad!"
 
-#: src/screen.c:817
+#: src/screen.c:905
 msgid "Shuffled playlist!"
 msgstr "Slumpsorterat spellistan!"
 
-#: src/screen.c:821
+#: src/screen.c:909
 msgid "Cleared playlist!"
 msgstr "Rensar spellistan!"
 
-#: src/screen.c:839
+#: src/screen.c:927 src/screen_file.c:655
 msgid "Database update started!"
 msgstr "Uppdaterar databasen!"
 
-#: src/screen.c:842 src/screen_file.c:673
+#: src/screen.c:930 src/screen_file.c:663
 msgid "Database update running..."
 msgstr "Databasen uppdateras..."
 
-#: src/screen.c:855
+#: src/screen.c:943
 msgid "Find mode: Wrapped"
 msgstr "S�k runt (b�rja om)"
 
-#: src/screen.c:856
+#: src/screen.c:944
 msgid "Find mode: Normal"
 msgstr "S�k normalt (till slut/b�rjan)"
 
-#: src/screen.c:861
+#: src/screen.c:949
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering �r p�"
 
-#: src/screen.c:862
+#: src/screen.c:950
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering �r av"
 
@@ -145,121 +156,187 @@ msgstr "S�k: "
 msgid "Find backward: "
 msgstr "S�k (bak�t): "
 
-#: src/screen_utils.c:165
+#: src/screen_utils.c:166
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Hittar inte '%s'"
 
-#: src/screen_play.c:155
+#: src/screen_play.c:156
 msgid "Save playlist as: "
 msgstr "Spara spellistan som: "
 
-#: src/screen_play.c:185
+#: src/screen_play.c:186
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Ers�tt '%s' [%s/%s] ? "
 
-#: src/screen_play.c:199 src/screen_file.c:319 src/screen_keydef.c:162
+#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
 msgid "Aborted!"
 msgstr "Avbr�t!"
 
 #. success
-#: src/screen_play.c:205
+#: src/screen_play.c:206
 #, c-format
 msgid "Saved %s"
 msgstr "Sparat %s"
 
-#: src/screen_play.c:269
+#: src/screen_play.c:270
 msgid "Add: "
 msgstr "L�gg till: "
 
-#: src/screen_play.c:324
+#: src/screen_play.c:325
 msgid "Playlist"
 msgstr "Spellista"
 
-#: src/screen_play.c:326
+#: src/screen_play.c:327
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spellista p� %s"
 
-#: src/screen_file.c:282
+#: src/screen_file.c:256
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Laddar %s..."
 
-#: src/screen_file.c:304
+#: src/screen_file.c:298
 msgid "You can only delete playlists!"
 msgstr "Du kan endast radera spellistor!"
 
-#: src/screen_file.c:311
+#: src/screen_file.c:305
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Radera '%s' [%s/%s] ? "
 
-#: src/screen_file.c:327
+#: src/screen_file.c:321
 msgid "Playlist deleted!"
 msgstr "Spellistan raderad!"
 
-#: src/screen_file.c:346 src/screen_file.c:467 src/screen_file.c:493
+#: 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:397
+#: 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:569
+#: src/screen_file.c:552
 #, c-format
 msgid "Browse: %s"
 msgstr "Filer: %s"
 
-#: src/screen_file.c:658
+#: src/screen_file.c:644
 msgid "Screen updated!"
 msgstr "Uppdaterat!"
 
-#: src/screen_file.c:665
+#: src/screen_file.c:652
 #, c-format
 msgid "Database update of %s started!"
 msgstr "Uppdaterar databasen ifr�n %s!"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:56
+msgid "artist"
+msgstr ""
+
+#: src/screen_search.c:57
+msgid "album"
+msgstr ""
+
+#: src/screen_search.c:58
+#, fuzzy
+msgid "title"
+msgstr "Titel"
+
+#: src/screen_search.c:59
+#, fuzzy
+msgid "track"
+msgstr "N�sta"
+
+#: src/screen_search.c:60
+#, fuzzy
+msgid "name"
+msgstr "Filnamn"
+
+#: src/screen_search.c:61
+msgid "genre"
+msgstr ""
+
+#: src/screen_search.c:62
+msgid "date"
+msgstr ""
+
+#: src/screen_search.c:63
+msgid "composer"
+msgstr ""
+
+#: src/screen_search.c:64
+msgid "performer"
+msgstr ""
+
+#: src/screen_search.c:65
+msgid "comment"
+msgstr ""
+
+#: src/screen_search.c:66
+#, fuzzy
+msgid "file"
+msgstr "Titel"
+
+#: src/screen_search.c:100
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:101
 msgid "Artist"
 msgstr ""
 
-#: src/screen_search.c:52
+#: src/screen_search.c:102
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:53
+#: src/screen_search.c:103
 msgid "Filename"
 msgstr "Filnamn"
 
-#: src/screen_search.c:114
+#: src/screen_search.c:244
+#, c-format
+msgid "Bad search tag %s"
+msgstr ""
+
+#: src/screen_search.c:251
+#, c-format
+msgid "No argument for search tag %s"
+msgstr ""
+
+#: src/screen_search.c:323
 msgid "Search: "
 msgstr "S�k: "
 
-#: src/screen_search.c:162
+#. if( pattern==NULL )
+#. search_new(screen, c);
+#. else
+#: src/screen_search.c:379
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Tryck p� %s f�r en ny s�kning"
 
-#: src/screen_search.c:214
+#: src/screen_search.c:435
+#, fuzzy, c-format
+msgid "Search: %s"
+msgstr "S�k: "
+
+#: src/screen_search.c:438
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "S�k: %s [%s]"
 
-#: src/screen_search.c:218
+#: src/screen_search.c:442
 #, 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:252
+#: src/screen_search.c:476
 #, c-format
 msgid "Search mode: %s"
 msgstr "S�k efter: %s"
@@ -344,308 +421,351 @@ msgstr "Klocka"
 msgid "Keys - Movement"
 msgstr "Tangenter - Navigation"
 
-#: src/screen_help.c:68
+#: src/screen_help.c:69
 msgid "Keys - Global"
 msgstr "Tangenter - Globala"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Keys - Playlist screen"
 msgstr "Tangenter - Spellista"
 
-#: src/screen_help.c:97
+#: src/screen_help.c:98
 msgid "Play"
 msgstr "Starta/Spela markerad"
 
-#: src/screen_help.c:100
+#: src/screen_help.c:101
 msgid "Move song up"
 msgstr "Flytta markerad upp�t i spellistan"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:102
 msgid "Move song down"
 msgstr "Flytta markerad ned�t i spellistan"
 
-#: src/screen_help.c:104
+#: src/screen_help.c:105
 msgid "Center"
 msgstr "Centrera"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Keys - Browse screen"
 msgstr "Tangenter - Filer"
 
-#: src/screen_help.c:111
+#: src/screen_help.c:112
 msgid "Enter directory/Select and play song"
 msgstr "V�lj bibliotek/L�gg till spellistan och spela"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:115
 msgid "Delete playlist"
 msgstr "Radera spellista"
 
-#: src/screen_help.c:119
+#: src/screen_help.c:121
 msgid "Keys - Search screen"
 msgstr "Tangenter - Databas s�kning"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:123
 msgid "Search"
 msgstr "S�k"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:124
 msgid "Select and play"
 msgstr "L�gg till spellistan och spela"
 
-#: src/screen_help.c:208
+#: src/screen_help.c:131
+#, fuzzy
+msgid "Keys - Lyrics screen"
+msgstr "Tangenter - Spellista"
+
+#: src/screen_help.c:133
+msgid "View Lyrics"
+msgstr ""
+
+#: src/screen_help.c:134
+msgid "(Re)load lyrics"
+msgstr ""
+
+#: src/screen_help.c:135
+msgid "Interrupt retrieval"
+msgstr ""
+
+#: src/screen_help.c:218
 msgid "Help"
 msgstr "Hj�lp"
 
-#: src/command.c:70
+#: src/screen_lyrics.c:421
+msgid "Lyrics  [No connection]"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+msgid "Lyrics  [Not found]"
+msgstr ""
+
+#: src/screen_lyrics.c:423
+msgid "Lyrics  [retrieving]"
+msgstr ""
+
+#: src/command.c:71
 msgid "Key configuration screen"
 msgstr "Tangentdefinitioner"
 
-#: src/command.c:73
+#: src/command.c:74
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor up"
 msgstr "Mark�r ned�t"
 
-#: src/command.c:79
+#: src/command.c:80
 msgid "Move cursor down"
 msgstr "Mark�r upp�t"
 
-#: src/command.c:81
+#: src/command.c:82
 msgid "Home "
 msgstr "Mark�ren till den f�rsta raden"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "End "
 msgstr "Mark�ren till den sista raden"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page up"
 msgstr "Mark�ren en sk�rm upp�t"
 
-#: src/command.c:87
+#: src/command.c:88
 msgid "Page down"
 msgstr "Mark�ren en sk�rm ned�t"
 
-#: src/command.c:92
+#: src/command.c:93
 msgid "Help screen"
 msgstr "Hj�lp"
 
-#: src/command.c:94
+#: src/command.c:95
 msgid "Playlist screen"
 msgstr "Spellista"
 
-#: src/command.c:96
+#: src/command.c:97
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Play/Enter directory"
 msgstr "Spela/V�lj"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Pause"
 msgstr "Paus"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "N�sta"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "F�reg�nde"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Spola/S�k fram�t"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Spola/S�k tillbaka"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "�ka volymen"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Minska volymen"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "L�gg till/Ta bort ifr�n spellistan"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Ta bort/Radera"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Shuffle playlist"
 msgstr "Slumpsportera spellista"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Clear playlist"
 msgstr "Rensa spellistan"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Toggle repeat mode"
 msgstr "Repeat P�/Av"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle random mode"
 msgstr "Random P�/Av"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle crossfade mode"
 msgstr "Crossfade P�/Av"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Start a music database update"
 msgstr "Updatera databasen"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Save playlist"
 msgstr "Spara spellista"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Add url/file to playlist"
 msgstr "L�gger till url eller fil till spellistan"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Move item up"
 msgstr "Flytta upp"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Move item down"
 msgstr "Flytta ner"
 
-#: src/command.c:146
+#: src/command.c:147
 msgid "Update screen"
 msgstr "Updatera"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Toggle find mode"
 msgstr "�ndra s�k inst�llningar"
 
-#: src/command.c:153
+#: src/command.c:154
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering P�/Av"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Next screen"
 msgstr "N�sta sk�rm"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Previous screen"
 msgstr "Tidigare sk�rm"
 
-#: src/command.c:165
+#: src/command.c:166
 msgid "Forward find"
 msgstr "S�k"
 
-#: src/command.c:167
+#: src/command.c:168
 msgid "Forward find next"
 msgstr "Upprepa S�kning"
 
-#: src/command.c:169
+#: src/command.c:170
 msgid "Backward find"
 msgstr "S�k bak�t"
 
-#: src/command.c:171
+#: src/command.c:172
 msgid "Backward find previous"
 msgstr "Upprepa S�kning bak�t"
 
-#: src/command.c:177
+#: src/command.c:178
+#, fuzzy
+msgid "Artist screen"
+msgstr "Spellista"
+
+#: src/command.c:182
 msgid "Search screen"
 msgstr "Databas s�kning"
 
-#: src/command.c:179
+#: src/command.c:184
 msgid "Change search mode"
 msgstr "�ndra m�ltyp f�r databas s�kning"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Clock screen"
 msgstr "Klocka"
 
-#: src/command.c:206
+#: src/command.c:193
+#, fuzzy
+msgid "Lyrics screen"
+msgstr "Spellista"
+
+#: src/command.c:195
+msgid "Interrupt action"
+msgstr ""
+
+#: src/command.c:218
 msgid "Undefined"
 msgstr "Ej definerad"
 
-#: src/command.c:208
+#: src/command.c:220
 msgid "Space"
 msgstr "Mellanslag"
 
-#: src/command.c:210
+#: src/command.c:222
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:212
+#: src/command.c:224
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:214
+#: src/command.c:226
 msgid "Delete"
 msgstr "Del"
 
-#: src/command.c:216
+#: src/command.c:228
 msgid "Up"
 msgstr "Upp�tpil"
 
-#: src/command.c:218
+#: src/command.c:230
 msgid "Down"
 msgstr "Ned�tpil"
 
-#: src/command.c:220
+#: src/command.c:232
 msgid "Left"
 msgstr "V�nsterpil"
 
-#: src/command.c:222
+#: src/command.c:234
 msgid "Right"
 msgstr "H�gerpil"
 
-#: src/command.c:224
+#: src/command.c:236
 msgid "Home"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:238
 msgid "End"
 msgstr ""
 
-#: src/command.c:228
+#: src/command.c:240
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:230
+#: src/command.c:242
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:232
+#: src/command.c:244
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:234
+#: src/command.c:246
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:236
+#: src/command.c:248
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:238
+#: src/command.c:250
 msgid "Insert"
 msgstr "Ins"
 
-#: src/command.c:488
+#: src/command.c:500
 #, 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:495 src/command.c:502
+#: src/command.c:507 src/command.c:514
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Fel: Tangenten %s �r tilldelad b�de %s och %s !!!\n"
@@ -661,19 +781,21 @@ msgid "Warning: Unknown color field - %s\n"
 msgstr "Varning: %s ej definerad.\n"
 
 #: src/colors.c:267
+#, 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
+#, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "Terminalen saknar st�d f�r f�rger!\n"
 
-#: src/support.c:168
+#: 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"
 
-#: src/support.c:197
+#: src/support.c:216
 msgid "Error: Unable to convert characters to UTF-8"
 msgstr "Fel vid konvertering av tecken till UTF-8"
 
diff --git a/src/command.c b/src/command.c
index 6766e2ac3..9802fc387 100644
--- a/src/command.c
+++ b/src/command.c
@@ -191,6 +191,8 @@ static command_definition_t cmds[] =
 #ifdef ENABLE_LYRICS_SCREEN
   { {'7',  F7,   0 }, 0, CMD_SCREEN_LYRICS,    "screen-lyrics",
     N_("Lyrics screen") },
+  { {ESC,  0,   0 }, 0, CMD_INTERRUPT,    "screen-lyrics",
+    N_("Interrupt action") },
 #endif
 
 
diff --git a/src/command.h b/src/command.h
index 6da0025c2..fd8c47c9a 100644
--- a/src/command.h
+++ b/src/command.h
@@ -53,6 +53,7 @@ typedef enum
   CMD_SCREEN_CLOCK,
   CMD_SCREEN_HELP,
   CMD_SCREEN_LYRICS,
+  CMD_INTERRUPT,
   CMD_QUIT
 } command_t;
 
diff --git a/src/screen_help.c b/src/screen_help.c
index c90c8692d..90032cf9a 100644
--- a/src/screen_help.c
+++ b/src/screen_help.c
@@ -132,6 +132,7 @@ static help_text_row_t help_text[] =
   { 2, CMD_NONE,           NULL },
   { 0, CMD_SCREEN_LYRICS,  N_("View Lyrics") },
   { 0, CMD_SELECT,         N_("(Re)load lyrics") },
+  { 0, CMD_INTERRUPT,         N_("Interrupt retrieval") },
 #endif
   { 0, CMD_NONE, NULL },
   {-1, CMD_NONE, NULL }
diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 15f5721ec..c068a43ed 100644
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -59,9 +59,6 @@ guint8 result;
 char *hid;
 GTimer *dltime;
 short int lock;
-//GString *lyr_text;
-//char *lyr_text;	
-//GArray *textline;
 formed_text lyr_text;
 /* result is a bitset in which the succes when searching 4 lyrics is logged
 countend by position - backwards
@@ -217,11 +214,12 @@ void check_repaint()
 int check_dl_progress(void *clientp, double dltotal, double dlnow,
                         double ultotal, double ulnow)
 {
-	if(g_timer_elapsed(dltime, NULL) >= options.lyrics_timeout)
+	if(g_timer_elapsed(dltime, NULL) >= options.lyrics_timeout || lock == 4)
 	{	
 		formed_text_init(&lyr_text);
 		return -1;
 	}
+
 	return 0;
 }	
 
@@ -493,6 +491,9 @@ lyrics_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
       return 1;
 	case CMD_SELECT:
 	  g_thread_create(get_lyr, c, FALSE, NULL);	
+	  return 1;
+	case CMD_INTERRUPT:
+	  if(lock != 0) lock = 4;
 	  return 1;	
 	default:
       break;