po: updated *.po

10 files changed, 2570 insertions, 1740 deletions

diff --git a/po/da.po b/po/da.po
index b1e8c95d7..24798c2b2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-26 14:38+0100\n"
-"PO-Revision-Date: 2008-12-16 02:06+0000\n"
+"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"PO-Revision-Date: 2008-12-25 23:43+0100\n"
 "Last-Translator: Mikkel Kirkgaard Nielsen <ncmpc@mikini.dk>\n"
 "Language-Team: da <da@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,130 +17,136 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-12-16 08:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/i18n.h:36
+#: src/i18n.h:41
 msgid "y"
 msgstr "j"
 
-#: src/i18n.h:37
+#: src/i18n.h:42
 msgid "n"
 msgstr "n"
 
-#: src/main.c:210
+#: src/main.c:214
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Forbinder til %s... [Tryk %s for at afbryde]"
 
-#: src/main.c:228
+#: src/main.c:232
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Fejl: MPD version %d.%d.%d er for gammel (mindst %s er nødvendig)"
 
-#: src/main.c:242
+#: src/main.c:246
 #, c-format
 msgid "Connected to %s"
 msgstr "Forbundet til %s"
 
-#: src/screen.c:148 src/screen_help.c:205
+#: src/screen.c:152 src/screen_help.c:216
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/screen.c:149 src/screen_play.c:455
+#: src/screen.c:154 src/screen_play.c:471
 msgid "Playlist"
 msgstr "Afspilningsliste"
 
-#: src/screen.c:150
+#. translators: caption of the browser screen
+#: src/screen.c:155 src/screen_file.c:205
 msgid "Browse"
 msgstr "Gennemse"
 
-#: src/screen.c:152 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/screen.c:155 src/screen_help.c:119
+#: src/screen.c:160 src/screen_help.c:123
 msgid "Search"
 msgstr "Søg"
 
-#: src/screen.c:158 src/screen_lyrics.c:290 src/screen_lyrics.c:295
-#: src/screen_lyrics.c:299
+#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "Sangtekster"
 
-#: src/screen.c:164
+#: src/screen.c:166 src/screen_outputs.c:161
+msgid "Outputs"
+msgstr ""
+
+#: src/screen.c:172
+#, c-format
 msgid "Volume n/a "
 msgstr "Volumen: n/a "
 
-#: src/screen.c:166
+#: src/screen.c:174
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volumen: %d%%"
 
-#: src/screen.c:273
+#: src/screen.c:281
 msgid "Playing:"
 msgstr "Afspiller:"
 
-#: src/screen.c:276
+#: src/screen.c:284
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:396 src/screen.c:469
-#, c-format
-msgid "Error: Screen to small\n"
-msgstr "Fejl: Skærmen er for lille\n"
+#: src/screen.c:404 src/screen.c:477
+#, fuzzy
+msgid "Error: Screen too small"
+msgstr "Fejl: Skærmen er for lille"
 
-#: src/screen.c:592
+#: src/screen.c:600
 msgid "Repeat is on"
 msgstr "Gentag er aktiv"
 
-#: src/screen.c:593
+#: src/screen.c:601
 msgid "Repeat is off"
 msgstr "Gentag er inaktiv"
 
-#: src/screen.c:597
+#: src/screen.c:605
 msgid "Random is on"
 msgstr "Tilfældig er aktiv"
 
-#: src/screen.c:598
+#: src/screen.c:606
 msgid "Random is off"
 msgstr "Tilfældig er inaktiv"
 
-#: src/screen.c:601
+#: src/screen.c:609
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:604
+#: src/screen.c:612
 msgid "Database updated"
 msgstr "Databasen er opdateret"
 
-#: src/screen.c:737
+#: src/screen.c:745
 msgid "Shuffled playlist"
 msgstr "Afspilninsglisten blandet"
 
-#: src/screen.c:741
+#: src/screen.c:749
 msgid "Cleared playlist"
 msgstr "Sletter afspilningslisten"
 
-#: src/screen.c:758 src/screen_file.c:257
+#: src/screen.c:766 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Database opdatering startet"
 
-#: src/screen.c:760 src/screen_file.c:264
+#: src/screen.c:768 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Databasen opdateres..."
 
-#: src/screen.c:796
+#: src/screen.c:804
 msgid "Find mode: Wrapped"
 msgstr "Søg (begynd forfra)"
 
-#: src/screen.c:797
+#: src/screen.c:805
 msgid "Find mode: Normal"
 msgstr "Søg normalt (start/slut)"
 
-#: src/screen.c:802
+#: src/screen.c:810
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering er aktiv"
 
-#: src/screen.c:803
+#: src/screen.c:811
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er inaktiv"
 
@@ -149,6 +155,7 @@ msgid "All tracks"
 msgstr "Alle spor"
 
 #: src/screen_artist.c:382
+#, c-format
 msgid "All artists"
 msgstr "Alle kunstnere"
 
@@ -172,80 +179,83 @@ msgstr "Alle spor fra kunstneren: %s"
 msgid "Loading playlist %s..."
 msgstr "Henter %s..."
 
-#: src/screen_browser.c:261 src/screen_browser.c:370 src/screen_browser.c:396
+#: src/screen_browser.c:261 src/screen_browser.c:371 src/screen_browser.c:397
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "Tilføjer '%s' til listen...\n"
 
-#: src/screen_browser.c:315
+#. translators: a directory is being added the to playlist
+#: src/screen_browser.c:316
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Tilføjer mappen %s...\n"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:31
 msgid "Find: "
 msgstr "Søg: "
 
-#: src/screen_utils.c:33
+#: src/screen_utils.c:32
 msgid "Find backward: "
 msgstr "Søg (baglæns): "
 
-#: src/screen_utils.c:114
+#: src/screen_utils.c:113
 msgid "Password: "
 msgstr "Adgangskode: "
 
-#: src/screen_utils.c:207
+#: src/screen_utils.c:202
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kan ikke finde '%s'"
 
-#: src/screen_play.c:211
+#: src/screen_play.c:227
 msgid "Save playlist as: "
 msgstr "Gem afspilningslisten som: "
 
-#: src/screen_play.c:244
+#: src/screen_play.c:260
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstat '%s' [%s/%s] ? "
 
-#: src/screen_play.c:265 src/screen_file.c:136 src/screen_keydef.c:162
+#. translators: a dialog was aborted by the user
+#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
 msgid "Aborted"
 msgstr "Afbrudt"
 
 #. success
-#: src/screen_play.c:273
+#: src/screen_play.c:289
 #, c-format
 msgid "Saved %s"
 msgstr "Gemt %s"
 
-#: src/screen_play.c:349
+#: src/screen_play.c:365
 msgid "Add: "
 msgstr "Tilføj: "
 
-#: src/screen_play.c:457
+#: src/screen_play.c:473
 #, c-format
 msgid "Playlist on %s"
 msgstr "Afspilningsliste på %s"
 
-#: src/screen_file.c:124
-msgid "You can only delete playlists"
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/screen_file.c:127
+#, fuzzy
+msgid "Deleting this item is not possible"
 msgstr "Du kan kun slette afspilningslister"
 
-#: src/screen_file.c:131
+#: src/screen_file.c:134
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slet '%s' [%s/%s] ? "
 
-#: src/screen_file.c:143
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/screen_file.c:149
 msgid "Playlist deleted"
 msgstr "Afspilningslisten slettet"
 
-#: src/screen_file.c:197
-#, c-format
-msgid "Browse: %s"
-msgstr "Gennemse: %s"
-
-#: src/screen_file.c:253
+#: src/screen_file.c:261
 #, c-format
 msgid "Database update of %s started"
 msgstr "Database opdatering af %s startet"
@@ -420,93 +430,115 @@ msgid "Edit keys for %s"
 msgstr "Modificer tast for '%s'"
 
 #: src/screen_help.c:37
-msgid "Keys - Movement"
-msgstr "Taster - Navigation"
+msgid "Movement"
+msgstr "Navigation"
 
-#: src/screen_help.c:60
-msgid "Keys - Global"
-msgstr "Taster - Globale"
+#: src/screen_help.c:63
+msgid "Global"
+msgstr "Globale"
 
-#: src/screen_help.c:89
-msgid "Keys - Playlist screen"
-msgstr "Taster - Afspilningsliste"
+#: src/screen_help.c:93 src/command.c:92
+msgid "Playlist screen"
+msgstr "Afspilningsliste"
 
-#: src/screen_help.c:91
+#: src/screen_help.c:95
 msgid "Play"
 msgstr "Afspil"
 
-#: src/screen_help.c:94
+#: src/screen_help.c:98
 msgid "Move song up"
 msgstr "Flyt markøren op i afspilningslisten"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:99
 msgid "Move song down"
 msgstr "Flyt markøren ned i afspilningslisten"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:102
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:103
-msgid "Keys - Browse screen"
-msgstr "Taster - Gennemse"
+#: src/screen_help.c:107 src/command.c:94
+msgid "Browse screen"
+msgstr "Gennemse"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:109
 msgid "Enter directory/Select and play song"
 msgstr "Skift til bibliotek/Tilføj til afspilningslisten og afspil"
 
-#: src/screen_help.c:107 src/screen_help.c:122
+#: src/screen_help.c:111 src/screen_help.c:126
 msgid "Append song to playlist"
 msgstr "Tilføj spor til afspilningsliste"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:113
 msgid "Delete playlist"
 msgstr "Slet afspilningsliste"
 
-#: src/screen_help.c:117
-msgid "Keys - Search screen"
-msgstr "Taster - Søge skærm"
+#: src/screen_help.c:121 src/command.c:199
+msgid "Search screen"
+msgstr "Database søgning"
 
-#: src/screen_help.c:120
+#: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Vælg og afspil"
 
-#: src/screen_help.c:129
-msgid "Keys - Lyrics screen"
-msgstr "Taster - Sangtekst skærm"
+#: src/screen_help.c:133 src/command.c:206
+msgid "Lyrics screen"
+msgstr "Sangtekst skærm"
 
-#: src/screen_help.c:131
+#: src/screen_help.c:135
 msgid "View Lyrics"
 msgstr "Gennemse sangtekster"
 
-#: src/screen_help.c:132
+#: src/screen_help.c:136
 msgid "(Re)load lyrics"
 msgstr "(Gen)indlæs santekster"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:137
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:134
+#: src/screen_help.c:138
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:135
+#: src/screen_help.c:139
 msgid "Save lyrics"
 msgstr "Gem sagtekster"
 
-#: src/screen_lyrics.c:166
+#: src/screen_help.c:144 src/command.c:217
+msgid "Outputs screen"
+msgstr ""
+
+#: src/screen_help.c:146
+msgid "Enable/disable output"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/screen_lyrics.c:104
 msgid "No lyrics"
 msgstr "Ingen sangtekster"
 
-#: src/screen_lyrics.c:290
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/screen_lyrics.c:206
 msgid "loading..."
 msgstr "indlæser..."
 
-#: src/screen_lyrics.c:326
+#. lyrics for the song were saved on hard disk
+#: src/screen_lyrics.c:241
 msgid "Lyrics saved"
 msgstr "Sangtekster gemt"
 
+#: src/screen_outputs.c:57
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/screen_outputs.c:63
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
 #: src/screen_song.c:105
 msgid "Song viewer"
 msgstr ""
@@ -539,294 +571,277 @@ msgstr "Genre"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/command.c:67
+#: src/command.c:68
 msgid "Key configuration screen"
 msgstr "Taste konfigurations skærm"
 
-#: src/command.c:70
+#: src/command.c:71
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/command.c:74
+#: src/command.c:75
 msgid "Move cursor up"
 msgstr "Flyt markør op"
 
-#: src/command.c:76
+#: src/command.c:77
 msgid "Move cursor down"
 msgstr "Flyt markør ned"
 
-#: src/command.c:78
-msgid "Home "
-msgstr "Flyt markør til start "
+#: src/command.c:79 src/command.c:259
+msgid "Home"
+msgstr "Hjem"
 
-#: src/command.c:80
-msgid "End "
-msgstr "Flyt markør til slut "
+#: src/command.c:81 src/command.c:261
+msgid "End"
+msgstr "Slut"
 
-#: src/command.c:82
+#: src/command.c:83
 msgid "Page up"
 msgstr "Side op"
 
-#: src/command.c:84
+#: src/command.c:85
 msgid "Page down"
 msgstr "Side ned"
 
-#: src/command.c:89
+#: src/command.c:90
 msgid "Help screen"
 msgstr "Hjælp"
 
-#: src/command.c:91
-msgid "Playlist screen"
-msgstr "Afspilningsliste"
-
-#: src/command.c:93
-msgid "Browse screen"
-msgstr "Gennemse"
-
-#: src/command.c:98
+#: src/command.c:99
 msgid "Play/Enter directory"
 msgstr "Afspil/Gå til mappe"
 
-#: src/command.c:100
+#: src/command.c:101
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:102
+#: src/command.c:103
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:104
+#: src/command.c:105
 msgid "Crop"
 msgstr "Beskær"
 
-#: src/command.c:106
+#: src/command.c:107
 msgid "Next track"
 msgstr "Næste"
 
-#: src/command.c:108
+#: src/command.c:109
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:110
+#: src/command.c:111
 msgid "Seek forward"
 msgstr "Søg fremad"
 
-#: src/command.c:112
+#: src/command.c:113
 msgid "Seek backward"
 msgstr "Søg tilbage"
 
-#: src/command.c:114
+#: src/command.c:115
 msgid "Increase volume"
 msgstr "Hæv volumen"
 
-#: src/command.c:116
+#: src/command.c:117
 msgid "Decrease volume"
 msgstr "Sænk volumen"
 
-#: src/command.c:118
+#: src/command.c:119
 msgid "Select/deselect song in playlist"
 msgstr "Marker/afmarker sang i afspilningsliste"
 
-#: src/command.c:120
+#: src/command.c:121
 msgid "Select all listed items"
 msgstr "Vælg alle emner på listen"
 
-#: src/command.c:122
+#: src/command.c:123
 msgid "Delete song from playlist"
 msgstr "Slet sang fra afspilningsliste"
 
-#: src/command.c:124
+#: src/command.c:125
 msgid "Shuffle playlist"
 msgstr "Bland rækkefølgen i afspilningslisten"
 
-#: src/command.c:126
+#: src/command.c:127
 msgid "Clear playlist"
 msgstr "Slet afspilningslisten"
 
-#: src/command.c:128
+#: src/command.c:129
 msgid "Toggle repeat mode"
 msgstr "Aktiver/deaktiver gentag"
 
-#: src/command.c:130
+#: src/command.c:131
 msgid "Toggle random mode"
 msgstr "Aktiver/deaktiver tilfældigt valg"
 
-#: src/command.c:132
+#: src/command.c:133
 msgid "Toggle crossfade mode"
 msgstr "Aktiver/deaktiver crossfade mellem sange"
 
-#: src/command.c:134
+#: src/command.c:135
 msgid "Start a music database update"
 msgstr "Opdater databasen"
 
-#: src/command.c:136
+#: src/command.c:137
 msgid "Save playlist"
 msgstr "Gem afspilningslisten"
 
-#: src/command.c:138
+#: src/command.c:139
 msgid "Add url/file to playlist"
 msgstr "Tilføj URL eller fil til afspilningslisten"
 
-#: src/command.c:141
+#: src/command.c:142
 msgid "Go to root directory"
 msgstr "Gå til rod mappen"
 
-#: src/command.c:143
+#: src/command.c:144
 msgid "Go to parent directory"
 msgstr "Gå til forældre mappe"
 
-#: src/command.c:147
+#: src/command.c:148
 msgid "View the song"
 msgstr "Vis sangen"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:155
+#: src/command.c:156
 msgid "Move item up"
 msgstr "Flyt op"
 
-#: src/command.c:157
+#: src/command.c:158
 msgid "Move item down"
 msgstr "Flyt ned"
 
-#: src/command.c:159
-msgid "Update screen"
+#: src/command.c:160
+#, fuzzy
+msgid "Refresh screen"
 msgstr "Opdater skærm"
 
-#: src/command.c:164
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/command.c:167
 msgid "Toggle find mode"
 msgstr "Ændre søge tilstand"
 
-#: src/command.c:166
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/command.c:171
 msgid "Toggle auto center mode"
 msgstr "Aktiver/deaktiver automatisk centrering"
 
-#: src/command.c:171
+#: src/command.c:176
 msgid "Next screen"
 msgstr "Næste skærm"
 
-#: src/command.c:173
+#: src/command.c:178
 msgid "Previous screen"
 msgstr "Forrige skærm"
 
-#: src/command.c:178
+#: src/command.c:183
 msgid "Forward find"
 msgstr "Søg"
 
-#: src/command.c:180
+#: src/command.c:185
 msgid "Forward find next"
 msgstr "Gentag søg"
 
-#: src/command.c:182
+#: src/command.c:187
 msgid "Backward find"
 msgstr "Søg baglæns"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Backward find previous"
 msgstr "Gentag søg baglæns"
 
-#: src/command.c:190
+#: src/command.c:195
 msgid "Artist screen"
 msgstr "Kunstner skærm"
 
-#: src/command.c:194
-msgid "Search screen"
-msgstr "Database søgning"
-
-#: src/command.c:196
+#: src/command.c:201
 msgid "Change search mode"
 msgstr "Ændre søge tilstand"
 
-#: src/command.c:201
-msgid "Lyrics screen"
-msgstr "Sangtekst skærm"
-
-#: src/command.c:203
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/command.c:210
 msgid "Interrupt action"
 msgstr "Afbryd action"
 
-#: src/command.c:205
+#: src/command.c:212
 msgid "Update Lyrics"
 msgstr "Opdater sangtekster"
 
-#: src/command.c:228
+#: src/command.c:241
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: src/command.c:230
+#: src/command.c:243
 msgid "Space"
 msgstr "Mellemrum"
 
-#: src/command.c:232
+#: src/command.c:245
 msgid "Enter"
 msgstr "Retur"
 
-#: src/command.c:234
+#: src/command.c:247
 msgid "Backspace"
 msgstr "Tilbagetast"
 
-#: src/command.c:236
+#: src/command.c:249
 msgid "Delete"
 msgstr "Slet"
 
-#: src/command.c:238
+#: src/command.c:251
 msgid "Up"
 msgstr "Op"
 
-#: src/command.c:240
+#: src/command.c:253
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:242
+#: src/command.c:255
 msgid "Left"
 msgstr "Venstre"
 
-#: src/command.c:244
+#: src/command.c:257
 msgid "Right"
 msgstr "Højre"
 
-#: src/command.c:246
-msgid "Home"
-msgstr "Hjem"
-
-#: src/command.c:248
-msgid "End"
-msgstr "Slut"
-
-#: src/command.c:250
+#: src/command.c:263
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:252
+#: src/command.c:265
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:254
+#: src/command.c:267
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:256
+#: src/command.c:269
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:258
+#: src/command.c:271
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:260
+#: src/command.c:273
 msgid "Insert"
 msgstr "Indsæt"
 
-#: src/command.c:464
+#: src/command.c:485
 #, 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:471 src/command.c:478
-#, c-format
-msgid "Error: Key %s assigned to %s and %s\n"
+#: src/command.c:492 src/command.c:499
+#, fuzzy, c-format
+msgid "Key %s assigned to %s and %s\n"
 msgstr "Fel: Tasten %s er bundet til både %s og %s\n"
 
 #: src/colors.c:163
@@ -849,6 +864,73 @@ msgstr "Terminalen understøtter ikke at ændre farver\n"
 msgid "Terminal lacks color capabilities\n"
 msgstr "Terminalen understøtter ikke farver\n"
 
+#. To translators: prefix for error messages
+#: src/conf.c:87
+msgid "Error"
+msgstr ""
+
+#: src/conf.c:95 src/conf.c:104
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration contains an unknown
+#. command
+#: src/conf.c:131
+msgid "Unknown command"
+msgstr ""
+
+#. the hotkey configuration line is incomplete
+#: src/conf.c:144
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. translators: ncmpc supports displaying the
+#. "elapsed" or "remaining" time of a song being
+#. played; in this case, the configuration file
+#. contained an invalid setting
+#: src/conf.c:176
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/conf.c:191
+msgid "Missing '='"
+msgstr ""
+
+#: src/conf.c:247
+msgid "Bad color name"
+msgstr ""
+
+#: src/conf.c:256
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/conf.c:262
+msgid "Invalid number"
+msgstr ""
+
+#: src/conf.c:270
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen name was specified in the
+#. configuration file
+#: src/conf.c:305
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/conf.c:454
+#, fuzzy
+msgid "Unknown configuration parameter"
+msgstr "Taste konfigurations skærm"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/options.c:216 src/options.c:219
+msgid "translator-credits"
+msgstr ""
+
 #~ msgid "Screen updated!"
 #~ msgstr "Skærm opdateret!"
 
diff --git a/po/de.po b/po/de.po
index d3b1a2dbf..8fd84b256 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,137 +9,143 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-04 22:41+0100\n"
-"PO-Revision-Date: 2008-12-04 22:42+0100\n"
+"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"PO-Revision-Date: 2008-12-25 23:43+0100\n"
 "Last-Translator: Monika Brinkert <moni@sunpig.de>\n"
 "Language-Team: de <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:36
+#: src/i18n.h:41
 msgid "y"
 msgstr "j"
 
-#: src/i18n.h:37
+#: src/i18n.h:42
 msgid "n"
 msgstr "n"
 
-#: src/main.c:210
+#: src/main.c:214
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Verbinde mit %s...   [%s drücken, um abzubrechen]"
 
-#: src/main.c:228
+#: src/main.c:232
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Fehler: MPD-Version %d.%d.%d ist zu alt (%s wird benötigt)"
 
-#: src/main.c:242
+#: src/main.c:246
 #, c-format
 msgid "Connected to %s"
 msgstr "Verbunden mit %s"
 
-#: src/screen.c:149 src/screen_help.c:209
+#: src/screen.c:152 src/screen_help.c:216
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/screen.c:151 src/screen_play.c:455
+#: src/screen.c:154 src/screen_play.c:471
 msgid "Playlist"
 msgstr "Playlist"
 
-#: src/screen.c:152
+#. translators: caption of the browser screen
+#: src/screen.c:155 src/screen_file.c:205
 msgid "Browse"
 msgstr "Stöbern"
 
-#: src/screen.c:154 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/screen.c:157 src/screen_help.c:123
+#: src/screen.c:160 src/screen_help.c:123
 msgid "Search"
 msgstr "Suche"
 
-#: src/screen.c:160 src/screen_lyrics.c:290 src/screen_lyrics.c:295
-#: src/screen_lyrics.c:299
+#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "Liedtexte"
 
-#: src/screen.c:166
+#: src/screen.c:166 src/screen_outputs.c:161
+msgid "Outputs"
+msgstr ""
+
+#: src/screen.c:172
+#, c-format
 msgid "Volume n/a "
 msgstr "Lautstärke n/a "
 
-#: src/screen.c:168
+#: src/screen.c:174
 #, c-format
 msgid " Volume %d%%"
 msgstr " Lautstärke %d%%"
 
-#: src/screen.c:275
+#: src/screen.c:281
 msgid "Playing:"
 msgstr "Spiele:"
 
-#: src/screen.c:278
+#: src/screen.c:284
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:398 src/screen.c:471
+#: src/screen.c:404 src/screen.c:477
 msgid "Error: Screen too small"
 msgstr "Fehler: Anzeige zu klein"
 
-#: src/screen.c:594
+#: src/screen.c:600
 msgid "Repeat is on"
 msgstr "Wiederholung ist an"
 
-#: src/screen.c:595
+#: src/screen.c:601
 msgid "Repeat is off"
 msgstr "Wiederholung ist aus"
 
-#: src/screen.c:599
+#: src/screen.c:605
 msgid "Random is on"
 msgstr "Zufallswiedergabe ist an"
 
-#: src/screen.c:600
+#: src/screen.c:606
 msgid "Random is off"
 msgstr "Zufallswiedergabe ist aus"
 
-#: src/screen.c:603
+#: src/screen.c:609
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "%d Sekunden Crossfade"
 
-#: src/screen.c:606
+#: src/screen.c:612
 msgid "Database updated"
 msgstr "Datenbank aktualisiert"
 
-#: src/screen.c:739
+#: src/screen.c:745
 msgid "Shuffled playlist"
 msgstr "Playlist gemischt"
 
-#: src/screen.c:743
+#: src/screen.c:749
 msgid "Cleared playlist"
 msgstr "Playlist gelöscht"
 
-#: src/screen.c:760 src/screen_file.c:257
+#: src/screen.c:766 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Datenbankaktualisierung gestartet"
 
-#: src/screen.c:762 src/screen_file.c:264
+#: src/screen.c:768 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Datenbankaktualisierung läuft..."
 
-#: src/screen.c:798
+#: src/screen.c:804
 msgid "Find mode: Wrapped"
 msgstr "Suchmodus: Wrapped"
 
-#: src/screen.c:799
+#: src/screen.c:805
 msgid "Find mode: Normal"
 msgstr "Suchmodus: Normal"
 
-#: src/screen.c:804
+#: src/screen.c:810
 msgid "Auto center mode: On"
 msgstr "Autozentriermodus: an"
 
-#: src/screen.c:805
+#: src/screen.c:811
 msgid "Auto center mode: Off"
 msgstr "Autozentriermodus: aus"
 
@@ -148,6 +154,7 @@ msgid "All tracks"
 msgstr "Alle Stücke"
 
 #: src/screen_artist.c:382
+#, c-format
 msgid "All artists"
 msgstr "Alle Künstler"
 
@@ -171,80 +178,82 @@ msgstr "Alle Lieder des Künstlers: %s"
 msgid "Loading playlist %s..."
 msgstr "Lade Playlist %s..."
 
-#: src/screen_browser.c:261 src/screen_browser.c:370 src/screen_browser.c:396
+#: src/screen_browser.c:261 src/screen_browser.c:371 src/screen_browser.c:397
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "Füge '%s' der Playlist hinzu\n"
 
-#: src/screen_browser.c:315
+#. translators: a directory is being added the to playlist
+#: src/screen_browser.c:316
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Füge Verzeichnis %s hinzu...\n"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:31
 msgid "Find: "
 msgstr "Suche: "
 
-#: src/screen_utils.c:33
+#: src/screen_utils.c:32
 msgid "Find backward: "
 msgstr "Suche rückwärts: "
 
-#: src/screen_utils.c:114
+#: src/screen_utils.c:113
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/screen_utils.c:203
+#: src/screen_utils.c:202
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kann '%s' nicht finden"
 
