From bdb3382cc7190a0ff8ddddf32e7998d4582e590c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 6 Jan 2009 17:57:46 +0100
Subject: [PATCH] command: check_key_bindings() returns message without comment

The comment "press %s for the key editor" is only used by
timer_check_key_bindings(), move it there.  This lets us merge the two
error messages in check_key_bindings() and eases the translator's
work.
---
 po/da.po      | 375 ++++++++++++++++++++++++-------------------------
 po/de.po      | 377 ++++++++++++++++++++++++-------------------------
 po/es.po      | 377 ++++++++++++++++++++++++-------------------------
 po/fr.po      | 378 +++++++++++++++++++++++++-------------------------
 po/gl.po      | 377 ++++++++++++++++++++++++-------------------------
 po/hu.po      | 375 +++++++++++++++++++++++++------------------------
 po/ncmpc.pot  | 367 ++++++++++++++++++++++++------------------------
 po/no.po      | 375 ++++++++++++++++++++++++-------------------------
 po/ru.po      | 373 +++++++++++++++++++++++++------------------------
 po/sk.po      | 375 ++++++++++++++++++++++++-------------------------
 po/sv.po      | 375 ++++++++++++++++++++++++-------------------------
 src/command.c |   9 --
 src/main.c    |  16 +++
 13 files changed, 2097 insertions(+), 2052 deletions(-)

diff --git a/po/da.po b/po/da.po
index a176915..47dee0f 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-12-27 13:00+0100\n"
-"PO-Revision-Date: 2009-01-01 17:04+0000\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
+"PO-Revision-Date: 2009-01-06 17:53+0100\n"
 "Last-Translator: Niels Anker <nanker@webspeed.dk>\n"
 "Language-Team: da <da@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,158 +17,166 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-02 08:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/i18n.h:41
+#: src/i18n.h:42
 msgid "y"
 msgstr "j"
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:214
+#: src/main.c:215
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Forbinder til %s... [Tryk %s for at afbryde]"
 
-#: src/main.c:232
+#: src/main.c:233
 #, 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:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr "Forbundet til %s"
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr "tryk på %s for at redigere"
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr "Afspilningsliste"
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr "Gennemse"
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr "Søg"
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 src/screen_lyrics.c:203 src/screen_lyrics.c:211
 #: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "Sangtekster"
 
-#: src/screen.c:166 src/screen_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr "Output"
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr "Volumen: n/a "
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volumen: %d%%"
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr "Afspiller:"
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr "Fejl: Skærm for lille"
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr "Gentag er aktiv"
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr "Gentag er inaktiv"
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr "Tilfældig er aktiv"
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr "Tilfældig er inaktiv"
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr "Databasen er opdateret"
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr "Afspilninsglisten blandet"
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr "Sletter afspilningslisten"
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Database opdatering startet"
 