-#: src/screen_play.c:211
+#: src/screen_play.c:227
 msgid "Save playlist as: "
 msgstr "Speichere Playlist als: "
 
-#: src/screen_play.c:244
+#: src/screen_play.c:260
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Ersetze %s [%s/%s] ?"
 
-#: src/screen_play.c:265 src/screen_file.c:136 src/screen_keydef.c:162
+#. translators: a dialog was aborted by the user
+#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
 msgid "Aborted"
 msgstr "Abbruch"
 
 #. success
-#: src/screen_play.c:273
+#: src/screen_play.c:289
 #, c-format
 msgid "Saved %s"
 msgstr "%s gespeichert"
 
-#: src/screen_play.c:349
+#: src/screen_play.c:365
 msgid "Add: "
 msgstr "Hinzufügen: "
 
-#: src/screen_play.c:457
+#: src/screen_play.c:473
 #, c-format
 msgid "Playlist on %s"
 msgstr "Playlist auf %s"
 
-#: src/screen_file.c:124
-msgid "You can only delete playlists"
-msgstr "Du kannst nur Playlisten löschen"
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/screen_file.c:127
+msgid "Deleting this item is not possible"
+msgstr "Dieses Objekt kann nicht gelöscht werden"
 
-#: src/screen_file.c:131
+#: src/screen_file.c:134
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Lösche Playlist %s [%s/%s] ? "
 
-#: src/screen_file.c:143
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/screen_file.c:149
 msgid "Playlist deleted"
 msgstr "Playlist gelöscht"
 
-#: src/screen_file.c:197
-#, c-format
-msgid "Browse: %s"
-msgstr "Stöbern: %s"
-
-#: src/screen_file.c:253
+#: src/screen_file.c:261
 #, c-format
 msgid "Database update of %s started"
 msgstr "Datenbankaktualisierung von %s gestartet"
@@ -419,16 +428,16 @@ msgid "Edit keys for %s"
 msgstr "Editiere Tasten für %s"
 
 #: src/screen_help.c:37
-msgid "Keys - Movement"
-msgstr "Tasten - Bewegung"
+msgid "Movement"
+msgstr "Bewegung"
 
 #: src/screen_help.c:63
-msgid "Keys - Global"
-msgstr "Tasten - Global"
+msgid "Global"
+msgstr "Global"
 
-#: src/screen_help.c:93
-msgid "Keys - Playlist screen"
-msgstr "Tasten - Playlistenanzeige"
+#: src/screen_help.c:93 src/command.c:92
+msgid "Playlist screen"
+msgstr "Playlistenanzeige"
 
 #: src/screen_help.c:95
 msgid "Play"
@@ -446,9 +455,9 @@ msgstr "Stück nach unten bewegen"
 msgid "Center"
 msgstr "Zentrieren"
 
-#: src/screen_help.c:107
-msgid "Keys - Browse screen"
-msgstr "Tasten - Stöber-Anzeige"
+#: src/screen_help.c:107 src/command.c:94
+msgid "Browse screen"
+msgstr "Anzeige durchstöbern"
 
 #: src/screen_help.c:109
 msgid "Enter directory/Select and play song"
@@ -462,17 +471,17 @@ msgstr "Song zur Playlist hinzufügen"
 msgid "Delete playlist"
 msgstr "Lösche Playlist"
 
-#: src/screen_help.c:121
-msgid "Keys - Search screen"
-msgstr "Tasten - Stöber-Anzeige"
+#: src/screen_help.c:121 src/command.c:199
+msgid "Search screen"
+msgstr "Suchanzeige"
 
 #: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Auswählen und abspielen"
 
-#: src/screen_help.c:133
-msgid "Keys - Lyrics screen"
-msgstr "Tasten - Liedtexteanzeige"
+#: src/screen_help.c:133 src/command.c:206
+msgid "Lyrics screen"
+msgstr "Liedtextanzeige"
 
 #: src/screen_help.c:135
 msgid "View Lyrics"
@@ -494,18 +503,40 @@ msgstr "Texte explizit herunterladen"
 msgid "Save lyrics"
 msgstr "Liedtext speichern"
 
-#: src/screen_lyrics.c:166
+#: src/screen_help.c:144 src/command.c:217
+msgid "Outputs screen"
+msgstr ""
+
+#: src/screen_help.c:146
+msgid "Enable/disable output"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/screen_lyrics.c:104
 msgid "No lyrics"
 msgstr "Kein Liedtext verfügbar"
 
-#: src/screen_lyrics.c:290
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/screen_lyrics.c:206
 msgid "loading..."
 msgstr "lade..."
 
-#: src/screen_lyrics.c:326
+#. lyrics for the song were saved on hard disk
+#: src/screen_lyrics.c:241
 msgid "Lyrics saved"
 msgstr "Liedtext gespeichert"
 
+#: src/screen_outputs.c:57
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/screen_outputs.c:63
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
 #: src/screen_song.c:105
 msgid "Song viewer"
 msgstr "Liedbetrachter"
@@ -538,294 +569,276 @@ msgstr "Genre"
 msgid "Comment"
 msgstr "Anmerkung"
 
-#: src/command.c:67
+#: src/command.c:68
 msgid "Key configuration screen"
 msgstr "Tastenkonfigurationsanzeige"
 
-#: src/command.c:70
+#: src/command.c:71
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/command.c:74
+#: src/command.c:75
 msgid "Move cursor up"
 msgstr "Cursor nach oben bewegen"
 
-#: src/command.c:76
+#: src/command.c:77
 msgid "Move cursor down"
 msgstr "Cursor nach unten bewegen"
 
-#: src/command.c:78
-msgid "Home "
-msgstr "Anfang "
+#: src/command.c:79 src/command.c:259
+msgid "Home"
+msgstr "Pos1"
 
-#: src/command.c:80
-msgid "End "
-msgstr "Ende "
+#: src/command.c:81 src/command.c:261
+msgid "End"
+msgstr "Ende"
 
-#: src/command.c:82
+#: src/command.c:83
 msgid "Page up"
 msgstr "Bild auf"
 
-#: src/command.c:84
+#: src/command.c:85
 msgid "Page down"
 msgstr "Bild ab"
 
-#: src/command.c:89
+#: src/command.c:90
 msgid "Help screen"
 msgstr "Hilfeanzeige"
 
-#: src/command.c:91
-msgid "Playlist screen"
-msgstr "Playlistenanzeige"
-
-#: src/command.c:93
-msgid "Browse screen"
-msgstr "Anzeige durchstöbern"
-
-#: src/command.c:98
+#: src/command.c:99
 msgid "Play/Enter directory"
 msgstr "Abspielen/Verzeichnis öffnen"
 
-#: src/command.c:100
+#: src/command.c:101
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:102
+#: src/command.c:103
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:104
+#: src/command.c:105
 msgid "Crop"
 msgstr "Playlist auf das markierte Lied reduzieren"
 
-#: src/command.c:106
+#: src/command.c:107
 msgid "Next track"
 msgstr "Nächstes Stück"
 
-#: src/command.c:108
+#: src/command.c:109
 msgid "Previous track"
 msgstr "Vorheriges Stück"
 
-#: src/command.c:110
+#: src/command.c:111
 msgid "Seek forward"
 msgstr "Vorspulen"
 
-#: src/command.c:112
+#: src/command.c:113
 msgid "Seek backward"
 msgstr "Zurückspulen"
 
-#: src/command.c:114
+#: src/command.c:115
 msgid "Increase volume"
 msgstr "Lautstärke erhöhen"
 
-#: src/command.c:116
+#: src/command.c:117
 msgid "Decrease volume"
 msgstr "Lautstärke verringern"
 
-#: src/command.c:118
+#: src/command.c:119
 msgid "Select/deselect song in playlist"
 msgstr "Wähle Stück in der Playlist an/ab"
 
-#: src/command.c:120
+#: src/command.c:121
 msgid "Select all listed items"
 msgstr "Alle angezeigten Lieder zur Playlist hinzufügen"
 
-#: src/command.c:122
+#: src/command.c:123
 msgid "Delete song from playlist"
 msgstr "Lösche Song aus der Playlist"
 
-#: src/command.c:124
+#: src/command.c:125
 msgid "Shuffle playlist"
 msgstr "Mische Playlist"
 
-#: src/command.c:126
+#: src/command.c:127
 msgid "Clear playlist"
 msgstr "Lösche Playlist"
 
-#: src/command.c:128
+#: src/command.c:129
 msgid "Toggle repeat mode"
 msgstr "Schalte Wiederholungswiedergabe ein/aus"
 
-#: src/command.c:130
+#: src/command.c:131
 msgid "Toggle random mode"
 msgstr "Schalte Zufallswiedergabe ein/aus"
 
-#: src/command.c:132
+#: src/command.c:133
 msgid "Toggle crossfade mode"
 msgstr "Schalte Crossfade-Wiedergabe ein/aus"
 
-#: src/command.c:134
+#: src/command.c:135
 msgid "Start a music database update"
 msgstr "Starte eine Aktualisierung der Musikdatenbank"
 
-#: src/command.c:136
+#: src/command.c:137
 msgid "Save playlist"
 msgstr "Speichere Playlist"
 
-#: src/command.c:138
+#: src/command.c:139
 msgid "Add url/file to playlist"
 msgstr "Füge eine URL/Datei der Playlist hinzu"
 
-#: src/command.c:141
+#: src/command.c:142
 msgid "Go to root directory"
 msgstr "Basis-Verzeichnis öffnen"
 
-#: src/command.c:143
+#: src/command.c:144
 msgid "Go to parent directory"
 msgstr "Übergeordnetes Verzeichnis öffnen"
 
-#: src/command.c:147
+#: src/command.c:148
 msgid "View the song"
 msgstr "Lied anzeigen"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Locate song in browser"
 msgstr "Lied in Datenbank orten"
 
-#: src/command.c:155
+#: src/command.c:156
 msgid "Move item up"
 msgstr "Bewege es nach oben"
 
-#: src/command.c:157
+#: src/command.c:158
 msgid "Move item down"
 msgstr "Bewege es nach unten"
 
-#: src/command.c:159
-msgid "Update screen"
+#: src/command.c:160
+msgid "Refresh screen"
 msgstr "Aktualisiere Anzeige"
 
-#: src/command.c:164
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/command.c:167
 msgid "Toggle find mode"
 msgstr "Wechsle den Suchmodus"
 
-#: src/command.c:166
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/command.c:171
 msgid "Toggle auto center mode"
 msgstr "Schalte den Autozentrier-Modus ein/aus"
 
-#: src/command.c:171
+#: src/command.c:176
 msgid "Next screen"
 msgstr "Nächste Anzeige"
 
-#: src/command.c:173
+#: src/command.c:178
 msgid "Previous screen"
 msgstr "Vorherige Anzeige"
 
-#: src/command.c:178
+#: src/command.c:183
 msgid "Forward find"
 msgstr "Vorwärtssuche"
 
-#: src/command.c:180
+#: src/command.c:185
 msgid "Forward find next"
 msgstr "Vorwärtssuche fortsetzen"
 
-#: src/command.c:182
+#: src/command.c:187
 msgid "Backward find"
 msgstr "Rückwärtssuche"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Backward find previous"
 msgstr "Rückwärtssuche fortsetzen"
 
-#: src/command.c:190
+#: src/command.c:195
 msgid "Artist screen"
 msgstr "Künstlerdatenbank"
 
-#: src/command.c:194
-msgid "Search screen"
-msgstr "Suchanzeige"
-
-#: src/command.c:196
+#: src/command.c:201
 msgid "Change search mode"
 msgstr "Suchmodus wechseln"
 
-#: src/command.c:201
-msgid "Lyrics screen"
-msgstr "Liedtextanzeige"
-
-#: src/command.c:203
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/command.c:210
 msgid "Interrupt action"
 msgstr "Kommando Unterbrechen"
 
-#: src/command.c:205
+#: src/command.c:212
 msgid "Update Lyrics"
 msgstr "Liedtext aktualisieren"
 
-#: src/command.c:228
+#: src/command.c:241
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: src/command.c:230
+#: src/command.c:243
 msgid "Space"
 msgstr "Leertaste"
 
-#: src/command.c:232
+#: src/command.c:245
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:234
+#: src/command.c:247
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:236
+#: src/command.c:249
 msgid "Delete"
 msgstr "Entf"
 
-#: src/command.c:238
+#: src/command.c:251
 msgid "Up"
 msgstr "Oben"
 
-#: src/command.c:240
+#: src/command.c:253
 msgid "Down"
 msgstr "Unten"
 
-#: src/command.c:242
+#: src/command.c:255
 msgid "Left"
 msgstr "Links"
 
-#: src/command.c:244
+#: src/command.c:257
 msgid "Right"
 msgstr "Rechts"
 
-#: src/command.c:246
-msgid "Home"
-msgstr "Pos1"
-
-#: src/command.c:248
-msgid "End"
-msgstr "Ende"
-
-#: src/command.c:250
+#: src/command.c:263
 msgid "PageDown"
 msgstr "Bild ab"
 
-#: src/command.c:252
+#: src/command.c:265
 msgid "PageUp"
 msgstr "Bild auf"
 
-#: src/command.c:254
+#: src/command.c:267
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:256
+#: src/command.c:269
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:258
+#: src/command.c:271
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:260
+#: src/command.c:273
 msgid "Insert"
 msgstr "Einfg"
 
-#: src/command.c:464
+#: src/command.c:485
 #, 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:471 src/command.c:478
-#, c-format
-msgid "Error: Key %s assigned to %s and %s\n"
+#: src/command.c:492 src/command.c:499
+#, fuzzy, c-format
+msgid "Key %s assigned to %s and %s\n"
 msgstr "Fehler: Taste %s ist %s und %s zugeordnet\n"
 
 #: src/colors.c:163
@@ -848,6 +861,85 @@ msgstr "Das Terminal unterstützt keine Farbwechsel\n"
 msgid "Terminal lacks color capabilities\n"
 msgstr "Das Terminal unterstützt keine Farben\n"
 
+#. To translators: prefix for error messages
+#: src/conf.c:87
+msgid "Error"
+msgstr ""
+
+#: src/conf.c:95 src/conf.c:104
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration contains an unknown
+#. command
+#: src/conf.c:131
+msgid "Unknown command"
+msgstr ""
+
+#. the hotkey configuration line is incomplete
+#: src/conf.c:144
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. translators: ncmpc supports displaying the
+#. "elapsed" or "remaining" time of a song being
+#. played; in this case, the configuration file
+#. contained an invalid setting
+#: src/conf.c:176
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/conf.c:191
+msgid "Missing '='"
+msgstr ""
+
+#: src/conf.c:247
+msgid "Bad color name"
+msgstr ""
+
+#: src/conf.c:256
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/conf.c:262
+msgid "Invalid number"
+msgstr ""
+
+#: src/conf.c:270
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen name was specified in the
+#. configuration file
+#: src/conf.c:305
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/conf.c:454
+#, fuzzy
+msgid "Unknown configuration parameter"
+msgstr "Tastenkonfigurationsanzeige"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/options.c:216 src/options.c:219
+msgid "translator-credits"
+msgstr ""
+
+#~ msgid "You can only delete playlists"
+#~ msgstr "Du kannst nur Playlisten löschen"
+
+#~ msgid "Browse: %s"
+#~ msgstr "Stöbern: %s"
+
+#~ msgid "Home "
+#~ msgstr "Anfang "
+
+#~ msgid "End "
+#~ msgstr "Ende "
+
 #~ msgid "Screen updated!"
 #~ msgstr "Anzeige aktualisiert!"
 
diff --git a/po/es.po b/po/es.po
index a10af1acf..6ab8197dd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-04 22:41+0100\n"
-"PO-Revision-Date: 2008-12-04 22:42+0100\n"
+"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"PO-Revision-Date: 2008-12-25 23:44+0100\n"
 "Last-Translator: Johám-Luís Miguéns Vila <ashtophet@ashtophet.org>\n"
 "Language-Team: es\n"
 "MIME-Version: 1.0\n"
@@ -20,131 +20,137 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
-#: src/i18n.h:36
+#: src/i18n.h:41
 msgid "y"
 msgstr "s"
 
-#: src/i18n.h:37
+#: src/i18n.h:42
 msgid "n"
 msgstr "n"
 
-#: src/main.c:210
+#: src/main.c:214
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectándose a %s... [Presiona %s para interrumpir la ejecución]"
 
-#: src/main.c:228
+#: src/main.c:232
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr ""
 "Error: La versión %d.%d.%d del MPD es demasiado antigua (se necesita al "
 "menos la %s)"
 
-#: src/main.c:242
+#: src/main.c:246
 #, c-format
 msgid "Connected to %s"
 msgstr "Conectado a %s"
 
-#: src/screen.c:149 src/screen_help.c:209
+#: src/screen.c:152 src/screen_help.c:216
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/screen.c:151 src/screen_play.c:455
+#: src/screen.c:154 src/screen_play.c:471
 msgid "Playlist"
 msgstr "Lista de canciones"
 
-#: src/screen.c:152
+#. translators: caption of the browser screen
+#: src/screen.c:155 src/screen_file.c:205
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/screen.c:154 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen.c:157 src/screen_help.c:123
+#: src/screen.c:160 src/screen_help.c:123
 msgid "Search"
 msgstr "Búsqueda"
 
-#: src/screen.c:160 src/screen_lyrics.c:290 src/screen_lyrics.c:295
-#: src/screen_lyrics.c:299
+#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "Letras"
 
-#: src/screen.c:166
+#: src/screen.c:166 src/screen_outputs.c:161
+msgid "Outputs"
+msgstr ""
+
+#: src/screen.c:172
+#, c-format
 msgid "Volume n/a "
 msgstr "Volumen n/a "
 
-#: src/screen.c:168
+#: src/screen.c:174
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volumen %d%%"
 
-#: src/screen.c:275
+#: src/screen.c:281
 msgid "Playing:"
 msgstr "Escuchando:"
 
-#: src/screen.c:278
+#: src/screen.c:284
 msgid "[Paused]"
 msgstr "[Parado]"
 
-#: src/screen.c:398 src/screen.c:471
+#: src/screen.c:404 src/screen.c:477
 msgid "Error: Screen too small"
 msgstr "Error: La ventana/pantalla es muy pequeña"
 
-#: src/screen.c:594
+#: src/screen.c:600
 msgid "Repeat is on"
 msgstr "Modo repetición activado"
 
-#: src/screen.c:595
+#: src/screen.c:601
 msgid "Repeat is off"
 msgstr "Modo repetición desactivado"
 
-#: src/screen.c:599
+#: src/screen.c:605
 msgid "Random is on"
 msgstr "Modo aleatorio activado"
 
-#: src/screen.c:600
+#: src/screen.c:606
 msgid "Random is off"
 msgstr "Modo aleatorio desactivado"
 
-#: src/screen.c:603
+#: src/screen.c:609
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Desvanecimiento de %d segundos"
 
-#: src/screen.c:606
+#: src/screen.c:612
 msgid "Database updated"
 msgstr "Base de datos actualizada"
 
-#: src/screen.c:739
+#: src/screen.c:745
 msgid "Shuffled playlist"
 msgstr "Lista de canciones barajada"
 
-#: src/screen.c:743
+#: src/screen.c:749
 msgid "Cleared playlist"
 msgstr "Vaciada la lista de canciones"
 
-#: src/screen.c:760 src/screen_file.c:257
+#: src/screen.c:766 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Ha comenzado la actualización de la base de datos"
 
-#: src/screen.c:762 src/screen_file.c:264
+#: src/screen.c:768 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Actualizando la base de datos..."
 
-#: src/screen.c:798
+#: src/screen.c:804
 msgid "Find mode: Wrapped"
 msgstr "Tipo de búsqueda: simple"
 
-#: src/screen.c:799
+#: src/screen.c:805
 msgid "Find mode: Normal"
 msgstr "Tipo de búsqueda: Normal"
 
-#: src/screen.c:804
+#: src/screen.c:810
 msgid "Auto center mode: On"
 msgstr "Modo autocentrado activado"
 
-#: src/screen.c:805
+#: src/screen.c:811
 msgid "Auto center mode: Off"
 msgstr "Modo autocentrado desactivado"
 
@@ -153,6 +159,7 @@ msgid "All tracks"
 msgstr "Todas las pistas"
 
 #: src/screen_artist.c:382
+#, c-format
 msgid "All artists"
 msgstr "Todos los artistas"
 
@@ -176,80 +183,83 @@ msgstr "Todas las pistas del artista: %s"
 msgid "Loading playlist %s..."
 msgstr "Cargando la lista %s..."
 
-#: src/screen_browser.c:261 src/screen_browser.c:370 src/screen_browser.c:396
+#: src/screen_browser.c:261 src/screen_browser.c:371 src/screen_browser.c:397
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "Añadiendo '%s' a la lista de canciones\n"
 
-#: src/screen_browser.c:315
+#. translators: a directory is being added the to playlist
+#: src/screen_browser.c:316
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Añadiendo directorio %s...\n"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:31
 msgid "Find: "
 msgstr "Buscar:"
 
-#: src/screen_utils.c:33
+#: src/screen_utils.c:32
 msgid "Find backward: "
 msgstr "Buscar hacia atrás"
 
-#: src/screen_utils.c:114
+#: src/screen_utils.c:113
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: src/screen_utils.c:203
+#: src/screen_utils.c:202
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "No se pudo encontrar %s"
 
-#: src/screen_play.c:211
+#: src/screen_play.c:227
 msgid "Save playlist as: "
 msgstr "Guardar la lista como: "
 
-#: src/screen_play.c:244
+#: src/screen_play.c:260
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Sustituir %s [%s%s] ? "
 
-#: src/screen_play.c:265 src/screen_file.c:136 src/screen_keydef.c:162
+#. translators: a dialog was aborted by the user
+#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
 msgid "Aborted"
 msgstr "Ejecución interrumpida"
 
 #. success
-#: src/screen_play.c:273
+#: src/screen_play.c:289
 #, c-format
 msgid "Saved %s"
 msgstr "%s Guardada"
 
-#: src/screen_play.c:349
+#: src/screen_play.c:365
 msgid "Add: "
 msgstr "Añadir: "
 
-#: src/screen_play.c:457
+#: src/screen_play.c:473
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lista de reproducción en %s"
 
-#: src/screen_file.c:124
-msgid "You can only delete playlists"
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/screen_file.c:127
+#, fuzzy
+msgid "Deleting this item is not possible"
 msgstr "Sólo puedes eliminar las listas"
 
-#: src/screen_file.c:131
+#: src/screen_file.c:134
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Borrar la lista de reproducción %s [%s/%s] ? "
 
-#: src/screen_file.c:143
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/screen_file.c:149
 msgid "Playlist deleted"
 msgstr "Lista de reproducción borrada"
 
-#: src/screen_file.c:197
-#, c-format
-msgid "Browse: %s"
-msgstr "Navegando: %s"
-
-#: src/screen_file.c:253
+#: src/screen_file.c:261
 #, c-format
 msgid "Database update of %s started"
 msgstr "Ha comenzado la actualización de la base de datos %s"
@@ -424,16 +434,16 @@ msgid "Edit keys for %s"
 msgstr "Cambia las teclas para %s"
 
 #: src/screen_help.c:37
-msgid "Keys - Movement"
-msgstr "Teclas - Navegar"
+msgid "Movement"
+msgstr "Navegar"
 
 #: src/screen_help.c:63
-msgid "Keys - Global"
-msgstr "Teclas - Global"
+msgid "Global"
+msgstr "Global"
 
-#: src/screen_help.c:93
-msgid "Keys - Playlist screen"
-msgstr "Teclas - Lista de canciones"
+#: src/screen_help.c:93 src/command.c:92
+msgid "Playlist screen"
+msgstr "Lista de canciones"
 
 #: src/screen_help.c:95
 msgid "Play"
@@ -451,9 +461,9 @@ msgstr "Mover la canción abajo"
 msgid "Center"
 msgstr "Centro"
 
-#: src/screen_help.c:107
-msgid "Keys - Browse screen"
-msgstr "Teclas - Navegador"
+#: src/screen_help.c:107 src/command.c:94
+msgid "Browse screen"
+msgstr "Navegador"
 
 #: src/screen_help.c:109
 msgid "Enter directory/Select and play song"
@@ -467,17 +477,17 @@ msgstr "Añadir la canción de la lista"
 msgid "Delete playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/screen_help.c:121
-msgid "Keys - Search screen"
-msgstr "Teclas - Búsqueda"
+#: src/screen_help.c:121 src/command.c:199
+msgid "Search screen"
+msgstr "Búsqueda"
 
 #: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Seleccionar y reproducir"
 
-#: src/screen_help.c:133
-msgid "Keys - Lyrics screen"
-msgstr "Teclas - Letras"
+#: src/screen_help.c:133 src/command.c:206
+msgid "Lyrics screen"
+msgstr "Letras"
 
 #: src/screen_help.c:135
 msgid "View Lyrics"
@@ -499,18 +509,40 @@ msgstr "Forzar la descarga de las letras"
 msgid "Save lyrics"
 msgstr "Guardar las letras"
 
-#: src/screen_lyrics.c:166
+#: src/screen_help.c:144 src/command.c:217
+msgid "Outputs screen"
+msgstr ""
+
+#: src/screen_help.c:146
+msgid "Enable/disable output"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/screen_lyrics.c:104
 msgid "No lyrics"
 msgstr "No letras disponibles"
 
-#: src/screen_lyrics.c:290
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/screen_lyrics.c:206
 msgid "loading..."
 msgstr "cargando..."
 
-#: src/screen_lyrics.c:326
+#. lyrics for the song were saved on hard disk
+#: src/screen_lyrics.c:241
 msgid "Lyrics saved"
 msgstr "Letras guardadas"
 
+#: src/screen_outputs.c:57
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/screen_outputs.c:63
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
 #: src/screen_song.c:105
 msgid "Song viewer"
 msgstr "Visor de la canción"
@@ -543,295 +575,278 @@ msgstr "Estilo"
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/command.c:67
+#: src/command.c:68
 msgid "Key configuration screen"
 msgstr "Configuración de teclas"
 
-#: src/command.c:70
+#: src/command.c:71
 msgid "Quit"
 msgstr "Salir"
 
-#: src/command.c:74
+#: src/command.c:75
 msgid "Move cursor up"
 msgstr "Mover el cursor hacia arriba"
 
-#: src/command.c:76
+#: src/command.c:77
 msgid "Move cursor down"
 msgstr "Mover el cursor hacia abajo"
 
-#: src/command.c:78
-msgid "Home "
+#: src/command.c:79 src/command.c:259
+msgid "Home"
 msgstr "Inicio"
 
-#: src/command.c:80
-msgid "End "
+#: src/command.c:81 src/command.c:261
+msgid "End"
 msgstr "Fin"
 
-#: src/command.c:82
+#: src/command.c:83
 msgid "Page up"
 msgstr "Página arriba"
 
-#: src/command.c:84
+#: src/command.c:85
 msgid "Page down"
 msgstr "Página abajo"
 
-#: src/command.c:89
+#: src/command.c:90
 msgid "Help screen"
 msgstr "Ayuda"
 
-#: src/command.c:91
-msgid "Playlist screen"
-msgstr "Lista de canciones"
-
-#: src/command.c:93
-msgid "Browse screen"
-msgstr "Navegador"
-
-#: src/command.c:98
+#: src/command.c:99
 msgid "Play/Enter directory"
 msgstr "Reproducir/Entrar en el directorio"
 
-#: src/command.c:100
+#: src/command.c:101
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:102
+#: src/command.c:103
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:104
+#: src/command.c:105
 msgid "Crop"
 msgstr "Reducir lista de canciónes a canción marcado"
 
-#: src/command.c:106
+#: src/command.c:107
 msgid "Next track"
 msgstr "Siguiente"
 
-#: src/command.c:108
+#: src/command.c:109
 msgid "Previous track"
 msgstr "Anterior"
 
-#: src/command.c:110
+#: src/command.c:111
 msgid "Seek forward"
 msgstr "Avanzar"
 
-#: src/command.c:112
+#: src/command.c:113
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:114
+#: src/command.c:115
 msgid "Increase volume"
 msgstr "Subir el volumen"
 
-#: src/command.c:116
+#: src/command.c:117
 msgid "Decrease volume"
 msgstr "Bajar el volumen"
 
-#: src/command.c:118
+#: src/command.c:119
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/Deseleccionar la canción en la lista"
 
-#: src/command.c:120
+#: src/command.c:121
 msgid "Select all listed items"
 msgstr "Seleccionar todos"
 
-#: src/command.c:122
+#: src/command.c:123
 msgid "Delete song from playlist"
 msgstr "Borrar la canción de la lista"
 
-#: src/command.c:124
+#: src/command.c:125
 msgid "Shuffle playlist"
 msgstr "Aleatorizar lista de canciones"
 
-#: src/command.c:126
+#: src/command.c:127
 msgid "Clear playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/command.c:128
+#: src/command.c:129
 msgid "Toggle repeat mode"
 msgstr "Alternar modo repetición"
 
-#: src/command.c:130
+#: src/command.c:131
 msgid "Toggle random mode"
 msgstr "Alternar modo aleatorio "
 
-#: src/command.c:132
+#: src/command.c:133
 msgid "Toggle crossfade mode"
 msgstr "Alternar modo crossfade"
 
-#: src/command.c:134
+#: src/command.c:135
 msgid "Start a music database update"
 msgstr "Iniciar la actualización de la BD musical"
 
-#: src/command.c:136
+#: src/command.c:137
 msgid "Save playlist"
 msgstr "Guardar la lista de canciones"
 
-#: src/command.c:138
+#: src/command.c:139
 msgid "Add url/file to playlist"
 msgstr "Añadir una URL o fichero a la lista"
 
-#: src/command.c:141
+#: src/command.c:142
 msgid "Go to root directory"
 msgstr "Entrar al directorio fundamental"
 
-#: src/command.c:143
+#: src/command.c:144
 msgid "Go to parent directory"
 msgstr "Entrar al directorio superior"
 
-#: src/command.c:147
+#: src/command.c:148
 msgid "View the song"
 msgstr "Ver la canción"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Locate song in browser"
 msgstr "Encontrar la canción en el navegador"
 
-#: src/command.c:155
+#: src/command.c:156
 msgid "Move item up"
 msgstr "Moverlo arriba"
 
-#: src/command.c:157
+#: src/command.c:158
 msgid "Move item down"
 msgstr "Moverlo abajo"
 
-#: src/command.c:159
-msgid "Update screen"
+#: src/command.c:160
+#, fuzzy
+msgid "Refresh screen"
 msgstr "Actualizar la ventana"
 
-#: src/command.c:164
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/command.c:167
 msgid "Toggle find mode"
 msgstr "Alternar modo de búsqueda"
 
-#: src/command.c:166
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/command.c:171
 msgid "Toggle auto center mode"
 msgstr "Alternar centrado automático de la ventana"
 
-#: src/command.c:171
+#: src/command.c:176
 msgid "Next screen"
 msgstr "Pantalla siguiente"
 
-#: src/command.c:173
+#: src/command.c:178
 msgid "Previous screen"
 msgstr "Pantalla anterior"
 
-#: src/command.c:178
+#: src/command.c:183
 msgid "Forward find"
 msgstr "Buscar hacia adelante"
 
-#: src/command.c:180
+#: src/command.c:185
 msgid "Forward find next"
 msgstr "Buscar siguiente"
 
-#: src/command.c:182
+#: src/command.c:187
 msgid "Backward find"
 msgstr "Buscar hacia atrás"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Backward find previous"
 msgstr "Buscar anterior"
 
-#: src/command.c:190
+#: src/command.c:195
 msgid "Artist screen"
 msgstr "Artistas"
 
-#: src/command.c:194
-msgid "Search screen"
-msgstr "Búsqueda"
-
-#: src/command.c:196
+#: src/command.c:201
 msgid "Change search mode"
 msgstr "Cambiar el modo de búsqueda"
 
-#: src/command.c:201
-msgid "Lyrics screen"
-msgstr "Letras"
-
-#: src/command.c:203
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/command.c:210
 msgid "Interrupt action"
 msgstr "Interrumpir la acción"
 
-#: src/command.c:205
+#: src/command.c:212
 msgid "Update Lyrics"
 msgstr "Actualizar las letras"
 
-#: src/command.c:228
+#: src/command.c:241
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: src/command.c:230
+#: src/command.c:243
 msgid "Space"
 msgstr "Espacio"
 
-#: src/command.c:232
+#: src/command.c:245
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:234
+#: src/command.c:247
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:236
+#: src/command.c:249
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/command.c:238
+#: src/command.c:251
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:240
+#: src/command.c:253
 msgid "Down"
 msgstr "Abajo"
 
-#: src/command.c:242
+#: src/command.c:255
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/command.c:244
+#: src/command.c:257
 msgid "Right"
 msgstr "Derecha"
 
-#: src/command.c:246
-msgid "Home"
-msgstr "Inicio"
-
-#: src/command.c:248
-msgid "End"
-msgstr "Fin"
-
-#: src/command.c:250
+#: src/command.c:263
 msgid "PageDown"
 msgstr "Pagina siguiente"
 
-#: src/command.c:252
+#: src/command.c:265
 msgid "PageUp"
 msgstr "Pagina anterior"
 
-#: src/command.c:254
+#: src/command.c:267
 msgid "Tab"
 msgstr "Tabulador"
 
-#: src/command.c:256
+#: src/command.c:269
 msgid "Shift+Tab"
 msgstr "Shift+Tabulador"
 
-#: src/command.c:258
+#: src/command.c:271
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:260
+#: src/command.c:273
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/command.c:464
+#: src/command.c:485
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr ""
 "Tecla %s asignada a %s y %s (pressiona %s para accer al editor de teclas)"
 
-#: src/command.c:471 src/command.c:478
-#, c-format
-msgid "Error: Key %s assigned to %s and %s\n"
+#: src/command.c:492 src/command.c:499
+#, fuzzy, c-format
+msgid "Key %s assigned to %s and %s\n"
 msgstr "Error: Tecla %s asignada a %s y %s\n"
 
 #: src/colors.c:163
@@ -854,6 +869,73 @@ msgstr "La terminal no soporta el cambio de colores\n"
 msgid "Terminal lacks color capabilities\n"
 msgstr "La terminal no tiene la opcion de diferentes colores\n"
 
+#. To translators: prefix for error messages
+#: src/conf.c:87
+msgid "Error"
+msgstr ""
+
+#: src/conf.c:95 src/conf.c:104
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration contains an unknown
+#. command
+#: src/conf.c:131
+msgid "Unknown command"
+msgstr ""
+
+#. the hotkey configuration line is incomplete
+#: src/conf.c:144
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. translators: ncmpc supports displaying the
+#. "elapsed" or "remaining" time of a song being
+#. played; in this case, the configuration file
+#. contained an invalid setting
+#: src/conf.c:176
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/conf.c:191
+msgid "Missing '='"
+msgstr ""
+
+#: src/conf.c:247
+msgid "Bad color name"
+msgstr ""
+
+#: src/conf.c:256
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/conf.c:262
+msgid "Invalid number"
+msgstr ""
+
+#: src/conf.c:270
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen name was specified in the
+#. configuration file
+#: src/conf.c:305
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/conf.c:454
+#, fuzzy
+msgid "Unknown configuration parameter"
+msgstr "Configuración de teclas"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/options.c:216 src/options.c:219
+msgid "translator-credits"
+msgstr ""
+
 #~ msgid "Screen updated!"
 #~ msgstr "Ventana actualizada!"
 
diff --git a/po/fr.po b/po/fr.po
index 33cc7f3fe..6998b8bc6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,137 +7,143 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-04 22:41+0100\n"
-"PO-Revision-Date: 2008-12-04 22:42+0100\n"
+"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"PO-Revision-Date: 2008-12-25 23:44+0100\n"
 "Last-Translator: Yann Cézard <eesprit@free.fr>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:36
+#: src/i18n.h:41
 msgid "y"
 msgstr "o"
 
-#: src/i18n.h:37
+#: src/i18n.h:42
 msgid "n"
 msgstr "n"
 
-#: src/main.c:210
+#: src/main.c:214
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Connexion à %s...  [Appuyez sur %s pour annuler]"
 
-#: src/main.c:228
+#: src/main.c:232
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Erreur: la version %d.%d.%d de MPD est trop ancienne (%s requise)"
 
-#: src/main.c:242
+#: src/main.c:246
 #, c-format
 msgid "Connected to %s"
 msgstr "Connecté à %s"
 
-#: src/screen.c:149 src/screen_help.c:209
+#: src/screen.c:152 src/screen_help.c:216
 msgid "Help"
 msgstr "Aide"
 
-#: src/screen.c:151 src/screen_play.c:455
+#: src/screen.c:154 src/screen_play.c:471
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: src/screen.c:152
+#. translators: caption of the browser screen
+#: src/screen.c:155 src/screen_file.c:205
 msgid "Browse"
 msgstr "Parcourir"
 
-#: src/screen.c:154 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/screen.c:157 src/screen_help.c:123
+#: src/screen.c:160 src/screen_help.c:123
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/screen.c:160 src/screen_lyrics.c:290 src/screen_lyrics.c:295
-#: src/screen_lyrics.c:299
+#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "Paroles"
 
-#: src/screen.c:166
+#: src/screen.c:166 src/screen_outputs.c:161
+msgid "Outputs"
+msgstr ""
+
+#: src/screen.c:172
+#, c-format
 msgid "Volume n/a "
 msgstr "Volume n/a "
 
-#: src/screen.c:168
+#: src/screen.c:174
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volume %d%%"
 
-#: src/screen.c:275
+#: src/screen.c:281
 msgid "Playing:"
 msgstr "En Lecture:"
 
-#: src/screen.c:278
+#: src/screen.c:284
 msgid "[Paused]"
 msgstr "[En Pause]"
 
-#: src/screen.c:398 src/screen.c:471
+#: src/screen.c:404 src/screen.c:477
 msgid "Error: Screen too small"
 msgstr "Erreur: Ecran trop petit"
 
-#: src/screen.c:594
+#: src/screen.c:600
 msgid "Repeat is on"
 msgstr "Mode de répetition activé"
 
-#: src/screen.c:595
+#: src/screen.c:601
 msgid "Repeat is off"
 msgstr "Mode de répetition désactivé"
 
-#: src/screen.c:599
+#: src/screen.c:605
 msgid "Random is on"
 msgstr "Mode Aléatoire activé"
 
-#: src/screen.c:600
+#: src/screen.c:606
 msgid "Random is off"
 msgstr "Mode Aléatoire désactivé"
 
-#: src/screen.c:603
+#: src/screen.c:609
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Fondu sur %d seconde(s)"
 
-#: src/screen.c:606
+#: src/screen.c:612
 msgid "Database updated"
 msgstr "Base de données mise à jour"
 
-#: src/screen.c:739
+#: src/screen.c:745
 msgid "Shuffled playlist"
 msgstr "Liste de lecture aléatoire"
 
-#: src/screen.c:743
+#: src/screen.c:749
 msgid "Cleared playlist"
 msgstr "Liste de lecture vidée"
 
-#: src/screen.c:760 src/screen_file.c:257
+#: src/screen.c:766 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Début de la mise à jour de la base de données"
 
-#: src/screen.c:762 src/screen_file.c:264
+#: src/screen.c:768 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Mise à jour de la base de données en cours..."
 
-#: src/screen.c:798
+#: src/screen.c:804
 msgid "Find mode: Wrapped"
 msgstr "Mode de recherche: Enveloppe"
 
-#: src/screen.c:799
+#: src/screen.c:805
 msgid "Find mode: Normal"
 msgstr "Mode de recherche: Normal"
 
-#: src/screen.c:804
+#: src/screen.c:810
 msgid "Auto center mode: On"
 msgstr "Mode d'auto-centrage: Actif"
 
-#: src/screen.c:805
+#: src/screen.c:811
 msgid "Auto center mode: Off"
 msgstr "Mode d'auto-centrage: Inactif"
 
@@ -146,6 +152,7 @@ msgid "All tracks"
 msgstr "Toutes les pistes"
 
 #: src/screen_artist.c:382
+#, c-format
 msgid "All artists"
 msgstr "Tous les artistes"
 
@@ -169,80 +176,83 @@ msgstr "Toutes les pistes de l'artiste : %s"
 msgid "Loading playlist %s..."
 msgstr "Chargement de la liste de lecture %s..."
 
-#: src/screen_browser.c:261 src/screen_browser.c:370 src/screen_browser.c:396
+#: src/screen_browser.c:261 src/screen_browser.c:371 src/screen_browser.c:397
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "Ajout de '%s' à la liste de lecture\n"
 
-#: src/screen_browser.c:315
+#. translators: a directory is being added the to playlist
+#: src/screen_browser.c:316
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Ajout du répertoire %s...\n"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:31
 msgid "Find: "
 msgstr "Trouver: "
 
-#: src/screen_utils.c:33
+#: src/screen_utils.c:32
 msgid "Find backward: "
 msgstr "Trouver avant: "
 
-#: src/screen_utils.c:114
+#: src/screen_utils.c:113
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: src/screen_utils.c:203
+#: src/screen_utils.c:202
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Impossible de trouver '%s'"
 
-#: src/screen_play.c:211
+#: src/screen_play.c:227
 msgid "Save playlist as: "
 msgstr "Enregistrer la liste de lecture sous: "
 
-#: src/screen_play.c:244
+#: src/screen_play.c:260
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Remplacer %s [%s/%s] ? "
 
-#: src/screen_play.c:265 src/screen_file.c:136 src/screen_keydef.c:162
+#. translators: a dialog was aborted by the user
+#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
 msgid "Aborted"
 msgstr "Annulé"
 
 #. success
-#: src/screen_play.c:273
+#: src/screen_play.c:289
 #, c-format
 msgid "Saved %s"
 msgstr "%s enregistré"
 
-#: src/screen_play.c:349
+#: src/screen_play.c:365
 msgid "Add: "
 msgstr "Ajouter: "
 
-#: src/screen_play.c:457
+#: src/screen_play.c:473
 #, c-format
 msgid "Playlist on %s"
 msgstr "Liste de lecture sur %s"
 
-#: src/screen_file.c:124
-msgid "You can only delete playlists"
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/screen_file.c:127
+#, fuzzy
+msgid "Deleting this item is not possible"
 msgstr "Seules les listes de lecture peuvent être éffacées"
 
-#: src/screen_file.c:131
+#: src/screen_file.c:134
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Effacer la liste de lecture %s [%s/%s] ? "
 
-#: src/screen_file.c:143
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/screen_file.c:149
 msgid "Playlist deleted"
 msgstr "Liste de lecture éffacée"
 
-#: src/screen_file.c:197
-#, c-format
-msgid "Browse: %s"
-msgstr "Parcourir: %s"
-
-#: src/screen_file.c:253
+#: src/screen_file.c:261
 #, c-format
 msgid "Database update of %s started"
 msgstr "Mise à jour de la base de données de %s commençée"
@@ -417,16 +427,16 @@ msgid "Edit keys for %s"
 msgstr "Editer les touches pour %s"
 
 #: src/screen_help.c:37
-msgid "Keys - Movement"
-msgstr "Touches - Déplacements"
+msgid "Movement"
+msgstr "Déplacements"
 
 #: src/screen_help.c:63
-msgid "Keys - Global"
-msgstr "Touches - Globales"
+msgid "Global"
+msgstr "Globales"
 
-#: src/screen_help.c:93
-msgid "Keys - Playlist screen"
-msgstr "Touches - Liste de Lecture"
+#: src/screen_help.c:93 src/command.c:92
+msgid "Playlist screen"
+msgstr "Ecran de Liste de lecture"
 
 #: src/screen_help.c:95
 msgid "Play"
@@ -444,9 +454,9 @@ msgstr "Déplacer la chanson vers le bas"
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:107
-msgid "Keys - Browse screen"
-msgstr "Touches - Ecran de Navigation"
+#: src/screen_help.c:107 src/command.c:94
+msgid "Browse screen"
+msgstr "Ecran de Navigation"
 
 #: src/screen_help.c:109
 msgid "Enter directory/Select and play song"
@@ -460,17 +470,17 @@ msgstr "Ajouter la chanson à la liste de lecture"
 msgid "Delete playlist"
 msgstr "Effacer la liste de lecture"
 
-#: src/screen_help.c:121
-msgid "Keys - Search screen"
-msgstr "Touches - Ecran de Recherche"
+#: src/screen_help.c:121 src/command.c:199
+msgid "Search screen"
+msgstr "Ecran de recherche"
 
 #: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Sélectionner et Lire"
 
-#: src/screen_help.c:133
-msgid "Keys - Lyrics screen"
-msgstr "Touches - Ecran des paroles"
+#: src/screen_help.c:133 src/command.c:206
+msgid "Lyrics screen"
+msgstr "Ecran des paroles"
 
 #: src/screen_help.c:135
 msgid "View Lyrics"
@@ -492,18 +502,40 @@ msgstr "Forcer le téléchargement des paroles"
 msgid "Save lyrics"
 msgstr "Enregistrer les paroles"
 
-#: src/screen_lyrics.c:166
+#: src/screen_help.c:144 src/command.c:217
+msgid "Outputs screen"
+msgstr ""
+
+#: src/screen_help.c:146
+msgid "Enable/disable output"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/screen_lyrics.c:104
 msgid "No lyrics"
 msgstr "Pas de paroles"
 
-#: src/screen_lyrics.c:290
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/screen_lyrics.c:206
 msgid "loading..."
 msgstr "Chargement..."
 
-#: src/screen_lyrics.c:326
+#. lyrics for the song were saved on hard disk
+#: src/screen_lyrics.c:241
 msgid "Lyrics saved"
 msgstr "Paroles enregistrées"
 
+#: src/screen_outputs.c:57
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/screen_outputs.c:63
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
 #: src/screen_song.c:105
 msgid "Song viewer"
 msgstr "Visualiseur de chanson"
@@ -536,296 +568,279 @@ msgstr "Style"
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/command.c:67
+#: src/command.c:68
 msgid "Key configuration screen"
 msgstr "Ecran de configuration des touches"
 
-#: src/command.c:70
+#: src/command.c:71
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/command.c:74
+#: src/command.c:75
 msgid "Move cursor up"
 msgstr "Déplacer le curseur vers le haut"
 
-#: src/command.c:76
+#: src/command.c:77
 msgid "Move cursor down"
 msgstr "Déplacer le curseur vers le bas"
 
-#: src/command.c:78
-msgid "Home "
-msgstr "Début "
+#: src/command.c:79 src/command.c:259
+msgid "Home"
+msgstr "Début"
 
-#: src/command.c:80
-msgid "End "
-msgstr "Fin "
+#: src/command.c:81 src/command.c:261
+msgid "End"
+msgstr "Fin"
 
-#: src/command.c:82
+#: src/command.c:83
 msgid "Page up"
 msgstr "Monter d'une page"
 
-#: src/command.c:84
+#: src/command.c:85
 msgid "Page down"
 msgstr "Descendre d'une page"
 
-#: src/command.c:89
+#: src/command.c:90
 msgid "Help screen"
 msgstr "Ecran d'aide"
 
-#: src/command.c:91
-msgid "Playlist screen"
-msgstr "Ecran de Liste de lecture"
-
-#: src/command.c:93
-msgid "Browse screen"
-msgstr "Ecran de Navigation"
-
-#: src/command.c:98
+#: src/command.c:99
 msgid "Play/Enter directory"
 msgstr "Jouer/Entrer dans le répertoire"
 
-#: src/command.c:100
+#: src/command.c:101
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:102
+#: src/command.c:103
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:104
+#: src/command.c:105
 msgid "Crop"
 msgstr "Couper"
 
-#: src/command.c:106
+#: src/command.c:107
 msgid "Next track"
 msgstr "Piste suivante"
 
-#: src/command.c:108
+#: src/command.c:109
 msgid "Previous track"
 msgstr "Piste précédente"
 
-#: src/command.c:110
+#: src/command.c:111
 msgid "Seek forward"
 msgstr "Avancer"
 
-#: src/command.c:112
+#: src/command.c:113
 msgid "Seek backward"
 msgstr "Reculer"
 
-#: src/command.c:114
+#: src/command.c:115
 msgid "Increase volume"
 msgstr "Augmenter le volume"
 
-#: src/command.c:116
+#: src/command.c:117
 msgid "Decrease volume"
 msgstr "Diminuer le volume"
 
-#: src/command.c:118
+#: src/command.c:119
 msgid "Select/deselect song in playlist"
 msgstr "Sélectionner/Désélectionner la chanson dans la liste de lecture"
 
-#: src/command.c:120
+#: src/command.c:121
 msgid "Select all listed items"
 msgstr "Selectionner tous les éléments listés"
 
-#: src/command.c:122
+#: src/command.c:123
 msgid "Delete song from playlist"
 msgstr "Enlever la chanson de la liste de lecture"
 
-#: src/command.c:124
+#: src/command.c:125
 msgid "Shuffle playlist"
 msgstr "Liste de lecture aléatoire"
 
-#: src/command.c:126
+#: src/command.c:127
 msgid "Clear playlist"
 msgstr "Vider la liste de lecture"
 
-#: src/command.c:128
+#: src/command.c:129
 msgid "Toggle repeat mode"
 msgstr "Activer/désactiver le mode répétition"
 
-#: src/command.c:130
+#: src/command.c:131
 msgid "Toggle random mode"
 msgstr "Activer/désactiver le mode aléatoire"
 
-#: src/command.c:132
+#: src/command.c:133
 msgid "Toggle crossfade mode"
 msgstr "Activer/désactiver le mode de fondu"
 
-#: src/command.c:134
+#: src/command.c:135
 msgid "Start a music database update"
 msgstr "Mettre à jour la base de données musicale"
 
-#: src/command.c:136
+#: src/command.c:137
 msgid "Save playlist"
 msgstr "Enregistrer la liste de lecture"
 
-#: src/command.c:138
+#: src/command.c:139
 msgid "Add url/file to playlist"
 msgstr "Ajouter une url/un fichier à la liste de lecture"
 
-#: src/command.c:141
+#: src/command.c:142
 msgid "Go to root directory"
 msgstr "Aller au répertoire racine"
 
-#: src/command.c:143
+#: src/command.c:144
 msgid "Go to parent directory"
 msgstr "Aller au répertoire supérieur"
 
-#: src/command.c:147
+#: src/command.c:148
 msgid "View the song"
 msgstr "Voir la chanson"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Locate song in browser"
 msgstr "Localiser la chanson dans le navigateur"
 
-#: src/command.c:155
+#: src/command.c:156
 msgid "Move item up"
 msgstr "Déplacer l'élément vers le haut"
 
-#: src/command.c:157
+#: src/command.c:158
 msgid "Move item down"
 msgstr "Déplacer l'élément vers le bas"
 
-#: src/command.c:159
-msgid "Update screen"
+#: src/command.c:160
+#, fuzzy
+msgid "Refresh screen"
 msgstr "Mettre à jour l'écran"
 
-#: src/command.c:164
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/command.c:167
 msgid "Toggle find mode"
 msgstr "Activer le mode de recherche"
 
-#: src/command.c:166
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/command.c:171
 msgid "Toggle auto center mode"
 msgstr "Activer le mode d'auto-centrage"
 
-#: src/command.c:171
+#: src/command.c:176
 msgid "Next screen"
 msgstr "Ecran suivant"
 
-#: src/command.c:173
+#: src/command.c:178
 msgid "Previous screen"
 msgstr "Ecran précédent"
 
-#: src/command.c:178
+#: src/command.c:183
 msgid "Forward find"
 msgstr "Chercher après"
 
-#: src/command.c:180
+#: src/command.c:185
 msgid "Forward find next"
 msgstr "Chercher après/suivant"
 
-#: src/command.c:182
+#: src/command.c:187
 msgid "Backward find"
 msgstr "Chercher avant"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Backward find previous"
 msgstr "Chercher avant/précédent"
 
-#: src/command.c:190
+#: src/command.c:195
 msgid "Artist screen"
 msgstr "Ecran sur l'Artiste"
 
-#: src/command.c:194
-msgid "Search screen"
-msgstr "Ecran de recherche"
-
-#: src/command.c:196
+#: src/command.c:201
 msgid "Change search mode"
 msgstr "Changer le mode de recherche"
 
-#: src/command.c:201
-msgid "Lyrics screen"
-msgstr "Ecran des paroles"
-
-#: src/command.c:203
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/command.c:210
 msgid "Interrupt action"
 msgstr "Interrompre l'action"
 
-#: src/command.c:205
+#: src/command.c:212
 msgid "Update Lyrics"
 msgstr "Mettre à jour les paroles"
 
-#: src/command.c:228
+#: src/command.c:241
 msgid "Undefined"
 msgstr "Indéfini"
 
-#: src/command.c:230
+#: src/command.c:243
 msgid "Space"
 msgstr "Espace"
 
-#: src/command.c:232
+#: src/command.c:245
 msgid "Enter"
 msgstr "Entrée"
 
-#: src/command.c:234
+#: src/command.c:247
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:236
+#: src/command.c:249
 msgid "Delete"
 msgstr "Suppr"
 