-#: src/screen.c:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Databasen opdateres..."
 
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr "Søg (begynd forfra)"
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr "Søg normalt (start/slut)"
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering er aktiv"
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er inaktiv"
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 msgid "All tracks"
 msgstr "Alle spor"
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr "Alle kunstnere"
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album fra kunstneren: %s"
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle spor fra kunstneren: %s"
@@ -189,48 +197,48 @@ msgstr "Tilføjer '%s' til listen...\n"
 msgid "Adding directory %s...\n"
 msgstr "Tilføjer mappen %s...\n"
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Søg: "
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Søg (baglæns): "
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr "Adgangskode: "
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kan ikke finde '%s'"
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr "Gem afspilningslisten som: "
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstat '%s' [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Afbrudt"
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr "Gemt %s"
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr "Tilføj: "
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr "Afspilningsliste på %s"
@@ -302,11 +310,11 @@ msgstr "kommentar"
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr "Album"
 
@@ -360,154 +368,154 @@ msgstr "Tryk på %s for en ny søgning [%s]"
 msgid "Search mode: %s"
 msgstr "Søg efter: %s"
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "==> Anvend og gem taste bindinger  "
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "==> Anvend taste bindinger "
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr "Taste bindinger opdaterede"
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Taste bindinger uændrede!"
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Fejl: Kan ikke oprette mappen ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fejl: %s - %s"
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "Skrev %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Slettet"
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tast for %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Tasten %s anvendes allerede til %s"
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Tildelt %s til %s"
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr "Definér ny tast"
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Du glemte vel ikke at 'anvende' dine ændringer?"
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Modificer taste bindinger"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Modificer tast for '%s'"
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr "Navigation"
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr "Globale"
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr "Afspilningsliste"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr "Afspil"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr "Flyt markøren op i afspilningslisten"
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr "Flyt markøren ned i afspilningslisten"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr "Gennemse"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr "Skift til bibliotek/Tilføj til afspilningslisten og afspil"
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 msgid "Append song to playlist"
 msgstr "Tilføj spor til afspilningsliste"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr "Slet afspilningsliste"
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr "Database søgning"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr "Vælg og afspil"
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr "Sangtekst skærm"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr "Gennemse sangtekster"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr "(Gen)indlæs santekster"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr "Abryd hentning"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr "Hent kun sangtekster"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr "Gem sagtekster"
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr "Output skærm"
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr "Slå output til/fra"
 
@@ -527,357 +535,352 @@ msgstr "indlæser..."
 msgid "Lyrics saved"
 msgstr "Sangtekster gemt"
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Output '%s' slået til"
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Output '%s' slået fra"
 
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr "Sang viser"
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 msgid "Name"
 msgstr "Navn"
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr "Disk"
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 msgid "Track"
 msgstr "Spor"
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 msgid "Date"
 msgstr "Dato"
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Taste konfigurations skærm"
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr "Flyt markør op"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr "Flyt markør ned"
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr "Hjem"
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr "Slut"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr "Side op"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr "Side ned"
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr "Hjælp"
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr "Afspil/GÃ¥ til mappe"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr "Beskær"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Næste"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Søg fremad"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Søg tilbage"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Hæv volumen"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Sænk volumen"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Marker/afmarker sang i afspilningsliste"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr "Vælg alle emner på listen"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr "Slet sang fra afspilningsliste"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr "Bland rækkefølgen i afspilningslisten"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr "Slet afspilningslisten"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr "Aktiver/deaktiver gentag"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr "Aktiver/deaktiver tilfældigt valg"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr "Aktiver/deaktiver crossfade mellem sange"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr "Opdater databasen"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr "Gem afspilningslisten"
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr "Tilføj URL eller fil til afspilningslisten"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr "GÃ¥ til rod mappen"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr "Gå til forældre mappe"
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr "Vis sangen"
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr "Lokaliser sang i browseren"
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr "Flyt op"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr "Flyt ned"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Refresh screen"
 msgstr "Genopfrisk skærm"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr "Ændre søge tilstand"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr "Aktiver/deaktiver automatisk centrering"
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr "Næste skærm"
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr "Forrige skærm"
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr "Søg"
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr "Gentag søg"
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr "Søg baglæns"
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr "Gentag søg baglæns"
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr "Kunstner skærm"
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr "Ændre søge tilstand"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr "Afbryd action"
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr "Opdater sangtekster"
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr "Mellemrum"
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr "Retur"
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr "Tilbagetast"
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr "Slet"
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr "Op"
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr "Venstre"
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr "Højre"
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr "Skift+Tabulator"
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr "Indsæt"
 
-#: 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:492 src/command.c:499
+#: src/command.c:485 src/command.c:491
 #, c-format
 msgid "Key %s assigned to %s and %s\n"
 msgstr "Tast %s tildelt %s og %s\n"
 
-#: src/colors.c:163
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Advarsel: Ukendt farve - %s\n"
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Advarsel: Ukendt farve felt - %s.\n"
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr "Terminalen understøtter ikke at ændre farver\n"
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, c-format
 msgid "Terminal lacks color capabilities\n"
 msgstr "Terminalen understøtter ikke farver\n"
 
 #. To translators: prefix for error messages
-#: src/conf.c:87
+#: src/conf.c:89
 msgid "Error"
 msgstr "Fejl"
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr "Forkert hotkey definition"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr "Ufuldstændig hotkey konfiguration"
 
@@ -885,57 +888,57 @@ msgstr "Ufuldstændig hotkey konfiguration"
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr "Ringe tidsvisningstype"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr "Mangler '='"
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr "DÃ¥rligt farvenavn"
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr "Ufuldstændig farve definition"
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr "Ugyldigt tal."
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr "Forkert farve definition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr "Ukendt skærm navn"
 
-#: src/conf.c:454
+#: src/conf.c:462
 msgid "Unknown configuration parameter"
 msgstr "Ukendt konfigurations parameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:216 src/options.c:219
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Mikkel Kirkgaard Nielsen https://launchpad.net/~ncmpc\n"
 "  Niels Anker https://launchpad.net/~nanker"
 
+#~ 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)"
+
 #~ msgid "Screen updated!"
 #~ msgstr "Skærm opdateret!"
 
-#~ msgid "Welcome to the key editor!"
-#~ msgstr "Velkommen til taste editoren"
-
 #~ msgid "Clock"
 #~ msgstr "Ur"
 
diff --git a/po/de.po b/po/de.po
index a357316..ca3a1d7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,166 +9,174 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-27 13:00+0100\n"
-"PO-Revision-Date: 2008-12-28 14:22+0100\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
+"PO-Revision-Date: 2009-01-06 17:53+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=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:41
+#: src/i18n.h:42
 msgid "y"
 msgstr "j"
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:214
+#: src/main.c:215
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Verbinde mit %s...   [%s drücken, um abzubrechen]"
 
-#: src/main.c:232
+#: src/main.c:233
 #, 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:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr "Verbunden mit %s"
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr "drücke %s für den Tasteneditor"
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr "Playlist"
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr "Stöbern"
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr "Suche"
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 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_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr "Ausgabegeräte"
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr "Lautstärke n/a "
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr " Lautstärke %d%%"
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr "Spiele:"
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr "Fehler: Anzeige zu klein"
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr "Wiederholung ist an"
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr "Wiederholung ist aus"
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr "Zufallswiedergabe ist an"
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr "Zufallswiedergabe ist aus"
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "%d Sekunden Crossfade"
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr "Datenbank aktualisiert"
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr "Playlist gemischt"
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr "Playlist gelöscht"
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Datenbankaktualisierung gestartet"
 
-#: src/screen.c:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Datenbankaktualisierung läuft..."
 
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr "Suchmodus: Wrapped"
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr "Suchmodus: Normal"
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr "Autozentriermodus: an"
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr "Autozentriermodus: aus"
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 msgid "All tracks"
 msgstr "Alle Stücke"
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr "Alle Künstler"
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Alben des Künstlers: %s"
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle Lieder des Künstlers: %s"
@@ -189,48 +197,48 @@ msgstr "Füge '%s' der Playlist hinzu\n"
 msgid "Adding directory %s...\n"
 msgstr "Füge Verzeichnis %s hinzu...\n"
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Suche: "
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Suche rückwärts: "
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kann '%s' nicht finden"
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr "Speichere Playlist als: "
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Ersetze %s [%s/%s] ?"
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Abbruch"
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr "%s gespeichert"
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr "Hinzufügen: "
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr "Playlist auf %s"
@@ -302,11 +310,11 @@ msgstr "Anmerkung"
 msgid "file"
 msgstr "Datei"
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr "Album"
 
@@ -360,154 +368,154 @@ msgstr "Suche: Drücke %s für eine neue Suche [%s]"
 msgid "Search mode: %s"
 msgstr "Suchmodus: %s"
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Tastenbelegung speichern und anwenden  "
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Tastenbelegung anwenden "
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr "Du hast eine neue Tastenbelegung"
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Tastenbelegung unverändert."
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Fehler: kann Verzeichnis ~/.ncmpc - %s nicht erstellen"
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fehler: %s - %s"
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "%s geschrieben"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Gib neue Taste für %s ein: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Fehler: Taste %s wird bereits benutzt für %s"
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s wurde %s zugeordnet"
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr "Füge neue Taste hinzu"
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Tipp: Hast du vergessen, deine Änderungen 'Anzuwenden'?"
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Editiere Tastenbelegungen"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editiere Tasten für %s"
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr "Bewegung"
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr "Playlistenanzeige"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr "Abspielen"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr "Stück nach oben bewegen"
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr "Stück nach unten bewegen"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr "Zentrieren"
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr "Anzeige durchstöbern"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr "Verzeichnis öffnen/Stück auswählen und abspielen"
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 msgid "Append song to playlist"
 msgstr "Song zur Playlist hinzufügen"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr "Lösche Playlist"
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr "Suchanzeige"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr "Auswählen und abspielen"
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr "Liedtextanzeige"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr "Liedtext lesen"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr "Text (neu) laden"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr "Laden unterbrechen"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr "Texte explizit herunterladen"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr "Liedtext speichern"
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr "Anzeige der Ausgabegeräte"
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr "Ausgabegerät aktivieren/deaktivieren"
 
@@ -527,357 +535,352 @@ msgstr "lade..."
 msgid "Lyrics saved"
 msgstr "Liedtext gespeichert"
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Ausgabegerät '%s' aktiviert"
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Ausgabegerät '%s' deaktiviert"
 
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr "Liedbetrachter"
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 msgid "Name"
 msgstr "Name"
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr "CD"
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 msgid "Track"
 msgstr "Stück"
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 msgid "Comment"
 msgstr "Anmerkung"
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Tastenkonfigurationsanzeige"
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr "Cursor nach oben bewegen"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr "Cursor nach unten bewegen"
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr "Pos1"
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr "Ende"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr "Bild auf"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr "Bild ab"
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr "Hilfeanzeige"
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr "Abspielen/Verzeichnis öffnen"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr "Playlist auf das markierte Lied reduzieren"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Nächstes Stück"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Vorheriges Stück"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Vorspulen"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Zurückspulen"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Lautstärke erhöhen"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Lautstärke verringern"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Wähle Stück in der Playlist an/ab"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr "Alle angezeigten Lieder zur Playlist hinzufügen"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr "Lösche Song aus der Playlist"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr "Mische Playlist"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr "Lösche Playlist"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr "Schalte Wiederholungswiedergabe ein/aus"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr "Schalte Zufallswiedergabe ein/aus"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr "Schalte Crossfade-Wiedergabe ein/aus"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr "Starte eine Aktualisierung der Musikdatenbank"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr "Speichere Playlist"
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr "Füge eine URL/Datei der Playlist hinzu"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr "Basis-Verzeichnis öffnen"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr "Übergeordnetes Verzeichnis öffnen"
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr "Lied anzeigen"
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr "Lied in Datenbank orten"
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr "Bewege es nach oben"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr "Bewege es nach unten"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Refresh screen"
 msgstr "Aktualisiere Anzeige"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr "Wechsle den Suchmodus"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr "Schalte den Autozentrier-Modus ein/aus"
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr "Nächste Anzeige"
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr "Vorherige Anzeige"
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr "Vorwärtssuche"
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr "Vorwärtssuche fortsetzen"
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr "Rückwärtssuche"
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr "Rückwärtssuche fortsetzen"
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr "Künstlerdatenbank"
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr "Suchmodus wechseln"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr "Kommando Unterbrechen"
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr "Liedtext aktualisieren"
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr "Leertaste"
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr "Entf"
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr "Oben"
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr "Unten"
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr "Links"
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr "Rechts"
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr "Bild ab"
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr "Bild auf"
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr "Einfg"
 
-#: 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:492 src/command.c:499
+#: src/command.c:485 src/command.c:491
 #, 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
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Warnung: Unbekannte Farbe - %s\n"
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Warnung: Unbekanntes Farbfeld - %s\n"
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr "Das Terminal unterstützt keine Farbwechsel\n"
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, c-format
 msgid "Terminal lacks color capabilities\n"
 msgstr "Das Terminal unterstützt keine Farben\n"
 
 #. To translators: prefix for error messages
-#: src/conf.c:87
+#: src/conf.c:89
 msgid "Error"
 msgstr "Fehler"
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr "Fehlerhafte Definition der Tastenbelegung"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr "Unvollständige Konfiguration für Tastenbelegung"
 
@@ -885,48 +888,51 @@ msgstr "Unvollständige Konfiguration für Tastenbelegung"
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr "Ungültige Anzeigeart"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr "Es fehlt ein '='"
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr "Ungültiger Farbname"
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr "Unvollständige Farbkonfiguration"
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr "Ungültige Zahl"
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr "Fehlerhafte Farbdefinition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr "Unbekannter Anzeigenname"
 
-#: src/conf.c:454
+#: src/conf.c:462
 msgid "Unknown configuration parameter"
 msgstr "Unbekannter Konfigurationsparameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:216 src/options.c:219
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr ""
 
+#~ 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)"
+
 #~ msgid "You can only delete playlists"
 #~ msgstr "Du kannst nur Playlisten löschen"
 
@@ -942,9 +948,6 @@ msgstr ""
 #~ msgid "Screen updated!"
 #~ msgstr "Anzeige aktualisiert!"
 
-#~ msgid "Welcome to the key editor!"
-#~ msgstr "Willkommen im Tasteneditor!"
-
 #~ msgid "Clock"
 #~ msgstr "Uhr"
 
diff --git a/po/es.po b/po/es.po
index c70d690..d6c3cdb 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-25 23:41+0100\n"
-"PO-Revision-Date: 2009-01-05 15:29+0100\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
+"PO-Revision-Date: 2009-01-06 17:54+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,160 +20,168 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
-#: src/i18n.h:41
+#: src/i18n.h:42
 msgid "y"
 msgstr "s"
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:214
+#: src/main.c:215
 #, 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:232
+#: src/main.c:233
 #, 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:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr "Conectado a %s"
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr "pressiona %s para accer al editor de teclas"
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr "Lista de canciones"
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr "Búsqueda"
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 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_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr "Salidas"
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr "Volumen n/a "
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volumen %d%%"
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr "Escuchando:"
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr "[Parado]"
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr "Error: La ventana/pantalla es muy pequeña"
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr "Modo repetición activado"
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr "Modo repetición desactivado"
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr "Modo aleatorio activado"
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr "Modo aleatorio desactivado"
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Desvanecimiento de %d segundos"
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr "Base de datos actualizada"
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr "Lista de canciones barajada"
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr "Vaciada la lista de canciones"
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Ha comenzado la actualización de la base de datos"
 
-#: src/screen.c:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Actualizando la base de datos..."
 
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr "Tipo de búsqueda: simple"
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr "Tipo de búsqueda: Normal"
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr "Modo autocentrado activado"
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr "Modo autocentrado desactivado"
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 msgid "All tracks"
 msgstr "Todas las pistas"
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr "Todos los artistas"
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Álbumes del artista: %s"
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas las pistas del artista: %s"
@@ -194,48 +202,48 @@ msgstr "Añadiendo '%s' a la lista de canciones\n"
 msgid "Adding directory %s...\n"
 msgstr "Añadiendo directorio %s...\n"
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Buscar:"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Buscar hacia atrás"
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "No se pudo encontrar %s"
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr "Guardar la lista como: "
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Sustituir %s [%s%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Ejecución interrumpida"
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr "%s Guardada"
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr "Añadir: "
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lista de reproducción en %s"
@@ -307,11 +315,11 @@ msgstr "comentario"
 msgid "file"
 msgstr "fichero"
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr "Álbum"
 
@@ -365,154 +373,154 @@ msgstr "Búsqueda: Pulsar %s para una nueva búsqueda [%s]"
 msgid "Search mode: %s"
 msgstr "Modo de búsqueda: %s"
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Aplicar y guardar las teclas de acceso rápido "
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Aplicar las teclas de acceso rápido "
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr "Has definido nuevas teclas de acceso rápido"
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Las teclas de acceso rápido no han sido modificadas."
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Error: No se ha podido crear el directorio ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Error: %s - %s"
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "%s creado"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Borrado"
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Introduce tecla de acceso rápido para %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Error: la tecla %s ya está asignada a %s"
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s asignada a %s"
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr "Introduce una nueva tecla"
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Has olvidado 'Aplicar' tus cambios?"
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Cambia las teclas de acceso rápido"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Cambia las teclas para %s"
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr "Navegar"
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr "Lista de canciones"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr "Mover la canción arriba"
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr "Mover la canción abajo"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr "Centro"
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr "Navegador"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr "Acceder al directorio/Seleccionar y reproducir canción"
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 msgid "Append song to playlist"
 msgstr "Añadir la canción de la lista"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr "Búsqueda"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr "Seleccionar y reproducir"
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr "Letras"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr "Ver letras"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr "(Re)cargar letras"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr "Interrumpir la descarga"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr "Forzar la descarga de las letras"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr "Guardar las letras"
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr "Pantalla de salidas"
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr "Activar/desactivar la salida"
 
@@ -532,358 +540,352 @@ msgstr "cargando..."
 msgid "Lyrics saved"
 msgstr "Letras guardadas"
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Se activó la salida '%s'"
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Se desactivó la salida '%s'"
 
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr "Visor de la canción"
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 msgid "Name"
 msgstr "Nombre"
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 msgid "Track"
 msgstr "Pista"
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 msgid "Date"
 msgstr "Fecha"
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr "Estilo"
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Configuración de teclas"
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr "Salir"
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr "Mover el cursor hacia arriba"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr "Mover el cursor hacia abajo"
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr "Inicio"
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr "Página arriba"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr "Página abajo"
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr "Ayuda"
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr "Reproducir/Entrar en el directorio"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr "Reducir lista de canciónes a canción marcado"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Siguiente"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Anterior"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Avanzar"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Subir el volumen"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Bajar el volumen"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/Deseleccionar la canción en la lista"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr "Seleccionar todos"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr "Borrar la canción de la lista"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr "Aleatorizar lista de canciones"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr "Alternar modo repetición"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr "Alternar modo aleatorio "
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr "Alternar modo crossfade"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr "Iniciar la actualización de la BD musical"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr "Guardar la lista de canciones"
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr "Añadir una URL o fichero a la lista"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr "Entrar al directorio fundamental"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr "Entrar al directorio superior"
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr "Ver la canción"
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr "Encontrar la canción en el navegador"
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr "Moverlo arriba"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr "Moverlo abajo"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Refresh screen"
 msgstr "Actualizar la ventana"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr "Alternar modo de búsqueda"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr "Alternar centrado automático de la ventana"
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr "Pantalla siguiente"
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr "Pantalla anterior"
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr "Buscar hacia adelante"
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr "Buscar siguiente"
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr "Buscar hacia atrás"
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr "Buscar anterior"
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr "Artistas"
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr "Cambiar el modo de búsqueda"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr "Interrumpir la acción"
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr "Actualizar las letras"
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr "Espacio"
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr "Abajo"
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr "Derecha"
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr "Pagina siguiente"
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr "Pagina anterior"
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr "Tabulador"
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr "Shift+Tabulador"
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr "Insertar"
 
-#: 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:492 src/command.c:499
+#: src/command.c:485 src/command.c:491
 #, c-format
 msgid "Key %s assigned to %s and %s\n"
 msgstr "Tecla %s asignada a %s y %s\n"
 
-#: src/colors.c:163
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Advertencia: Color %s - no reconocido\n"
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Advertencia: Propiedad del color - %s no reconocida\n"
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr "La terminal no soporta el cambio de colores\n"
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, c-format
 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
+#: src/conf.c:89
 msgid "Error"
 msgstr "Error"
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr "Definición incorrecta de la tecla de acceso"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr "Configuración incompleta de la tecla de acceso"
 
@@ -891,54 +893,55 @@ msgstr "Configuración incompleta de la tecla de acceso"
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr "Configuración incorrecta del tipo de duración mostrada"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr "Falta un '='"
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr "Nombre de color incorrecto"
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr "Definición de color incompleta"
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr "Número inválido"
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr "Definición de color erronea"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr "Nombre de pantalla desconocido"
 
-#: src/conf.c:454
+#: src/conf.c:462
 msgid "Unknown configuration parameter"
 msgstr "Parámetro de configuración desconocido"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:216 src/options.c:219
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr "ashtophet"
 
+#~ 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)"
+
 #~ msgid "Screen updated!"
 #~ msgstr "Ventana actualizada!"
 
-#~ msgid "Welcome to the key editor!"
-#~ msgstr "Bienvenida/o al editor de teclas!"
-
 #~ msgid "Clock"
 #~ msgstr "Reloj"
 
diff --git a/po/fr.po b/po/fr.po
index 88a7341..fbe8f55 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,166 +7,174 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-25 23:41+0100\n"
-"PO-Revision-Date: 2009-01-05 21:09+0100\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
+"PO-Revision-Date: 2009-01-06 17:54+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:41
+#: src/i18n.h:42
 msgid "y"
 msgstr "o"
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:214
+#: src/main.c:215
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Connexion à %s...  [Appuyez sur %s pour annuler]"
 
-#: src/main.c:232
+#: src/main.c:233
 #, 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:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr "Connecté à %s"
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr "appuyez sur %s pour l'éditeur de touches"
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr "Aide"
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr "Liste de lecture"
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr "Parcourir"
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 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_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr "Sorties"
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr "Volume n/a "
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volume %d%%"
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr "En Lecture:"
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr "[En Pause]"
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr "Erreur: Ecran trop petit"
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr "Mode de répetition activé"
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr "Mode de répetition désactivé"
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr "Mode Aléatoire activé"
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr "Mode Aléatoire désactivé"
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Fondu sur %d seconde(s)"
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr "Base de données mise à jour"
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr "Liste de lecture aléatoire"
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr "Liste de lecture vidée"
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 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:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Mise à jour de la base de données en cours..."
 
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr "Mode de recherche: Enveloppe"
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr "Mode de recherche: Normal"
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr "Mode d'auto-centrage: Actif"
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr "Mode d'auto-centrage: Inactif"
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 msgid "All tracks"
 msgstr "Toutes les pistes"
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr "Tous les artistes"
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albums de l'artiste : %s"
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Toutes les pistes de l'artiste : %s"
@@ -187,48 +195,48 @@ msgstr "Ajout de '%s' à la liste de lecture\n"
 msgid "Adding directory %s...\n"
 msgstr "Ajout du répertoire %s...\n"
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Trouver: "
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Trouver avant: "
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Impossible de trouver '%s'"
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr "Enregistrer la liste de lecture sous: "
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Remplacer %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Annulé"
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr "%s enregistré"
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr "Ajouter: "
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr "Liste de lecture sur %s"
@@ -300,11 +308,11 @@ msgstr "commentaire"
 msgid "file"
 msgstr "fichier"
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr "Titre"
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr "Album"
 
@@ -358,154 +366,154 @@ msgstr "Rechercher: Appuyez sur %s pour une nouvelle recherche [%s]"
 msgid "Search mode: %s"
 msgstr "Mode de recherche : %s"
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Appliquer et Enregistrer la correspondance des touches  "
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Appliquer la correspondance des touches "
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr "Vous avez une nouvelle correspondance de touches"
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "La correspondance des touches n'a pas été changée."
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Erreur: Impossible de créer le répertoire ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Erreur: %s - %s"
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "%s écrit"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Effacé"
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Entrez la nouvelle touche pour %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Erreur: la touche %s est déja attribuée à %s"
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s assignée à %s"
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr "Ajouter une nouvelle touche"
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Note: Auriez-vous oublié d''Appliquer' vos changements?"
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Editer les correspondances de touches"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editer les touches pour %s"
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr "Déplacements"
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr "Globales"
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr "Ecran de Liste de lecture"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr "Lire"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr "Déplacer la chanson vers le haut"
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr "Déplacer la chanson vers le bas"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr "Ecran de Navigation"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr "Entrer dans le répertoire/Sélectionner et lire la chanson"
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 msgid "Append song to playlist"
 msgstr "Ajouter la chanson à la liste de lecture"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr "Effacer la liste de lecture"
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr "Ecran de recherche"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr "Sélectionner et Lire"
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr "Ecran des paroles"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr "Voir les Paroles"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr "(Re)charger les paroles"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr "Récupération interrompue"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr "Forcer le téléchargement des paroles"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr "Enregistrer les paroles"
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr "Ecran des sorties"
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr "Activer/désactiver une sortie"
 
@@ -525,358 +533,352 @@ msgstr "Chargement..."
 msgid "Lyrics saved"
 msgstr "Paroles enregistrées"
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Sortie %s activée"
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Sortie %s désactivée"
 
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr "Visualiseur de chanson"
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr "Compositeur"
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 msgid "Name"
 msgstr "Nom"
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr "Disque"
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 msgid "Track"
 msgstr "Piste"
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 msgid "Date"
 msgstr "Date"
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr "Style"
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Ecran de configuration des touches"
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr "Déplacer le curseur vers le haut"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr "Déplacer le curseur vers le bas"
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr "Début"
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr "Monter d'une page"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr "Descendre d'une page"
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr "Ecran d'aide"
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr "Jouer/Entrer dans le répertoire"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr "Couper"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Piste suivante"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Piste précédente"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Avancer"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Reculer"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Augmenter le volume"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Diminuer le volume"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Sélectionner/Désélectionner la chanson dans la liste de lecture"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr "Selectionner tous les éléments listés"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr "Enlever la chanson de la liste de lecture"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr "Liste de lecture aléatoire"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr "Vider la liste de lecture"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr "Activer/désactiver le mode répétition"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr "Activer/désactiver le mode aléatoire"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr "Activer/désactiver le mode de fondu"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr "Mettre à jour la base de données musicale"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr "Enregistrer la liste de lecture"
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr "Ajouter une url/un fichier à la liste de lecture"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr "Aller au répertoire racine"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr "Aller au répertoire supérieur"
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr "Voir la chanson"
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr "Localiser la chanson dans le navigateur"
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr "Déplacer l'élément vers le haut"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr "Déplacer l'élément vers le bas"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Refresh screen"
 msgstr "Rafraîchir l'écran"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr "Activer le mode de recherche"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr "Activer le mode d'auto-centrage"
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr "Ecran suivant"
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr "Ecran précédent"
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr "Chercher après"
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr "Chercher après/suivant"
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr "Chercher avant"
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr "Chercher avant/précédent"
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr "Ecran sur l'Artiste"
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr "Changer le mode de recherche"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr "Interrompre l'action"
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr "Mettre à jour les paroles"
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr "Indéfini"
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr "Espace"
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr "Entrée"
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr "Suppr"
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr "Haut"
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr "Bas"
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr "Gauche"
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr "Droite"
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr "PageBas"
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr "PageHaut"
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr "Echap"
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr "Inser"
 
-#: src/command.c:485
+#: src/command.c:485 src/command.c:491
 #, 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:492 src/command.c:499
 msgid "Key %s assigned to %s and %s\n"
 msgstr "La touche %s est assignée à %s et à %s\n"
 
-#: src/colors.c:163
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Attention: Couleur inconnue - %s\n"
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Attention: Champ de couleur inconnu - %s\n"
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr "Le terminal ne supporte pas le changement de couleurs\n"
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, c-format
 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
+#: src/conf.c:89
 msgid "Error"
 msgstr "Erreur"
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr "Définition de raccourci malformée"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr "Configuration de raccourci incomplète"
 
@@ -884,54 +886,56 @@ msgstr "Configuration de raccourci incomplète"
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr "Mauvais type d'affichage du temps"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr "Manque '='"
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr "Mauvais nom de couleur"
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr "Définition de couleur incomplète"
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr "Nombre invalide"
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr "Définition de couleur malformée"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr "Nom d'écran inconnu"
 
-#: src/conf.c:454
+#: src/conf.c:462
 msgid "Unknown configuration parameter"
 msgstr "Paramètre de configuration inconnu"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:216 src/options.c:219
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr "Traduction française : Yann Cézard <eesprit@free.fr>"
 
+#~ 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)"
+
 #~ msgid "Screen updated!"
 #~ msgstr "Ecran mis à jour!"
 
-#~ msgid "Welcome to the key editor!"
-#~ msgstr "Bienvenue sur l'éditeur de touches!"
-
 #~ msgid "Clock"
 #~ msgstr "Horloge"
 
diff --git a/po/gl.po b/po/gl.po
index 2b31ec5..7cc27d5 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-25 23:41+0100\n"
-"PO-Revision-Date: 2009-01-05 15:29+0100\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
+"PO-Revision-Date: 2009-01-06 17:54+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,159 +16,167 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/i18n.h:41
+#: src/i18n.h:42
 msgid "y"
 msgstr "s"
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:214
+#: src/main.c:215
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "A conectar-se com %s... [Preme %s para abortar]"
 
-#: src/main.c:232
+#: src/main.c:233
 #, 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:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr "Conectado com %s"
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr "preme %s para ir ao editor de atalhos"
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr "Lista"
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr "Procura"
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 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_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr "Saídas"
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr "Volume n/a "
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volume %d%%"
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr "A tocar:"
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr "[Em Pausa]"
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr "Erro: O écrã é demasiado pequeno"
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr "Repetiçom activada"
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr "Repetiçom desactivada"
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr "Aleatório activado"
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr "Aleatório desactivado"
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Esvaecemento %d segundos"
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr "Base de dados actualizada"
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr "Lista aleatorizada"
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr "Lista limpada"
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 src/screen_file.c:265
 msgid "Database update started"
 msgstr "A actualizaçom da BD começou"
 
-#: src/screen.c:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "A BD está-se a actualizar..."
 
 # fuzzy
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr "Modo de procura: Limitada"
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr "Modo de procura: Normal"
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr "Modo de auto-centrado: activado"
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr "Modo de auto-centrado: desactivado"
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 msgid "All tracks"
 msgstr "Todas as pistas"
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr "Todos os artistas"
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumes do artista: %s"
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas as pistas do artista: %s"
@@ -189,48 +197,48 @@ msgstr "A engadir '%s' à lista\n"
 msgid "Adding directory %s...\n"
 msgstr "Engadindo o cartafol %s...\n"
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Procurar"
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Procurar atrás"
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr "Contrasinal :"
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Nom se puido atopar '%s'"
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr "Guardar lista como: "
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Reemprazar %s [%s/%s] ?"
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Abortado"
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr "Guardado %s"
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr "Engadir: "
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lista em %s"
@@ -302,11 +310,11 @@ msgstr "comentário"
 msgid "file"
 msgstr "ficheiro"
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr "Álbum"
 
@@ -360,154 +368,154 @@ msgstr "Procura: Preme %s para umha nova procura [%s]"
 msgid "Search mode: %s"
 msgstr "Modo da procura: %s"
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Aplicar e guardar os atalhos de teclado "
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Aplicar os atalhos de teclado "
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr "Tes novos atalhos de teclado"
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Atalhos de teclado sem mudanças"
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Erro: impossível criar o cartafol ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Erro: %s - %s"
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "Escreveu-se %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Introuduz um novo atalho para %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Erro: a tecla %s já se está a utilizar por %s"
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Assignou-se %s a %s"
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr "Engadir um novo atalho"
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Esquecestes de 'Aplicar' as mudanças?"
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Editar os atalhos de teclado"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editar atalhos para %s"
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr "Movimento"
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr "Écrã da lista"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr "Tocar"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr "Mover a cançom arriba"
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr "Mover a cançom abaixo"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr "Centrar"
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr "Écrã de navegaçom"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr "Entra no cartafol/Selecciona e toca a cançom"
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 msgid "Append song to playlist"
 msgstr "Engadir a cançom à lista"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr "Eliminar lista"
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr "Écrã de procura"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr "Seleccionar e tocar"
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr "Ecrã das letras"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr "Ver Letras"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr "(Re)carregar letras"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr "Interromper a descarga"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr "Forçar a descarga das letras"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr "Guardar as letras"
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr "Écrã de saída"
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr "Habilitar/Deshabilitar saída"
 
@@ -527,358 +535,352 @@ msgstr "a carregar..."
 msgid "Lyrics saved"
 msgstr "Letras guardadas"
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Activou-se a saída '%s'"
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Desactivou-se a saída '%s'"
 
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr "Visor da cançom"
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 msgid "Name"
 msgstr "Nome do ficheiro"
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 msgid "Track"
 msgstr "Pista"
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 msgid "Date"
 msgstr "Data"
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr "Estilo"
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Écrã da configuraçom dos atalhos"
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr "Sair"
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr "Mover o cursor arriba"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr "Mover o cursor abaixo"
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr "Fim"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr "Avance página"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr "Retrocesso página"
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr "Écrã de ajuda"
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr "Tocar/Entrar num cartafol"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr "Cortar"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Seguinte"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Anterior"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Avançar"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Aumentar volume"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Diminuir volume"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/desseleccionar a cançom na lista"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr "Seleccionar todos"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr "Eliminar a cançom da lista"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr "Aleatorizar a lista"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr "Limpar a lista"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr "Activar/desactivar o modo repetiçom"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr "Activar/desactivar o modo aleatório"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr "Activar/desactivar o modo esvaecimento"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr "Começar umha actualizaçom da BD"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr "Guardar lista"
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr "Engadir url/ficheiro à lista"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr "Ir ao cartafol raíz"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr "Ir ao cartafol pai"
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr "Ver a cançom"
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr "Atopar a cançom no navegador"
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr "Mover o elemento arriba"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr "Mover o elemento abaixo"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Refresh screen"
 msgstr "Actualizar o écrã"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr "Alternar o modo de procura"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr "Alternar o modo de auto-centrado"
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr "Seguinte écrã"
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr "Écrã anterior"
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr "Procurar cara adiante"
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr "Procurar para adiante, seguinte"
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr "Procurar cara atrás"
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr "Procurar cara atrás, anterior"
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr "Navegador de Artistas"
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr "Mudar o modo de procura"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr "Interromper a acçom"
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr "Actualizar as letras"
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr "Nom definido"
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr "Espaço"
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr "Supr"
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr "Direita"
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr "Re. Pág."
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr "Av. Pág."
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr "Insert"
 
-#: 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:492 src/command.c:499
+#: src/command.c:485 src/command.c:491
 #, c-format
 msgid "Key %s assigned to %s and %s\n"
 msgstr "A tecla %s assignou-se a %s e a %s\n"
 
-#: src/colors.c:163
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Aviso: Cor desconhecida - %s\n"
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Aviso: Campo de cor desconhecido - %s\n"
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr "A terminal nom tem suporte para a mudança das cores\n"
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, c-format
 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
+#: src/conf.c:89
 msgid "Error"
 msgstr "Erro"
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr "Definiçom incorrecta da tecla de acceso rápido."
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr "Configuraçom incompleta da tecla de acceso rápido"
 
@@ -886,54 +888,55 @@ msgstr "Configuraçom incompleta da tecla de acceso rápido"
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr "Configuración incorrecta da duración mostrada"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr "Falta o signo '='"
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr "Nome de cor incorrecto"
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr "Definiçom incompleta da cor"
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr "Número inválido"
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr "Definiçom incorrecta da cor"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr "Nome de écrã desconhecido"
 
-#: src/conf.c:454
+#: src/conf.c:462
 msgid "Unknown configuration parameter"
 msgstr "Parâmetro de configuraçom desconhecido"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:216 src/options.c:219
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr "ashtophet"
 
+#~ 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)"
+
 #~ msgid "Screen updated!"
 #~ msgstr "Écrã actualizado!"
 
-#~ msgid "Welcome to the key editor!"
-#~ msgstr "Bem-vid@ ao editor de atalhos!"
-
 #~ msgid "Clock"
 #~ msgstr "Relógio"
 
diff --git a/po/hu.po b/po/hu.po
index 69d3038..bb02eca 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-27 13:00+0100\n"
-"PO-Revision-Date: 2008-12-28 20:03+0000\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
+"PO-Revision-Date: 2009-01-06 17:55+0100\n"
 "Last-Translator: Laszlo Ashin <kodest@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,158 +17,166 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-02 08:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/i18n.h:41
+#: src/i18n.h:42
 msgid "y"
 msgstr "i"
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:214
+#: src/main.c:215
 #, 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:232
+#: src/main.c:233
 #, 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:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr "Csatlakoztatva ide: %s"
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr "nyomj %s-t a szerkesztéshez"
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr "Súgó"
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr "Lejátszólista"
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr "Tallózás"
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr "Keresés"
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 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_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr "Kimenetek"
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr "Hangerő ismeretlen "
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr " Hangerő %d%%"
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr "Ami szól:"
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr "[Szüneteltetve]"
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr "Hiba: a képernyő túl kicsi"
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr "Ismétlés elindítva"
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr "Ismétlés leállítva"
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr "Véletlenszerű lejátszás bekapcsolva"
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr "Véletlenszerű lejátszás kikapcsolva"
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Egymásba mosás %d másodperc"
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr "Adatbázis frissítve"
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr "Lejátszólista összekeverve"
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr "Lejátszólista törölve"
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Adatbázis frissítés elindult"
 
-#: src/screen.c:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Adatbázis frissítés folyamatban..."
 
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr "Keresési mód: újrakezdő"
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr "Keresési mód: normál"
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr "Középre igazítás bekapcsolva"
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr "Középre igazítás kikapcsolva"
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 msgid "All tracks"
 msgstr "Minden szám"
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr "Minden előadó"
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "%s előadó albumai"
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "%s előadó minden száma"
@@ -189,48 +197,48 @@ msgstr "'%s' hozzáadása a lejátszólistához\n"
 msgid "Adding directory %s...\n"
 msgstr "%s könyvtár hozzáadása...\n"
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Keresés: "
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Keresés visszafelé: "
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr "Jelszó: "
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "'%s' nem található"
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr "Lejátszólista mentése másként: "
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Cserélni a következőt: %s [%s/%s]? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Megszakítva"
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr "%s elmentve"
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr "Hozzáadás: "
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lejátszólista itt: %s"
@@ -302,11 +310,11 @@ msgstr "megjegyzés"
 msgid "file"
 msgstr "fájl"
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr "Cím"
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr "Album"
 
@@ -360,154 +368,154 @@ msgstr "Keresés: új kereséshez nyomj %s gombot [%s]"
 msgid "Search mode: %s"
 msgstr "Keresési mód: %s"
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Alkalmaz és Menti a billentyű beállításokat  "
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Billentyű beállítások használata "
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr "Új billentyű beállításaid vannak"
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "A billentyű beállítások változatlanok."
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Hiba: Nem sikerül létrehozni a ~/.ncmpc könyvtárat - %s"
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Hiba: %s - %s"
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "%s elmentve"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Törölve"
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Nyomd meg az új gombot a következőhöz: %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Hiba: %s gombot már a következő funkció használja: %s"
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s hozzárendelve a következőhöz: %s"
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr "Új gomb hozzáadása"
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Észrevétel: nem felejtetted el érvényesíteni a változtatásaidat?"
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Billentyűk változtatása"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Gombok módosítása a következőhöz: %s"
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr "Mozgás"
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr "Általános"
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr "Lejátszólista"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr "Lejátszás"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr "Szám mozgatása felfelé"
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr "Szám mozgatása lefelé"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr "Közép"
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr "Tallózás"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr "Könyvtár megadása/szám kiválasztása és lejátszása"
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 msgid "Append song to playlist"
 msgstr "Szám hozzáadása a lejátszólistához"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr "Kereső képernyő"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr "Kiválasztás és lejátszás"
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr "Dalszöveg képernyő"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr "Dalszövegek megtekintése"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr "Dalszövegek (újra)töltése"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr "Újrapróbálkozás megszakítása"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr "Dalszövegek kifejezett letöltése"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr "Dalszövegek mentése"
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr "Kimenetek"
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr "Kimenet engedélyezése/tiltása"
 
@@ -527,358 +535,352 @@ msgstr "betöltés..."
 msgid "Lyrics saved"
 msgstr "Dalszövegek elmentve"
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Kimenet engedélyezve: %s"
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Kimenet tiltva: %s"
 
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr "Szám néző"
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr "Zeneszerző"
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 msgid "Name"
 msgstr "Név"
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr "Lemez"
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 msgid "Track"
 msgstr "Szám"
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 msgid "Date"
 msgstr "Dátum"
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr "Műfaj"
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Billentyű beállító képernyő"
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr "Kilép"
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr "Kurzormozgatás felfelé"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr "Kurzormozgatás lefelé"
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr "End"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr "Egy oldalt fel"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr "Egy oldalt le"
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr "Segítség"
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr "Lejátszás/Belépés könyvtárba"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr "Szüneteltetés"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr "Leállítás"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr "Vágás"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Következő szám"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Előző szám"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Tekerés előre"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Tekerés hátra"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Hangerő növelése"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Hangerő csökkentése"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Szám kiválasztása a lejátszólistában"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr "Minden listázott elem kiválasztása"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr "Szám törlése a lejátszólistából"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr "Lejátszólista összekeverése"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr "Ismétlő mód ki- és bekapcsolása"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr "Véletlenszerű lejátszás ki- és bekapcsolása"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr "Egymásba mosás ki- és bekapcsolása"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr "A zenei adatbázis frissítésének indítása"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr "Lejátszólista mentése"
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr "URL vagy fájl hozzáadása a lejátszólistához"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr "Mozgás a gyökér könyvtárba"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr "Mozgás a szülő könyvtárba"
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr "A szám megtekintése"
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr "Szám megtekintése a tallozóban"
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr "Elem mozgatása fel"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr "Elem mozgatása le"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Refresh screen"
 msgstr "Képernyő frissítése"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr "Kereső mód ki- és bekapcsolása"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr "Középre igazítás ki- és bekapcsolása"
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr "Kövezkező képernyő"
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr "Előző képernyő"
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr "Keresés előre"
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr "Következő keresése előre"
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr "Keresés hátra"
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr "Előző keresése hátra"
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr "Előadó képernyő"
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr "Kereső mód váltása"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr "parancs megszakítása"
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr "Dalszövegek frissítése"
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr "Meghatározatlan"
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr "Szóköz"
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr "Insert"
 
-#: 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:492 src/command.c:499
+#: src/command.c:485 src/command.c:491
 #, c-format
 msgid "Key %s assigned to %s and %s\n"
 msgstr "A(z) %s gomb a követlezőkhoz van rendelve: %s és %s\n"
 
-#: src/colors.c:163
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Figyelem: ismeretlen szín - %s\n"
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Figyelem: ismeretlen szín mező - %s\n"
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr "A terminál nem támogatja a színek változtatását\n"
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, 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
+#: src/conf.c:89
 msgid "Error"
 msgstr "Hiba"
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr "Hibás gyorsbillentyű definíció"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr "Hiányos gyorsbillentyű definíció"
 
@@ -886,46 +888,51 @@ msgstr "Hiányos gyorsbillentyű definíció"
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr "Hibás időkijelzési típus"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr "Hiányzó egyenlőség jel"
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr "Hibás szín megnevezés"
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr "Hiányos szín megadás"
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr "Érvénytelen szám"
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr "Hibás szín megadás"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr "Ismeretlen képernyő név"
 
-#: src/conf.c:454
+#: src/conf.c:462
 msgid "Unknown configuration parameter"
 msgstr "Ismeretlen konfigurációs paraméter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:216 src/options.c:219
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Laszlo Ashin https://launchpad.net/~kodest"
+
+#~ 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)"
diff --git a/po/ncmpc.pot b/po/ncmpc.pot
index 7a27e1f..14d4cc4 100644
--- a/po/ncmpc.pot
+++ b/po/ncmpc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-25 23:41+0100\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,158 +16,166 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:41
+#: src/i18n.h:42
 msgid "y"
 msgstr ""
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr ""
 
-#: src/main.c:214
+#: src/main.c:215
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr ""
 
-#: src/main.c:232
+#: src/main.c:233
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr ""
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr ""
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr ""
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr ""
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr ""
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr ""
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr ""
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 src/screen_lyrics.c:203 src/screen_lyrics.c:211
 #: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr ""
 
-#: src/screen.c:166 src/screen_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr ""
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr ""
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr ""
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr ""
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr ""
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr ""
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr ""
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr ""
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr ""
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr ""
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr ""
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr ""
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr ""
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 src/screen_file.c:265
 msgid "Database update started"
 msgstr ""
 
-#: src/screen.c:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr ""
 
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr ""
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 msgid "All tracks"
 msgstr ""
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr ""
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr ""
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr ""
@@ -188,48 +196,48 @@ msgstr ""
 msgid "Adding directory %s...\n"
 msgstr ""
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr ""
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr ""
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr ""
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr ""
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr ""
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr ""
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr ""
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr ""
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr ""
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr ""
@@ -301,11 +309,11 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr ""
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr ""
 
@@ -359,154 +367,154 @@ msgstr ""
 msgid "Search mode: %s"
 msgstr ""
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr ""
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr ""
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr ""
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr ""
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr ""
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr ""
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr ""
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr ""
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr ""
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr ""
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr ""
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr ""
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr ""
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr ""
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr ""
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr ""
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr ""
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr ""
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr ""
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr ""
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr ""
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 msgid "Append song to playlist"
 msgstr ""
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr ""
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr ""
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr ""
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr ""
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr ""
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr ""
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr ""
 
@@ -526,357 +534,352 @@ msgstr ""
 msgid "Lyrics saved"
 msgstr ""
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr ""
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr ""
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 msgid "Name"
 msgstr ""
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr ""
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 msgid "Track"
 msgstr ""
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 msgid "Date"
 msgstr ""
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr ""
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 msgid "Comment"
 msgstr ""
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr ""
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr ""
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr ""
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr ""
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr ""
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr ""
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr ""
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr ""
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr ""
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr ""
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr ""
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr ""
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr ""
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr ""
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr ""
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr ""
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr ""
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr ""
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr ""
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr ""
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr ""
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr ""
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr ""
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr ""
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr ""
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr ""
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr ""
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr ""
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr ""
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr ""
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr ""
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr ""
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr ""
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr ""
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr ""
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr ""
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr ""
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr ""
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr ""
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr ""
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:485
-#, c-format
-msgid "Key %s assigned to %s and %s (press %s for the key editor)"
-msgstr ""
-
-#: src/command.c:492 src/command.c:499
+#: src/command.c:485 src/command.c:491
 #, c-format
 msgid "Key %s assigned to %s and %s\n"
 msgstr ""
 
-#: src/colors.c:163
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr ""
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr ""
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr ""
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, c-format
 msgid "Terminal lacks color capabilities\n"
 msgstr ""
 
 #. To translators: prefix for error messages
-#: src/conf.c:87
+#: src/conf.c:89
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -884,44 +887,44 @@ msgstr ""
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr ""
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:454
+#: src/conf.c:462
 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
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index a874de0..0893be7 100644
--- a/po/no.po
+++ b/po/no.po
@@ -8,167 +8,175 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-27 13:00+0100\n"
-"PO-Revision-Date: 2008-12-25 23:45+0100\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
+"PO-Revision-Date: 2009-01-06 17:55+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=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:41
+#: src/i18n.h:42
 msgid "y"
 msgstr "j"
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr ""
 
-#: src/main.c:214
+#: src/main.c:215
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Kobler til %s... [Trykk %s for å avslutte]"
 
-#: src/main.c:232
+#: src/main.c:233
 #, 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:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr "Koblet til %s"
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr "trykk %s for å rette"
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr "Spilleliste"
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr "Filer"
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr ""
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr "Søk"
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 src/screen_lyrics.c:203 src/screen_lyrics.c:211
 #: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr ""
 
-#: src/screen.c:166 src/screen_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr ""
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr "Volum: n/a "
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volum: %d%%"
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr "Spiller:"
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr "Feil: Terminalen er for liten"
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr "Repeter er på"
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr "Repeter er av"
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr "Random er på"
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr "Random er av"
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr "Databasen er oppdatert"
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr "Tilfeldigjort spillelisten"
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr "Sletter spillelisten"
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Oppdaterar databasen"
 
-#: src/screen.c:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Databasen oppdateres..."
 
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr "Søkt rundt (starter på ny)"
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr "Søk normalt (til slutt/begynnelse)"
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr "Automatisk sentrering er på"
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er av"
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 #, fuzzy
 msgid "All tracks"
 msgstr "Neste"
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr ""
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr ""
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr ""
@@ -189,48 +197,48 @@ msgstr "Legger '%s' til spillelisten\n"
 msgid "Adding directory %s...\n"
 msgstr "Legger til mappen %s...\n"
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Søk: "
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Søk (bakover): "
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr ""
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Fant ikke '%s'"
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr "Lagre spillelisten som: "
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstatt '%s' [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Avbrutt"
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr "Lagret %s"
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr "Legg til: "
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spilleliste på %s"
@@ -307,11 +315,11 @@ msgstr ""
 msgid "file"
 msgstr "Tittel"
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr "Tittel"
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr ""
 
@@ -365,155 +373,155 @@ msgstr "Trykk på %s for ett nytt søk [%s]"
 msgid "Search mode: %s"
 msgstr "Søk etter: %s"
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "==> Bruk og Lagre snarveier"
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "==> Bruk snarveier"
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr "Du har nye tastatursnarveier"
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Tastatursnarveier uforandret!"
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Feil: Kan ikke lage ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Feil: %s - %s"
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "Skrev %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Slettet"
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tast for %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Tasten %s brukes allerede for %s"
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Satte %s = %s"
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr "Legg til ny tast"
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Du glemte vel ikke å legge til de nye endringene?"
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Endre tast"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Endre taster for '%s'"
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr "Navigasjon"
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr "Globale"
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr "Spilleliste"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr "Start/spill markert"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr "Sentrer"
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr "Velg bibliotek/Legg til spillisten og spill sang"
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 #, fuzzy
 msgid "Append song to playlist"
 msgstr "Ta bort/slett"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr "Slett spilleliste"
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr "Database søk"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr "Legg til spillelisten og spill"
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr ""
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr ""
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr ""
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr ""
 
@@ -534,362 +542,357 @@ msgstr "Avslutter..."
 msgid "Lyrics saved"
 msgstr ""
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr ""
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr ""
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 #, fuzzy
 msgid "Name"
 msgstr "Filnavn"
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr ""
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 #, fuzzy
 msgid "Track"
 msgstr "Neste"
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 #, fuzzy
 msgid "Date"
 msgstr "Del"
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr ""
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 #, fuzzy
 msgid "Comment"
 msgstr "Sentrer"
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Tastaturkonfigurasjon"
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr "Flytt markør opp"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr "Flytt markør ned"
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr ""
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr ""
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr "Markøren en side opp"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr "Markøren en side ned"
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr "Hjelp"
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr "Spill/Velg mappe"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Neste"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Spol/Søk framover"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Spol/Søk tilbake"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Øk volumet"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Demp volumet"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Legg til/Fjern fra spillelisten"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr ""
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr "Ta bort/slett"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr "Tilfeldiggjør spilleliste"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr "Tøm spillelisten"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr "Repeat PÃ¥/Av"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr "Random PÃ¥/Av"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr "Crossfade PÃ¥/Av"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr "Oppdater databasen"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr "Lagre spillelisten"
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr "Legg til URL eller fil til spillelisten"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr ""
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr "Flytt opp"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr "Flytt ned"
 
-#: src/command.c:160
+#: src/command.c:161
 #, fuzzy
 msgid "Refresh screen"
 msgstr "Oppdater"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr "Endre søk instillninger"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering PÃ¥/Av"
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr "Neste skjerm"
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr "Forrige skjerm"
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr "Søk"
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr "Fremover Søking"
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr "Søk bakover"
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr "Bakover Søk forrige"
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr "Endre søkemodus"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr "Ikke Definert"
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr "Mellomrom"
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr "Del"
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr "Opp"
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr "Venstrepil"
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr "Høyrepil"
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr "Ins"
 
-#: 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:492 src/command.c:499
+#: src/command.c:485 src/command.c:491
 #, 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
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Advarsel: Kjenner ikke til fargen %s\n"
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Advarsel: %s er ikke definert.\n"
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr "Terminalen mangler støtte for omdefinering av farger\n"
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, c-format
 msgid "Terminal lacks color capabilities\n"
 msgstr "Terminalen mangler støtte for farger\n"
 
 #. To translators: prefix for error messages
-#: src/conf.c:87
+#: src/conf.c:89
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -897,55 +900,55 @@ msgstr ""
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr ""
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:454
+#: src/conf.c:462
 #, 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
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr ""
 
+#~ 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)"
+
 #~ msgid "Screen updated!"
 #~ msgstr "pppdatert!"
 
-#~ msgid "Welcome to the key editor!"
-#~ msgstr "Her kan du endre tastene"
-
 #~ msgid "Clock"
 #~ msgstr "Klokke"
 
diff --git a/po/ru.po b/po/ru.po
index 61fdbbb..df67051 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,166 +9,174 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-25 23:41+0100\n"
-"PO-Revision-Date: 2008-12-25 23:46+0100\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
+"PO-Revision-Date: 2009-01-06 17:56+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:41
+#: src/i18n.h:42
 msgid "y"
 msgstr "y"
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:214
+#: src/main.c:215
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "ðÏÄËÌÀÞÅÎÉÅ Ë %s...  [îÁÖÍÉÔÅ %s ÄÌÑ ÏÔÍÅÎÙ]"
 
-#: src/main.c:232
+#: src/main.c:233
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "ïÛÉÂËÁ: MPD ×ÅÒÓÉÉ %d.%d.%d ÕÓÔÁÒÅÌ (ÎÅÏÂÈÏÄÉÍ %s)"
 
-#: src/main.c:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr "ðÏÄËÌÀÞÅÎÏ Ë %s"
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr "%s - ÒÅÄÁËÔÏÒ ËÌÁ×ÉÛ"
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr "ðÏÍÏÝØ"
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr "ðÌÅÊÌÉÓÔ"
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr "îÁ×ÉÇÁÃÉÑ"
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr "éÓÐÏÌÎÉÔÅÌØ"
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr "ðÏÉÓË"
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 src/screen_lyrics.c:203 src/screen_lyrics.c:211
 #: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "ôÅËÓÔ"
 
-#: src/screen.c:166 src/screen_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr "áÕÄÉÏ×ÙÈÏÄÙ"
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr "çÒÏÍËÏÓÔØ Î/Ä "
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr " çÒÏÍËÏÓÔØ %d%%"
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr "ðÒÏÉÇÒÙ×ÁÅÔÓÑ:"
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr "[ðÁÕÚÁ]"
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr "ïÛÉÂËÁ: üËÒÁÎ ÓÌÉÛËÏÍ ÍÁÌ"
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr "ðÏ×ÔÏÒ ×ËÌÀÞÅÎ"
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr "ðÏ×ÔÏÒ ×ÙËÌÀÞÅÎ"
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr "óÌÕÞÁÎÙÊ ÒÅÖÉÍ ×ËÌÀÞÅÎ"
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr "óÌÕÞÁÊÎÙÊ ÒÅÖÉÍ ×ÙËÌÀÞÅÎ"
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "ðÌÁ×ÎÙÊ ÐÅÒÅÈÏÄ %d ÓÅËÕÎÄ"
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr "âÁÚÁ ÏÂÎÏ×ÌÅÎÁ"
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr "ðÌÅÊÌÉÓÔ ÐÅÒÅÍÅÛÁÎ"
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr "ðÌÅÊÌÉÓÔ ÏÞÉÝÅÎ"
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 src/screen_file.c:265
 msgid "Database update started"
 msgstr "îÁÞÁÔÏ ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ"
 
-#: src/screen.c:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "éÄÅÔ ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ..."
 
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr "òÅÖÉÍ ÐÏÉÓËÁ: ãÉËÌÉÞÅÓËÉÊ"
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr "òÅÖÉÍ ÐÏÉÓËÁ: îÏÒÍÁÌØÎÙÊ"
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr "òÅÖÉÍ Á×ÔÏÃÅÎÔÒÉÒÏ×ÁÎÉÑ: ÷ËÌ."
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr "òÅÖÉÍ Á×ÔÏÃÅÎÔÒÉÒÏ×ÁÎÉÑ: ÷ÙËÌ."
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 msgid "All tracks"
 msgstr "÷ÓÅ ËÏÍÐÏÚÉÃÉÉ"
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr "÷ÓÅ ÉÓÐÏÌÎÉÔÅÌÉ"
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "áÌØÂÏÍÙ ÉÓÐÏÌÎÉÔÅÌÑ: %s"
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr "áÌØÂÏÍ: %s - %s"
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "÷ÓÅ ËÏÍÐÏÚÉÃÉÉ ÉÓÐÏÌÎÉÔÅÌÑ: %s"
@@ -189,48 +197,48 @@ msgstr "
 msgid "Adding directory %s...\n"
 msgstr "äÏÂÁ×ÌÑÅÔÓÑ ÄÉÒÅËÔÏÒÉÑ %s...\n"
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "ðÏÉÓË: "
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "ðÏÉÓË ÎÁÚÁÄ: "
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr "ðÁÒÏÌØ: "
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ '%s'"
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr "óÏÈÒÁÎÉÔØ ÐÌÅÊÌÉÓÔ ËÁË: "
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "úÁÍÅÎÉÔØ %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "ðÒÅÒ×ÁÎÏ"
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr "óÏÈÒÁÎÅÎÏ × %s"
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr "äÏÂÁ×ÉÔØ: "
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr "ðÌÅÊÌÉÓÔ ÎÁ %s"
@@ -303,11 +311,11 @@ msgstr "comment"
 msgid "file"
 msgstr "file"
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr "ëÏÍÐÏÚÉÃÉÑ"
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr "áÌØÂÏÍ"
 
@@ -361,154 +369,154 @@ msgstr "
 msgid "Search mode: %s"
 msgstr "ðÏÌÅ ÄÌÑ ÐÏÉÓËÁ: %s"
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> ðÒÉÍÅÎÉÔØ É ÓÏÈÒÁÎÉÔØ ËÌÁ×ÉÁÔÕÒÎÙÅ ËÏÍÂÉÎÁÃÉÉ  "
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> ðÒÉÍÅÎÉÔØ ËÌÁ×ÉÁÔÕÒÎÙÅ ËÏÍÂÉÎÁÃÉÉ "
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr "îÏ×ÙÅ ËÌÁ×ÉÁÔÕÒÎÙÅ ËÏÍÂÉÎÁÃÉÉ ÚÁÄÅÊÓÔ×Ï×ÁÎÙ"
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "ëÌÁ×ÉÁÔÕÒÎÙÅ ËÏÍÂÉÎÁÃÉÉ ÎÅ ÉÚÍÅÎÉÌÉÓØ."
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "ïÛÉÂËÁ: îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÄÉÒÅËÔÏÒÉÀ ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "ïÛÉÂËÁ: %s - %s"
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "úÁÐÉÓÁÎÏ %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "õÄÁÌÅÎÏ"
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "îÁÖÍÉÔÅ ÎÏ×ÕÀ ËÌÁ×ÉÛÕ ÄÌÑ %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "ïÛÉÂËÁ: ËÌÁ×ÉÛÁ %s ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ %s"
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "îÁÚÎÁÞÅÎÏ %s ÄÌÑ %s"
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr "äÏÂÁ×ÉÔØ ÎÏ×ÕÀ ËÌÁ×ÉÛÕ"
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "÷ÎÉÍÁÎÉÅ: ÷Ù ÎÅ ÚÁÂÙÌÉ ÐÒÉÍÅÎÉÔØ ÓÄÅÌÁÎÎÙÅ ÉÚÍÅÎÅÎÉÑ?"
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "éÚÍÅÎÅÎÉÅ ËÌÁ×ÉÁÔÕÒÎÙÈ ËÏÍÂÉÎÁÃÉÊ"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "éÚÍÅÎÅÎÉÅ ËÌÁ×ÉÁÔÕÒÎÙÈ ËÏÍÂÉÎÁÃÉÊ ÄÌÑ %s"
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr "ðÅÒÅÍÅÝÅÎÉÅ"
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr "çÌÏÂÁÌØÎÙÅ"
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr "üËÒÁÎ ÐÌÅÊÌÉÓÔÁ"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr "÷ÏÓÐÒÏÉÚ×ÅÄÅÎÉÅ"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÏÍÐÏÚÉÃÉÀ ××ÅÒÈ"
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÏÍÐÏÚÉÃÉÀ ×ÎÉÚ"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr "ãÅÎÔÒÉÒÏ×ÁÔØ"
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr "üËÒÁÎ ÎÁ×ÉÇÁÃÉÉ"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr "ðÅÒÅÊÔÉ × ÄÉÒÅËÔÏÒÉÀ/÷ÙÂÒÁÔØ É ÐÒÏÉÇÒÁÔØ ËÏÍÐÏÚÉÃÉÀ"
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 msgid "Append song to playlist"
 msgstr "äÏÂÁ×ÉÔØ ËÏÍÐÏÚÉÃÉÀ × ÐÌÅÊÌÉÓÔ"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr "õÄÁÌÉÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr "üËÒÁÎ ÐÏÉÓËÁ"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr "÷ÙÂÒÁÔØ É ÐÒÏÉÇÒÁÔØ"
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr "üËÒÁÎ ÔÅËÓÔÁ ÐÅÓÎÉ"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr "ðÏËÁÚÁÔØ ÔÅËÓÔ"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr "(ðÅÒÅ)ÚÁÇÒÕÚÉÔØ ÔÅËÓÔ"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr "ðÒÅÒ×ÁÔØ ÚÁÇÒÕÚËÕ"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr "ðÒÉÎÕÄÉÔÅÌØÎÏ ÚÁÇÒÕÚÉÔØ ÔÅËÓÔ"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr "óÏÈÒÁÎÉÔØ ÔÅËÓÔ"
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr "üËÒÁÎ ÁÕÄÉÏ×ÙÈÏÄÏ×"
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr "÷ËÌ/×ÙËÌ ÁÕÄÉÏ×ÙÈÏÄ"
 
@@ -528,190 +536,190 @@ msgstr "
 msgid "Lyrics saved"
 msgstr "ôÅËÓÔ ÓÏÈÒÁÎÅÎ"
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "áÕÄÉÏ×ÙÈÏÄ '%s' ×ËÌÀÞÅÎ"
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "áÕÄÉÏ×ÙÈÏÄ '%s' ×ÙËÌÀÞÅÎ"
 
 # Several translations for Song Viewer:
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr "éÎÆÏÒÍÁÃÉÑ Ï ËÏÍÐÏÚÉÃÉÉ"
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr "ëÏÍÐÏÚÉÔÏÒ"
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 msgid "Name"
 msgstr "îÁÚ×ÁÎÉÅ"
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr "äÉÓË"
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 msgid "Track"
 msgstr "äÏÒÏÖËÁ"
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 msgid "Date"
 msgstr "äÁÔÁ"
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr "öÁÎÒ"
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 msgid "Comment"
 msgstr "ëÏÍÍÅÎÔÁÒÉÊ"
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr "üËÒÁÎ ËÌÁ×ÉÁÔÕÒÎÙÈ ËÏÍÂÉÎÁÃÉÊ"
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr "÷ÙÈÏÄ"
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr "ëÕÒÓÏÒ ××ÅÒÈ"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr "ëÕÒÓÏÒ ×ÎÉÚ"
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr "÷ ÎÁÞÁÌÏ"
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr "÷ ËÏÎÅÃ"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr "îÁ ÓÔÒÁÎÉÃÕ ××ÅÒÈ"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr "îÁ ÓÔÒÁÎÉÃÕ ×ÎÉÚ"
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr "üËÒÁÎ ÐÏÍÏÝÉ"
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr "÷ÏÓÐÒÏÉÚ×ÅÓÔÉ/ðÅÒÅÊÔÉ × ÄÉÒÅËÔÏÒÉÀ"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr "ðÁÕÚÁ"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr "ïÓÔÁÎÏ×"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr "õÄÁÌÉÔØ ÉÚ ÐÌÅÊÌÉÓÔÁ ×ÓÅ ËÏÍÐÏÚÉÃÉÉ ËÒÏÍÅ ÔÅËÕÝÅÊ"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "óÌÅÄÕÀÝÁÑ ËÏÍÐÏÚÉÃÉÑ"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "ðÒÅÄÙÄÕÝÁÑ ËÏÍÐÏÚÉÃÉÑ"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "ðÅÒÅÍÏÔËÁ ×ÐÅÒÅÄ"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "ðÅÒÅÍÏÔËÁ ÎÁÚÁÄ"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "õ×ÅÌÉÞÉÔØ ÇÒÏÍËÏÓÔØ"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "õÍÅÎØÛÉÔØ ÇÒÏÍËÏÓÔØ"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "ðÏÍÅÔÉÔØ/õÂÒÁÔØ ÐÏÍÅÔËÕ Ó ËÏÍÐÏÚÉÃÉÉ"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr "äÏÂÁ×ÉÔØ ×ÓÅ ËÏÍÐÏÚÉÃÉÉ × ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr "õÄÁÌÉÔØ ËÏÍÐÏÚÉÃÉÀ ÉÚ ÐÌÅÊÌÉÓÔÁ"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr "ðÅÒÅÍÅÛÁÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr "ïÞÉÓÔÉÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr "÷ËÌ/÷ÙËÌ ÒÅÖÉÍ ÐÏ×ÔÏÒÁ"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr "÷ËÌ/÷ÙËÌ ÓÌÕÞÁÊÎÙÊ ÒÅÖÉÍ"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr "÷ËÌ/÷ÙËÌ ÒÅÖÉÍ ÐÌÁ×ÎÏÇÏ ÐÅÒÅÈÏÄÁ"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr "ïÂÎÏ×ÉÔØ ÍÕÚÙËÁÌØÎÕÀ ÂÁÚÕ"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr "óÏÈÒÁÎÉÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr "äÏÂÁ×ÉÔØ url/ÆÁÊÌ × ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr "ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÄÉÒÅËÔÏÒÉÉ"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr "ðÅÒÅÊÔÉ Ë ÒÏÄÉÔÅÌØÓËÏÊ ÄÉÒÅËÔÏÒÉÉ"
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr "ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ"
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr "ðÅÒÅÊÔÉ Ë ÆÁÊÌÕ ËÏÍÐÏÚÉÃÉÉ"
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ××ÅÒÈ"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ×ÎÉÚ"
 
@@ -721,165 +729,160 @@ msgstr "
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr "ðÅÒÅËÌÀÞÉÔØ ÒÅÖÉÍ ÐÏÉÓËÁ"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr "÷ËÌ/÷ÙËÌ ÒÅÖÉÍ Á×ÔÏÃÅÎÔÒÉÒÏ×ÁÎÉÑ"
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr "óÌÅÄÕÀÝÉÊ ÜËÒÁÎ"
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr "ðÒÅÄÙÄÕÝÉÊ ÜËÒÁÎ"
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr "ðÏÉÓË ×ÐÅÒÅÄ"
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr "ðÒÏÄÏÌÖÉÔØ ÐÏÉÓË ×ÐÅÒ£Ä"
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr "ðÏÉÓË ÎÁÚÁÄ"
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr "ðÒÏÄÏÌÖÉÔØ ÐÏÉÓË ÎÁÚÁÄ"
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr "üËÒÁÎ ÉÓÐÏÌÎÉÔÅÌÅÊ"
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr "éÚÍÅÎÉÔØ ÐÏÌÅ ÄÌÑ ÐÏÉÓËÁ"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr "ðÒÅÒ×ÁÔØ ÏÐÅÒÁÃÉÀ"
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr "ïÂÎÏ×ÉÔØ ÔÅËÓÔ"
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr "îÅ ÚÁÄÁÎÏ"
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr "ðÒÏÂÅÌ"
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr "÷×ÏÄ"
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr "÷×ÅÒÈ"
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr "÷ÎÉÚ"
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr "÷ÌÅ×Ï"
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr "÷ÐÒÁ×Ï"
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr "Insert"
 
-#: 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:492 src/command.c:499
+#: src/command.c:485 src/command.c:491
 #, fuzzy, c-format
 msgid "Key %s assigned to %s and %s\n"
 msgstr "ëÌÁ×ÉÛÁ %s ÎÁÚÎÁÞÅÎÁ ÄÌÑ %s É %s\n"
 
-#: src/colors.c:163
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "÷ÎÉÍÁÎÉÅ: îÅÉÚ×ÅÓÔÎÙÊ Ã×ÅÔ - %s\n"
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "÷ÎÉÍÁÎÉÅ: îÅÉÚ×ÅÓÔÎÏÅ Ã×ÅÔÏ×ÏÅ ÐÏÌÅ - %s\n"
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr "ôÅÒÍÉÎÁÌ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÓÍÅÎÕ Ã×ÅÔÏ×\n"
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, c-format
 msgid "Terminal lacks color capabilities\n"
 msgstr "ôÅÒÍÉÎÁÌ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ Ã×ÅÔÁ\n"
 
 #. To translators: prefix for error messages
-#: src/conf.c:87
+#: src/conf.c:89
 msgid "Error"
 msgstr "ïÛÉÂËÁ"
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ËÌÁ×ÉÁÔÕÒÎÏÊ ËÏÍÂÉÎÁÃÉÉ"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr "îÅÏÐÒÅÄÅÌ£ÎÎÏÅ ÚÎÁÞÅÎÉÅ ËÌÁ×ÉÁÔÕÒÎÏÊ ËÏÍÂÉÎÁÃÉÉ"
 
@@ -887,55 +890,55 @@ msgstr "
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ ÏÔÏÂÒÁÖÅÎÉÑ ×ÒÅÍÅÎÉ"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr "ðÒÏÐÕÝÅÎ ÓÉÍ×ÏÌ '='"
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr "îÅ×ÅÒÎÏÅ ÎÁÚ×ÁÎÉÅ Ã×ÅÔÁ"
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr "îÅÏÐÒÅÄÅÌ£ÎÎÏÅ ÚÎÁÞÅÎÉÅ Ã×ÅÔÁ"
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr "îÅ×ÅÒÎÏÅ ÞÉÓÌÏ"
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ Ã×ÅÔÁ"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr "îÅÉÚ×ÅÓÔÎÏÅ ÎÁÚ×ÁÎÉÅ ÜËÒÁÎÁ"
 
-#: src/conf.c:454
+#: src/conf.c:462
 #, 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
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr "ðÅÒÅ×ÏÄ: Max Arnold <lwarxx@gmail.com>"
 
+#~ msgid "Key %s assigned to %s and %s (press %s for the key editor)"
+#~ msgstr "ëÌÁ×ÉÛÁ %s ÎÁÚÎÁÞÅÎÁ ÄÌÑ %s É %s (%s - ÒÅÄÁËÔÏÒ ËÌÁ×ÉÛ)"
+
 #~ msgid "Screen updated!"
 #~ msgstr "üËÒÁÎ ÏÂÎÏ×ÌÅÎ!"
 
-#~ msgid "Welcome to the key editor!"
-#~ msgstr "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × ÒÅÄÁËÔÏÒ ËÌÁ×ÉÁÔÕÒÎÙÈ ËÏÍÂÉÎÁÃÉÊ!"
-
 #~ msgid "Clock"
 #~ msgstr "þÁÓÙ"
 
diff --git a/po/sk.po b/po/sk.po
index 5bb3633..08af727 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,166 +7,174 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-27 13:00+0100\n"
-"PO-Revision-Date: 2009-01-05 18:25+0100\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
+"PO-Revision-Date: 2009-01-06 17:56+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=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/i18n.h:41
+#: src/i18n.h:42
 msgid "y"
 msgstr "a"
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:214
+#: src/main.c:215
 #, 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:232
+#: src/main.c:233
 #, 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:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr "Pripojený k %s"
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr "stlačte %s pre editor klávesov"
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr "Playlist"
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr "Listovať"
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr "Interpret"
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr "Hľadanie"
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 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_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr "Výstupy"
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr "Hlasitosť n/a"
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr " Hlasitosť %d%%"
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr "Prehrávam:"
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr "[Pozastavené]"
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr "Chyba: Okno je príliš malé"
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr "Opakovanie je zapnuté"
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr "Opakovanie je vypnuté"
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr "Náhodný režim zapnutý"
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr "Náhodný režim vypnutý"
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Prelínanie %d sekúnd"
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr "Databáza aktualizovaná"
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr "Zamiešaný playlist"
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr "Vyčistený playlist"
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Bola spustená aktualizácia databáze"
 
-#: src/screen.c:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Prebieha aktualizácia databáze..."
 
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr "Režim vyhľadávania: Zabalený"
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr "Režim vyhľadávanie: Normálny"
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr "Automatické centrovanie: Zapnuté"
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr "Automatické centrovanie: Vypnuté"
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 msgid "All tracks"
 msgstr "VÅ¡etky stopy"
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr "VÅ¡etci interpreti"
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumy od interpreta: %s"
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "VÅ¡etky stopy od interpreta: %s"
@@ -187,48 +195,48 @@ msgstr "Pridávam '%s' do playlistu\n"
 msgid "Adding directory %s...\n"
 msgstr "Pridávam adresár %s...\n"
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Vyhľadať: "
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Vyhľadať spätne: "
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr "Heslo: "
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Nepodarilo sa nájsť '%s'"
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr "Uložiť playlist ako: "
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Nahradiť %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Zrušené"
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr "Uložený %s"
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr "Pridať: "
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr "Playlist na %s"
@@ -300,11 +308,11 @@ msgstr "komentár"
 msgid "file"
 msgstr "súbor"
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr "Názov"
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr "Album"
 
@@ -358,154 +366,154 @@ msgstr "Hľadanie: Stlačte %s pre opätovné hľadanie [%s]"
 msgid "Search mode: %s"
 msgstr "Režim vyhľadávania: %s"
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Použiť & Uložiť nastavenie klávesov  "
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Použiť nastavenie klávesov "
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr "Nastavili ste nové priradenie klávesov"
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Priradenie klávesov sa nezmenilo."
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Chyba: Nepodarilo sa vytvoriť adresár ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Chyba: %s - %s"
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "Zapísané %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Vymazané"
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Zadajte nový kláves pre %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Chyba: kláves %s je už použitý pre %s"
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s priradené k %s"
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr "Pridať nový kláves"
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Poznámka: Zabudli ste 'Použiť' vaše zmeny?"
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Upraviť priradenie klávesov"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Upraviť klávesy pre %s"
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr "Pohyb"
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr "Globálne"
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr "Okno playlistu"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr "Prehrávať"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr "Presunúť skladbu nahor"
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr "Presunúť skladbu nadol"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr "Do stredu"
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr "Okno listovania"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr "Vstúpiť do adresára/Vybrať a prehrať skladbu"
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 msgid "Append song to playlist"
 msgstr "Pridať skladbu do playlistu"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr "Vymazať playlist"
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr "Okno vyhľadávania"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr "Vybrať a prehrať"
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr "Okno textu piesne"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr "Zobraziť text piesne"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr "(Znovu)načítať text"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr "Zachytené prerušenie"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr "Explicitne sťahovať texty"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr "Uložiť text piesne"
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr "Obrazovka výstupov"
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr "Povoliť/vypnúť výstup"
 
@@ -525,357 +533,352 @@ msgstr "načítam..."
 msgid "Lyrics saved"
 msgstr "Text piesne uložený"
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Výstup '%s' povolený"
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Výstup '%s' vypnutý"
 
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr "Prehliadač piesní"
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr "Skladateľ"
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 msgid "Name"
 msgstr "Názov"
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr "Disk"
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 msgid "Track"
 msgstr "Stopa"
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 msgid "Date"
 msgstr "Dátum"
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr "Žáner"
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 msgid "Comment"
 msgstr "Komentár"
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Okno nastavenia klávesov"
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr "Presunúť kurzor nahor"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr "Presunúť kurzor nadol"
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr "End"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr "Page up"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr "Page down"
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr "Okno s pomocou"
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr "Prehrať/Vstúpiť do adresára"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr "Orezať"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Ďalšia stopa"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Predchádzajúca stopa"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Posunúť vpred"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Posunúť vzad"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Pridať hlasitosť"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Stíšiť"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Vybrať/odvybrať skladbu v playliste"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr "Vybrať všetky položky v zozname"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr "Vymazať skladbu z playlistu"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr "Zamiešať playlist"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr "Vyčistiť playlist"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr "Prepnúť režim opakovania"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr "Prepnúť náhodný režim"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr "Prepnúť režím prelínania skladieb"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr "Spustiť aktualizáciu hudobnej databáze"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr "Uložiť playlist"
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr "Pridať url/súbor do playlistu"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr "Prejsť do koreňového adresára"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr "Prejsť do nadradeného adresára"
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr "Zobraziť skladbu"
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr "Nájsť skladbu v prehliadači"
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr "Presunúť položku nahor"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr "Presunúť položku nadol"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Refresh screen"
 msgstr "Obnoviť obrazovku"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr "Prepnúť režim vyhľadávania"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr "Prepnúť automatický režim centrovania"
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr "Ďalšia obrazovka"
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr "Predchádzajúca obrazovka"
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr "Hľadať vpred"
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr "Pokračovať v hľadaní vpred"
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr "Hľadať vzad"
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr "Pokračovať v hľadaní vzad"
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr "Okno interpreta"
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr "Zmeniť režim vyhľadávania"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr "Akcia prerušenia"
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr "Obnoviť text"
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr "Neurčené"
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr "Medzera"
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr "Hore"
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr "Dole"
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr "Vľavo"
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr "Insert"
 
-#: 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:492 src/command.c:499
+#: src/command.c:485 src/command.c:491
 #, c-format
 msgid "Key %s assigned to %s and %s\n"
 msgstr "Kláves %s priradený k %s a %s\n"
 
-#: src/colors.c:163
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Varovania: Neznáma farba - %s\n"
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Varovanie: Neznáme farebné pole - %s\n"
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr "Terminál nemá podporu pre zmenu farieb\n"
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, c-format
 msgid "Terminal lacks color capabilities\n"
 msgstr "Terminál nemá schopnosti zobrazovania farieb\n"
 
 #. To translators: prefix for error messages
-#: src/conf.c:87
+#: src/conf.c:89
 msgid "Error"
 msgstr "Chyba"
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr "Chybne zadaná definícia klávesovej skratky"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr "Neznámy príkaz"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr "Neúplná konfigurácie klavesových skratiek"
 
@@ -883,54 +886,54 @@ msgstr "Neúplná konfigurácie klavesových skratiek"
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr "Nesprávny typ zobrazovania času"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr "Chýba '='"
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr "Nesprávny názov farby"
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr "Neúplná definícia farby"
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr "Neplatné číslo"
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr "Zle zadaná definícia farby"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr "Neznámy názov obrazovky"
 
-#: src/conf.c:454
+#: src/conf.c:462
 msgid "Unknown configuration parameter"
 msgstr "Neznámy parameter konfigurácie"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:216 src/options.c:219
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr "Jozef Riha <jose1711@gmail.com>"
 
+#~ 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)"
+
 #~ msgid "Screen updated!"
 #~ msgstr "Okno obnovené!"
 
-#~ msgid "Welcome to the key editor!"
-#~ msgstr "Vitajte v editori klávesov!"
-
 #~ msgid "Clock"
 #~ msgstr "Hodiny"
 
diff --git a/po/sv.po b/po/sv.po
index ccc9a68..f2d925e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-27 13:00+0100\n"
-"PO-Revision-Date: 2009-01-05 12:59+0000\n"
+"POT-Creation-Date: 2009-01-06 17:57+0100\n"
+"PO-Revision-Date: 2009-01-06 17:56+0100\n"
 "Last-Translator: Björn Pettersson <bjorn@hygiena.org>\n"
 "Language-Team: sv <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,158 +17,166 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-05 14:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/i18n.h:41
+#: src/i18n.h:42
 msgid "y"
 msgstr "j"
 
-#: src/i18n.h:42
+#: src/i18n.h:43
 msgid "n"
 msgstr "n"
 
-#: src/main.c:214
+#: src/main.c:215
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Ansluter till %s... [Tryck %s för att avbryta]"
 
-#: src/main.c:232
+#: src/main.c:233
 #, 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:246
+#: src/main.c:247
 #, c-format
 msgid "Connected to %s"
 msgstr "Ansluten till %s"
 
-#: src/screen.c:152 src/screen_help.c:216
+#. to translators: a key was bound twice in the key editor,
+#. and this is a hint for the user what to press to correct
+#. that
+#: src/main.c:366
+#, c-format
+msgid "press %s for the key editor"
+msgstr "tryck på %s för att korrigera"
+
+#: src/screen.c:153 src/screen_help.c:217
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/screen.c:154 src/screen_play.c:471
+#: src/screen.c:155 src/screen_play.c:472
 msgid "Playlist"
 msgstr "Spellista"
 
 #. translators: caption of the browser screen
-#: src/screen.c:155 src/screen_file.c:205
+#: src/screen.c:156 src/screen_file.c:205
 msgid "Browse"
 msgstr "Filer"
 
-#: src/screen.c:157 src/screen_search.c:80 src/screen_song.c:187
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:188
 msgid "Artist"
 msgstr "Artist"
 
-#: src/screen.c:160 src/screen_help.c:123
+#: src/screen.c:161 src/screen_help.c:124
 msgid "Search"
 msgstr "Sök"
 
-#: src/screen.c:163 src/screen_lyrics.c:203 src/screen_lyrics.c:211
+#: src/screen.c:164 src/screen_lyrics.c:203 src/screen_lyrics.c:211
 #: src/screen_lyrics.c:215
 msgid "Lyrics"
 msgstr "Texter"
 
-#: src/screen.c:166 src/screen_outputs.c:161
+#: src/screen.c:167 src/screen_outputs.c:162
 msgid "Outputs"
 msgstr "Utgångar"
 
-#: src/screen.c:172
+#: src/screen.c:173
 #, c-format
 msgid "Volume n/a "
 msgstr "Volym: n/a "
 
-#: src/screen.c:174
+#: src/screen.c:175
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volym: %d%%"
 
-#: src/screen.c:281
+#: src/screen.c:282
 msgid "Playing:"
 msgstr "Spelar:"
 
-#: src/screen.c:284
+#: src/screen.c:285
 msgid "[Paused]"
 msgstr "[Pausad]"
 
-#: src/screen.c:404 src/screen.c:477
+#: src/screen.c:407 src/screen.c:480
 msgid "Error: Screen too small"
 msgstr "Fel: Terminalen är för liten"
 
-#: src/screen.c:600
+#: src/screen.c:603
 msgid "Repeat is on"
 msgstr "Upprepning påslaget"
 
-#: src/screen.c:601
+#: src/screen.c:604
 msgid "Repeat is off"
 msgstr "Upprepning avslaget"
 
-#: src/screen.c:605
+#: src/screen.c:608
 msgid "Random is on"
 msgstr "Slumpning påslaget"
 
-#: src/screen.c:606
+#: src/screen.c:609
 msgid "Random is off"
 msgstr "Slumpning avslaget"
 
-#: src/screen.c:609
+#: src/screen.c:612
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Mjuk övergång %d sekunder"
 
-#: src/screen.c:612
+#: src/screen.c:615
 msgid "Database updated"
 msgstr "Databas uppdaterad"
 
-#: src/screen.c:745
+#: src/screen.c:748
 msgid "Shuffled playlist"
 msgstr "Spellistan slumpsorterades"
 
-#: src/screen.c:749
+#: src/screen.c:752
 msgid "Cleared playlist"
 msgstr "Spellistan rensad"
 
-#: src/screen.c:766 src/screen_file.c:265
+#: src/screen.c:769 src/screen_file.c:265
 msgid "Database update started"
 msgstr "Databasuppdatering påbörjad"
 
-#: src/screen.c:768 src/screen_file.c:272
+#: src/screen.c:771 src/screen_file.c:272
 msgid "Database update running..."
 msgstr "Databasen uppdateras..."
 
-#: src/screen.c:804
+#: src/screen.c:807
 msgid "Find mode: Wrapped"
 msgstr "Sökläge: Börja om"
 
-#: src/screen.c:805
+#: src/screen.c:808
 msgid "Find mode: Normal"
 msgstr "Sökläge: Till början/slut"
 
-#: src/screen.c:810
+#: src/screen.c:813
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering påslaget"
 
-#: src/screen.c:811
+#: src/screen.c:814
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering avslaget"
 
-#: src/screen_artist.c:73
+#: src/screen_artist.c:74
 msgid "All tracks"
 msgstr "Alla spår"
 
-#: src/screen_artist.c:382
+#: src/screen_artist.c:383
 #, c-format
 msgid "All artists"
 msgstr "Alla artister"
 
-#: src/screen_artist.c:387
+#: src/screen_artist.c:388
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album av artist: %s"
 
-#: src/screen_artist.c:396
+#: src/screen_artist.c:397
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:400
+#: src/screen_artist.c:401
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alla spår av artist: %s"
@@ -189,48 +197,48 @@ msgstr "Lägger till '%s' till spellista...\n"
 msgid "Adding directory %s...\n"
 msgstr "Lägger till katalog %s...\n"
 
-#: src/screen_utils.c:31
+#: src/screen_utils.c:32
 msgid "Find: "
 msgstr "Sök: "
 
-#: src/screen_utils.c:32
+#: src/screen_utils.c:33
 msgid "Find backward: "
 msgstr "Sök bakåt: "
 
-#: src/screen_utils.c:113
+#: src/screen_utils.c:114
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: src/screen_utils.c:202
+#: src/screen_utils.c:203
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kan inte hitta '%s'"
 
-#: src/screen_play.c:227
+#: src/screen_play.c:228
 msgid "Save playlist as: "
 msgstr "Spara spellistan som: "
 
-#: src/screen_play.c:260
+#: src/screen_play.c:261
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Ersätt %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:281 src/screen_file.c:140 src/screen_keydef.c:162
+#: src/screen_play.c:282 src/screen_file.c:140 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Avbrutet"
 
 #. success
-#: src/screen_play.c:289
+#: src/screen_play.c:290
 #, c-format
 msgid "Saved %s"
 msgstr "%s sparad"
 
-#: src/screen_play.c:365
+#: src/screen_play.c:366
 msgid "Add: "
 msgstr "Lägg till: "
 
-#: src/screen_play.c:473
+#: src/screen_play.c:474
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spellista på %s"
@@ -302,11 +310,11 @@ msgstr "kommentar"
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:79 src/screen_song.c:188
+#: src/screen_search.c:79 src/screen_song.c:189
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:81 src/screen_song.c:189
+#: src/screen_search.c:81 src/screen_song.c:190
 msgid "Album"
 msgstr "Album"
 
@@ -360,154 +368,154 @@ msgstr "Tryck %s för ny sökning [%s]"
 msgid "Search mode: %s"
 msgstr "Sök efter: %s"
 
-#: src/screen_keydef.c:40
+#: src/screen_keydef.c:41
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Verkställ och spara  "
 
-#: src/screen_keydef.c:41
+#: src/screen_keydef.c:42
 msgid "===> Apply key bindings "
 msgstr "===> Verkställ "
 
-#: src/screen_keydef.c:69
+#: src/screen_keydef.c:70
 msgid "You have new key bindings"
 msgstr "Tangentdefinitioner uppdaterade"
 
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:72
 msgid "Keybindings unchanged."
 msgstr "Tangentdefinitioner oförändrade."
 
-#: src/screen_keydef.c:81
+#: src/screen_keydef.c:82
 #, c-format
 msgid "Error: Unable to create direcory ~/.ncmpc - %s"
 msgstr "Fel: Kan inte skapa katalog ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:90 src/screen_keydef.c:97
+#: src/screen_keydef.c:91 src/screen_keydef.c:98
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fel: %s - %s"
 
-#: src/screen_keydef.c:99
+#: src/screen_keydef.c:100
 #, c-format
 msgid "Wrote %s"
 msgstr "Sparade %s"
 
-#: src/screen_keydef.c:136
+#: src/screen_keydef.c:137
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: src/screen_keydef.c:157
+#: src/screen_keydef.c:158
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tangent för %s: "
 
-#: src/screen_keydef.c:168
+#: src/screen_keydef.c:169
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Fel: Tangenten %s används redan för %s"
 
-#: src/screen_keydef.c:178
+#: src/screen_keydef.c:179
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s tilldelad %s"
 
-#: src/screen_keydef.c:216
+#: src/screen_keydef.c:217
 msgid "Add new key"
 msgstr "Lägg till ny tangent"
 
-#: src/screen_keydef.c:275
+#: src/screen_keydef.c:276
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Glömde du att 'Verkställa' dina ändringar?"
 
-#: src/screen_keydef.c:282
+#: src/screen_keydef.c:283
 msgid "Edit key bindings"
 msgstr "Ändra tangentdefinitioner"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:285
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Ändra tangenter för kommandot %s"
 
-#: src/screen_help.c:37
+#: src/screen_help.c:38
 msgid "Movement"
 msgstr "Navigation"
 
-#: src/screen_help.c:63
+#: src/screen_help.c:64
 msgid "Global"
 msgstr "Globala"
 
-#: src/screen_help.c:93 src/command.c:92
+#: src/screen_help.c:94 src/command.c:93
 msgid "Playlist screen"
 msgstr "Spellista"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Play"
 msgstr "Starta/Spela markerad"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:99
 msgid "Move song up"
 msgstr "Flytta spår uppåt"
 
-#: src/screen_help.c:99
+#: src/screen_help.c:100
 msgid "Move song down"
 msgstr "Flytta spår nedåt"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:103
 msgid "Center"
 msgstr "Centrera"
 
-#: src/screen_help.c:107 src/command.c:94
+#: src/screen_help.c:108 src/command.c:95
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Enter directory/Select and play song"
 msgstr "Välj katalog/Markera och spela upp"
 
-#: src/screen_help.c:111 src/screen_help.c:126
+#: src/screen_help.c:112 src/screen_help.c:127
 msgid "Append song to playlist"
 msgstr "Lägg till i spellista"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:114
 msgid "Delete playlist"
 msgstr "Ta bort spellista"
 
-#: src/screen_help.c:121 src/command.c:199
+#: src/screen_help.c:122 src/command.c:200
 msgid "Search screen"
 msgstr "Databassökning"
 
-#: src/screen_help.c:124
+#: src/screen_help.c:125
 msgid "Select and play"
 msgstr "Lägg till spellistan och spela"
 
-#: src/screen_help.c:133 src/command.c:206
+#: src/screen_help.c:134 src/command.c:207
 msgid "Lyrics screen"
 msgstr "Texter"
 
-#: src/screen_help.c:135
+#: src/screen_help.c:136
 msgid "View Lyrics"
 msgstr "Visa texter"
 
-#: src/screen_help.c:136
+#: src/screen_help.c:137
 msgid "(Re)load lyrics"
 msgstr "Ladda (om) texter"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:138
 msgid "Interrupt retrieval"
 msgstr "Avbryt hämtning"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:139
 msgid "Explicitly download lyrics"
 msgstr "Ladda ner texter explicit"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:140
 msgid "Save lyrics"
 msgstr "Spara texter"
 
-#: src/screen_help.c:144 src/command.c:217
+#: src/screen_help.c:145 src/command.c:218
 msgid "Outputs screen"
 msgstr "Utgångar"
 
-#: src/screen_help.c:146
+#: src/screen_help.c:147
 msgid "Enable/disable output"
 msgstr "Slå på/av utgång"
 
@@ -527,357 +535,352 @@ msgstr "laddar..."
 msgid "Lyrics saved"
 msgstr "Text sparad"
 
-#: src/screen_outputs.c:57
+#: src/screen_outputs.c:58
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Utgång '%s' påslagen"
 
-#: src/screen_outputs.c:63
+#: src/screen_outputs.c:64
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Utgång '%s' avslagen"
 
-#: src/screen_song.c:105
+#: src/screen_song.c:106
 msgid "Song viewer"
 msgstr "Spår"
 
-#: src/screen_song.c:190
+#: src/screen_song.c:191
 msgid "Composer"
 msgstr "Kompositör"
 
-#: src/screen_song.c:191
+#: src/screen_song.c:192
 msgid "Name"
 msgstr "Namn"
 
-#: src/screen_song.c:192
+#: src/screen_song.c:193
 msgid "Disc"
 msgstr "Skiva"
 
-#: src/screen_song.c:193
+#: src/screen_song.c:194
 msgid "Track"
 msgstr "Spår"
 
-#: src/screen_song.c:194
+#: src/screen_song.c:195
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:195
+#: src/screen_song.c:196
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:196
+#: src/screen_song.c:197
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/command.c:68
+#: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Tangentdefinitioner"
 
-#: src/command.c:71
+#: src/command.c:72
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/command.c:75
+#: src/command.c:76
 msgid "Move cursor up"
 msgstr "Markör uppåt"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor down"
 msgstr "Markör nedåt"
 
-#: src/command.c:79 src/command.c:259
+#: src/command.c:80 src/command.c:260
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:81 src/command.c:261
+#: src/command.c:82 src/command.c:262
 msgid "End"
 msgstr "End"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "Page up"
 msgstr "Markören en skärm uppåt"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page down"
 msgstr "Markören en skärm nedåt"
 
-#: src/command.c:90
+#: src/command.c:91
 msgid "Help screen"
 msgstr "Hjälp"
 
-#: src/command.c:99
+#: src/command.c:100
 msgid "Play/Enter directory"
 msgstr "Spela upp/Välj"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Stop"
 msgstr "Stoppa"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Crop"
 msgstr "Beskär"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Nästa spår"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Föregånde spår"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Sök framåt"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Sök bakåt"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Höj volymen"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Sänk volymen"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Markera/avmarkera spår till spellistan"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Select all listed items"
 msgstr "Markera alla listade föremål"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Delete song from playlist"
 msgstr "Ta bort låt från spellista"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Shuffle playlist"
 msgstr "Slumpsportera spellista"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Clear playlist"
 msgstr "Rensa spellista"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle repeat mode"
 msgstr "Repeat på/av"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle random mode"
 msgstr "Slumpning på/av"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Toggle crossfade mode"
 msgstr "Mjuk övergång på/av"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Start a music database update"
 msgstr "Updatera musikdatabasen"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Save playlist"
 msgstr "Spara spellista"
 
-#: src/command.c:139
+#: src/command.c:140
 msgid "Add url/file to playlist"
 msgstr "Lägg till url eller fil till spellistan"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Go to root directory"
 msgstr "GÃ¥ till rotkatalogen"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Go to parent directory"
 msgstr "Gå upp en nivå"
 
-#: src/command.c:148
+#: src/command.c:149
 msgid "View the song"
 msgstr "Visa spår"
 
-#: src/command.c:152
+#: src/command.c:153
 msgid "Locate song in browser"
 msgstr "Hitta spår i Filer"
 
-#: src/command.c:156
+#: src/command.c:157
 msgid "Move item up"
 msgstr "Flytta upp"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Move item down"
 msgstr "Flytta ner"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Refresh screen"
 msgstr "Uppdatera fönster"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:167
+#: src/command.c:168
 msgid "Toggle find mode"
 msgstr "Ändra sökinställningar"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:171
+#: src/command.c:172
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering på/av"
 
-#: src/command.c:176
+#: src/command.c:177
 msgid "Next screen"
 msgstr "Nästa skärm"
 
-#: src/command.c:178
+#: src/command.c:179
 msgid "Previous screen"
 msgstr "Tidigare skärm"
 
-#: src/command.c:183
+#: src/command.c:184
 msgid "Forward find"
 msgstr "Sök"
 
-#: src/command.c:185
+#: src/command.c:186
 msgid "Forward find next"
 msgstr "Nästa träff"
 
-#: src/command.c:187
+#: src/command.c:188
 msgid "Backward find"
 msgstr "Föregående träff"
 
-#: src/command.c:189
+#: src/command.c:190
 msgid "Backward find previous"
 msgstr "Upprepa sökning bakåt"
 
-#: src/command.c:195
+#: src/command.c:196
 msgid "Artist screen"
 msgstr "Artister"
 
-#: src/command.c:201
+#: src/command.c:202
 msgid "Change search mode"
 msgstr "Ändra måltyp för databassökning"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:210
+#: src/command.c:211
 msgid "Interrupt action"
 msgstr "Avbryt handling"
 
-#: src/command.c:212
+#: src/command.c:213
 msgid "Update Lyrics"
 msgstr "Uppdatera texter"
 
-#: src/command.c:241
+#: src/command.c:242
 msgid "Undefined"
 msgstr "Ej definierad"
 
-#: src/command.c:243
+#: src/command.c:244
 msgid "Space"
 msgstr "Mellanslag"
 
-#: src/command.c:245
+#: src/command.c:246
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:247
+#: src/command.c:248
 msgid "Backspace"
 msgstr "Bakstegstangent"
 
-#: src/command.c:249
+#: src/command.c:250
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/command.c:251
+#: src/command.c:252
 msgid "Up"
 msgstr "Uppåtpil"
 
-#: src/command.c:253
+#: src/command.c:254
 msgid "Down"
 msgstr "Nedåtpil"
 
-#: src/command.c:255
+#: src/command.c:256
 msgid "Left"
 msgstr "Vänsterpil"
 
-#: src/command.c:257
+#: src/command.c:258
 msgid "Right"
 msgstr "Högerpil"
 
-#: src/command.c:263
+#: src/command.c:264
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:265
+#: src/command.c:266
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:267
+#: src/command.c:268
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:269
+#: src/command.c:270
 msgid "Shift+Tab"
 msgstr "Shift+tabb"
 
-#: src/command.c:271
+#: src/command.c:272
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:273
+#: src/command.c:274
 msgid "Insert"
 msgstr "Insert"
 
-#: 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:492 src/command.c:499
+#: src/command.c:485 src/command.c:491
 #, c-format
 msgid "Key %s assigned to %s and %s\n"
 msgstr "Tangent %s tilldelad %s och %s\n"
 
-#: src/colors.c:163
+#: src/colors.c:164
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Varning: Okänd färg - %s\n"
 
-#: src/colors.c:206
+#: src/colors.c:207
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Varning: %s ej definierad.\n"
 
-#: src/colors.c:238
+#: src/colors.c:239
 #, c-format
 msgid "Terminal lacks support for changing colors\n"
 msgstr "Terminalen saknar stöd för växling av färger\n"
 
-#: src/colors.c:248
+#: src/colors.c:249
 #, c-format
 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
+#: src/conf.c:89
 msgid "Error"
 msgstr "Fel"
 
-#: src/conf.c:95 src/conf.c:104
+#: src/conf.c:97 src/conf.c:106
 msgid "Malformed hotkey definition"
 msgstr "DÃ¥lig tangentdefinition"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:131
+#: src/conf.c:133
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:144
+#: src/conf.c:146
 msgid "Incomplete hotkey configuration"
 msgstr "Inkomplett tangentdefinition"
 
@@ -885,45 +888,45 @@ msgstr "Inkomplett tangentdefinition"
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:176
+#: src/conf.c:178
 msgid "Bad time display type"
 msgstr "Felaktigt tidsformat"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:191
+#: src/conf.c:193
 msgid "Missing '='"
 msgstr "Saknar '='"
 
-#: src/conf.c:247
+#: src/conf.c:249
 msgid "Bad color name"
 msgstr "Felaktigt färgnamn"
 
-#: src/conf.c:256
+#: src/conf.c:258
 msgid "Incomplete color definition"
 msgstr "Inkomplett färgdefinition"
 
-#: src/conf.c:262
+#: src/conf.c:264
 msgid "Invalid number"
 msgstr "Ogiltigt nummer"
 
-#: src/conf.c:270
+#: src/conf.c:272
 msgid "Malformed color definition"
 msgstr "Felaktig färgdefinition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:305
+#: src/conf.c:307
 msgid "Unknown screen name"
 msgstr "Skärmnamn okänt"
 
-#: src/conf.c:454
+#: src/conf.c:462
 msgid "Unknown configuration parameter"
 msgstr "Okänd konfigurationsinställning"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:216 src/options.c:219
+#: src/options.c:218 src/options.c:221
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -931,12 +934,12 @@ msgstr ""
 "  Kalle Wallin https://launchpad.net/~kaw\n"
 "  nanker https://launchpad.net/~nanker"
 
+#~ 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)"
+
 #~ msgid "Screen updated!"
 #~ msgstr "Uppdaterat!"
 
-#~ msgid "Welcome to the key editor!"
-#~ msgstr "Här kan du ändra tangentdefinitioner"
-
 #~ msgid "Clock"
 #~ msgstr "Klocka"
 
diff --git a/src/command.c b/src/command.c
index 35efb0c..685fa70 100644
--- a/src/command.c
+++ b/src/command.c
@@ -481,20 +481,11 @@ check_key_bindings(command_definition_t *cp, char *buf, size_t bufsize)
 			if (cp[i].keys[j] &&
 			    (cmd = find_key_command(cp[i].keys[j],cp)) != cp[i].command) {
 				if (buf) {
-#ifdef ENABLE_KEYDEF_SCREEN
-					g_snprintf(buf, bufsize,
-						   _("Key %s assigned to %s and %s (press %s for the key editor)"),
-						   key2str(cp[i].keys[j]),
-						   get_key_command_name(cp[i].command),
-						   get_key_command_name(cmd),
-						   get_key_names(CMD_SCREEN_KEYDEF,0));
-#else
 					g_snprintf(buf, bufsize,
 						   _("Key %s assigned to %s and %s\n"),
 						   key2str(cp[i].keys[j]),
 						   get_key_command_name(cp[i].command),
 						   get_key_command_name(cmd));
-#endif
 				} else
 					fprintf(stderr,
 						_("Key %s assigned to %s and %s\n"),
diff --git a/src/main.c b/src/main.c
index 01f0a42..2edf2d4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -346,6 +346,9 @@ static gboolean
 timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
 {
 	char buf[256];
+#ifdef ENABLE_KEYDEF_SCREEN
+	char comment[64];
+#endif
 	gboolean key_error;
 
 	key_error = check_key_bindings(NULL, buf, sizeof(buf));
@@ -354,7 +357,20 @@ timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
 		   process */
 		return FALSE;
 
+#ifdef ENABLE_KEYDEF_SCREEN
+	g_strchomp(buf);
+	g_strlcat(buf, " (", sizeof(buf));
+	/* to translators: a key was bound twice in the key editor,
+	   and this is a hint for the user what to press to correct
+	   that */
+	g_snprintf(comment, sizeof(comment), _("press %s for the key editor"),
+		   get_key_names(CMD_SCREEN_KEYDEF, 0));
+	g_strlcat(buf, comment, sizeof(buf));
+	g_strlcat(buf, ")", sizeof(buf));
+#endif
+
 	screen_status_printf("%s", buf);
+
 	doupdate();
 	return TRUE;
 }
-- 
2.30.2