-#: src/command.c:238
+#: src/command.c:251
 msgid "Up"
 msgstr "Haut"
 
-#: src/command.c:240
+#: src/command.c:253
 msgid "Down"
 msgstr "Bas"
 
-#: src/command.c:242
+#: src/command.c:255
 msgid "Left"
 msgstr "Gauche"
 
-#: src/command.c:244
+#: src/command.c:257
 msgid "Right"
 msgstr "Droite"
 
-#: src/command.c:246
-msgid "Home"
-msgstr "Début"
-
-#: src/command.c:248
-msgid "End"
-msgstr "Fin"
-
-#: src/command.c:250
+#: src/command.c:263
 msgid "PageDown"
 msgstr "PageBas"
 
-#: src/command.c:252
+#: src/command.c:265
 msgid "PageUp"
 msgstr "PageHaut"
 
-#: src/command.c:254
+#: src/command.c:267
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:256
+#: src/command.c:269
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:258
+#: src/command.c:271
 msgid "Esc"
 msgstr "Echap"
 
-#: src/command.c:260
+#: src/command.c:273
 msgid "Insert"
 msgstr "Inser"
 
-#: src/command.c:464
+#: src/command.c:485
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr ""
 "La touche %s est assignée à %s et à %s (appuyez sur %s pour l'éditeur de "
 "touches)"
 
-#: src/command.c:471 src/command.c:478
-#, c-format
-msgid "Error: Key %s assigned to %s and %s\n"
+#: src/command.c:492 src/command.c:499
+#, fuzzy, c-format
+msgid "Key %s assigned to %s and %s\n"
 msgstr "Erreur: La touche %s est assignée à %s et à %s\n"
 
 #: src/colors.c:163
@@ -848,6 +863,73 @@ msgstr "Le terminal ne supporte pas le changement de couleurs\n"
 msgid "Terminal lacks color capabilities\n"
 msgstr "Le terminal ne dispose pas de la gestion des couleurs\n"
 
+#. To translators: prefix for error messages
+#: src/conf.c:87
+msgid "Error"
+msgstr ""
+
+#: src/conf.c:95 src/conf.c:104
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration contains an unknown
+#. command
+#: src/conf.c:131
+msgid "Unknown command"
+msgstr ""
+
+#. the hotkey configuration line is incomplete
+#: src/conf.c:144
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. translators: ncmpc supports displaying the
+#. "elapsed" or "remaining" time of a song being
+#. played; in this case, the configuration file
+#. contained an invalid setting
+#: src/conf.c:176
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/conf.c:191
+msgid "Missing '='"
+msgstr ""
+
+#: src/conf.c:247
+msgid "Bad color name"
+msgstr ""
+
+#: src/conf.c:256
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/conf.c:262
+msgid "Invalid number"
+msgstr ""
+
+#: src/conf.c:270
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen name was specified in the
+#. configuration file
+#: src/conf.c:305
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/conf.c:454
+#, fuzzy
+msgid "Unknown configuration parameter"
+msgstr "Ecran de configuration des touches"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/options.c:216 src/options.c:219
+msgid "translator-credits"
+msgstr ""
+
 #~ msgid "Screen updated!"
 #~ msgstr "Ecran mis à jour!"
 
diff --git a/po/gl.po b/po/gl.po
index 5a496515f..3b0b67050 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-04 22:41+0100\n"
-"PO-Revision-Date: 2008-12-04 22:42+0100\n"
+"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"PO-Revision-Date: 2008-12-25 23:44+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"
@@ -16,130 +16,136 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/i18n.h:36
+#: src/i18n.h:41
 msgid "y"
 msgstr "s"
 
-#: src/i18n.h:37
+#: src/i18n.h:42
 msgid "n"
 msgstr "n"
 
-#: src/main.c:210
+#: src/main.c:214
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "A conectar-se com %s... [Preme %s para abortar]"
 
-#: src/main.c:228
+#: src/main.c:232
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Erro: a versom %d.%d.%d do MPD é demasiado antiga (cumpre a %s)"
 
-#: src/main.c:242
+#: src/main.c:246
 #, c-format
 msgid "Connected to %s"
 msgstr "Conectado com %s"
 
-#: src/screen.c:149 src/screen_help.c:209
+#: src/screen.c:152 src/screen_help.c:216
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/screen.c:151 src/screen_play.c:455
+#: src/screen.c:154 src/screen_play.c:471
 msgid "Playlist"
 msgstr "Lista"
 
-#: src/screen.c:152
+#. translators: caption of the browser screen
+#: src/screen.c:155 src/screen_file.c:205
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/screen.c:154 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen.c:157 src/screen_help.c:123
+#: src/screen.c:160 src/screen_help.c:123
 msgid "Search"
 msgstr "Procura"
 
-#: src/screen.c:160 src/screen_lyrics.c:290 src/screen_lyrics.c:295
-#: src/screen_lyrics.c:299
+#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "Letras"
 
-#: src/screen.c:166
+#: src/screen.c:166 src/screen_outputs.c:161
+msgid "Outputs"
+msgstr ""
+
+#: src/screen.c:172
+#, c-format
 msgid "Volume n/a "
 msgstr "Volume n/a "
 
-#: src/screen.c:168
+#: src/screen.c:174
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volume %d%%"
 
-#: src/screen.c:275
+#: src/screen.c:281
 msgid "Playing:"
 msgstr "A tocar:"
 
-#: src/screen.c:278
+#: src/screen.c:284
 msgid "[Paused]"
 msgstr "[Em Pausa]"
 
-#: src/screen.c:398 src/screen.c:471
+#: src/screen.c:404 src/screen.c:477
 msgid "Error: Screen too small"
 msgstr "Erro: O écrã é demasiado pequeno"
 
-#: src/screen.c:594
+#: src/screen.c:600
 msgid "Repeat is on"
 msgstr "Repetiçom activada"
 
-#: src/screen.c:595
+#: src/screen.c:601
 msgid "Repeat is off"
 msgstr "Repetiçom desactivada"
 
-#: src/screen.c:599
+#: src/screen.c:605
 msgid "Random is on"
 msgstr "Aleatório activado"
 
-#: src/screen.c:600
+#: src/screen.c:606
 msgid "Random is off"
 msgstr "Aleatório desactivado"
 
-#: src/screen.c:603
+#: src/screen.c:609
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Esvaecemento %d segundos"
 
-#: src/screen.c:606
+#: src/screen.c:612
 msgid "Database updated"
 msgstr "Base de dados actualizada"
 
-#: src/screen.c:739
+#: src/screen.c:745
 msgid "Shuffled playlist"
 msgstr "Lista aleatorizada"
 
-#: src/screen.c:743
+#: src/screen.c:749
 msgid "Cleared playlist"
 msgstr "Lista limpada"
 
-#: src/screen.c:760 src/screen_file.c:257
+#: src/screen.c:766 src/screen_file.c:265
 msgid "Database update started"
 msgstr "A actualizaçom da BD começou"
 
-#: src/screen.c:762 src/screen_file.c:264
+#: src/screen.c:768 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "A BD está-se a actualizar..."
 
 # fuzzy
-#: src/screen.c:798
+#: src/screen.c:804
 msgid "Find mode: Wrapped"
 msgstr "Modo de procura: Limitada"
 
-#: src/screen.c:799
+#: src/screen.c:805
 msgid "Find mode: Normal"
 msgstr "Modo de procura: Normal"
 
-#: src/screen.c:804
+#: src/screen.c:810
 msgid "Auto center mode: On"
 msgstr "Modo de auto-centrado: activado"
 
-#: src/screen.c:805
+#: src/screen.c:811
 msgid "Auto center mode: Off"
 msgstr "Modo de auto-centrado: desactivado"
 
@@ -148,6 +154,7 @@ msgid "All tracks"
 msgstr "Todas as pistas"
 
 #: src/screen_artist.c:382
+#, c-format
 msgid "All artists"
 msgstr "Todos os artistas"
 
@@ -171,80 +178,83 @@ msgstr "Todas as pistas do artista: %s"
 msgid "Loading playlist %s..."
 msgstr "A carregar a lista %s..."
 
-#: src/screen_browser.c:261 src/screen_browser.c:370 src/screen_browser.c:396
+#: src/screen_browser.c:261 src/screen_browser.c:371 src/screen_browser.c:397
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "A engadir '%s' à lista\n"
 
-#: src/screen_browser.c:315
+#. translators: a directory is being added the to playlist
+#: src/screen_browser.c:316
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Engadindo o cartafol %s...\n"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:31
 msgid "Find: "
 msgstr "Procurar"
 
-#: src/screen_utils.c:33
+#: src/screen_utils.c:32
 msgid "Find backward: "
 msgstr "Procurar atrás"
 
-#: src/screen_utils.c:114
+#: src/screen_utils.c:113
 msgid "Password: "
 msgstr "Contrasinal :"
 
-#: src/screen_utils.c:203
+#: src/screen_utils.c:202
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Nom se puido atopar '%s'"
 
-#: src/screen_play.c:211
+#: src/screen_play.c:227
 msgid "Save playlist as: "
 msgstr "Guardar lista como: "
 
-#: src/screen_play.c:244
+#: src/screen_play.c:260
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Reemprazar %s [%s/%s] ?"
 
-#: src/screen_play.c:265 src/screen_file.c:136 src/screen_keydef.c:162
+#. translators: a dialog was aborted by the user
+#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
 msgid "Aborted"
 msgstr "Abortado"
 
 #. success
-#: src/screen_play.c:273
+#: src/screen_play.c:289
 #, c-format
 msgid "Saved %s"
 msgstr "Guardado %s"
 
-#: src/screen_play.c:349
+#: src/screen_play.c:365
 msgid "Add: "
 msgstr "Engadir: "
 
-#: src/screen_play.c:457
+#: src/screen_play.c:473
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lista em %s"
 
-#: src/screen_file.c:124
-msgid "You can only delete playlists"
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/screen_file.c:127
+#, fuzzy
+msgid "Deleting this item is not possible"
 msgstr "Apenas podes eliminar as listas"
 
-#: src/screen_file.c:131
+#: src/screen_file.c:134
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Eliminar a lista %s [%s/%s] ?"
 
-#: src/screen_file.c:143
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/screen_file.c:149
 msgid "Playlist deleted"
 msgstr "Lista eliminada"
 
-#: src/screen_file.c:197
-#, c-format
-msgid "Browse: %s"
-msgstr "Navegar: %s"
-
-#: src/screen_file.c:253
+#: src/screen_file.c:261
 #, c-format
 msgid "Database update of %s started"
 msgstr "A actualizaçom da BD de %s começou"
@@ -419,16 +429,16 @@ msgid "Edit keys for %s"
 msgstr "Editar atalhos para %s"
 
 #: src/screen_help.c:37
-msgid "Keys - Movement"
-msgstr "Teclas - Movimento"
+msgid "Movement"
+msgstr "Movimento"
 
 #: src/screen_help.c:63
-msgid "Keys - Global"
-msgstr "Teclas - Global"
+msgid "Global"
+msgstr "Global"
 
-#: src/screen_help.c:93
-msgid "Keys - Playlist screen"
-msgstr "Teclas - Écrã da lista"
+#: src/screen_help.c:93 src/command.c:92
+msgid "Playlist screen"
+msgstr "Écrã da lista"
 
 #: src/screen_help.c:95
 msgid "Play"
@@ -446,9 +456,9 @@ msgstr "Mover a cançom abaixo"
 msgid "Center"
 msgstr "Centrar"
 
-#: src/screen_help.c:107
-msgid "Keys - Browse screen"
-msgstr "Teclas - Écrã de navegaçom"
+#: src/screen_help.c:107 src/command.c:94
+msgid "Browse screen"
+msgstr "Écrã de navegaçom"
 
 #: src/screen_help.c:109
 msgid "Enter directory/Select and play song"
@@ -462,17 +472,17 @@ msgstr "Engadir a cançom à lista"
 msgid "Delete playlist"
 msgstr "Eliminar lista"
 
-#: src/screen_help.c:121
-msgid "Keys - Search screen"
-msgstr "Teclas - Écrã de procura"
+#: src/screen_help.c:121 src/command.c:199
+msgid "Search screen"
+msgstr "Écrã de procura"
 
 #: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Seleccionar e tocar"
 
-#: src/screen_help.c:133
-msgid "Keys - Lyrics screen"
-msgstr "Teclas - Écrã das letras"
+#: src/screen_help.c:133 src/command.c:206
+msgid "Lyrics screen"
+msgstr "Ecrã das letras"
 
 #: src/screen_help.c:135
 msgid "View Lyrics"
@@ -494,18 +504,40 @@ msgstr "Forçar a descarga das letras"
 msgid "Save lyrics"
 msgstr "Guardar as letras"
 
-#: src/screen_lyrics.c:166
+#: src/screen_help.c:144 src/command.c:217
+msgid "Outputs screen"
+msgstr ""
+
+#: src/screen_help.c:146
+msgid "Enable/disable output"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/screen_lyrics.c:104
 msgid "No lyrics"
 msgstr "Sen letras"
 
-#: src/screen_lyrics.c:290
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/screen_lyrics.c:206
 msgid "loading..."
 msgstr "a carregar..."
 
-#: src/screen_lyrics.c:326
+#. lyrics for the song were saved on hard disk
+#: src/screen_lyrics.c:241
 msgid "Lyrics saved"
 msgstr "Letras guardadas"
 
+#: src/screen_outputs.c:57
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/screen_outputs.c:63
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
 #: src/screen_song.c:105
 msgid "Song viewer"
 msgstr "Visor da cançom"
@@ -538,295 +570,278 @@ msgstr "Estilo"
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/command.c:67
+#: src/command.c:68
 msgid "Key configuration screen"
 msgstr "Écrã da configuraçom dos atalhos"
 
-#: src/command.c:70
+#: src/command.c:71
 msgid "Quit"
 msgstr "Sair"
 
-#: src/command.c:74
+#: src/command.c:75
 msgid "Move cursor up"
 msgstr "Mover o cursor arriba"
 
-#: src/command.c:76
+#: src/command.c:77
 msgid "Move cursor down"
 msgstr "Mover o cursor abaixo"
 
-#: src/command.c:78
-msgid "Home "
-msgstr "Início"
+#: src/command.c:79 src/command.c:259
+msgid "Home"
+msgstr "Home"
 
-#: src/command.c:80
-msgid "End "
+#: src/command.c:81 src/command.c:261
+msgid "End"
 msgstr "Fim"
 
-#: src/command.c:82
+#: src/command.c:83
 msgid "Page up"
 msgstr "Avance página"
 
-#: src/command.c:84
+#: src/command.c:85
 msgid "Page down"
 msgstr "Retrocesso página"
 
-#: src/command.c:89
+#: src/command.c:90
 msgid "Help screen"
 msgstr "Écrã de ajuda"
 
-#: src/command.c:91
-msgid "Playlist screen"
-msgstr "Écrã da lista"
-
-#: src/command.c:93
-msgid "Browse screen"
-msgstr "Écrã de navegaçom"
-
-#: src/command.c:98
+#: src/command.c:99
 msgid "Play/Enter directory"
 msgstr "Tocar/Entrar num cartafol"
 
-#: src/command.c:100
+#: src/command.c:101
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/command.c:102
+#: src/command.c:103
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:104
+#: src/command.c:105
 msgid "Crop"
 msgstr "Cortar"
 
-#: src/command.c:106
+#: src/command.c:107
 msgid "Next track"
 msgstr "Seguinte"
 
-#: src/command.c:108
+#: src/command.c:109
 msgid "Previous track"
 msgstr "Anterior"
 
-#: src/command.c:110
+#: src/command.c:111
 msgid "Seek forward"
 msgstr "Avançar"
 
-#: src/command.c:112
+#: src/command.c:113
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:114
+#: src/command.c:115
 msgid "Increase volume"
 msgstr "Aumentar volume"
 
-#: src/command.c:116
+#: src/command.c:117
 msgid "Decrease volume"
 msgstr "Diminuir volume"
 
-#: src/command.c:118
+#: src/command.c:119
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/desseleccionar a cançom na lista"
 
-#: src/command.c:120
+#: src/command.c:121
 msgid "Select all listed items"
 msgstr "Seleccionar todos"
 
-#: src/command.c:122
+#: src/command.c:123
 msgid "Delete song from playlist"
 msgstr "Eliminar a cançom da lista"
 
-#: src/command.c:124
+#: src/command.c:125
 msgid "Shuffle playlist"
 msgstr "Aleatorizar a lista"
 
-#: src/command.c:126
+#: src/command.c:127
 msgid "Clear playlist"
 msgstr "Limpar a lista"
 
-#: src/command.c:128
+#: src/command.c:129
 msgid "Toggle repeat mode"
 msgstr "Activar/desactivar o modo repetiçom"
 
-#: src/command.c:130
+#: src/command.c:131
 msgid "Toggle random mode"
 msgstr "Activar/desactivar o modo aleatório"
 
-#: src/command.c:132
+#: src/command.c:133
 msgid "Toggle crossfade mode"
 msgstr "Activar/desactivar o modo esvaecimento"
 
-#: src/command.c:134
+#: src/command.c:135
 msgid "Start a music database update"
 msgstr "Começar umha actualizaçom da BD"
 
-#: src/command.c:136
+#: src/command.c:137
 msgid "Save playlist"
 msgstr "Guardar lista"
 
-#: src/command.c:138
+#: src/command.c:139
 msgid "Add url/file to playlist"
 msgstr "Engadir url/ficheiro à lista"
 
-#: src/command.c:141
+#: src/command.c:142
 msgid "Go to root directory"
 msgstr "Ir ao cartafol raíz"
 
-#: src/command.c:143
+#: src/command.c:144
 msgid "Go to parent directory"
 msgstr "Ir ao cartafol pai"
 
-#: src/command.c:147
+#: src/command.c:148
 msgid "View the song"
 msgstr "Ver a cançom"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Locate song in browser"
 msgstr "Atopar a cançom no navegador"
 
-#: src/command.c:155
+#: src/command.c:156
 msgid "Move item up"
 msgstr "Mover o elemento arriba"
 
-#: src/command.c:157
+#: src/command.c:158
 msgid "Move item down"
 msgstr "Mover o elemento abaixo"
 
-#: src/command.c:159
-msgid "Update screen"
+#: src/command.c:160
+#, fuzzy
+msgid "Refresh screen"
 msgstr "Actualizar o écrã"
 
-#: src/command.c:164
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/command.c:167
 msgid "Toggle find mode"
 msgstr "Alternar o modo de procura"
 
-#: src/command.c:166
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/command.c:171
 msgid "Toggle auto center mode"
 msgstr "Alternar o modo de auto-centrado"
 
-#: src/command.c:171
+#: src/command.c:176
 msgid "Next screen"
 msgstr "Seguinte écrã"
 
-#: src/command.c:173
+#: src/command.c:178
 msgid "Previous screen"
 msgstr "Écrã anterior"
 
-#: src/command.c:178
+#: src/command.c:183
 msgid "Forward find"
 msgstr "Procurar cara adiante"
 
-#: src/command.c:180
+#: src/command.c:185
 msgid "Forward find next"
 msgstr "Procurar para adiante, seguinte"
 
-#: src/command.c:182
+#: src/command.c:187
 msgid "Backward find"
 msgstr "Procurar cara atrás"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Backward find previous"
 msgstr "Procurar cara atrás, anterior"
 
-#: src/command.c:190
+#: src/command.c:195
 msgid "Artist screen"
 msgstr "Navegador de Artistas"
 
-#: src/command.c:194
-msgid "Search screen"
-msgstr "Écrã de procura"
-
-#: src/command.c:196
+#: src/command.c:201
 msgid "Change search mode"
 msgstr "Mudar o modo de procura"
 
-#: src/command.c:201
-msgid "Lyrics screen"
-msgstr "Ecrã das letras"
-
-#: src/command.c:203
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/command.c:210
 msgid "Interrupt action"
 msgstr "Interromper a acçom"
 
-#: src/command.c:205
+#: src/command.c:212
 msgid "Update Lyrics"
 msgstr "Actualizar as letras"
 
-#: src/command.c:228
+#: src/command.c:241
 msgid "Undefined"
 msgstr "Nom definido"
 
-#: src/command.c:230
+#: src/command.c:243
 msgid "Space"
 msgstr "Espaço"
 
-#: src/command.c:232
+#: src/command.c:245
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:234
+#: src/command.c:247
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:236
+#: src/command.c:249
 msgid "Delete"
 msgstr "Supr"
 
-#: src/command.c:238
+#: src/command.c:251
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:240
+#: src/command.c:253
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/command.c:242
+#: src/command.c:255
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/command.c:244
+#: src/command.c:257
 msgid "Right"
 msgstr "Direita"
 
-#: src/command.c:246
-msgid "Home"
-msgstr "Home"
-
-#: src/command.c:248
-msgid "End"
-msgstr "Fim"
-
-#: src/command.c:250
+#: src/command.c:263
 msgid "PageDown"
 msgstr "Re. Pág."
 
-#: src/command.c:252
+#: src/command.c:265
 msgid "PageUp"
 msgstr "Av. Pág."
 
-#: src/command.c:254
+#: src/command.c:267
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:256
+#: src/command.c:269
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:258
+#: src/command.c:271
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:260
+#: src/command.c:273
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:464
+#: src/command.c:485
 #, 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:471 src/command.c:478
-#, c-format
-msgid "Error: Key %s assigned to %s and %s\n"
+#: src/command.c:492 src/command.c:499
+#, fuzzy, c-format
+msgid "Key %s assigned to %s and %s\n"
 msgstr "Erro: a tecla %s assignou-se a %s e a %s\n"
 
 #: src/colors.c:163
@@ -849,6 +864,73 @@ msgstr "A terminal nom tem suporte para a mudança das cores\n"
 msgid "Terminal lacks color capabilities\n"
 msgstr "A terminal nom tem capacidades de cor\n"
 
+#. To translators: prefix for error messages
+#: src/conf.c:87
+msgid "Error"
+msgstr ""
+
+#: src/conf.c:95 src/conf.c:104
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration contains an unknown
+#. command
+#: src/conf.c:131
+msgid "Unknown command"
+msgstr ""
+
+#. the hotkey configuration line is incomplete
+#: src/conf.c:144
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. translators: ncmpc supports displaying the
+#. "elapsed" or "remaining" time of a song being
+#. played; in this case, the configuration file
+#. contained an invalid setting
+#: src/conf.c:176
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/conf.c:191
+msgid "Missing '='"
+msgstr ""
+
+#: src/conf.c:247
+msgid "Bad color name"
+msgstr ""
+
+#: src/conf.c:256
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/conf.c:262
+msgid "Invalid number"
+msgstr ""
+
+#: src/conf.c:270
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen name was specified in the
+#. configuration file
+#: src/conf.c:305
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/conf.c:454
+#, fuzzy
+msgid "Unknown configuration parameter"
+msgstr "Écrã da configuraçom dos atalhos"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/options.c:216 src/options.c:219
+msgid "translator-credits"
+msgstr ""
+
 #~ msgid "Screen updated!"
 #~ msgstr "Écrã actualizado!"
 
diff --git a/po/hu.po b/po/hu.po
index 80c5632b0..d5ccd949f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-04 22:41+0100\n"
-"PO-Revision-Date: 2008-12-04 22:47+0100\n"
+"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"PO-Revision-Date: 2008-12-25 23:44+0100\n"
 "Last-Translator: Laszlo Ashin <kodest@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,129 +17,135 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-12-04 21:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/i18n.h:36
+#: src/i18n.h:41
 msgid "y"
 msgstr "i"
 
-#: src/i18n.h:37
+#: src/i18n.h:42
 msgid "n"
 msgstr "n"
 
-#: src/main.c:210
+#: src/main.c:214
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Kapcsolódás a következőhöz: %s... [Nyomj %s gombot a megszakításhoz]"
 
-#: src/main.c:228
+#: src/main.c:232
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Hiba: a(z) %d.%d.%d MPD verzió túl régi (%s kell)"
 
-#: src/main.c:242
+#: src/main.c:246
 #, c-format
 msgid "Connected to %s"
 msgstr "Csatlakoztatva ide: %s"
 
-#: src/screen.c:149 src/screen_help.c:209
+#: src/screen.c:152 src/screen_help.c:216
 msgid "Help"
 msgstr "Súgó"
 
-#: src/screen.c:151 src/screen_play.c:455
+#: src/screen.c:154 src/screen_play.c:471
 msgid "Playlist"
 msgstr "Lejátszólista"
 
-#: src/screen.c:152
+#. translators: caption of the browser screen
+#: src/screen.c:155 src/screen_file.c:205
 msgid "Browse"
 msgstr "Tallózás"
 
-#: src/screen.c:154 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/screen.c:157 src/screen_help.c:123
+#: src/screen.c:160 src/screen_help.c:123
 msgid "Search"
 msgstr "Keresés"
 
-#: src/screen.c:160 src/screen_lyrics.c:290 src/screen_lyrics.c:295
-#: src/screen_lyrics.c:299
+#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "Dalszövegek"
 
-#: src/screen.c:166
+#: src/screen.c:166 src/screen_outputs.c:161
+msgid "Outputs"
+msgstr ""
+
+#: src/screen.c:172
+#, c-format
 msgid "Volume n/a "
 msgstr "Hangerő ismeretlen "
 
-#: src/screen.c:168
+#: src/screen.c:174
 #, c-format
 msgid " Volume %d%%"
 msgstr " Hangerő %d%%"
 
-#: src/screen.c:275
+#: src/screen.c:281
 msgid "Playing:"
 msgstr "Ami szól:"
 
-#: src/screen.c:278
+#: src/screen.c:284
 msgid "[Paused]"
 msgstr "[Szüneteltetve]"
 
-#: src/screen.c:398 src/screen.c:471
+#: src/screen.c:404 src/screen.c:477
 msgid "Error: Screen too small"
 msgstr "Hiba: a képernyő túl kicsi"
 
-#: src/screen.c:594
+#: src/screen.c:600
 msgid "Repeat is on"
 msgstr "Ismétlés elindítva"
 
-#: src/screen.c:595
+#: src/screen.c:601
 msgid "Repeat is off"
 msgstr "Ismétlés leállítva"
 
-#: src/screen.c:599
+#: src/screen.c:605
 msgid "Random is on"
 msgstr "Véletlenszerű lejátszás bekapcsolva"
 
-#: src/screen.c:600
+#: src/screen.c:606
 msgid "Random is off"
 msgstr "Véletlenszerű lejátszás kikapcsolva"
 
-#: src/screen.c:603
+#: src/screen.c:609
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Egymásba mosás %d másodperc"
 
-#: src/screen.c:606
+#: src/screen.c:612
 msgid "Database updated"
 msgstr "Adatbázis frissítve"
 
-#: src/screen.c:739
+#: src/screen.c:745
 msgid "Shuffled playlist"
 msgstr "Lejátszólista összekeverve"
 
-#: src/screen.c:743
+#: src/screen.c:749
 msgid "Cleared playlist"
 msgstr "Lejátszólista törölve"
 
-#: src/screen.c:760 src/screen_file.c:257
+#: src/screen.c:766 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Adatbázis frissítés elindult"
 
-#: src/screen.c:762 src/screen_file.c:264
+#: src/screen.c:768 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Adatbázis frissítés folyamatban..."
 
-#: src/screen.c:798
+#: src/screen.c:804
 msgid "Find mode: Wrapped"
 msgstr "Keresési mód: újrakezdő"
 
-#: src/screen.c:799
+#: src/screen.c:805
 msgid "Find mode: Normal"
 msgstr "Keresési mód: normál"
 
-#: src/screen.c:804
+#: src/screen.c:810
 msgid "Auto center mode: On"
 msgstr "Középre igazítás bekapcsolva"
 
-#: src/screen.c:805
+#: src/screen.c:811
 msgid "Auto center mode: Off"
 msgstr "Középre igazítás kikapcsolva"
 
@@ -148,6 +154,7 @@ msgid "All tracks"
 msgstr "Minden szám"
 
 #: src/screen_artist.c:382
+#, c-format
 msgid "All artists"
 msgstr "Minden előadó"
 
@@ -171,80 +178,83 @@ msgstr "%s előadó minden száma"
 msgid "Loading playlist %s..."
 msgstr "%s lejátszólista betöltése..."
 
-#: src/screen_browser.c:261 src/screen_browser.c:370 src/screen_browser.c:396
+#: src/screen_browser.c:261 src/screen_browser.c:371 src/screen_browser.c:397
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "'%s' hozzáadása a lejátszólistához\n"
 
-#: src/screen_browser.c:315
+#. translators: a directory is being added the to playlist
+#: src/screen_browser.c:316
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "%s könyvtár hozzáadása...\n"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:31
 msgid "Find: "
 msgstr "Keresés: "
 
-#: src/screen_utils.c:33
+#: src/screen_utils.c:32
 msgid "Find backward: "
 msgstr "Keresés visszafelé: "
 
-#: src/screen_utils.c:114
+#: src/screen_utils.c:113
 msgid "Password: "
 msgstr "Jelszó: "
 
-#: src/screen_utils.c:203
+#: src/screen_utils.c:202
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "'%s' nem található"
 
-#: src/screen_play.c:211
+#: src/screen_play.c:227
 msgid "Save playlist as: "
 msgstr "Lejátszólista mentése másként: "
 
-#: src/screen_play.c:244
+#: src/screen_play.c:260
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Cserélni a következőt: %s [%s/%s]? "
 
-#: src/screen_play.c:265 src/screen_file.c:136 src/screen_keydef.c:162
+#. translators: a dialog was aborted by the user
+#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
 msgid "Aborted"
 msgstr "Megszakítva"
 
 #. success
-#: src/screen_play.c:273
+#: src/screen_play.c:289
 #, c-format
 msgid "Saved %s"
 msgstr "%s elmentve"
 
-#: src/screen_play.c:349
+#: src/screen_play.c:365
 msgid "Add: "
 msgstr "Hozzáadás: "
 
-#: src/screen_play.c:457
+#: src/screen_play.c:473
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lejátszólista itt: %s"
 
-#: src/screen_file.c:124
-msgid "You can only delete playlists"
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/screen_file.c:127
+#, fuzzy
+msgid "Deleting this item is not possible"
 msgstr "A lejátszólistákat csak törölni tudod"
 
-#: src/screen_file.c:131
+#: src/screen_file.c:134
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Törlöd a %s lejátszólistát [%s/%s]? "
 
-#: src/screen_file.c:143
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/screen_file.c:149
 msgid "Playlist deleted"
 msgstr "Lejátszólista törölve"
 
-#: src/screen_file.c:197
-#, c-format
-msgid "Browse: %s"
-msgstr "Tallózás: %s"
-
-#: src/screen_file.c:253
+#: src/screen_file.c:261
 #, c-format
 msgid "Database update of %s started"
 msgstr "%s adatbázis frissítése elkezdődött"
@@ -419,16 +429,16 @@ msgid "Edit keys for %s"
 msgstr "Gombok módosítása a következőhöz: %s"
 
 #: src/screen_help.c:37
-msgid "Keys - Movement"
-msgstr "Gombok - Mozgás"
+msgid "Movement"
+msgstr "Mozgás"
 
 #: src/screen_help.c:63
-msgid "Keys - Global"
-msgstr "Gombok - �ltalános"
+msgid "Global"
+msgstr "�ltalános"
 
-#: src/screen_help.c:93
-msgid "Keys - Playlist screen"
-msgstr "Gombok - Lejátszólista"
+#: src/screen_help.c:93 src/command.c:92
+msgid "Playlist screen"
+msgstr "Lejátszólista"
 
 #: src/screen_help.c:95
 msgid "Play"
@@ -446,9 +456,9 @@ msgstr "Szám mozgatása lefelé"
 msgid "Center"
 msgstr "Közép"
 
-#: src/screen_help.c:107
-msgid "Keys - Browse screen"
-msgstr "Gombok - Tallozás"
+#: src/screen_help.c:107 src/command.c:94
+msgid "Browse screen"
+msgstr "Tallózás"
 
 #: src/screen_help.c:109
 msgid "Enter directory/Select and play song"
@@ -462,17 +472,17 @@ msgstr "Szám hozzáadása a lejátszólistához"
 msgid "Delete playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/screen_help.c:121
-msgid "Keys - Search screen"
-msgstr "Gombok - Keresés"
+#: src/screen_help.c:121 src/command.c:199
+msgid "Search screen"
+msgstr "Kereső képernyő"
 
 #: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Kiválasztás és lejátszás"
 
-#: src/screen_help.c:133
-msgid "Keys - Lyrics screen"
-msgstr "Gombok - Dalszövegek"
+#: src/screen_help.c:133 src/command.c:206
+msgid "Lyrics screen"
+msgstr "Dalszöveg képernyő"
 
 #: src/screen_help.c:135
 msgid "View Lyrics"
@@ -494,18 +504,40 @@ msgstr "Dalszövegek kifejezett letöltése"
 msgid "Save lyrics"
 msgstr "Dalszövegek mentése"
 
-#: src/screen_lyrics.c:166
+#: src/screen_help.c:144 src/command.c:217
+msgid "Outputs screen"
+msgstr ""
+
+#: src/screen_help.c:146
+msgid "Enable/disable output"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/screen_lyrics.c:104
 msgid "No lyrics"
 msgstr "Nincs dalszöveg"
 
-#: src/screen_lyrics.c:290
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/screen_lyrics.c:206
 msgid "loading..."
 msgstr "betöltés..."
 
-#: src/screen_lyrics.c:326
+#. lyrics for the song were saved on hard disk
+#: src/screen_lyrics.c:241
 msgid "Lyrics saved"
 msgstr "Dalszövegek elmentve"
 
+#: src/screen_outputs.c:57
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/screen_outputs.c:63
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
 #: src/screen_song.c:105
 msgid "Song viewer"
 msgstr "Szám néző"
@@ -538,295 +570,278 @@ msgstr "Műfaj"
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/command.c:67
+#: src/command.c:68
 msgid "Key configuration screen"
 msgstr "Billentyű beállító képernyő"
 
-#: src/command.c:70
+#: src/command.c:71
 msgid "Quit"
 msgstr "Kilép"
 
-#: src/command.c:74
+#: src/command.c:75
 msgid "Move cursor up"
 msgstr "Kurzormozgatás felfelé"
 
-#: src/command.c:76
+#: src/command.c:77
 msgid "Move cursor down"
 msgstr "Kurzormozgatás lefelé"
 
-#: src/command.c:78
-msgid "Home "
-msgstr "Eleje "
+#: src/command.c:79 src/command.c:259
+msgid "Home"
+msgstr "Home"
 
-#: src/command.c:80
-msgid "End "
-msgstr "Vége "
+#: src/command.c:81 src/command.c:261
+msgid "End"
+msgstr "End"
 
-#: src/command.c:82
+#: src/command.c:83
 msgid "Page up"
 msgstr "Egy oldalt fel"
 
-#: src/command.c:84
+#: src/command.c:85
 msgid "Page down"
 msgstr "Egy oldalt le"
 
-#: src/command.c:89
+#: src/command.c:90
 msgid "Help screen"
 msgstr "Segítség"
 
-#: src/command.c:91
-msgid "Playlist screen"
-msgstr "Lejátszólista"
-
-#: src/command.c:93
-msgid "Browse screen"
-msgstr "Tallózás"
-
-#: src/command.c:98
+#: src/command.c:99
 msgid "Play/Enter directory"
 msgstr "Lejátszás/Belépés könyvtárba"
 
-#: src/command.c:100
+#: src/command.c:101
 msgid "Pause"
 msgstr "Szüneteltetés"
 
-#: src/command.c:102
+#: src/command.c:103
 msgid "Stop"
 msgstr "Leállítás"
 
-#: src/command.c:104
+#: src/command.c:105
 msgid "Crop"
 msgstr "Vágás"
 
-#: src/command.c:106
+#: src/command.c:107
 msgid "Next track"
 msgstr "Következő szám"
 
-#: src/command.c:108
+#: src/command.c:109
 msgid "Previous track"
 msgstr "Előző szám"
 
-#: src/command.c:110
+#: src/command.c:111
 msgid "Seek forward"
 msgstr "Tekerés előre"
 
-#: src/command.c:112
+#: src/command.c:113
 msgid "Seek backward"
 msgstr "Tekerés hátra"
 
-#: src/command.c:114
+#: src/command.c:115
 msgid "Increase volume"
 msgstr "Hangerő növelése"
 
-#: src/command.c:116
+#: src/command.c:117
 msgid "Decrease volume"
 msgstr "Hangerő csökkentése"
 
-#: src/command.c:118
+#: src/command.c:119
 msgid "Select/deselect song in playlist"
 msgstr "Szám kiválasztása a lejátszólistában"
 
-#: src/command.c:120
+#: src/command.c:121
 msgid "Select all listed items"
 msgstr "Minden listázott elem kiválasztása"
 
-#: src/command.c:122
+#: src/command.c:123
 msgid "Delete song from playlist"
 msgstr "Szám törlése a lejátszólistából"
 
-#: src/command.c:124
+#: src/command.c:125
 msgid "Shuffle playlist"
 msgstr "Lejátszólista összekeverése"
 
-#: src/command.c:126
+#: src/command.c:127
 msgid "Clear playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/command.c:128
+#: src/command.c:129
 msgid "Toggle repeat mode"
 msgstr "Ismétlő mód ki- és bekapcsolása"
 
-#: src/command.c:130
+#: src/command.c:131
 msgid "Toggle random mode"
 msgstr "Véletlenszerű lejátszás ki- és bekapcsolása"
 
-#: src/command.c:132
+#: src/command.c:133
 msgid "Toggle crossfade mode"
 msgstr "Egymásba mosás ki- és bekapcsolása"
 
-#: src/command.c:134
+#: src/command.c:135
 msgid "Start a music database update"
 msgstr "A zenei adatbázis frissítésének indítása"
 
-#: src/command.c:136
+#: src/command.c:137
 msgid "Save playlist"
 msgstr "Lejátszólista mentése"
 
-#: src/command.c:138
+#: src/command.c:139
 msgid "Add url/file to playlist"
 msgstr "URL vagy fájl hozzáadása a lejátszólistához"
 
-#: src/command.c:141
+#: src/command.c:142
 msgid "Go to root directory"
 msgstr "Mozgás a gyökér könyvtárba"
 
-#: src/command.c:143
+#: src/command.c:144
 msgid "Go to parent directory"
 msgstr "Mozgás a szülő könyvtárba"
 
-#: src/command.c:147
+#: src/command.c:148
 msgid "View the song"
 msgstr "A szám megtekintése"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Locate song in browser"
 msgstr "Szám megtekintése a tallozóban"
 
-#: src/command.c:155
+#: src/command.c:156
 msgid "Move item up"
 msgstr "Elem mozgatása fel"
 
-#: src/command.c:157
+#: src/command.c:158
 msgid "Move item down"
 msgstr "Elem mozgatása le"
 
-#: src/command.c:159
-msgid "Update screen"
+#: src/command.c:160
+#, fuzzy
+msgid "Refresh screen"
 msgstr "Képernyő frissítése"
 
-#: src/command.c:164
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/command.c:167
 msgid "Toggle find mode"
 msgstr "Kereső mód ki- és bekapcsolása"
 
-#: src/command.c:166
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/command.c:171
 msgid "Toggle auto center mode"
 msgstr "Középre igazítás ki- és bekapcsolása"
 
-#: src/command.c:171
+#: src/command.c:176
 msgid "Next screen"
 msgstr "Kövezkező képernyő"
 
-#: src/command.c:173
+#: src/command.c:178
 msgid "Previous screen"
 msgstr "Előző képernyő"
 
-#: src/command.c:178
+#: src/command.c:183
 msgid "Forward find"
 msgstr "Keresés előre"
 
-#: src/command.c:180
+#: src/command.c:185
 msgid "Forward find next"
 msgstr "Következő keresése előre"
 
-#: src/command.c:182
+#: src/command.c:187
 msgid "Backward find"
 msgstr "Keresés hátra"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Backward find previous"
 msgstr "Előző keresése hátra"
 
-#: src/command.c:190
+#: src/command.c:195
 msgid "Artist screen"
 msgstr "Előadó képernyő"
 
-#: src/command.c:194
-msgid "Search screen"
-msgstr "Kereső képernyő"
-
-#: src/command.c:196
+#: src/command.c:201
 msgid "Change search mode"
 msgstr "Kereső mód váltása"
 
-#: src/command.c:201
-msgid "Lyrics screen"
-msgstr "Dalszöveg képernyő"
-
-#: src/command.c:203
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/command.c:210
 msgid "Interrupt action"
 msgstr "parancs megszakítása"
 
-#: src/command.c:205
+#: src/command.c:212
 msgid "Update Lyrics"
 msgstr "Dalszövegek frissítése"
 
-#: src/command.c:228
+#: src/command.c:241
 msgid "Undefined"
 msgstr "Meghatározatlan"
 
-#: src/command.c:230
+#: src/command.c:243
 msgid "Space"
 msgstr "Szóköz"
 
-#: src/command.c:232
+#: src/command.c:245
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:234
+#: src/command.c:247
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:236
+#: src/command.c:249
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:238
+#: src/command.c:251
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:240
+#: src/command.c:253
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:242
+#: src/command.c:255
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:244
+#: src/command.c:257
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:246
-msgid "Home"
-msgstr "Home"
-
-#: src/command.c:248
-msgid "End"
-msgstr "End"
-
-#: src/command.c:250
+#: src/command.c:263
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:252
+#: src/command.c:265
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:254
+#: src/command.c:267
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:256
+#: src/command.c:269
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:258
+#: src/command.c:271
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:260
+#: src/command.c:273
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:464
+#: src/command.c:485
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr ""
 "%s gomb hozzárendelve a következőkhöz: %s és %s (nyomj %s-t a szerkesztéshez)"
 
-#: src/command.c:471 src/command.c:478
-#, c-format
-msgid "Error: Key %s assigned to %s and %s\n"
+#: src/command.c:492 src/command.c:499
+#, fuzzy, c-format
+msgid "Key %s assigned to %s and %s\n"
 msgstr "Hiba: %s gomb hozzárendelve a következőkhöz: %s és %s\n"
 
 #: src/colors.c:163
@@ -848,3 +863,70 @@ msgstr "A terminál nem támogatja a színek változtatását\n"
 #, c-format
 msgid "Terminal lacks color capabilities\n"
 msgstr "A terminál nem támogatja a színeket\n"
+
+#. To translators: prefix for error messages
+#: src/conf.c:87
+msgid "Error"
+msgstr ""
+
+#: src/conf.c:95 src/conf.c:104
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration contains an unknown
+#. command
+#: src/conf.c:131
+msgid "Unknown command"
+msgstr ""
+
+#. the hotkey configuration line is incomplete
+#: src/conf.c:144
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. translators: ncmpc supports displaying the
+#. "elapsed" or "remaining" time of a song being
+#. played; in this case, the configuration file
+#. contained an invalid setting
+#: src/conf.c:176
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/conf.c:191
+msgid "Missing '='"
+msgstr ""
+
+#: src/conf.c:247
+msgid "Bad color name"
+msgstr ""
+
+#: src/conf.c:256
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/conf.c:262
+msgid "Invalid number"
+msgstr ""
+
+#: src/conf.c:270
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen name was specified in the
+#. configuration file
+#: src/conf.c:305
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/conf.c:454
+#, fuzzy
+msgid "Unknown configuration parameter"
+msgstr "Billentyű beállító képernyő"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/options.c:216 src/options.c:219
+msgid "translator-credits"
+msgstr ""
diff --git a/po/no.po b/po/no.po
index 0f0eb3924..3c1cdc16d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -8,137 +8,143 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-04 22:41+0100\n"
-"PO-Revision-Date: 2008-12-04 22:42+0100\n"
+"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"PO-Revision-Date: 2008-12-25 23:45+0100\n"
 "Last-Translator: Ole R. Thorsen <ole.rth@gmail.com>\n"
 "Language-Team: no <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:36
+#: src/i18n.h:41
 msgid "y"
 msgstr "j"
 
-#: src/i18n.h:37
+#: src/i18n.h:42
 msgid "n"
 msgstr ""
 
-#: src/main.c:210
+#: src/main.c:214
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Kobler til %s... [Trykk %s for å avslutte]"
 
-#: src/main.c:228
+#: src/main.c:232
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "MPD versjon %d.%d.%d er for gammel - oppgrader til versjon %s"
 
-#: src/main.c:242
+#: src/main.c:246
 #, c-format
 msgid "Connected to %s"
 msgstr "Koblet til %s"
 
-#: src/screen.c:149 src/screen_help.c:209
+#: src/screen.c:152 src/screen_help.c:216
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/screen.c:151 src/screen_play.c:455
+#: src/screen.c:154 src/screen_play.c:471
 msgid "Playlist"
 msgstr "Spilleliste"
 
-#: src/screen.c:152
+#. translators: caption of the browser screen
+#: src/screen.c:155 src/screen_file.c:205
 msgid "Browse"
 msgstr "Filer"
 
-#: src/screen.c:154 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
 msgid "Artist"
 msgstr ""
 
-#: src/screen.c:157 src/screen_help.c:123
+#: src/screen.c:160 src/screen_help.c:123
 msgid "Search"
 msgstr "Søk"
 
-#: src/screen.c:160 src/screen_lyrics.c:290 src/screen_lyrics.c:295
-#: src/screen_lyrics.c:299
+#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr ""
 
-#: src/screen.c:166
+#: src/screen.c:166 src/screen_outputs.c:161
+msgid "Outputs"
+msgstr ""
+
+#: src/screen.c:172
+#, c-format
 msgid "Volume n/a "
 msgstr "Volum: n/a "
 
-#: src/screen.c:168
+#: src/screen.c:174
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volum: %d%%"
 
-#: src/screen.c:275
+#: src/screen.c:281
 msgid "Playing:"
 msgstr "Spiller:"
 
-#: src/screen.c:278
+#: src/screen.c:284
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:398 src/screen.c:471
+#: src/screen.c:404 src/screen.c:477
 msgid "Error: Screen too small"
 msgstr "Feil: Terminalen er for liten"
 
-#: src/screen.c:594
+#: src/screen.c:600
 msgid "Repeat is on"
 msgstr "Repeter er på"
 
-#: src/screen.c:595
+#: src/screen.c:601
 msgid "Repeat is off"
 msgstr "Repeter er av"
 
-#: src/screen.c:599
+#: src/screen.c:605
 msgid "Random is on"
 msgstr "Random er på"
 
-#: src/screen.c:600
+#: src/screen.c:606
 msgid "Random is off"
 msgstr "Random er av"
 
-#: src/screen.c:603
+#: src/screen.c:609
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:606
+#: src/screen.c:612
 msgid "Database updated"
 msgstr "Databasen er oppdatert"
 
-#: src/screen.c:739
+#: src/screen.c:745
 msgid "Shuffled playlist"
 msgstr "Tilfeldigjort spillelisten"
 
-#: src/screen.c:743
+#: src/screen.c:749
 msgid "Cleared playlist"
 msgstr "Sletter spillelisten"
 
-#: src/screen.c:760 src/screen_file.c:257
+#: src/screen.c:766 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Oppdaterar databasen"
 
-#: src/screen.c:762 src/screen_file.c:264
+#: src/screen.c:768 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Databasen oppdateres..."
 
-#: src/screen.c:798
+#: src/screen.c:804
 msgid "Find mode: Wrapped"
 msgstr "Søkt rundt (starter på ny)"
 
-#: src/screen.c:799
+#: src/screen.c:805
 msgid "Find mode: Normal"
 msgstr "Søk normalt (til slutt/begynnelse)"
 
-#: src/screen.c:804
+#: src/screen.c:810
 msgid "Auto center mode: On"
 msgstr "Automatisk sentrering er på"
 
-#: src/screen.c:805
+#: src/screen.c:811
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er av"
 
@@ -148,6 +154,7 @@ msgid "All tracks"
 msgstr "Neste"
 
 #: src/screen_artist.c:382
+#, c-format
 msgid "All artists"
 msgstr ""
 
@@ -171,80 +178,83 @@ msgstr ""
 msgid "Loading playlist %s..."
 msgstr "Henter spilleliste %s..."
 
-#: src/screen_browser.c:261 src/screen_browser.c:370 src/screen_browser.c:396
+#: src/screen_browser.c:261 src/screen_browser.c:371 src/screen_browser.c:397
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "Legger '%s' til spillelisten\n"
 
-#: src/screen_browser.c:315
+#. translators: a directory is being added the to playlist
+#: src/screen_browser.c:316
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Legger til mappen %s...\n"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:31
 msgid "Find: "
 msgstr "Søk: "
 
-#: src/screen_utils.c:33
+#: src/screen_utils.c:32
 msgid "Find backward: "
 msgstr "Søk (bakover): "
 
-#: src/screen_utils.c:114
+#: src/screen_utils.c:113
 msgid "Password: "
 msgstr ""
 
-#: src/screen_utils.c:203
+#: src/screen_utils.c:202
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Fant ikke '%s'"
 
-#: src/screen_play.c:211
+#: src/screen_play.c:227
 msgid "Save playlist as: "
 msgstr "Lagre spillelisten som: "
 
-#: src/screen_play.c:244
+#: src/screen_play.c:260
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstatt '%s' [%s/%s] ? "
 
-#: src/screen_play.c:265 src/screen_file.c:136 src/screen_keydef.c:162
+#. translators: a dialog was aborted by the user
+#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
 msgid "Aborted"
 msgstr "Avbrutt"
 
 #. success
-#: src/screen_play.c:273
+#: src/screen_play.c:289
 #, c-format
 msgid "Saved %s"
 msgstr "Lagret %s"
 
-#: src/screen_play.c:349
+#: src/screen_play.c:365
 msgid "Add: "
 msgstr "Legg til: "
 
-#: src/screen_play.c:457
+#: src/screen_play.c:473
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spilleliste på %s"
 
-#: src/screen_file.c:124
-msgid "You can only delete playlists"
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/screen_file.c:127
+#, fuzzy
+msgid "Deleting this item is not possible"
 msgstr "Du kan bare slette spillelister"
 
-#: src/screen_file.c:131
+#: src/screen_file.c:134
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slette '%s' [%s/%s] ? "
 
-#: src/screen_file.c:143
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/screen_file.c:149
 msgid "Playlist deleted"
 msgstr "Spillelisten slettet"
 
-#: src/screen_file.c:197
-#, c-format
-msgid "Browse: %s"
-msgstr "Filer: %s"
-
-#: src/screen_file.c:253
+#: src/screen_file.c:261
 #, c-format
 msgid "Database update of %s started"
 msgstr "oppdaterer databasen ifra %s"
@@ -423,16 +433,16 @@ msgid "Edit keys for %s"
 msgstr "Endre taster for '%s'"
 
 #: src/screen_help.c:37
-msgid "Keys - Movement"
-msgstr "Taster - Navigasjon"
+msgid "Movement"
+msgstr "Navigasjon"
 
 #: src/screen_help.c:63
-msgid "Keys - Global"
-msgstr "Taster - Globale"
+msgid "Global"
+msgstr "Globale"
 
-#: src/screen_help.c:93
-msgid "Keys - Playlist screen"
-msgstr "Taster - Spilliste"
+#: src/screen_help.c:93 src/command.c:92
+msgid "Playlist screen"
+msgstr "Spilleliste"
 
 #: src/screen_help.c:95
 msgid "Play"
@@ -450,9 +460,9 @@ msgstr "Flytt den markerte sangen opp i spillelisten"
 msgid "Center"
 msgstr "Sentrer"
 
-#: src/screen_help.c:107
-msgid "Keys - Browse screen"
-msgstr "Taster - Filer"
+#: src/screen_help.c:107 src/command.c:94
+msgid "Browse screen"
+msgstr "Filer"
 
 #: src/screen_help.c:109
 msgid "Enter directory/Select and play song"
@@ -467,16 +477,16 @@ msgstr "Ta bort/slett"
 msgid "Delete playlist"
 msgstr "Slett spilleliste"
 
-#: src/screen_help.c:121
-msgid "Keys - Search screen"
-msgstr "Taster - Database søk"
+#: src/screen_help.c:121 src/command.c:199
+msgid "Search screen"
+msgstr "Database søk"
 
 #: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Legg til spillelisten og spill"
 
-#: src/screen_help.c:133
-msgid "Keys - Lyrics screen"
+#: src/screen_help.c:133 src/command.c:206
+msgid "Lyrics screen"
 msgstr ""
 
 #: src/screen_help.c:135
@@ -499,19 +509,41 @@ msgstr ""
 msgid "Save lyrics"
 msgstr ""
 
-#: src/screen_lyrics.c:166
+#: src/screen_help.c:144 src/command.c:217
+msgid "Outputs screen"
+msgstr ""
+
+#: src/screen_help.c:146
+msgid "Enable/disable output"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/screen_lyrics.c:104
 msgid "No lyrics"
 msgstr ""
 
-#: src/screen_lyrics.c:290
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/screen_lyrics.c:206
 #, fuzzy
 msgid "loading..."
 msgstr "Avslutter..."
 
-#: src/screen_lyrics.c:326
+#. lyrics for the song were saved on hard disk
+#: src/screen_lyrics.c:241
 msgid "Lyrics saved"
 msgstr ""
 
+#: src/screen_outputs.c:57
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/screen_outputs.c:63
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
 #: src/screen_song.c:105
 msgid "Song viewer"
 msgstr ""
@@ -548,294 +580,277 @@ msgstr ""
 msgid "Comment"
 msgstr "Sentrer"
 
-#: src/command.c:67
+#: src/command.c:68
 msgid "Key configuration screen"
 msgstr "Tastaturkonfigurasjon"
 
-#: src/command.c:70
+#: src/command.c:71
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/command.c:74
+#: src/command.c:75
 msgid "Move cursor up"
 msgstr "Flytt markør opp"
 
-#: src/command.c:76
+#: src/command.c:77
 msgid "Move cursor down"
 msgstr "Flytt markør ned"
 
-#: src/command.c:78
-msgid "Home "
-msgstr "Markøren til den første raden"
+#: src/command.c:79 src/command.c:259
+msgid "Home"
+msgstr ""
 
-#: src/command.c:80
-msgid "End "
-msgstr "Markøren til den siste raden"
+#: src/command.c:81 src/command.c:261
+msgid "End"
+msgstr ""
 
-#: src/command.c:82
+#: src/command.c:83
 msgid "Page up"
 msgstr "Markøren en side opp"
 
-#: src/command.c:84
+#: src/command.c:85
 msgid "Page down"
 msgstr "Markøren en side ned"
 
-#: src/command.c:89
+#: src/command.c:90
 msgid "Help screen"
 msgstr "Hjelp"
 
-#: src/command.c:91
-msgid "Playlist screen"
-msgstr "Spilleliste"
-
-#: src/command.c:93
-msgid "Browse screen"
-msgstr "Filer"
-
-#: src/command.c:98
+#: src/command.c:99
 msgid "Play/Enter directory"
 msgstr "Spill/Velg mappe"
 
-#: src/command.c:100
+#: src/command.c:101
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:102
+#: src/command.c:103
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/command.c:104
+#: src/command.c:105
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:106
+#: src/command.c:107
 msgid "Next track"
 msgstr "Neste"
 
-#: src/command.c:108
+#: src/command.c:109
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:110
+#: src/command.c:111
 msgid "Seek forward"
 msgstr "Spol/Søk framover"
 
-#: src/command.c:112
+#: src/command.c:113
 msgid "Seek backward"
 msgstr "Spol/Søk tilbake"
 
-#: src/command.c:114
+#: src/command.c:115
 msgid "Increase volume"
 msgstr "Øk volumet"
 
-#: src/command.c:116
+#: src/command.c:117
 msgid "Decrease volume"
 msgstr "Demp volumet"
 
-#: src/command.c:118
+#: src/command.c:119
 msgid "Select/deselect song in playlist"
 msgstr "Legg til/Fjern fra spillelisten"
 
-#: src/command.c:120
+#: src/command.c:121
 msgid "Select all listed items"
 msgstr ""
 
-#: src/command.c:122
+#: src/command.c:123
 msgid "Delete song from playlist"
 msgstr "Ta bort/slett"
 
-#: src/command.c:124
+#: src/command.c:125
 msgid "Shuffle playlist"
 msgstr "Tilfeldiggjør spilleliste"
 
-#: src/command.c:126
+#: src/command.c:127
 msgid "Clear playlist"
 msgstr "Tøm spillelisten"
 
-#: src/command.c:128
+#: src/command.c:129
 msgid "Toggle repeat mode"
 msgstr "Repeat På/Av"
 
-#: src/command.c:130
+#: src/command.c:131
 msgid "Toggle random mode"
 msgstr "Random På/Av"
 
-#: src/command.c:132
+#: src/command.c:133
 msgid "Toggle crossfade mode"
 msgstr "Crossfade På/Av"
 
-#: src/command.c:134
+#: src/command.c:135
 msgid "Start a music database update"
 msgstr "Oppdater databasen"
 
-#: src/command.c:136
+#: src/command.c:137
 msgid "Save playlist"
 msgstr "Lagre spillelisten"
 
-#: src/command.c:138
+#: src/command.c:139
 msgid "Add url/file to playlist"
 msgstr "Legg til URL eller fil til spillelisten"
 
-#: src/command.c:141
+#: src/command.c:142
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:143
+#: src/command.c:144
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:147
+#: src/command.c:148
 msgid "View the song"
 msgstr ""
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:155
+#: src/command.c:156
 msgid "Move item up"
 msgstr "Flytt opp"
 
-#: src/command.c:157
+#: src/command.c:158
 msgid "Move item down"
 msgstr "Flytt ned"
 
-#: src/command.c:159
-msgid "Update screen"
+#: src/command.c:160
+#, fuzzy
+msgid "Refresh screen"
 msgstr "Oppdater"
 
-#: src/command.c:164
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/command.c:167
 msgid "Toggle find mode"
 msgstr "Endre søk instillninger"
 
-#: src/command.c:166
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/command.c:171
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering På/Av"
 
-#: src/command.c:171
+#: src/command.c:176
 msgid "Next screen"
 msgstr "Neste skjerm"
 
-#: src/command.c:173
+#: src/command.c:178
 msgid "Previous screen"
 msgstr "Forrige skjerm"
 
-#: src/command.c:178
+#: src/command.c:183
 msgid "Forward find"
 msgstr "Søk"
 
-#: src/command.c:180
+#: src/command.c:185
 msgid "Forward find next"
 msgstr "Fremover Søking"
 
-#: src/command.c:182
+#: src/command.c:187
 msgid "Backward find"
 msgstr "Søk bakover"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Backward find previous"
 msgstr "Bakover Søk forrige"
 
-#: src/command.c:190
+#: src/command.c:195
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:194
-msgid "Search screen"
-msgstr "Database søk"
-
-#: src/command.c:196
+#: src/command.c:201
 msgid "Change search mode"
 msgstr "Endre søkemodus"
 
-#: src/command.c:201
-msgid "Lyrics screen"
-msgstr ""
-
-#: src/command.c:203
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/command.c:210
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:205
+#: src/command.c:212
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:228
+#: src/command.c:241
 msgid "Undefined"
 msgstr "Ikke Definert"
 
-#: src/command.c:230
+#: src/command.c:243
 msgid "Space"
 msgstr "Mellomrom"
 
-#: src/command.c:232
+#: src/command.c:245
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:234
+#: src/command.c:247
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:236
+#: src/command.c:249
 msgid "Delete"
 msgstr "Del"
 
-#: src/command.c:238
+#: src/command.c:251
 msgid "Up"
 msgstr "Opp"
 
-#: src/command.c:240
+#: src/command.c:253
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:242
+#: src/command.c:255
 msgid "Left"
 msgstr "Venstrepil"
 
-#: src/command.c:244
+#: src/command.c:257
 msgid "Right"
 msgstr "Høyrepil"
 
-#: src/command.c:246
-msgid "Home"
-msgstr ""
-
-#: src/command.c:248
-msgid "End"
-msgstr ""
-
-#: src/command.c:250
+#: src/command.c:263
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:252
+#: src/command.c:265
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:254
+#: src/command.c:267
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:256
+#: src/command.c:269
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:258
+#: src/command.c:271
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:260
+#: src/command.c:273
 msgid "Insert"
 msgstr "Ins"
 
-#: src/command.c:464
+#: src/command.c:485
 #, 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:471 src/command.c:478
-#, c-format
-msgid "Error: Key %s assigned to %s and %s\n"
+#: src/command.c:492 src/command.c:499
+#, fuzzy, c-format
+msgid "Key %s assigned to %s and %s\n"
 msgstr "Feil: Tasten %s er tildelt både %s og %s\n"
 
 #: src/colors.c:163
@@ -858,6 +873,73 @@ msgstr "Terminalen mangler støtte for omdefinering av farger\n"
 msgid "Terminal lacks color capabilities\n"
 msgstr "Terminalen mangler støtte for farger\n"
 
+#. To translators: prefix for error messages
+#: src/conf.c:87
+msgid "Error"
+msgstr ""
+
+#: src/conf.c:95 src/conf.c:104
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration contains an unknown
+#. command
+#: src/conf.c:131
+msgid "Unknown command"
+msgstr ""
+
+#. the hotkey configuration line is incomplete
+#: src/conf.c:144
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. translators: ncmpc supports displaying the
+#. "elapsed" or "remaining" time of a song being
+#. played; in this case, the configuration file
+#. contained an invalid setting
+#: src/conf.c:176
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/conf.c:191
+msgid "Missing '='"
+msgstr ""
+
+#: src/conf.c:247
+msgid "Bad color name"
+msgstr ""
+
+#: src/conf.c:256
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/conf.c:262
+msgid "Invalid number"
+msgstr ""
+
+#: src/conf.c:270
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen name was specified in the
+#. configuration file
+#: src/conf.c:305
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/conf.c:454
+#, fuzzy
+msgid "Unknown configuration parameter"
+msgstr "Tastaturkonfigurasjon"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/options.c:216 src/options.c:219
+msgid "translator-credits"
+msgstr ""
+
 #~ msgid "Screen updated!"
 #~ msgstr "pppdatert!"
 
diff --git a/po/ru.po b/po/ru.po
index 6f274cf19..7261877a0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,137 +9,143 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-04 22:41+0100\n"
-"PO-Revision-Date: 2008-12-04 22:42+0100\n"
+"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"PO-Revision-Date: 2008-12-25 23:46+0100\n"
 "Last-Translator: Max Arnold <amv_cbx@mail.ru>\n"
 "Language-Team: ru <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:36
+#: src/i18n.h:41
 msgid "y"
 msgstr "y"
 
-#: src/i18n.h:37
+#: src/i18n.h:42
 msgid "n"
 msgstr "n"
 
-#: src/main.c:210
+#: src/main.c:214
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "ðÏÄËÌÀÞÅÎÉÅ Ë %s...  [îÁÖÍÉÔÅ %s ÄÌÑ ÏÔÍÅÎÙ]"
 
-#: src/main.c:228
+#: src/main.c:232
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "ïÛÉÂËÁ: MPD ×ÅÒÓÉÉ %d.%d.%d ÕÓÔÁÒÅÌ (ÎÅÏÂÈÏÄÉÍ %s)"
 
-#: src/main.c:242
+#: src/main.c:246
 #, c-format
 msgid "Connected to %s"
 msgstr "ðÏÄËÌÀÞÅÎÏ Ë %s"
 
-#: src/screen.c:149 src/screen_help.c:209
+#: src/screen.c:152 src/screen_help.c:216
 msgid "Help"
 msgstr "ðÏÍÏÝØ"
 
-#: src/screen.c:151 src/screen_play.c:455
+#: src/screen.c:154 src/screen_play.c:471
 msgid "Playlist"
 msgstr "ðÌÅÊÌÉÓÔ"
 
-#: src/screen.c:152
+#. translators: caption of the browser screen
+#: src/screen.c:155 src/screen_file.c:205
 msgid "Browse"
 msgstr "ðÒÏÓÍÏÔÒ"
 
-#: src/screen.c:154 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
 msgid "Artist"
 msgstr "éÓÐÏÌÎÉÔÅÌØ"
 
-#: src/screen.c:157 src/screen_help.c:123
+#: src/screen.c:160 src/screen_help.c:123
 msgid "Search"
 msgstr "ðÏÉÓË"
 
-#: src/screen.c:160 src/screen_lyrics.c:290 src/screen_lyrics.c:295
-#: src/screen_lyrics.c:299
+#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "ôÅËÓÔ"
 
-#: src/screen.c:166
+#: src/screen.c:166 src/screen_outputs.c:161
+msgid "Outputs"
+msgstr ""
+
+#: src/screen.c:172
+#, c-format
 msgid "Volume n/a "
 msgstr "çÒÏÍËÏÓÔØ Î/Ä "
 
-#: src/screen.c:168
+#: src/screen.c:174
 #, c-format
 msgid " Volume %d%%"
 msgstr " çÒÏÍËÏÓÔØ %d%%"
 
-#: src/screen.c:275
+#: src/screen.c:281
 msgid "Playing:"
 msgstr "ðÒÏÉÇÒÙ×ÁÅÔÓÑ:"
 
-#: src/screen.c:278
+#: src/screen.c:284
 msgid "[Paused]"
 msgstr "[ðÁÕÚÁ]"
 
-#: src/screen.c:398 src/screen.c:471
+#: src/screen.c:404 src/screen.c:477
 msgid "Error: Screen too small"
 msgstr "ïÛÉÂËÁ: üËÒÁÎ ÓÌÉÛËÏÍ ÍÁÌ"
 
-#: src/screen.c:594
+#: src/screen.c:600
 msgid "Repeat is on"
 msgstr "ðÏ×ÔÏÒ ×ËÌÀÞÅÎ"
 
-#: src/screen.c:595
+#: src/screen.c:601
 msgid "Repeat is off"
 msgstr "ðÏ×ÔÏÒ ×ÙËÌÀÞÅÎ"
 
-#: src/screen.c:599
+#: src/screen.c:605
 msgid "Random is on"
 msgstr "óÌÕÞÁÎÙÊ ÒÅÖÉÍ ×ËÌÀÞÅÎ"
 
-#: src/screen.c:600
+#: src/screen.c:606
 msgid "Random is off"
 msgstr "óÌÕÞÁÊÎÙÊ ÒÅÖÉÍ ×ÙËÌÀÞÅÎ"
 
-#: src/screen.c:603
+#: src/screen.c:609
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "ðÌÁ×ÎÙÊ ÐÅÒÅÈÏÄ %d ÓÅËÕÎÄ"
 
-#: src/screen.c:606
+#: src/screen.c:612
 msgid "Database updated"
 msgstr "âÁÚÁ ÏÂÎÏ×ÌÅÎÁ"
 
-#: src/screen.c:739
+#: src/screen.c:745
 msgid "Shuffled playlist"
 msgstr "ðÌÅÊÌÉÓÔ ÐÅÒÅÍÅÛÁÎ"
 
-#: src/screen.c:743
+#: src/screen.c:749
 msgid "Cleared playlist"
 msgstr "ðÌÅÊÌÉÓÔ ÏÞÉÝÅÎ"
 
-#: src/screen.c:760 src/screen_file.c:257
+#: src/screen.c:766 src/screen_file.c:265
 msgid "Database update started"
 msgstr "îÁÞÁÔÏ ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ"
 
-#: src/screen.c:762 src/screen_file.c:264
+#: src/screen.c:768 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "éÄÅÔ ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ..."
 
-#: src/screen.c:798
+#: src/screen.c:804
 msgid "Find mode: Wrapped"
 msgstr "òÅÖÉÍ ÐÏÉÓËÁ: ãÉËÌÉÞÅÓËÉÊ"
 
-#: src/screen.c:799
+#: src/screen.c:805
 msgid "Find mode: Normal"
 msgstr "òÅÖÉÍ ÐÏÉÓËÁ: îÏÒÍÁÌØÎÙÊ"
 
-#: src/screen.c:804
+#: src/screen.c:810
 msgid "Auto center mode: On"
 msgstr "òÅÖÉÍ Á×ÔÏÃÅÎÔÒÉÒÏ×ÁÎÉÑ: ÷ËÌ."
 
-#: src/screen.c:805
+#: src/screen.c:811
 msgid "Auto center mode: Off"
 msgstr "òÅÖÉÍ Á×ÔÏÃÅÎÔÒÉÒÏ×ÁÎÉÑ: ÷ÙËÌ."
 
@@ -148,6 +154,7 @@ msgid "All tracks"
 msgstr "÷ÓÅ ËÏÍÐÏÚÉÃÉÉ"
 
 #: src/screen_artist.c:382
+#, c-format
 msgid "All artists"
 msgstr "÷ÓÅ ÉÓÐÏÌÎÉÔÅÌÉ"
 
@@ -171,80 +178,83 @@ msgstr "÷ÓÅ ËÏÍÐÏÚÉÃÉÉ ÉÓÐÏÌÎÉÔÅÌÑ: %s"
 msgid "Loading playlist %s..."
 msgstr "úÁÇÒÕÖÁÅÔÓÑ ÐÌÅÊÌÉÓÔ %s..."
 
-#: src/screen_browser.c:261 src/screen_browser.c:370 src/screen_browser.c:396
+#: src/screen_browser.c:261 src/screen_browser.c:371 src/screen_browser.c:397
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "÷ ÐÌÅÊÌÉÓÔ ÄÏÂÁ×ÌÑÅÔÓÑ '%s'\n"
 
-#: src/screen_browser.c:315
+#. translators: a directory is being added the to playlist
+#: src/screen_browser.c:316
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "äÏÂÁ×ÌÑÅÔÓÑ ÄÉÒÅËÔÏÒÉÑ %s...\n"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:31
 msgid "Find: "
 msgstr "ðÏÉÓË: "
 
-#: src/screen_utils.c:33
+#: src/screen_utils.c:32
 msgid "Find backward: "
 msgstr "ðÏÉÓË ÎÁÚÁÄ: "
 
-#: src/screen_utils.c:114
+#: src/screen_utils.c:113
 msgid "Password: "
 msgstr "ðÁÒÏÌØ: "
 
-#: src/screen_utils.c:203
+#: src/screen_utils.c:202
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ '%s'"
 
-#: src/screen_play.c:211
+#: src/screen_play.c:227
 msgid "Save playlist as: "
 msgstr "óÏÈÒÁÎÉÔØ ÐÌÅÊÌÉÓÔ ËÁË: "
 
-#: src/screen_play.c:244
+#: src/screen_play.c:260
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "úÁÍÅÎÉÔØ %s [%s/%s] ? "
 
-#: src/screen_play.c:265 src/screen_file.c:136 src/screen_keydef.c:162
+#. translators: a dialog was aborted by the user
+#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
 msgid "Aborted"
 msgstr "ðÒÅÒ×ÁÎÏ"
 
 #. success
-#: src/screen_play.c:273
+#: src/screen_play.c:289
 #, c-format
 msgid "Saved %s"
 msgstr "óÏÈÒÁÎÅÎÏ × %s"
 
-#: src/screen_play.c:349
+#: src/screen_play.c:365
 msgid "Add: "
 msgstr "äÏÂÁ×ÉÔØ: "
 
-#: src/screen_play.c:457
+#: src/screen_play.c:473
 #, c-format
 msgid "Playlist on %s"
 msgstr "ðÌÅÊÌÉÓÔ ÎÁ %s"
 
-#: src/screen_file.c:124
-msgid "You can only delete playlists"
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/screen_file.c:127
+#, fuzzy
+msgid "Deleting this item is not possible"
 msgstr "ðÌÅÊÌÉÓÔÙ ÍÏÖÎÏ ÔÏÌØËÏ ÕÄÁÌÑÔØ"
 
-#: src/screen_file.c:131
+#: src/screen_file.c:134
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "õÄÁÌÉÔØ ÐÌÅÊÌÉÓÔ %s [%s/%s] ? "
 
-#: src/screen_file.c:143
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/screen_file.c:149
 msgid "Playlist deleted"
 msgstr "ðÌÅÊÌÉÓÔ ÕÄÁÌÅÎ"
 
-#: src/screen_file.c:197
-#, c-format
-msgid "Browse: %s"
-msgstr "ðÒÏÓÍÏÔÒ: %s"
-
-#: src/screen_file.c:253
+#: src/screen_file.c:261
 #, c-format
 msgid "Database update of %s started"
 msgstr "ïÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ %s ÚÁÐÕÝÅÎÏ"
@@ -419,16 +429,16 @@ msgid "Edit keys for %s"
 msgstr "éÚÍÅÎÅÎÉÅ ËÌÁ×ÉÁÔÕÒÎÙÈ ËÏÍÂÉÎÁÃÉÊ ÄÌÑ %s"
 
 #: src/screen_help.c:37
-msgid "Keys - Movement"
-msgstr "ëÏÍÁÎÄÙ - ðÅÒÅÍÅÝÅÎÉÅ"
+msgid "Movement"
+msgstr "ðÅÒÅÍÅÝÅÎÉÅ"
 
 #: src/screen_help.c:63
-msgid "Keys - Global"
-msgstr "ëÏÍÁÎÄÙ - çÌÏÂÁÌØÎÙÅ"
+msgid "Global"
+msgstr "çÌÏÂÁÌØÎÙÅ"
 
-#: src/screen_help.c:93
-msgid "Keys - Playlist screen"
-msgstr "ëÏÍÁÎÄÙ - üËÒÁÎ ÐÌÅÊÌÉÓÔÁ"
+#: src/screen_help.c:93 src/command.c:92
+msgid "Playlist screen"
+msgstr "üËÒÁÎ ÐÌÅÊÌÉÓÔÁ"
 
 #: src/screen_help.c:95
 msgid "Play"
@@ -446,9 +456,9 @@ msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÏÍÐÏÚÉÃÉÀ ×ÎÉÚ"
 msgid "Center"
 msgstr "ãÅÎÔÒÉÒÏ×ÁÔØ"
 
-#: src/screen_help.c:107
-msgid "Keys - Browse screen"
-msgstr "ëÏÍÁÎÄÙ - üËÒÁÎ ÐÒÏÓÍÏÔÒÁ"
+#: src/screen_help.c:107 src/command.c:94
+msgid "Browse screen"
+msgstr "üËÒÁÎ ÐÒÏÓÍÏÔÒÁ"
 
 #: src/screen_help.c:109
 msgid "Enter directory/Select and play song"
@@ -462,17 +472,17 @@ msgstr "äÏÂÁ×ÉÔØ ËÏÍÐÏÚÉÃÉÀ × ÐÌÅÊÌÉÓÔ"
 msgid "Delete playlist"
 msgstr "õÄÁÌÉÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/screen_help.c:121
-msgid "Keys - Search screen"
-msgstr "ëÏÍÁÎÄÙ - üËÒÁÎ ÐÏÉÓËÁ"
+#: src/screen_help.c:121 src/command.c:199
+msgid "Search screen"
+msgstr "üËÒÁÎ ÐÏÉÓËÁ"
 
 #: src/screen_help.c:124
 msgid "Select and play"
 msgstr "÷ÙÂÒÁÔØ É ÐÒÏÉÇÒÁÔØ"
 
-#: src/screen_help.c:133
-msgid "Keys - Lyrics screen"
-msgstr "ëÏÍÁÎÄÙ - üËÒÁÎ ÔÅËÓÔÁ ÐÅÓÎÉ"
+#: src/screen_help.c:133 src/command.c:206
+msgid "Lyrics screen"
+msgstr "üËÒÁÎ ÔÅËÓÔÁ ÐÅÓÎÉ"
 
 #: src/screen_help.c:135
 msgid "View Lyrics"
@@ -494,18 +504,40 @@ msgstr "ðÒÉÎÕÄÉÔÅÌØÎÏ ÚÁÇÒÕÚÉÔØ ÔÅËÓÔ"
 msgid "Save lyrics"
 msgstr "óÏÈÒÁÎÉÔØ ÔÅËÓÔ"
 
-#: src/screen_lyrics.c:166
+#: src/screen_help.c:144 src/command.c:217
+msgid "Outputs screen"
+msgstr ""
+
+#: src/screen_help.c:146
+msgid "Enable/disable output"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/screen_lyrics.c:104
 msgid "No lyrics"
 msgstr "ôÅËÓÔ ÏÔÓÕÔÓÔ×ÕÅÔ"
 
-#: src/screen_lyrics.c:290
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/screen_lyrics.c:206
 msgid "loading..."
 msgstr "ÚÁÇÒÕÖÁÅÔÓÑ..."
 
-#: src/screen_lyrics.c:326
+#. lyrics for the song were saved on hard disk
+#: src/screen_lyrics.c:241
 msgid "Lyrics saved"
 msgstr "ôÅËÓÔ ÓÏÈÒÁÎÅÎ"
 
+#: src/screen_outputs.c:57
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/screen_outputs.c:63
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
 # Several translations for Song Viewer:
 #: src/screen_song.c:105
 msgid "Song viewer"
@@ -539,294 +571,277 @@ msgstr "öÁÎÒ"
 msgid "Comment"
 msgstr "ëÏÍÍÅÎÔÁÒÉÊ"
 
-#: src/command.c:67
+#: src/command.c:68
 msgid "Key configuration screen"
 msgstr "üËÒÁÎ ËÌÁ×ÉÁÔÕÒÎÙÈ ËÏÍÂÉÎÁÃÉÊ"
 
-#: src/command.c:70
+#: src/command.c:71
 msgid "Quit"
 msgstr "÷ÙÈÏÄ"
 
-#: src/command.c:74
+#: src/command.c:75
 msgid "Move cursor up"
 msgstr "ëÕÒÓÏÒ ××ÅÒÈ"
 
-#: src/command.c:76
+#: src/command.c:77
 msgid "Move cursor down"
 msgstr "ëÕÒÓÏÒ ×ÎÉÚ"
 
-#: src/command.c:78
-msgid "Home "
-msgstr "÷ ÎÁÞÁÌÏ "
+#: src/command.c:79 src/command.c:259
+msgid "Home"
+msgstr "Home"
 
-#: src/command.c:80
-msgid "End "
-msgstr "÷ ËÏÎÅÃ "
+#: src/command.c:81 src/command.c:261
+msgid "End"
+msgstr "End"
 
-#: src/command.c:82
+#: src/command.c:83
 msgid "Page up"
 msgstr "îÁ ÓÔÒÁÎÉÃÕ ××ÅÒÈ"
 
-#: src/command.c:84
+#: src/command.c:85
 msgid "Page down"
 msgstr "îÁ ÓÔÒÁÎÉÃÕ ×ÎÉÚ"
 
-#: src/command.c:89
+#: src/command.c:90
 msgid "Help screen"
 msgstr "üËÒÁÎ ÐÏÍÏÝÉ"
 
-#: src/command.c:91
-msgid "Playlist screen"
-msgstr "üËÒÁÎ ÐÌÅÊÌÉÓÔÁ"
-
-#: src/command.c:93
-msgid "Browse screen"
-msgstr "üËÒÁÎ ÐÒÏÓÍÏÔÒÁ"
-
-#: src/command.c:98
+#: src/command.c:99
 msgid "Play/Enter directory"
 msgstr "÷ÏÓÐÒÏÉÚ×ÅÓÔÉ/ðÅÒÅÊÔÉ × ÄÉÒÅËÔÏÒÉÀ"
 
-#: src/command.c:100
+#: src/command.c:101
 msgid "Pause"
 msgstr "ðÁÕÚÁ"
 
-#: src/command.c:102
+#: src/command.c:103
 msgid "Stop"
 msgstr "ïÓÔÁÎÏ×"
 
-#: src/command.c:104
+#: src/command.c:105
 msgid "Crop"
 msgstr "õÄÁÌÉÔØ ÉÚ ÐÌÅÊÌÉÓÔÁ ×ÓÅ ËÏÍÐÏÚÉÃÉÉ ËÒÏÍÅ ÔÅËÕÝÅÊ"
 
-#: src/command.c:106
+#: src/command.c:107
 msgid "Next track"
 msgstr "óÌÅÄÕÀÝÁÑ ËÏÍÐÏÚÉÃÉÑ"
 
-#: src/command.c:108
+#: src/command.c:109
 msgid "Previous track"
 msgstr "ðÒÅÄÙÄÕÝÁÑ ËÏÍÐÏÚÉÃÉÑ"
 
-#: src/command.c:110
+#: src/command.c:111
 msgid "Seek forward"
 msgstr "ðÅÒÅÍÏÔËÁ ×ÐÅÒÅÄ"
 
-#: src/command.c:112
+#: src/command.c:113
 msgid "Seek backward"
 msgstr "ðÅÒÅÍÏÔËÁ ÎÁÚÁÄ"
 
-#: src/command.c:114
+#: src/command.c:115
 msgid "Increase volume"
 msgstr "õ×ÅÌÉÞÉÔØ ÇÒÏÍËÏÓÔØ"
 
-#: src/command.c:116
+#: src/command.c:117
 msgid "Decrease volume"
 msgstr "õÍÅÎØÛÉÔØ ÇÒÏÍËÏÓÔØ"
 
-#: src/command.c:118
+#: src/command.c:119
 msgid "Select/deselect song in playlist"
 msgstr "ðÏÍÅÔÉÔØ/õÂÒÁÔØ ÐÏÍÅÔËÕ Ó ËÏÍÐÏÚÉÃÉÉ"
 
-#: src/command.c:120
+#: src/command.c:121
 msgid "Select all listed items"
 msgstr "äÏÂÁ×ÉÔØ ×ÓÅ ËÏÍÐÏÚÉÃÉÉ × ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:122
+#: src/command.c:123
 msgid "Delete song from playlist"
 msgstr "õÄÁÌÉÔØ ËÏÍÐÏÚÉÃÉÀ ÉÚ ÐÌÅÊÌÉÓÔÁ"
 
-#: src/command.c:124
+#: src/command.c:125
 msgid "Shuffle playlist"
 msgstr "ðÅÒÅÍÅÛÁÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:126
+#: src/command.c:127
 msgid "Clear playlist"
 msgstr "ïÞÉÓÔÉÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:128
+#: src/command.c:129
 msgid "Toggle repeat mode"
 msgstr "÷ËÌ/÷ÙËÌ ÒÅÖÉÍ ÐÏ×ÔÏÒÁ"
 
-#: src/command.c:130
+#: src/command.c:131
 msgid "Toggle random mode"
 msgstr "÷ËÌ/÷ÙËÌ ÓÌÕÞÁÊÎÙÊ ÒÅÖÉÍ"
 
-#: src/command.c:132
+#: src/command.c:133
 msgid "Toggle crossfade mode"
 msgstr "÷ËÌ/÷ÙËÌ ÒÅÖÉÍ ÐÌÁ×ÎÏÇÏ ÐÅÒÅÈÏÄÁ"
 
-#: src/command.c:134
+#: src/command.c:135
 msgid "Start a music database update"
 msgstr "ïÂÎÏ×ÉÔØ ÍÕÚÙËÁÌØÎÕÀ ÂÁÚÕ"
 
-#: src/command.c:136
+#: src/command.c:137
 msgid "Save playlist"
 msgstr "óÏÈÒÁÎÉÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:138
+#: src/command.c:139
 msgid "Add url/file to playlist"
 msgstr "äÏÂÁ×ÉÔØ url/ÆÁÊÌ × ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:141
+#: src/command.c:142
 msgid "Go to root directory"
 msgstr "ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÄÉÒÅËÔÏÒÉÉ"
 
-#: src/command.c:143
+#: src/command.c:144
 msgid "Go to parent directory"
 msgstr "ðÅÒÅÊÔÉ Ë ÒÏÄÉÔÅÌØÓËÏÊ ÄÉÒÅËÔÏÒÉÉ"
 
-#: src/command.c:147
+#: src/command.c:148
 msgid "View the song"
 msgstr "ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Locate song in browser"
 msgstr "ðÅÒÅÊÔÉ Ë ÆÁÊÌÕ ËÏÍÐÏÚÉÃÉÉ"
 
-#: src/command.c:155
+#: src/command.c:156
 msgid "Move item up"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ××ÅÒÈ"
 
-#: src/command.c:157
+#: src/command.c:158
 msgid "Move item down"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ×ÎÉÚ"
 
-#: src/command.c:159
-msgid "Update screen"
+#: src/command.c:160
+#, fuzzy
+msgid "Refresh screen"
 msgstr "ïÂÎÏ×ÉÔØ ÜËÒÁÎ"
 
-#: src/command.c:164
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/command.c:167
 msgid "Toggle find mode"
 msgstr "ðÅÒÅËÌÀÞÉÔØ ÒÅÖÉÍ ÐÏÉÓËÁ"
 
-#: src/command.c:166
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/command.c:171
 msgid "Toggle auto center mode"
 msgstr "÷ËÌ/÷ÙËÌ ÒÅÖÉÍ Á×ÔÏÃÅÎÔÒÉÒÏ×ÁÎÉÑ"
 
-#: src/command.c:171
+#: src/command.c:176
 msgid "Next screen"
 msgstr "óÌÅÄÕÀÝÉÊ ÜËÒÁÎ"
 
-#: src/command.c:173
+#: src/command.c:178
 msgid "Previous screen"
 msgstr "ðÒÅÄÙÄÕÝÉÊ ÜËÒÁÎ"
 
-#: src/command.c:178
+#: src/command.c:183
 msgid "Forward find"
 msgstr "ðÏÉÓË ×ÐÅÒÅÄ"
 
-#: src/command.c:180
+#: src/command.c:185
 msgid "Forward find next"
 msgstr "ðÒÏÄÏÌÖÉÔØ ÐÏÉÓË ×ÐÅÒ£Ä"
 
-#: src/command.c:182
+#: src/command.c:187
 msgid "Backward find"
 msgstr "ðÏÉÓË ÎÁÚÁÄ"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Backward find previous"
 msgstr "ðÒÏÄÏÌÖÉÔØ ÐÏÉÓË ÎÁÚÁÄ"
 
-#: src/command.c:190
+#: src/command.c:195
 msgid "Artist screen"
 msgstr "üËÒÁÎ ÉÓÐÏÌÎÉÔÅÌÅÊ"
 
-#: src/command.c:194
-msgid "Search screen"
-msgstr "üËÒÁÎ ÐÏÉÓËÁ"
-
-#: src/command.c:196
+#: src/command.c:201
 msgid "Change search mode"
 msgstr "éÚÍÅÎÉÔØ ÐÏÌÅ ÄÌÑ ÐÏÉÓËÁ"
 
-#: src/command.c:201
-msgid "Lyrics screen"
-msgstr "üËÒÁÎ ÔÅËÓÔÁ ÐÅÓÎÉ"
-
-#: src/command.c:203
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/command.c:210
 msgid "Interrupt action"
 msgstr "ðÒÅÒ×ÁÔØ ÏÐÅÒÁÃÉÀ"
 
-#: src/command.c:205
+#: src/command.c:212
 msgid "Update Lyrics"
 msgstr "ïÂÎÏ×ÉÔØ ÔÅËÓÔ"
 
-#: src/command.c:228
+#: src/command.c:241
 msgid "Undefined"
 msgstr "îÅ ÚÁÄÁÎÏ"
 
-#: src/command.c:230
+#: src/command.c:243
 msgid "Space"
 msgstr "ðÒÏÂÅÌ"
 
-#: src/command.c:232
+#: src/command.c:245
 msgid "Enter"
 msgstr "÷×ÏÄ"
 
-#: src/command.c:234
+#: src/command.c:247
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:236
+#: src/command.c:249
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:238
+#: src/command.c:251
 msgid "Up"
 msgstr "÷×ÅÒÈ"
 
-#: src/command.c:240
+#: src/command.c:253
 msgid "Down"
 msgstr "÷ÎÉÚ"
 
-#: src/command.c:242
+#: src/command.c:255
 msgid "Left"
 msgstr "÷ÌÅ×Ï"
 
-#: src/command.c:244
+#: src/command.c:257
 msgid "Right"
 msgstr "÷ÐÒÁ×Ï"
 
-#: src/command.c:246
-msgid "Home"
-msgstr "Home"
-
-#: src/command.c:248
-msgid "End"
-msgstr "End"
-
-#: src/command.c:250
+#: src/command.c:263
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:252
+#: src/command.c:265
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:254
+#: src/command.c:267
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:256
+#: src/command.c:269
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:258
+#: src/command.c:271
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:260
+#: src/command.c:273
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:464
+#: src/command.c:485
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr "ëÌÁ×ÉÛÁ %s ÎÁÚÎÁÞÅÎÁ ÄÌÑ %s É %s (%s - ÒÅÄÁËÔÏÒ ËÌÁ×ÉÛ)"
 
-#: src/command.c:471 src/command.c:478
-#, c-format
-msgid "Error: Key %s assigned to %s and %s\n"
+#: src/command.c:492 src/command.c:499
+#, fuzzy, c-format
+msgid "Key %s assigned to %s and %s\n"
 msgstr "ïÛÉÂËÁ: ëÌÁ×ÉÛÁ %s ÎÁÚÎÁÞÅÎÁ ÄÌÑ %s É %s\n"
 
 #: src/colors.c:163
@@ -849,6 +864,73 @@ msgstr "ôÅÒÍÉÎÁÌ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÓÍÅÎÕ Ã×ÅÔÏ×\n"
 msgid "Terminal lacks color capabilities\n"
 msgstr "ôÅÒÍÉÎÁÌ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ Ã×ÅÔÁ\n"
 
+#. To translators: prefix for error messages
+#: src/conf.c:87
+msgid "Error"
+msgstr ""
+
+#: src/conf.c:95 src/conf.c:104
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration contains an unknown
+#. command
+#: src/conf.c:131
+msgid "Unknown command"
+msgstr ""
+
+#. the hotkey configuration line is incomplete
+#: src/conf.c:144
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. translators: ncmpc supports displaying the
+#. "elapsed" or "remaining" time of a song being
+#. played; in this case, the configuration file
+#. contained an invalid setting
+#: src/conf.c:176
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/conf.c:191
+msgid "Missing '='"
+msgstr ""
+
+#: src/conf.c:247
+msgid "Bad color name"
+msgstr ""
+
+#: src/conf.c:256
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/conf.c:262
+msgid "Invalid number"
+msgstr ""
+
+#: src/conf.c:270
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen name was specified in the
+#. configuration file
+#: src/conf.c:305
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/conf.c:454
+#, fuzzy
+msgid "Unknown configuration parameter"
+msgstr "üËÒÁÎ ËÌÁ×ÉÁÔÕÒÎÙÈ ËÏÍÂÉÎÁÃÉÊ"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/options.c:216 src/options.c:219
+msgid "translator-credits"
+msgstr ""
+
 #~ msgid "Screen updated!"
 #~ msgstr "üËÒÁÎ ÏÂÎÏ×ÌÅÎ!"
 
diff --git a/po/sk.po b/po/sk.po
index 0a86e7b38..42d9188df 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,137 +7,143 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-04 22:41+0100\n"
-"PO-Revision-Date: 2008-12-04 22:42+0100\n"
+"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"PO-Revision-Date: 2008-12-25 23:46+0100\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com>\n"
 "Language-Team: sk <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:36
+#: src/i18n.h:41
 msgid "y"
 msgstr "a"
 
-#: src/i18n.h:37
+#: src/i18n.h:42
 msgid "n"
 msgstr "n"
 
-#: src/main.c:210
+#: src/main.c:214
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Pripájam sa k %s... [Stlaète %s pre zru¹enie]"
 
-#: src/main.c:228
+#: src/main.c:232
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Chyba: MPD verzie %d.%d.%d je príli¹ staré (%s je potrebná)"
 
-#: src/main.c:242
+#: src/main.c:246
 #, c-format
 msgid "Connected to %s"
 msgstr "Pripojený k %s"
 
-#: src/screen.c:149 src/screen_help.c:209
+#: src/screen.c:152 src/screen_help.c:216
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/screen.c:151 src/screen_play.c:455
+#: src/screen.c:154 src/screen_play.c:471
 msgid "Playlist"
 msgstr "Playlist"
 
-#: src/screen.c:152
+#. translators: caption of the browser screen
+#: src/screen.c:155 src/screen_file.c:205
 msgid "Browse"
 msgstr "Listova»"
 
-#: src/screen.c:154 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
 msgid "Artist"
 msgstr "Interpret"
 
-#: src/screen.c:157 src/screen_help.c:123
+#: src/screen.c:160 src/screen_help.c:123
 msgid "Search"
 msgstr "Hµadanie"
 
-#: src/screen.c:160 src/screen_lyrics.c:290 src/screen_lyrics.c:295
-#: src/screen_lyrics.c:299
+#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "Text piesne"
 
-#: src/screen.c:166
+#: src/screen.c:166 src/screen_outputs.c:161
+msgid "Outputs"
+msgstr ""
+
+#: src/screen.c:172
+#, c-format
 msgid "Volume n/a "
 msgstr "Hlasitos» n/a"
 
-#: src/screen.c:168
+#: src/screen.c:174
 #, c-format
 msgid " Volume %d%%"
 msgstr " Hlasitos» %d%%"
 
-#: src/screen.c:275
+#: src/screen.c:281
 msgid "Playing:"
 msgstr "Prehrávam:"
 
-#: src/screen.c:278
+#: src/screen.c:284
 msgid "[Paused]"
 msgstr "[Pozastavené]"
 
-#: src/screen.c:398 src/screen.c:471
+#: src/screen.c:404 src/screen.c:477
 msgid "Error: Screen too small"
 msgstr "Chyba: Okno je príli¹ malé"
 
-#: src/screen.c:594
+#: src/screen.c:600
 msgid "Repeat is on"
 msgstr "Opakovanie je zapnuté"
 
-#: src/screen.c:595
+#: src/screen.c:601
 msgid "Repeat is off"
 msgstr "Opakovanie je vypnuté"
 
-#: src/screen.c:599
+#: src/screen.c:605
 msgid "Random is on"
 msgstr "Náhodný re¾im zapnutý"
 
-#: src/screen.c:600
+#: src/screen.c:606
 msgid "Random is off"
 msgstr "Náhodný re¾im vypnutý"
 
-#: src/screen.c:603
+#: src/screen.c:609
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Prelínanie %d sekúnd"
 
-#: src/screen.c:606
+#: src/screen.c:612
 msgid "Database updated"
 msgstr "Databáza aktualizovaná"
 
-#: src/screen.c:739
+#: src/screen.c:745
 msgid "Shuffled playlist"
 msgstr "Zamie¹aný playlist"
 
-#: src/screen.c:743
+#: src/screen.c:749
 msgid "Cleared playlist"
 msgstr "Vyèistený playlist"
 
-#: src/screen.c:760 src/screen_file.c:257
+#: src/screen.c:766 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Bola spustená aktualizácia databáze"
 
-#: src/screen.c:762 src/screen_file.c:264
+#: src/screen.c:768 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Prebieha aktualizácia databáze..."
 
-#: src/screen.c:798
+#: src/screen.c:804
 msgid "Find mode: Wrapped"
 msgstr "Re¾im vyhµadávania: Zabalený"
 
-#: src/screen.c:799
+#: src/screen.c:805
 msgid "Find mode: Normal"
 msgstr "Re¾im vyhµadávanie: Normálny"
 
-#: src/screen.c:804
+#: src/screen.c:810
 msgid "Auto center mode: On"
 msgstr "Automatické centrovanie: Zapnuté"
 
-#: src/screen.c:805
+#: src/screen.c:811
 msgid "Auto center mode: Off"
 msgstr "Automatické centrovanie: Vypnuté"
 
@@ -146,6 +152,7 @@ msgid "All tracks"
 msgstr "V¹etky stopy"
 
 #: src/screen_artist.c:382
+#, c-format
 msgid "All artists"
 msgstr "V¹etci interpreti"
 
@@ -169,80 +176,83 @@ msgstr "V¹etky stopy od interpreta: %s"
 msgid "Loading playlist %s..."
 msgstr "Nahrávam playlist %s..."
 
-#: src/screen_browser.c:261 src/screen_browser.c:370 src/screen_browser.c:396
+#: src/screen_browser.c:261 src/screen_browser.c:371 src/screen_browser.c:397
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "Pridávam '%s' do playlistu\n"
 
-#: src/screen_browser.c:315
+#. translators: a directory is being added the to playlist
+#: src/screen_browser.c:316
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Pridávam adresár %s...\n"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:31
 msgid "Find: "
 msgstr "Vyhµada»: "
 
-#: src/screen_utils.c:33
+#: src/screen_utils.c:32
 msgid "Find backward: "
 msgstr "Vyhµada» spätne: "
 
-#: src/screen_utils.c:114
+#: src/screen_utils.c:113
 msgid "Password: "
 msgstr "Heslo: "
 
-#: src/screen_utils.c:203
+#: src/screen_utils.c:202
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Nepodarilo sa nájs» '%s'"
 
-#: src/screen_play.c:211
+#: src/screen_play.c:227
 msgid "Save playlist as: "
 msgstr "Ulo¾i» playlist ako: "
 
-#: src/screen_play.c:244
+#: src/screen_play.c:260
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Nahradi» %s [%s/%s] ? "
 
-#: src/screen_play.c:265 src/screen_file.c:136 src/screen_keydef.c:162
+#. translators: a dialog was aborted by the user
+#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
 msgid "Aborted"
 msgstr "Zru¹ené"
 
 #. success
-#: src/screen_play.c:273
+#: src/screen_play.c:289
 #, c-format
 msgid "Saved %s"
 msgstr "Ulo¾ený %s"
 
-#: src/screen_play.c:349
+#: src/screen_play.c:365
 msgid "Add: "
 msgstr "Prida»: "
 
-#: src/screen_play.c:457
+#: src/screen_play.c:473
 #, c-format
 msgid "Playlist on %s"
 msgstr "Playlist na %s"
 
-#: src/screen_file.c:124
-msgid "You can only delete playlists"
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/screen_file.c:127
+#, fuzzy
+msgid "Deleting this item is not possible"
 msgstr "Playlisti mô¾ete iba maza»"
 
-#: src/screen_file.c:131
+#: src/screen_file.c:134
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Vymaza» playlist %s [%s/%s] ? "
 
-#: src/screen_file.c:143
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/screen_file.c:149
 msgid "Playlist deleted"
 msgstr "Playlist vymazaný"
 
-#: src/screen_file.c:197
-#, c-format
-msgid "Browse: %s"
-msgstr "Listova»: %s"
-
-#: src/screen_file.c:253
+#: src/screen_file.c:261
 #, c-format
 msgid "Database update of %s started"
 msgstr "Aktualizácia databáze %s zaèala"
@@ -417,16 +427,16 @@ msgid "Edit keys for %s"
 msgstr "Upravi» klávesy pre %s"
 
 #: src/screen_help.c:37
-msgid "Keys - Movement"
-msgstr "Klávesy - Pohyb"
+msgid "Movement"
+msgstr "Pohyb"
 
 #: src/screen_help.c:63
-msgid "Keys - Global"
-msgstr "Klávesy - Globálne"
+msgid "Global"
+msgstr "Globálne"
 
-#: src/screen_help.c:93
-msgid "Keys - Playlist screen"
-msgstr "Klávesy - Okno playlistu"
+#: src/screen_help.c:93 src/command.c:92
+msgid "Playlist screen"
+msgstr "Okno playlistu"
 
 #: src/screen_help.c:95
 msgid "Play"
@@ -444,9 +454,9 @@ msgstr "Presunú» skladbu nadol"
 msgid "Center"
 msgstr "Do stredu"
 
-#: src/screen_help.c:107
-msgid "Keys - Browse screen"
-msgstr "Klávesy - Okno listovania"
+#: src/screen_help.c:107 src/command.c:94
+msgid "Browse screen"
+msgstr "Okno listovania"
 
 #: src/screen_help.c:109
 msgid "Enter directory/Select and play song"
@@ -460,17 +470,17 @@ msgstr "Prida» skladbu do playlistu"
 msgid "Delete playlist"
 msgstr "Vymaza» playlist"
 
-#: src/screen_help.c:121
-msgid "Keys - Search screen"
-msgstr "Klávesy - Okno vyhµadávania"
+#: src/screen_help.c:121 src/command.c:199
+msgid "Search screen"
+msgstr "Okno vyhµadávania"
 
 #: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Vybra» a prehra»"
 
-#: src/screen_help.c:133
-msgid "Keys - Lyrics screen"
-msgstr "Klávesy - Okno textu piesne"
+#: src/screen_help.c:133 src/command.c:206
+msgid "Lyrics screen"
+msgstr "Okno textu piesne"
 
 #: src/screen_help.c:135
 msgid "View Lyrics"
@@ -492,18 +502,40 @@ msgstr "Explicitne s»ahova» texty"
 msgid "Save lyrics"
 msgstr "Ulo¾i» text piesne"
 
-#: src/screen_lyrics.c:166
+#: src/screen_help.c:144 src/command.c:217
+msgid "Outputs screen"
+msgstr ""
+
+#: src/screen_help.c:146
+msgid "Enable/disable output"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/screen_lyrics.c:104
 msgid "No lyrics"
 msgstr "Bez textu"
 
-#: src/screen_lyrics.c:290
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/screen_lyrics.c:206
 msgid "loading..."
 msgstr "naèítam..."
 
-#: src/screen_lyrics.c:326
+#. lyrics for the song were saved on hard disk
+#: src/screen_lyrics.c:241
 msgid "Lyrics saved"
 msgstr "Text piesne ulo¾ený"
 
+#: src/screen_outputs.c:57
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/screen_outputs.c:63
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
 #: src/screen_song.c:105
 msgid "Song viewer"
 msgstr "Prehliadaè piesní"
@@ -536,294 +568,277 @@ msgstr "®áner"
 msgid "Comment"
 msgstr "Komentár"
 
-#: src/command.c:67
+#: src/command.c:68
 msgid "Key configuration screen"
 msgstr "Okno nastavenia klávesov"
 
-#: src/command.c:70
+#: src/command.c:71
 msgid "Quit"
 msgstr "Ukonèi»"
 
-#: src/command.c:74
+#: src/command.c:75
 msgid "Move cursor up"
 msgstr "Presunú» kurzor nahor"
 
-#: src/command.c:76
+#: src/command.c:77
 msgid "Move cursor down"
 msgstr "Presunú» kurzor nadol"
 
-#: src/command.c:78
-msgid "Home "
-msgstr "Home "
+#: src/command.c:79 src/command.c:259
+msgid "Home"
+msgstr "Home"
 
-#: src/command.c:80
-msgid "End "
-msgstr "End "
+#: src/command.c:81 src/command.c:261
+msgid "End"
+msgstr "End"
 
-#: src/command.c:82
+#: src/command.c:83
 msgid "Page up"
 msgstr "Page up"
 
-#: src/command.c:84
+#: src/command.c:85
 msgid "Page down"
 msgstr "Page down"
 
-#: src/command.c:89
+#: src/command.c:90
 msgid "Help screen"
 msgstr "Okno s pomocou"
 
-#: src/command.c:91
-msgid "Playlist screen"
-msgstr "Okno playlistu"
-
-#: src/command.c:93
-msgid "Browse screen"
-msgstr "Okno listovania"
-
-#: src/command.c:98
+#: src/command.c:99
 msgid "Play/Enter directory"
 msgstr "Prehra»/Vstúpi» do adresára"
 
-#: src/command.c:100
+#: src/command.c:101
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/command.c:102
+#: src/command.c:103
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:104
+#: src/command.c:105
 msgid "Crop"
 msgstr "Oreza»"
 
-#: src/command.c:106
+#: src/command.c:107
 msgid "Next track"
 msgstr "Ïal¹ia stopa"
 
-#: src/command.c:108
+#: src/command.c:109
 msgid "Previous track"
 msgstr "Predchádzajúca stopa"
 
-#: src/command.c:110
+#: src/command.c:111
 msgid "Seek forward"
 msgstr "Posunú» vpred"
 
-#: src/command.c:112
+#: src/command.c:113
 msgid "Seek backward"
 msgstr "Posunú» vzad"
 
-#: src/command.c:114
+#: src/command.c:115
 msgid "Increase volume"
 msgstr "Prida» hlasitos»"
 
-#: src/command.c:116
+#: src/command.c:117
 msgid "Decrease volume"
 msgstr "Stí¹i»"
 
-#: src/command.c:118
+#: src/command.c:119
 msgid "Select/deselect song in playlist"
 msgstr "Vybra»/odvybra» skladbu v playliste"
 
-#: src/command.c:120
+#: src/command.c:121
 msgid "Select all listed items"
 msgstr "Vybra» v¹etky polo¾ky v zozname"
 
-#: src/command.c:122
+#: src/command.c:123
 msgid "Delete song from playlist"
 msgstr "Vymaza» skladbu z playlistu"
 
-#: src/command.c:124
+#: src/command.c:125
 msgid "Shuffle playlist"
 msgstr "Zamie¹a» playlist"
 
-#: src/command.c:126
+#: src/command.c:127
 msgid "Clear playlist"
 msgstr "Vyèisti» playlist"
 
-#: src/command.c:128
+#: src/command.c:129
 msgid "Toggle repeat mode"
 msgstr "Prepnú» re¾im opakovania"
 
-#: src/command.c:130
+#: src/command.c:131
 msgid "Toggle random mode"
 msgstr "Prepnú» náhodný re¾im"
 
-#: src/command.c:132
+#: src/command.c:133
 msgid "Toggle crossfade mode"
 msgstr "Prepnú» re¾ím prelínania skladieb"
 
-#: src/command.c:134
+#: src/command.c:135
 msgid "Start a music database update"
 msgstr "Spusti» aktualizáciu hudobnej databáze"
 
-#: src/command.c:136
+#: src/command.c:137
 msgid "Save playlist"
 msgstr "Ulo¾i» playlist"
 
-#: src/command.c:138
+#: src/command.c:139
 msgid "Add url/file to playlist"
 msgstr "Prida» url/súbor do playlistu"
 
-#: src/command.c:141
+#: src/command.c:142
 msgid "Go to root directory"
 msgstr "Prejs» do koreòového adresára"
 
-#: src/command.c:143
+#: src/command.c:144
 msgid "Go to parent directory"
 msgstr "Prejs» do nadradeného adresára"
 
-#: src/command.c:147
+#: src/command.c:148
 msgid "View the song"
 msgstr "Zobrazi» skladbu"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Locate song in browser"
 msgstr "Nájs» skladbu v prehliadaèi"
 
-#: src/command.c:155
+#: src/command.c:156
 msgid "Move item up"
 msgstr "Presunú» polo¾ku nahor"
 
-#: src/command.c:157
+#: src/command.c:158
 msgid "Move item down"
 msgstr "Presunú» polo¾ku nadol"
 
-#: src/command.c:159
-msgid "Update screen"
+#: src/command.c:160
+#, fuzzy
+msgid "Refresh screen"
 msgstr "Obnovi» okno"
 
-#: src/command.c:164
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/command.c:167
 msgid "Toggle find mode"
 msgstr "Prepnú» re¾im vyhµadávania"
 
-#: src/command.c:166
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/command.c:171
 msgid "Toggle auto center mode"
 msgstr "Prepnú» automatický re¾im centrovania"
 
-#: src/command.c:171
+#: src/command.c:176
 msgid "Next screen"
 msgstr "Ïal¹ia obrazovka"
 
-#: src/command.c:173
+#: src/command.c:178
 msgid "Previous screen"
 msgstr "Predchádzajúca obrazovka"
 
-#: src/command.c:178
+#: src/command.c:183
 msgid "Forward find"
 msgstr "Hµada» vpred"
 
-#: src/command.c:180
+#: src/command.c:185
 msgid "Forward find next"
 msgstr "Pokraèova» v hµadaní vpred"
 
-#: src/command.c:182
+#: src/command.c:187
 msgid "Backward find"
 msgstr "Hµada» vzad"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Backward find previous"
 msgstr "Pokraèova» v hµadaní vzad"
 
-#: src/command.c:190
+#: src/command.c:195
 msgid "Artist screen"
 msgstr "Okno interpreta"
 
-#: src/command.c:194
-msgid "Search screen"
-msgstr "Okno vyhµadávania"
-
-#: src/command.c:196
+#: src/command.c:201
 msgid "Change search mode"
 msgstr "Zmeni» re¾im vyhµadávania"
 
-#: src/command.c:201
-msgid "Lyrics screen"
-msgstr "Okno textu piesne"
-
-#: src/command.c:203
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/command.c:210
 msgid "Interrupt action"
 msgstr "Akcia preru¹enia"
 
-#: src/command.c:205
+#: src/command.c:212
 msgid "Update Lyrics"
 msgstr "Obnovi» text"
 
-#: src/command.c:228
+#: src/command.c:241
 msgid "Undefined"
 msgstr "Neurèené"
 
-#: src/command.c:230
+#: src/command.c:243
 msgid "Space"
 msgstr "Medzera"
 
-#: src/command.c:232
+#: src/command.c:245
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:234
+#: src/command.c:247
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:236
+#: src/command.c:249
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:238
+#: src/command.c:251
 msgid "Up"
 msgstr "Hore"
 
-#: src/command.c:240
+#: src/command.c:253
 msgid "Down"
 msgstr "Dole"
 
-#: src/command.c:242
+#: src/command.c:255
 msgid "Left"
 msgstr "Vµavo"
 
-#: src/command.c:244
+#: src/command.c:257
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/command.c:246
-msgid "Home"
-msgstr "Home"
-
-#: src/command.c:248
-msgid "End"
-msgstr "End"
-
-#: src/command.c:250
+#: src/command.c:263
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:252
+#: src/command.c:265
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:254
+#: src/command.c:267
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:256
+#: src/command.c:269
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:258
+#: src/command.c:271
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:260
+#: src/command.c:273
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:464
+#: src/command.c:485
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr "Kláves %s priradený k %s a %s (stlaète %s pre editor klávesov)"
 
-#: src/command.c:471 src/command.c:478
-#, c-format
-msgid "Error: Key %s assigned to %s and %s\n"
+#: src/command.c:492 src/command.c:499
+#, fuzzy, c-format
+msgid "Key %s assigned to %s and %s\n"
 msgstr "Chyba: Kláves %s priradený k %s a %s\n"
 
 #: src/colors.c:163
@@ -846,6 +861,73 @@ msgstr "Terminál nemá podporu pre zmenu farieb\n"
 msgid "Terminal lacks color capabilities\n"
 msgstr "Terminál nemá schopnosti zobrazovania farieb\n"
 
+#. To translators: prefix for error messages
+#: src/conf.c:87
+msgid "Error"
+msgstr ""
+
+#: src/conf.c:95 src/conf.c:104
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration contains an unknown
+#. command
+#: src/conf.c:131
+msgid "Unknown command"
+msgstr ""
+
+#. the hotkey configuration line is incomplete
+#: src/conf.c:144
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. translators: ncmpc supports displaying the
+#. "elapsed" or "remaining" time of a song being
+#. played; in this case, the configuration file
+#. contained an invalid setting
+#: src/conf.c:176
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/conf.c:191
+msgid "Missing '='"
+msgstr ""
+
+#: src/conf.c:247
+msgid "Bad color name"
+msgstr ""
+
+#: src/conf.c:256
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/conf.c:262
+msgid "Invalid number"
+msgstr ""
+
+#: src/conf.c:270
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen name was specified in the
+#. configuration file
+#: src/conf.c:305
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/conf.c:454
+#, fuzzy
+msgid "Unknown configuration parameter"
+msgstr "Okno nastavenia klávesov"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/options.c:216 src/options.c:219
+msgid "translator-credits"
+msgstr ""
+
 #~ msgid "Screen updated!"
 #~ msgstr "Okno obnovené!"
 
diff --git a/po/sv.po b/po/sv.po
index 64f86fb6b..aa44cad24 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,138 +7,144 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-26 14:38+0100\n"
-"PO-Revision-Date: 2008-12-25 12:40+0100\n"
+"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"PO-Revision-Date: 2008-12-25 23:46+0100\n"
 "Last-Translator: Björn Pettersson <bjorn@hygiena.org>\n"
 "Language-Team: sv <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:36
+#: src/i18n.h:41
 msgid "y"
 msgstr "j"
 
-#: src/i18n.h:37
+#: src/i18n.h:42
 msgid "n"
 msgstr "n"
 
-#: src/main.c:210
+#: src/main.c:214
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Ansluter till %s... [Tryck %s för att avbryta]"
 
-#: src/main.c:228
+#: src/main.c:232
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Fel: MPD version %d.%d.%d är för gammal (%s krävs)"
 
-#: src/main.c:242
+#: src/main.c:246
 #, c-format
 msgid "Connected to %s"
 msgstr "Ansluten till %s"
 
-#: src/screen.c:148 src/screen_help.c:205
+#: src/screen.c:152 src/screen_help.c:216
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/screen.c:149 src/screen_play.c:455
+#: src/screen.c:154 src/screen_play.c:471
 msgid "Playlist"
 msgstr "Spellista"
 
-#: src/screen.c:150
+#. translators: caption of the browser screen
+#: src/screen.c:155 src/screen_file.c:205
 msgid "Browse"
 msgstr "Filer"
 
-#: src/screen.c:152 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
 msgid "Artist"
 msgstr "Artist"
 
-#: src/screen.c:155 src/screen_help.c:119
+#: src/screen.c:160 src/screen_help.c:123
 msgid "Search"
 msgstr "Sök"
 
-#: src/screen.c:158 src/screen_lyrics.c:290 src/screen_lyrics.c:295
-#: src/screen_lyrics.c:299
+#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "Texter"
 
-#: src/screen.c:164
+#: src/screen.c:166 src/screen_outputs.c:161
+msgid "Outputs"
+msgstr ""
+
+#: src/screen.c:172
+#, c-format
 msgid "Volume n/a "
 msgstr "Volym: n/a "
 
-#: src/screen.c:166
+#: src/screen.c:174
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volym: %d%%"
 
-#: src/screen.c:273
+#: src/screen.c:281
 msgid "Playing:"
 msgstr "Spelar:"
 
-#: src/screen.c:276
+#: src/screen.c:284
 msgid "[Paused]"
 msgstr "[Pausad]"
 
-#: src/screen.c:396 src/screen.c:469
-#, c-format
-msgid "Error: Screen to small\n"
+#: src/screen.c:404 src/screen.c:477
+#, fuzzy
+msgid "Error: Screen too small"
 msgstr "Fel: Terminalen är för liten\n"
 
-#: src/screen.c:592
+#: src/screen.c:600
 msgid "Repeat is on"
 msgstr "Upprepning påslaget"
 
-#: src/screen.c:593
+#: src/screen.c:601
 msgid "Repeat is off"
 msgstr "Upprepning avslaget"
 
-#: src/screen.c:597
+#: src/screen.c:605
 msgid "Random is on"
 msgstr "Slumpning påslaget"
 
-#: src/screen.c:598
+#: src/screen.c:606
 msgid "Random is off"
 msgstr "Slumpning avslaget"
 
-#: src/screen.c:601
+#: src/screen.c:609
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Mjuk övergång %d sekunder"
 
-#: src/screen.c:604
+#: src/screen.c:612
 msgid "Database updated"
 msgstr "Databas uppdaterad"
 
-#: src/screen.c:737
+#: src/screen.c:745
 msgid "Shuffled playlist"
 msgstr "Spellistan slumpsorterades"
 
-#: src/screen.c:741
+#: src/screen.c:749
 msgid "Cleared playlist"
 msgstr "Spellistan rensad"
 
-#: src/screen.c:758 src/screen_file.c:257
+#: src/screen.c:766 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Databasuppdatering påbörjad"
 
-#: src/screen.c:760 src/screen_file.c:264
+#: src/screen.c:768 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Databasen uppdateras..."
 
-#: src/screen.c:796
+#: src/screen.c:804
 msgid "Find mode: Wrapped"
 msgstr "Sökläge: Börja om"
 
-#: src/screen.c:797
+#: src/screen.c:805
 msgid "Find mode: Normal"
 msgstr "Sökläge: Till början/slut"
 
-#: src/screen.c:802
+#: src/screen.c:810
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering påslaget"
 
-#: src/screen.c:803
+#: src/screen.c:811
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering avslaget"
 
@@ -147,6 +153,7 @@ msgid "All tracks"
 msgstr "Alla spår"
 
 #: src/screen_artist.c:382
+#, c-format
 msgid "All artists"
 msgstr "Alla artister"
 
@@ -170,80 +177,83 @@ msgstr "Alla spår av artist: %s"
 msgid "Loading playlist %s..."
 msgstr "Laddar spellista %s..."
 
-#: src/screen_browser.c:261 src/screen_browser.c:370 src/screen_browser.c:396
+#: src/screen_browser.c:261 src/screen_browser.c:371 src/screen_browser.c:397
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "Lägger till '%s' till spellista...\n"
 
-#: src/screen_browser.c:315
+#. translators: a directory is being added the to playlist
+#: src/screen_browser.c:316
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Lägger till katalog %s...\n"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:31
 msgid "Find: "
 msgstr "Sök: "
 
-#: src/screen_utils.c:33
+#: src/screen_utils.c:32
 msgid "Find backward: "
 msgstr "Sök bakåt: "
 
-#: src/screen_utils.c:114
+#: src/screen_utils.c:113
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: src/screen_utils.c:207
+#: src/screen_utils.c:202
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kan inte hitta '%s'"
 
-#: src/screen_play.c:211
+#: src/screen_play.c:227
 msgid "Save playlist as: "
 msgstr "Spara spellistan som: "
 
-#: src/screen_play.c:244
+#: src/screen_play.c:260
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Ersätt %s [%s/%s] ? "
 
-#: src/screen_play.c:265 src/screen_file.c:136 src/screen_keydef.c:162
+#. translators: a dialog was aborted by the user
+#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
 msgid "Aborted"
 msgstr "Avbrutet"
 
 #. success
-#: src/screen_play.c:273
+#: src/screen_play.c:289
 #, c-format
 msgid "Saved %s"
 msgstr "%s sparad"
 
-#: src/screen_play.c:349
+#: src/screen_play.c:365
 msgid "Add: "
 msgstr "Lägg till: "
 
-#: src/screen_play.c:457
+#: src/screen_play.c:473
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spellista på %s"
 
-#: src/screen_file.c:124
-msgid "You can only delete playlists"
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/screen_file.c:127
+#, fuzzy
+msgid "Deleting this item is not possible"
 msgstr "Du kan bara ta bort spellistor"
 
-#: src/screen_file.c:131
+#: src/screen_file.c:134
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Ta bort spellista %s [%s/%s] ? "
 
-#: src/screen_file.c:143
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/screen_file.c:149
 msgid "Playlist deleted"
 msgstr "Spellista borttagen"
 
-#: src/screen_file.c:197
-#, c-format
-msgid "Browse: %s"
-msgstr "Filer: %s"
-
-#: src/screen_file.c:253
+#: src/screen_file.c:261
 #, c-format
 msgid "Database update of %s started"
 msgstr "Uppdaterar databasen ifrån %s"
@@ -418,93 +428,115 @@ msgid "Edit keys for %s"
 msgstr "Ändra tangenter för kommandot %s"
 
 #: src/screen_help.c:37
-msgid "Keys - Movement"
-msgstr "Tangenter - Navigation"
+msgid "Movement"
+msgstr "Navigation"
 
-#: src/screen_help.c:60
-msgid "Keys - Global"
-msgstr "Tangenter - Globala"
+#: src/screen_help.c:63
+msgid "Global"
+msgstr "Globala"
 
-#: src/screen_help.c:89
-msgid "Keys - Playlist screen"
-msgstr "Tangenter - Spellista"
+#: src/screen_help.c:93 src/command.c:92
+msgid "Playlist screen"
+msgstr "Spellista"
 
-#: src/screen_help.c:91
+#: src/screen_help.c:95
 msgid "Play"
 msgstr "Starta/Spela markerad"
 
-#: src/screen_help.c:94
+#: src/screen_help.c:98
 msgid "Move song up"
 msgstr "Flytta spår uppåt"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:99
 msgid "Move song down"
 msgstr "Flytta spår nedåt"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:102
 msgid "Center"
 msgstr "Centrera"
 
-#: src/screen_help.c:103
-msgid "Keys - Browse screen"
-msgstr "Tangenter - Filer"
+#: src/screen_help.c:107 src/command.c:94
+msgid "Browse screen"
+msgstr "Filer"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:109
 msgid "Enter directory/Select and play song"
 msgstr "Välj katalog/Markera och spela upp"
 
-#: src/screen_help.c:107 src/screen_help.c:122
+#: src/screen_help.c:111 src/screen_help.c:126
 msgid "Append song to playlist"
 msgstr "Lägg till i spellista"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:113
 msgid "Delete playlist"
 msgstr "Ta bort spellista"
 
-#: src/screen_help.c:117
-msgid "Keys - Search screen"
-msgstr "Tangenter - Sök"
+#: src/screen_help.c:121 src/command.c:199
+msgid "Search screen"
+msgstr "Databassökning"
 
-#: src/screen_help.c:120
+#: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Lägg till spellistan och spela"
 
-#: src/screen_help.c:129
-msgid "Keys - Lyrics screen"
-msgstr "Tangenter - Texter"
+#: src/screen_help.c:133 src/command.c:206
+msgid "Lyrics screen"
+msgstr "Texter"
 
-#: src/screen_help.c:131
+#: src/screen_help.c:135
 msgid "View Lyrics"
 msgstr "Visa texter"
 
-#: src/screen_help.c:132
+#: src/screen_help.c:136
 msgid "(Re)load lyrics"
 msgstr "Ladda (om) texter"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:137
 msgid "Interrupt retrieval"
 msgstr "Avbryt hämtning"
 
-#: src/screen_help.c:134
+#: src/screen_help.c:138
 msgid "Explicitly download lyrics"
 msgstr "Ladda ner texter explicit"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:139
 msgid "Save lyrics"
 msgstr "Spara texter"
 
-#: src/screen_lyrics.c:166
+#: src/screen_help.c:144 src/command.c:217
+msgid "Outputs screen"
+msgstr ""
+
+#: src/screen_help.c:146
+msgid "Enable/disable output"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/screen_lyrics.c:104
 msgid "No lyrics"
 msgstr "Ingen text"
 
-#: src/screen_lyrics.c:290
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/screen_lyrics.c:206
 msgid "loading..."
 msgstr "laddar..."
 
-#: src/screen_lyrics.c:326
+#. lyrics for the song were saved on hard disk
+#: src/screen_lyrics.c:241
 msgid "Lyrics saved"
 msgstr "Text sparad"
 
+#: src/screen_outputs.c:57
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/screen_outputs.c:63
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
 #: src/screen_song.c:105
 msgid "Song viewer"
 msgstr "Spår"
@@ -537,294 +569,277 @@ msgstr "Genre"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/command.c:67
+#: src/command.c:68
 msgid "Key configuration screen"
 msgstr "Tangentdefinitioner"
 
-#: src/command.c:70
+#: src/command.c:71
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/command.c:74
+#: src/command.c:75
 msgid "Move cursor up"
 msgstr "Markör uppåt"
 
-#: src/command.c:76
+#: src/command.c:77
 msgid "Move cursor down"
 msgstr "Markör nedåt"
 
-#: src/command.c:78
-msgid "Home "
-msgstr "Markören till den första raden"
+#: src/command.c:79 src/command.c:259
+msgid "Home"
+msgstr "Home"
 
-#: src/command.c:80
-msgid "End "
-msgstr "Markören till den sista raden"
+#: src/command.c:81 src/command.c:261
+msgid "End"
+msgstr "End"
 
-#: src/command.c:82
+#: src/command.c:83
 msgid "Page up"
 msgstr "Markören en skärm uppåt"
 
-#: src/command.c:84
+#: src/command.c:85
 msgid "Page down"
 msgstr "Markören en skärm nedåt"
 
-#: src/command.c:89
+#: src/command.c:90
 msgid "Help screen"
 msgstr "Hjälp"
 
-#: src/command.c:91
-msgid "Playlist screen"
-msgstr "Spellista"
-
-#: src/command.c:93
-msgid "Browse screen"
-msgstr "Filer"
-
-#: src/command.c:98
+#: src/command.c:99
 msgid "Play/Enter directory"
 msgstr "Spela upp/Välj"
 
-#: src/command.c:100
+#: src/command.c:101
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:102
+#: src/command.c:103
 msgid "Stop"
 msgstr "Stoppa"
 
-#: src/command.c:104
+#: src/command.c:105
 msgid "Crop"
 msgstr "Beskär"
 
-#: src/command.c:106
+#: src/command.c:107
 msgid "Next track"
 msgstr "Nästa spår"
 
-#: src/command.c:108
+#: src/command.c:109
 msgid "Previous track"
 msgstr "Föregånde spår"
 
-#: src/command.c:110
+#: src/command.c:111
 msgid "Seek forward"
 msgstr "Sök framåt"
 
-#: src/command.c:112
+#: src/command.c:113
 msgid "Seek backward"
 msgstr "Sök bakåt"
 
-#: src/command.c:114
+#: src/command.c:115
 msgid "Increase volume"
 msgstr "Höj volymen"
 
-#: src/command.c:116
+#: src/command.c:117
 msgid "Decrease volume"
 msgstr "Sänk volymen"
 
-#: src/command.c:118
+#: src/command.c:119
 msgid "Select/deselect song in playlist"
 msgstr "Markera/avmarkera spår till spellistan"
 
-#: src/command.c:120
+#: src/command.c:121
 msgid "Select all listed items"
 msgstr "Markera alla listade föremål"
 
-#: src/command.c:122
+#: src/command.c:123
 msgid "Delete song from playlist"
 msgstr "Ta bort låt från spellista"
 
-#: src/command.c:124
+#: src/command.c:125
 msgid "Shuffle playlist"
 msgstr "Slumpsportera spellista"
 
-#: src/command.c:126
+#: src/command.c:127
 msgid "Clear playlist"
 msgstr "Rensa spellista"
 
-#: src/command.c:128
+#: src/command.c:129
 msgid "Toggle repeat mode"
 msgstr "Repeat på/av"
 
-#: src/command.c:130
+#: src/command.c:131
 msgid "Toggle random mode"
 msgstr "Slumpning på/av"
 
-#: src/command.c:132
+#: src/command.c:133
 msgid "Toggle crossfade mode"
 msgstr "Mjuk övergång på/av"
 
-#: src/command.c:134
+#: src/command.c:135
 msgid "Start a music database update"
 msgstr "Updatera musikdatabasen"
 
-#: src/command.c:136
+#: src/command.c:137
 msgid "Save playlist"
 msgstr "Spara spellista"
 
-#: src/command.c:138
+#: src/command.c:139
 msgid "Add url/file to playlist"
 msgstr "Lägg till url eller fil till spellistan"
 
-#: src/command.c:141
+#: src/command.c:142
 msgid "Go to root directory"
 msgstr "GÃ¥ till rotkatalogen"
 
-#: src/command.c:143
+#: src/command.c:144
 msgid "Go to parent directory"
 msgstr "Gå upp en nivå"
 
-#: src/command.c:147
+#: src/command.c:148
 msgid "View the song"
 msgstr "Visa spår"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Locate song in browser"
 msgstr "Hitta spår i Filer"
 
-#: src/command.c:155
+#: src/command.c:156
 msgid "Move item up"
 msgstr "Flytta upp"
 
-#: src/command.c:157
+#: src/command.c:158
 msgid "Move item down"
 msgstr "Flytta ner"
 
-#: src/command.c:159
-msgid "Update screen"
+#: src/command.c:160
+#, fuzzy
+msgid "Refresh screen"
 msgstr "Updatera"
 
-#: src/command.c:164
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/command.c:167
 msgid "Toggle find mode"
 msgstr "Ändra sökinställningar"
 
-#: src/command.c:166
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/command.c:171
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering på/av"
 
-#: src/command.c:171
+#: src/command.c:176
 msgid "Next screen"
 msgstr "Nästa skärm"
 
-#: src/command.c:173
+#: src/command.c:178
 msgid "Previous screen"
 msgstr "Tidigare skärm"
 
-#: src/command.c:178
+#: src/command.c:183
 msgid "Forward find"
 msgstr "Sök"
 
-#: src/command.c:180
+#: src/command.c:185
 msgid "Forward find next"
 msgstr "Nästa träff"
 
-#: src/command.c:182
+#: src/command.c:187
 msgid "Backward find"
 msgstr "Föregående träff"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Backward find previous"
 msgstr "Upprepa sökning bakåt"
 
-#: src/command.c:190
+#: src/command.c:195
 msgid "Artist screen"
 msgstr "Artister"
 
-#: src/command.c:194
-msgid "Search screen"
-msgstr "Databassökning"
-
-#: src/command.c:196
+#: src/command.c:201
 msgid "Change search mode"
 msgstr "Ändra måltyp för databassökning"
 
-#: src/command.c:201
-msgid "Lyrics screen"
-msgstr "Texter"
-
-#: src/command.c:203
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/command.c:210
 msgid "Interrupt action"
 msgstr "Avbryt handling"
 
-#: src/command.c:205
+#: src/command.c:212
 msgid "Update Lyrics"
 msgstr "Uppdatera texter"
 
-#: src/command.c:228
+#: src/command.c:241
 msgid "Undefined"
 msgstr "Ej definierad"
 
-#: src/command.c:230
+#: src/command.c:243
 msgid "Space"
 msgstr "Mellanslag"
 
-#: src/command.c:232
+#: src/command.c:245
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:234
+#: src/command.c:247
 msgid "Backspace"
 msgstr "Bakstegstangent"
 
-#: src/command.c:236
+#: src/command.c:249
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/command.c:238
+#: src/command.c:251
 msgid "Up"
 msgstr "Uppåtpil"
 
-#: src/command.c:240
+#: src/command.c:253
 msgid "Down"
 msgstr "Nedåtpil"
 
-#: src/command.c:242
+#: src/command.c:255
 msgid "Left"
 msgstr "Vänsterpil"
 
-#: src/command.c:244
+#: src/command.c:257
 msgid "Right"
 msgstr "Högerpil"
 
-#: src/command.c:246
-msgid "Home"
-msgstr "Home"
-
-#: src/command.c:248
-msgid "End"
-msgstr "End"
-
-#: src/command.c:250
+#: src/command.c:263
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:252
+#: src/command.c:265
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:254
+#: src/command.c:267
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:256
+#: src/command.c:269
 msgid "Shift+Tab"
 msgstr "Shift+tabb"
 
-#: src/command.c:258
+#: src/command.c:271
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:260
+#: src/command.c:273
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:464
+#: src/command.c:485
 #, 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 för att korrigera)"
 
-#: src/command.c:471 src/command.c:478
-#, c-format
-msgid "Error: Key %s assigned to %s and %s\n"
+#: src/command.c:492 src/command.c:499
+#, fuzzy, c-format
+msgid "Key %s assigned to %s and %s\n"
 msgstr "Fel: Tangent %s är tilldelad både %s och %s\n"
 
 #: src/colors.c:163
@@ -847,6 +862,73 @@ msgstr "Terminalen saknar stöd för växling av färger\n"
 msgid "Terminal lacks color capabilities\n"
 msgstr "Terminalen saknar stöd för färger\n"
 
+#. To translators: prefix for error messages
+#: src/conf.c:87
+msgid "Error"
+msgstr ""
+
+#: src/conf.c:95 src/conf.c:104
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration contains an unknown
+#. command
+#: src/conf.c:131
+msgid "Unknown command"
+msgstr ""
+
+#. the hotkey configuration line is incomplete
+#: src/conf.c:144
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. translators: ncmpc supports displaying the
+#. "elapsed" or "remaining" time of a song being
+#. played; in this case, the configuration file
+#. contained an invalid setting
+#: src/conf.c:176
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/conf.c:191
+msgid "Missing '='"
+msgstr ""
+
+#: src/conf.c:247
+msgid "Bad color name"
+msgstr ""
+
+#: src/conf.c:256
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/conf.c:262
+msgid "Invalid number"
+msgstr ""
+
+#: src/conf.c:270
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen name was specified in the
+#. configuration file
+#: src/conf.c:305
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/conf.c:454
+#, fuzzy
+msgid "Unknown configuration parameter"
+msgstr "Tangentdefinitioner"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/options.c:216 src/options.c:219
+msgid "translator-credits"
+msgstr ""
+
 #~ msgid "Screen updated!"
 #~ msgstr "Uppdaterat!"