From: Patrick Hallen <patrick.hallen@rwth-aachen.de>
Date: Sat, 14 Mar 2009 14:52:29 +0000 (+0100)
Subject: de.po: Update the german translation.
X-Git-Tag: release-0.14~60
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=57769c066bcececab207064660d2f78cadfffc90;p=ncmpc.git

de.po: Update the german translation.

Added a german translation for the new strings which were
added to the song screen.
---

diff --git a/po/da.po b/po/da.po
index fba63fc..3d333a5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-17 14:53+0100\n"
 "Last-Translator: Niels Anker <nanker@webspeed.dk>\n"
 "Language-Team: da <da@li.org>\n"
@@ -48,24 +48,24 @@ msgstr "Forbundet til %s"
 msgid "press %s for the key editor"
 msgstr "tryk på %s for at redigere"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "Afspilningsliste"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "Gennemse"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "Søg"
 
@@ -125,7 +125,7 @@ msgstr "Crossfade %d sekunder"
 msgid "Database updated"
 msgstr "Databasen er opdateret"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "Afspilninsglisten blandet"
 
@@ -133,11 +133,11 @@ msgstr "Afspilninsglisten blandet"
 msgid "Cleared playlist"
 msgstr "Sletter afspilningslisten"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "Database opdatering startet"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "Databasen opdateres..."
 
@@ -212,31 +212,31 @@ msgstr "Adgangskode"
 msgid "Unable to find '%s'"
 msgstr "Kan ikke finde '%s'"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "Gem afspilningslisten som"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstat '%s' [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Afbrudt"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "Gemt %s"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "Afspilningsliste på %s"
@@ -244,22 +244,22 @@ msgstr "Afspilningsliste på %s"
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr "Sletning af dette emne ikke muligt"
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slet '%s' [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "Afspilningslisten slettet"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "Database opdatering af %s startet"
@@ -308,11 +308,11 @@ msgstr "kommentar"
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "Album"
 
@@ -379,8 +379,8 @@ msgid "Keybindings unchanged."
 msgstr "Taste bindinger uændrede!"
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Fejl: Kan ikke oprette mappen ~/.ncmpc - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -433,83 +433,83 @@ msgstr "Modificer tast for '%s'"
 msgid "Movement"
 msgstr "Navigation"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "Globale"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "Afspilningsliste"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "Afspil"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "Flyt markøren op i afspilningslisten"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "Flyt markøren ned i afspilningslisten"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "Gennemse"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "Skift til bibliotek/Tilføj til afspilningslisten og afspil"
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "Tilføj spor til afspilningsliste"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "Slet afspilningsliste"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "Database søgning"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "Vælg og afspil"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Sangtekst skærm"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "Gennemse sangtekster"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "(Gen)indlæs santekster"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr "Abryd hentning"
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "Hent kun sangtekster"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "Gem sagtekster"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "Output skærm"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "Slå output til/fra"
 
@@ -539,42 +539,95 @@ msgstr "Output '%s' slået til"
 msgid "Output '%s' disabled"
 msgstr "Output '%s' slået fra"
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr "Sang viser"
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "Navn"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "Disk"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "Spor"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "Dato"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr ""
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "Album fra kunstneren: %s"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "Databasen er opdateret"
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "Afspil"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "Vis sangen"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Taste konfigurations skærm"
@@ -591,264 +644,298 @@ msgstr "Flyt markør op"
 msgid "Move cursor down"
 msgstr "Flyt markør ned"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "Flyt markør ned"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "Flyt markør ned"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "Hjem"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "Slut"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "Side op"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "Side ned"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr ""
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "Hjælp"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "Afspil/GÃ¥ til mappe"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "Beskær"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "Næste"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "Søg fremad"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "Søg tilbage"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "Hæv volumen"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "Sænk volumen"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "Marker/afmarker sang i afspilningsliste"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "Vælg alle emner på listen"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "Slet sang fra afspilningsliste"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "Bland rækkefølgen i afspilningslisten"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "Slet afspilningslisten"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "Aktiver/deaktiver gentag"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "Aktiver/deaktiver tilfældigt valg"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Aktiver/deaktiver crossfade mellem sange"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Opdater databasen"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "Gem afspilningslisten"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "Tilføj URL eller fil til afspilningslisten"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "GÃ¥ til rod mappen"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Gå til forældre mappe"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "Vis sangen"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Lokaliser sang i browseren"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Flyt op"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Flyt ned"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Genopfrisk skærm"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Ændre søge tilstand"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Aktiver/deaktiver automatisk centrering"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Næste skærm"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Forrige skærm"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Søg"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Gentag søg"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Søg baglæns"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "Gentag søg baglæns"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Kunstner skærm"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Ændre søge tilstand"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Afbryd action"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Opdater sangtekster"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Mellemrum"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Retur"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Tilbagetast"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Slet"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Op"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Venstre"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Højre"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Skift+Tabulator"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Indsæt"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tast %s tildelt %s og %s"
@@ -872,22 +959,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "Terminalen understøtter ikke farver"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "Fejl"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "Forkert hotkey definition"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "Ufuldstændig hotkey konfiguration"
 
@@ -895,56 +982,56 @@ 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:179
+#: src/conf.c:180
 msgid "Bad time display type"
 msgstr "Ringe tidsvisningstype"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "Mangler '='"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "DÃ¥rligt farvenavn"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "Ufuldstændig farve definition"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "Ugyldigt tal."
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "Forkert farve definition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "Ukendt skærm navn"
 
-#: src/conf.c:465
+#: src/conf.c:468
 msgid "Unknown configuration parameter"
 msgstr "Ukendt konfigurations parameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Mikkel Kirkgaard Nielsen https://launchpad.net/~ncmpc\n"
 "  Niels Anker https://launchpad.net/~nanker"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr ""
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 601ef0f..0e9478a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,15 +2,14 @@
 # Copyright (C) 2004 Kalle Wallin
 # This file is distributed under the same license as the ncmpc package.
 # Ingmar Gebert, 2004
-# , fuzzy
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
-"PO-Revision-Date: 2009-02-17 14:54+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
+"PO-Revision-Date: 2009-03-14 15:32+0100\n"
 "Last-Translator: Monika Brinkert <moni@sunpig.de>\n"
 "Language-Team: de <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -48,24 +47,24 @@ msgstr "Verbunden mit %s"
 msgid "press %s for the key editor"
 msgstr "drücke %s für den Tasteneditor"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "Playlist"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "Stöbern"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "Suche"
 
@@ -125,7 +124,7 @@ msgstr "%d Sekunden Crossfade"
 msgid "Database updated"
 msgstr "Datenbank aktualisiert"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "Playlist gemischt"
 
@@ -133,11 +132,11 @@ msgstr "Playlist gemischt"
 msgid "Cleared playlist"
 msgstr "Playlist gelöscht"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "Datenbankaktualisierung gestartet"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "Datenbankaktualisierung läuft..."
 
@@ -212,31 +211,31 @@ msgstr "Passwort"
 msgid "Unable to find '%s'"
 msgstr "Kann '%s' nicht finden"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "Speichere Playlist als"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Ersetze %s [%s/%s] ?"
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Abbruch"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "%s gespeichert"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "Playlist auf %s"
@@ -244,22 +243,22 @@ msgstr "Playlist auf %s"
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr "Dieses Objekt kann nicht gelöscht werden"
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Lösche Playlist %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "Playlist gelöscht"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "Datenbankaktualisierung von %s gestartet"
@@ -308,11 +307,11 @@ msgstr "Anmerkung"
 msgid "file"
 msgstr "Datei"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "Album"
 
@@ -380,7 +379,7 @@ msgstr "Tastenbelegung unverändert."
 
 #: src/screen_keydef.c:82
 #, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Fehler: kann Verzeichnis ~/.ncmpc - %s nicht erstellen"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -433,83 +432,83 @@ msgstr "Editiere Tasten für %s"
 msgid "Movement"
 msgstr "Bewegung"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "Playlistenanzeige"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "Abspielen"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "Stück nach oben bewegen"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "Stück nach unten bewegen"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "Zentrieren"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "Anzeige durchstöbern"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "Verzeichnis öffnen/Stück auswählen und abspielen"
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "Song zur Playlist hinzufügen"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "Lösche Playlist"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "Suchanzeige"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "Auswählen und abspielen"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Liedtextanzeige"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "Liedtext lesen"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "Text (neu) laden"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr "Laden unterbrechen"
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "Texte explizit herunterladen"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "Liedtext speichern"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "Anzeige der Ausgabegeräte"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "Ausgabegerät aktivieren/deaktivieren"
 
@@ -539,42 +538,91 @@ msgstr "Ausgabegerät '%s' aktiviert"
 msgid "Output '%s' disabled"
 msgstr "Ausgabegerät '%s' deaktiviert"
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr "Liedbetrachter"
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "Name"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "CD"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "Stück"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "Anmerkung"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr "Pfad"
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/screen_song.c:244
+msgid "Number of artists"
+msgstr "Anzahl der Künstler"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr "Anzahl der Alben"
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr "Anzahl der Lieder"
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr "Laufzeit"
+
+#: src/screen_song.c:248
+msgid "DB last updated"
+msgstr "DB zuletzt aktualisiert"
+
+#: src/screen_song.c:249
+msgid "Playtime"
+msgstr "Spielzeit"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr "DB Spielzeit"
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr "MPD Statistik"
+
+#: src/screen_song.c:310
+msgid "Selected song"
+msgstr "Lied anzeigen"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr "Gerade laufendes Lied"
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Tastenkonfigurationsanzeige"
@@ -591,264 +639,296 @@ msgstr "Cursor nach oben bewegen"
 msgid "Move cursor down"
 msgstr "Cursor nach unten bewegen"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+msgid "Move cursor to top of screen"
+msgstr "Cursor zum Beginn der Anzeige bewegen"
+
+#: src/command.c:82
+msgid "Move cursor to middle of screen"
+msgstr "Cursor zur Mitte der Anzeige bewegen"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr "Cursor zum Ende der Anzeige bewegen"
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "Pos1"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "Ende"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "Bild auf"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "Bild ab"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr "Auswahlmodus"
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr "Eine Zeile nach oben scrollen"
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr "Eine Zeile nach unten scrollen"
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr "Die halbe Anzeige nach oben scrollen"
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr "Die halbe Anzeige nach unten scrollen"
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "Hilfeanzeige"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "Abspielen/Verzeichnis öffnen"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "Playlist auf das markierte Lied reduzieren"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "Nächstes Stück"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "Vorheriges Stück"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "Vorspulen"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "Zurückspulen"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "Lautstärke erhöhen"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "Lautstärke verringern"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "Wähle Stück in der Playlist an/ab"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "Alle angezeigten Lieder zur Playlist hinzufügen"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "Lösche Song aus der Playlist"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "Mische Playlist"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "Lösche Playlist"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "Schalte Wiederholungswiedergabe ein/aus"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "Schalte Zufallswiedergabe ein/aus"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Schalte Crossfade-Wiedergabe ein/aus"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Starte eine Aktualisierung der Musikdatenbank"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "Speichere Playlist"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "Füge eine URL/Datei der Playlist hinzu"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Basis-Verzeichnis öffnen"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Übergeordnetes Verzeichnis öffnen"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "Lied anzeigen"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Lied in Datenbank orten"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Bewege es nach oben"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Bewege es nach unten"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Aktualisiere Anzeige"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Wechsle den Suchmodus"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Schalte den Autozentrier-Modus ein/aus"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Nächste Anzeige"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Vorherige Anzeige"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr "Wechsle zur zuletzt benutzten Anzeige"
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Vorwärtssuche"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Vorwärtssuche fortsetzen"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Rückwärtssuche"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "Rückwärtssuche fortsetzen"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Springe zu"
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Künstlerdatenbank"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Suchmodus wechseln"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr "Zeige das ausgewählte und das gerade laufende Lied an"
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Kommando Unterbrechen"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Liedtext aktualisieren"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Leertaste"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Entf"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Oben"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Unten"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Links"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Rechts"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "Bild ab"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "Bild auf"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Einfg"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Taste %s ist %s und %s zugeordnet"
@@ -872,22 +952,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "Das Terminal unterstützt keine Farben"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "Fehler"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "Fehlerhafte Definition der Tastenbelegung"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "Unvollständige Konfiguration für Tastenbelegung"
 
@@ -895,53 +975,53 @@ 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:179
+#: src/conf.c:180
 msgid "Bad time display type"
 msgstr "Ungültige Anzeigeart"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "Es fehlt ein '='"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "Ungültiger Farbname"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "Unvollständige Farbkonfiguration"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "Ungültige Zahl"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "Fehlerhafte Farbdefinition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "Unbekannter Anzeigenname"
 
-#: src/conf.c:465
+#: src/conf.c:468
 msgid "Unknown configuration parameter"
 msgstr "Unbekannter Konfigurationsparameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
-msgstr ""
+msgstr "Übersetzer"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr "Auswahlmodus deaktiviert"
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr "Auswahlmodus aktiviert"
 
diff --git a/po/es.po b/po/es.po
index 0b470ea..f6d3042 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-26 11:52+0000\n"
 "Last-Translator: Feder Sáiz <federsaiz@googlemail.com>\n"
 "Language-Team: es\n"
@@ -54,24 +54,24 @@ msgstr "Conectado a %s"
 msgid "press %s for the key editor"
 msgstr "pressiona %s para accer al editor de teclas"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "Lista de canciones"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "Búsqueda"
 
@@ -131,7 +131,7 @@ msgstr "Desvanecimiento de %d segundos"
 msgid "Database updated"
 msgstr "Base de datos actualizada"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "Lista de canciones barajada"
 
@@ -139,11 +139,11 @@ msgstr "Lista de canciones barajada"
 msgid "Cleared playlist"
 msgstr "Vaciada la lista de canciones"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "Ha comenzado la actualización de la base de datos"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "Actualizando la base de datos..."
 
@@ -218,31 +218,31 @@ msgstr "Contraseña"
 msgid "Unable to find '%s'"
 msgstr "No se pudo encontrar %s"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "Guardar la lista como"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Sustituir %s [%s%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Ejecución interrumpida"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "%s Guardada"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "Añadir"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lista de reproducción en %s"
@@ -250,22 +250,22 @@ msgstr "Lista de reproducción en %s"
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr "No se puede borrar el elemento"
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Borrar la lista de reproducción %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "Lista de reproducción borrada"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "Ha comenzado la actualización de la base de datos %s"
@@ -314,11 +314,11 @@ msgstr "comentario"
 msgid "file"
 msgstr "fichero"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "Álbum"
 
@@ -385,8 +385,8 @@ msgid "Keybindings unchanged."
 msgstr "Las teclas de acceso rápido no han sido modificadas."
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Error: No se ha podido crear el directorio ~/.ncmpc - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -439,83 +439,83 @@ msgstr "Cambia las teclas para %s"
 msgid "Movement"
 msgstr "Navegar"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "Lista de canciones"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "Mover la canción arriba"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "Mover la canción abajo"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "Centro"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "Navegador"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "Acceder al directorio/Seleccionar y reproducir canción"
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "Añadir la canción de la lista"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "Búsqueda"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "Seleccionar y reproducir"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Letras"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "Ver letras"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "(Re)cargar letras"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr "Interrumpir la descarga"
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "Forzar la descarga de las letras"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "Guardar las letras"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "Pantalla de salidas"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "Activar/desactivar la salida"
 
@@ -545,42 +545,95 @@ msgstr "Se activó la salida '%s'"
 msgid "Output '%s' disabled"
 msgstr "Se desactivó la salida '%s'"
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr "Visor de la canción"
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "Nombre"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "Pista"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "Fecha"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "Estilo"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr "Ruta"
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "Álbumes del artista: %s"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "Base de datos actualizada"
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "Reproducir"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "Ver la canción"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Configuración de teclas"
@@ -597,264 +650,298 @@ msgstr "Mover el cursor hacia arriba"
 msgid "Move cursor down"
 msgstr "Mover el cursor hacia abajo"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "Mover el cursor hacia abajo"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "Mover el cursor hacia abajo"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "Inicio"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "Página arriba"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "Página abajo"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr "Selección visual"
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "Ayuda"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "Reproducir/Entrar en el directorio"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "Reducir lista de canciónes a canción marcado"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "Siguiente"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "Anterior"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "Avanzar"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "Subir el volumen"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "Bajar el volumen"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/Deseleccionar la canción en la lista"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "Seleccionar todos"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "Borrar la canción de la lista"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "Aleatorizar lista de canciones"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "Alternar modo repetición"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "Alternar modo aleatorio"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Alternar modo crossfade"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Iniciar la actualización de la BD musical"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "Guardar la lista de canciones"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "Añadir una URL o fichero a la lista"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Entrar al directorio fundamental"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Entrar al directorio superior"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "Ver la canción"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Encontrar la canción en el navegador"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Moverlo arriba"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Moverlo abajo"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Actualizar la ventana"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 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:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Alternar centrado automático de la ventana"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Pantalla siguiente"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Pantalla anterior"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Buscar hacia adelante"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Buscar siguiente"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Buscar hacia atrás"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "Buscar anterior"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Saltar a"
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Artistas"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Cambiar el modo de búsqueda"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Interrumpir la acción"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Actualizar las letras"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Espacio"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Abajo"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Derecha"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "Pagina siguiente"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "Pagina anterior"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tabulador"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+Tabulador"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tecla %s asignada a %s y %s"
@@ -878,22 +965,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "La terminal no tiene la opcion de diferentes colores"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "Error"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "Definición incorrecta de la tecla de acceso"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "Configuración incompleta de la tecla de acceso"
 
@@ -901,67 +988,65 @@ 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:179
+#: src/conf.c:180
 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:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "Falta un '='"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "Nombre de color incorrecto"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "Definición de color incompleta"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "Número inválido"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "Definición de color erronea"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "Nombre de pantalla desconocido"
 
-#: src/conf.c:465
+#: src/conf.c:468
 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:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Feder Sáiz https://launchpad.net/~federsaiz\n"
 "  Johám-Luís Miguéns Vila https://launchpad.net/~ashtophet"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr "Selección visual deshabilitada"
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr "Selección visual habilitada"
 
-#, c-format
 #~ msgid "Adding directory %s...\n"
 #~ msgstr "Añadiendo directorio %s...\n"
 
 #~ msgid "Search: "
 #~ msgstr "Buscar: "
 
-#, 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)"
diff --git a/po/fr.po b/po/fr.po
index 9f4837d..87b5b38 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-17 14:54+0100\n"
 "Last-Translator: Yann Cézard <eesprit@free.fr>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -46,24 +46,24 @@ msgstr "Connecté à %s"
 msgid "press %s for the key editor"
 msgstr "appuyez sur %s pour l'éditeur de touches"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "Aide"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "Liste de lecture"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "Parcourir"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "Rechercher"
 
@@ -123,7 +123,7 @@ msgstr "Fondu sur %d seconde(s)"
 msgid "Database updated"
 msgstr "Base de données mise à jour"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "Liste de lecture aléatoire"
 
@@ -131,11 +131,11 @@ msgstr "Liste de lecture aléatoire"
 msgid "Cleared playlist"
 msgstr "Liste de lecture vidée"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "Début de la mise à jour de la base de données"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "Mise à jour de la base de données en cours..."
 
@@ -210,31 +210,31 @@ msgstr "Mot de passe"
 msgid "Unable to find '%s'"
 msgstr "Impossible de trouver '%s'"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "Enregistrer la liste de lecture sous"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Remplacer %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Annulé"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "%s enregistré"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "Liste de lecture sur %s"
@@ -242,22 +242,22 @@ msgstr "Liste de lecture sur %s"
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr "Impossible d'effacer ce type d'objet"
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Effacer la liste de lecture %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "Liste de lecture effacée"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "Mise à jour de la base de données de %s commençée"
@@ -306,11 +306,11 @@ msgstr "commentaire"
 msgid "file"
 msgstr "fichier"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "Titre"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "Album"
 
@@ -377,8 +377,8 @@ msgid "Keybindings unchanged."
 msgstr "La correspondance des touches n'a pas été changée."
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Erreur: Impossible de créer le répertoire ~/.ncmpc - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -431,83 +431,83 @@ msgstr "Editer les touches pour %s"
 msgid "Movement"
 msgstr "Déplacements"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "Globales"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "Ecran de Liste de lecture"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "Lire"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "Déplacer la chanson vers le haut"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "Déplacer la chanson vers le bas"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "Ecran de Navigation"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "Entrer dans le répertoire/Sélectionner et lire la chanson"
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "Ajouter la chanson à la liste de lecture"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "Effacer la liste de lecture"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "Ecran de recherche"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "Sélectionner et Lire"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Ecran des paroles"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "Voir les Paroles"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "(Re)charger les paroles"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr "Récupération interrompue"
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "Forcer le téléchargement des paroles"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "Enregistrer les paroles"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "Ecran des sorties"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "Activer/désactiver une sortie"
 
@@ -537,42 +537,95 @@ msgstr "Sortie %s activée"
 msgid "Output '%s' disabled"
 msgstr "Sortie %s désactivée"
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr "Visualiseur de chanson"
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "Compositeur"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "Nom"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "Disque"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "Piste"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "Date"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "Style"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr ""
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "Albums de l'artiste : %s"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "Base de données mise à jour"
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "Lire"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "Voir la chanson"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Ecran de configuration des touches"
@@ -589,264 +642,298 @@ msgstr "Déplacer le curseur vers le haut"
 msgid "Move cursor down"
 msgstr "Déplacer le curseur vers le bas"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "Déplacer le curseur vers le bas"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "Déplacer le curseur vers le bas"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "Début"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "Monter d'une page"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "Descendre d'une page"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr ""
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "Ecran d'aide"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "Jouer/Entrer dans le répertoire"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "Couper"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "Piste suivante"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "Piste précédente"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "Avancer"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "Reculer"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "Augmenter le volume"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "Diminuer le volume"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "Sélectionner/Désélectionner la chanson dans la liste de lecture"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "Selectionner tous les éléments listés"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "Enlever la chanson de la liste de lecture"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "Liste de lecture aléatoire"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "Vider la liste de lecture"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "Activer/désactiver le mode répétition"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "Activer/désactiver le mode aléatoire"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Activer/désactiver le mode de fondu"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Mettre à jour la base de données musicale"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "Enregistrer la liste de lecture"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "Ajouter une url/un fichier à la liste de lecture"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Aller au répertoire racine"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Aller au répertoire supérieur"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "Voir la chanson"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Localiser la chanson dans le navigateur"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Déplacer l'élément vers le haut"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Déplacer l'élément vers le bas"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Rafraîchir l'écran"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 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:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Activer le mode d'auto-centrage"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Ecran suivant"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Ecran précédent"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Chercher après"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Chercher après/suivant"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Chercher avant"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "Chercher avant/précédent"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Ecran sur l'Artiste"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Changer le mode de recherche"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Interrompre l'action"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Mettre à jour les paroles"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "Indéfini"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Espace"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Entrée"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Suppr"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Haut"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Bas"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Gauche"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Droite"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "PageBas"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "PageHaut"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Echap"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Inser"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "La touche %s est assignée à %s et à %s"
@@ -870,22 +957,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "Le terminal ne dispose pas de la gestion des couleurs"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "Erreur"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "Définition de raccourci malformée"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "Configuration de raccourci incomplète"
 
@@ -893,53 +980,53 @@ 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:179
+#: src/conf.c:180
 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:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "Manque '='"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "Mauvais nom de couleur"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "Définition de couleur incomplète"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "Nombre invalide"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "Définition de couleur malformée"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "Nom d'écran inconnu"
 
-#: src/conf.c:465
+#: src/conf.c:468
 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:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr "Traduction française : Yann Cézard <eesprit@free.fr>"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr ""
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index e4ce3ed..2ed41a8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-17 14:54+0100\n"
 "Last-Translator: Johám-Luís Miguéns Vila <galiza.ceive@gmail.com>\n"
 "Language-Team: galician\n"
@@ -47,24 +47,24 @@ msgstr "Conectado com %s"
 msgid "press %s for the key editor"
 msgstr "preme %s para ir ao editor de atalhos"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "Lista"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "Procura"
 
@@ -124,7 +124,7 @@ msgstr "Esvaecemento %d segundos"
 msgid "Database updated"
 msgstr "Base de dados actualizada"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "Lista aleatorizada"
 
@@ -132,11 +132,11 @@ msgstr "Lista aleatorizada"
 msgid "Cleared playlist"
 msgstr "Lista limpada"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "A actualizaçom da BD começou"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "A BD está-se a actualizar..."
 
@@ -213,33 +213,33 @@ msgstr "Contrasinal :"
 msgid "Unable to find '%s'"
 msgstr "Nom se puido atopar '%s'"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 #, fuzzy
 msgid "Save playlist as"
 msgstr "Guardar lista como: "
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Reemprazar %s [%s/%s] ?"
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Abortado"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "Guardado %s"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 #, fuzzy
 msgid "Add"
 msgstr "Engadir: "
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lista em %s"
@@ -247,22 +247,22 @@ msgstr "Lista em %s"
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr "Nom é possíbel eliminar o elemento"
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Eliminar a lista %s [%s/%s] ?"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "Lista eliminada"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "A actualizaçom da BD de %s começou"
@@ -311,11 +311,11 @@ msgstr "comentário"
 msgid "file"
 msgstr "ficheiro"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "Álbum"
 
@@ -382,8 +382,8 @@ msgid "Keybindings unchanged."
 msgstr "Atalhos de teclado sem mudanças"
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Erro: impossível criar o cartafol ~/.ncmpc - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -436,83 +436,83 @@ msgstr "Editar atalhos para %s"
 msgid "Movement"
 msgstr "Movimento"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "Écrã da lista"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "Tocar"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "Mover a cançom arriba"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "Mover a cançom abaixo"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "Centrar"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "Écrã de navegaçom"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "Entra no cartafol/Selecciona e toca a cançom"
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "Engadir a cançom à lista"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "Eliminar lista"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "Écrã de procura"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "Seleccionar e tocar"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Ecrã das letras"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "Ver Letras"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "(Re)carregar letras"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr "Interromper a descarga"
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "Forçar a descarga das letras"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "Guardar as letras"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "Écrã de saída"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "Habilitar/Deshabilitar saída"
 
@@ -542,42 +542,95 @@ msgstr "Activou-se a saída '%s'"
 msgid "Output '%s' disabled"
 msgstr "Desactivou-se a saída '%s'"
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr "Visor da cançom"
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "Nome do ficheiro"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "Pista"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "Data"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "Estilo"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr ""
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "Albumes do artista: %s"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "Base de dados actualizada"
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "Tocar"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "Ver a cançom"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Écrã da configuraçom dos atalhos"
@@ -594,264 +647,298 @@ msgstr "Mover o cursor arriba"
 msgid "Move cursor down"
 msgstr "Mover o cursor abaixo"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "Mover o cursor abaixo"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "Mover o cursor abaixo"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "Fim"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "Avance página"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "Retrocesso página"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr ""
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "Écrã de ajuda"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "Tocar/Entrar num cartafol"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "Cortar"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "Seguinte"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "Anterior"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "Avançar"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "Aumentar volume"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "Diminuir volume"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/desseleccionar a cançom na lista"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "Seleccionar todos"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "Eliminar a cançom da lista"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "Aleatorizar a lista"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "Limpar a lista"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "Activar/desactivar o modo repetiçom"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "Activar/desactivar o modo aleatório"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Activar/desactivar o modo esvaecimento"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Começar umha actualizaçom da BD"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "Guardar lista"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "Engadir url/ficheiro à lista"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Ir ao cartafol raíz"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Ir ao cartafol pai"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "Ver a cançom"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Atopar a cançom no navegador"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Mover o elemento arriba"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Mover o elemento abaixo"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Actualizar o écrã"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 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:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Alternar o modo de auto-centrado"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Seguinte écrã"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Écrã anterior"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Procurar cara adiante"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Procurar para adiante, seguinte"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Procurar cara atrás"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "Procurar cara atrás, anterior"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Navegador de Artistas"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Mudar o modo de procura"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Interromper a acçom"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Actualizar as letras"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "Nom definido"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Espaço"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Supr"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Direita"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "Re. Pág."
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "Av. Pág."
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "A tecla %s assignou-se a %s e a %s"
@@ -875,22 +962,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "A terminal nom tem capacidades de cor"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "Erro"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "Definiçom incorrecta da tecla de acceso rápido."
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "Configuraçom incompleta da tecla de acceso rápido"
 
@@ -898,53 +985,53 @@ 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:179
+#: src/conf.c:180
 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:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "Falta o signo '='"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "Nome de cor incorrecto"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "Definiçom incompleta da cor"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "Número inválido"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "Definiçom incorrecta da cor"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "Nome de écrã desconhecido"
 
-#: src/conf.c:465
+#: src/conf.c:468
 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:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr "ashtophet"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr ""
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 4a7e494..193a096 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-17 14:54+0100\n"
 "Last-Translator: Laszlo Ashin <kodest@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -48,24 +48,24 @@ msgstr "Csatlakoztatva ide: %s"
 msgid "press %s for the key editor"
 msgstr "nyomj %s-t a szerkesztéshez"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "Súgó"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "Lejátszólista"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "Tallózás"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "Keresés"
 
@@ -125,7 +125,7 @@ msgstr "Egymásba mosás %d másodperc"
 msgid "Database updated"
 msgstr "Adatbázis frissítve"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "Lejátszólista összekeverve"
 
@@ -133,11 +133,11 @@ msgstr "Lejátszólista összekeverve"
 msgid "Cleared playlist"
 msgstr "Lejátszólista törölve"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "Adatbázis frissítés elindult"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "Adatbázis frissítés folyamatban..."
 
@@ -212,31 +212,31 @@ msgstr "Jelszó"
 msgid "Unable to find '%s'"
 msgstr "'%s' nem található"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "Lejátszólista mentése másként"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, 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:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Megszakítva"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "%s elmentve"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lejátszólista itt: %s"
@@ -244,22 +244,22 @@ msgstr "Lejátszólista itt: %s"
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr "Ez az elem nem törölhető"
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Törlöd a %s lejátszólistát [%s/%s]? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "Lejátszólista törölve"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "%s adatbázis frissítése elkezdődött"
@@ -308,11 +308,11 @@ msgstr "megjegyzés"
 msgid "file"
 msgstr "fájl"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "Cím"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "Album"
 
@@ -379,8 +379,8 @@ msgid "Keybindings unchanged."
 msgstr "A billentyű beállítások változatlanok."
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Hiba: Nem sikerül létrehozni a ~/.ncmpc könyvtárat - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -433,83 +433,83 @@ msgstr "Gombok módosítása a következőhöz: %s"
 msgid "Movement"
 msgstr "Mozgás"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "Általános"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "Lejátszólista"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "Lejátszás"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "Szám mozgatása felfelé"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "Szám mozgatása lefelé"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "Közép"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "Tallózás"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 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:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "Szám hozzáadása a lejátszólistához"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "Kereső képernyő"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "Kiválasztás és lejátszás"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Dalszöveg képernyő"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "Dalszövegek megtekintése"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "Dalszövegek (újra)töltése"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr "Újrapróbálkozás megszakítása"
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "Dalszövegek kifejezett letöltése"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "Dalszövegek mentése"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "Kimenetek"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "Kimenet engedélyezése/tiltása"
 
@@ -539,42 +539,95 @@ msgstr "Kimenet engedélyezve: %s"
 msgid "Output '%s' disabled"
 msgstr "Kimenet tiltva: %s"
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr "Szám néző"
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "Zeneszerző"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "Név"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "Lemez"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "Szám"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "Dátum"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "Műfaj"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr ""
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "%s előadó albumai"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "Adatbázis frissítve"
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "Lejátszás"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "A szám megtekintése"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Billentyű beállító képernyő"
@@ -591,264 +644,298 @@ msgstr "Kurzormozgatás felfelé"
 msgid "Move cursor down"
 msgstr "Kurzormozgatás lefelé"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "Kurzormozgatás lefelé"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "Kurzormozgatás lefelé"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "End"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "Egy oldalt fel"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "Egy oldalt le"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr ""
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "Segítség"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "Lejátszás/Belépés könyvtárba"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "Szüneteltetés"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "Leállítás"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "Vágás"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "Következő szám"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "Előző szám"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "Tekerés előre"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "Tekerés hátra"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "Hangerő növelése"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "Hangerő csökkentése"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "Szám kiválasztása a lejátszólistában"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "Minden listázott elem kiválasztása"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "Szám törlése a lejátszólistából"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "Lejátszólista összekeverése"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "Ismétlő mód ki- és bekapcsolása"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "Véletlenszerű lejátszás ki- és bekapcsolása"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Egymásba mosás ki- és bekapcsolása"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "A zenei adatbázis frissítésének indítása"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "Lejátszólista mentése"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "URL vagy fájl hozzáadása a lejátszólistához"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Mozgás a gyökér könyvtárba"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Mozgás a szülő könyvtárba"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "A szám megtekintése"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Szám megtekintése a tallozóban"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Elem mozgatása fel"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Elem mozgatása le"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Képernyő frissítése"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 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:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Középre igazítás ki- és bekapcsolása"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Kövezkező képernyő"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Előző képernyő"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Keresés előre"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Következő keresése előre"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Keresés hátra"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "Előző keresése hátra"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Előadó képernyő"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Kereső mód váltása"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "parancs megszakítása"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Dalszövegek frissítése"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "Meghatározatlan"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Szóköz"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "A(z) %s gomb a követlezőkhoz van rendelve: %s és %s"
@@ -872,22 +959,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "A terminál nem támogatja a színeket"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "Hiba"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "Hibás gyorsbillentyű definíció"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "Hiányos gyorsbillentyű definíció"
 
@@ -895,55 +982,55 @@ 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:179
+#: src/conf.c:180
 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:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "Hiányzó egyenlőség jel"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "Hibás szín megnevezés"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "Hiányos szín megadás"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "Érvénytelen szám"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "Hibás szín megadás"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "Ismeretlen képernyő név"
 
-#: src/conf.c:465
+#: src/conf.c:468
 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:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Laszlo Ashin https://launchpad.net/~kodest"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr ""
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index 9388616..21ad183 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-20 15:22+0000\n"
 "Last-Translator: atie <atie.at.matrix@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -48,24 +48,24 @@ msgstr "%s로 접속함"
 msgid "press %s for the key editor"
 msgstr "키 편집기 사용을 위하여 %s(을)를 누르십시오."
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "도움말"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "연주 목록"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "열람"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "아티스트"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "찾기"
 
@@ -125,7 +125,7 @@ msgstr "곡바뀜 %d 초"
 msgid "Database updated"
 msgstr "데이터베이스를 업데이트 하였습니다."
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "섞여진 연주목록"
 
@@ -133,11 +133,11 @@ msgstr "섞여진 연주목록"
 msgid "Cleared playlist"
 msgstr "지워진 연주목록"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "데이터베이스 업데이트를 시작합니다."
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "데이터베이스 업데이트를 실행 중..."
 
@@ -212,31 +212,31 @@ msgstr "열쇠글"
 msgid "Unable to find '%s'"
 msgstr "'%s'(을)를 찾을 수 없습니다."
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "연주목록으로 저장"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "변경하기 %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "중단됨"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "%s(으)로 저장함"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "더하기"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "%s 상의 연주목록"
@@ -244,22 +244,22 @@ msgstr "%s 상의 연주목록"
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr "이 항목을 지우는 것은 가능하지 않습니다."
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "연주목록 %s [%s/%s] 삭제하기 ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "연주목록을 삭제하였습니다."
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "%s 데이터베이스 업데이트를 시작합니다."
@@ -308,11 +308,11 @@ msgstr "주석"
 msgid "file"
 msgstr "파일"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "제목"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "앨범"
 
@@ -379,8 +379,8 @@ msgid "Keybindings unchanged."
 msgstr "키 조합을 바꾸지 않았습니다."
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "디렉토리 ~/.ncmpc를 만들 수 없습니다. - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -433,83 +433,83 @@ msgstr "%s(을)를 위한 키 편집"
 msgid "Movement"
 msgstr "이동"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "전체"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "연주목록 화면"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "연주"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "곡을 위로 올리기"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "곡을 아래로 내리기"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "가운데"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "열람하기 화면"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "디렉토리를 입력하고 곡을 선택하여 연주합니다."
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "연주목록에 곡을 더하기"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "연주목록 지우기"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "찾기 화면"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "선택하고 연주"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "가사 화면"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "가사 보기"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "가사 (다시)올리기"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr "가사 가져오기 중지"
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "가사를 명식적으로 다운로드"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "가사 저장하기"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "출력 화면"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "출력 사용하기/안하기"
 
@@ -539,42 +539,95 @@ msgstr "출력 '%s'(을)를 사용합니다"
 msgid "Output '%s' disabled"
 msgstr "출력 '%s'(을)를 사용 안합니다"
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr "곡 보기"
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "작곡가"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "이름"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "디스크"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "트랙"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "날짜"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "장르"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "주석"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr "경로"
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "아티스트의 앨범: %s"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "데이터베이스를 업데이트 하였습니다."
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "연주"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "곡 보기"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "키 설정 화면"
@@ -591,264 +644,298 @@ msgstr "커서를 위로 올리기"
 msgid "Move cursor down"
 msgstr "커서를 아래로 내리기"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "커서를 아래로 내리기"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "커서를 아래로 내리기"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "End"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "위쪽 페이지"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "아래쪽 페이지"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr "비쥬얼 선택"
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "도움말 화면"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "연주/디렉토리 입력"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "일시정지"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "멈춤"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "연주중인 곡만 선택"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "다음 트랙"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "이전 트랙"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "앞으로 찾기"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "뒤로 찾기"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "음량 높이기"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "음량 낮추기"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "연주목록에서 곡 선택/해제"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "나열한 항목 모두 선택하기"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "연주목록에서 곡 삭제하기"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "연주목록 섞기"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "연주목록 비우기"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "반복연주 모드 토클"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "무작위연주 모드 토클"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "곡바꿈 모드 토글"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "음악 데이타베이스 업데이트를 시작"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "연주목록 저장"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "연주목록에 url/파일 더하기"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "루트 디렉토리로 가기"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "상위 디렉토리로 가기"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "곡 보기"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "열람 화면에 곡을 위치하기"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "항목 위로 올리기"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "항목 아래로 내리기"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "화면 갱신하기"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "찾기 모드 토글"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "자동 가운데 모드 토글"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "다음 화면"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "이전 화면"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "앞으로 찾기"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "앞으로 다음 찾기"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "뒤로 찾기"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "뒤로 이전 찾기"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr "직접 이동"
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "아티스트 화면"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "찾기 모드 변경"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "백그라운드 실행을 중지"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "가사 업데이트"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "정의되지 않음"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Space"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "지우기"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
@@ -872,22 +959,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "색상 기능이 없는 터미널입니다."
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "오류"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "잘못된 단축키 정의"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "알 수 없는 명령"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "단축키 설정이 불완전합니다."
 
@@ -895,56 +982,56 @@ msgstr "단축키 설정이 불완전합니다."
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:179
+#: src/conf.c:180
 msgid "Bad time display type"
 msgstr "잘못된 시간 표시 형식"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "'=' 기호가 없습니다."
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "잘못된 색상 이름"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "불완전한 색상 지정"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "유효하지 않은 숫자"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "잘못된 색상 지정"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "알 수 없는 화면 이름"
 
-#: src/conf.c:465
+#: src/conf.c:468
 msgid "Unknown configuration parameter"
 msgstr "알 수 없는 설정 요소"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  atie https://launchpad.net/~atie-at-matrix\n"
 "  bluejay https://launchpad.net/~jaypedia"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr "비쥬얼 선택을 사용하지 않습니다"
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr "비쥬얼 선택을 사용합니다"
 
diff --git a/po/nb.po b/po/nb.po
index de38f8a..45eb443 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-17 14:55+0100\n"
 "Last-Translator: Jon Bergli Heier <snakebite@jvnv.net>\n"
 "Language-Team: no <no@li.org>\n"
@@ -48,24 +48,24 @@ msgstr "Koblet til %s"
 msgid "press %s for the key editor"
 msgstr "trykk %s for å rette"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "Spilleliste"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "Filer"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "Artist"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "Søk"
 
@@ -125,7 +125,7 @@ msgstr "Crossfade %d sekunder"
 msgid "Database updated"
 msgstr "Databasen er oppdatert"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "Tilfeldigjort spillelisten"
 
@@ -133,11 +133,11 @@ msgstr "Tilfeldigjort spillelisten"
 msgid "Cleared playlist"
 msgstr "Sletter spillelisten"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "Oppdaterer databasen"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "Databasen oppdateres..."
 
@@ -212,31 +212,31 @@ msgstr "Passord"
 msgid "Unable to find '%s'"
 msgstr "Fant ikke '%s'"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "Lagre spillelisten som"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstatt '%s' [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Avbrutt"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "Lagret %s"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "Legg til"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spilleliste på %s"
@@ -244,22 +244,22 @@ msgstr "Spilleliste p
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr ""
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slette '%s' [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "Spillelisten slettet"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "oppdaterer databasen ifra %s"
@@ -308,11 +308,11 @@ msgstr "kommentar"
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "Tittel"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "Album"
 
@@ -379,8 +379,8 @@ msgid "Keybindings unchanged."
 msgstr "Tastatursnarveier uforandret!"
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Feil: Kan ikke lage ~/.ncmpc - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -433,83 +433,83 @@ msgstr "Endre taster for '%s'"
 msgid "Movement"
 msgstr ""
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "Spilleliste"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "Start/spill markert"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "Sentrer"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "Velg bibliotek/Legg til spillisten og spill sang"
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "Legg sang til spillelisten"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "Slett spilleliste"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "Database søk"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "Legg til spillelisten og spill"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr ""
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr ""
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr ""
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr ""
 
@@ -539,42 +539,95 @@ msgstr ""
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr ""
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "Navn"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "Plate"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "Spor"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "Dato"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "Sjanger"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr ""
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "Albumer fra artist: %s"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "Databasen er oppdatert"
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "Start/spill markert"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "Vis sangen"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Tastaturkonfigurasjon"
@@ -591,264 +644,298 @@ msgstr "Flytt mark
 msgid "Move cursor down"
 msgstr "Flytt markør ned"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "Flytt markør ned"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "Flytt markør ned"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr ""
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "Markøren en side opp"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "Markøren en side ned"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr ""
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "Hjelp"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "Spill/Velg mappe"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "Neste"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "Spol/Søk framover"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "Spol/Søk tilbake"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "Øk volumet"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "Demp volumet"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "Legg til/Fjern fra spillelisten"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "Velg alle i listen"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "Ta bort/slett"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "Tilfeldiggjør spilleliste"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "Tøm spillelisten"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "Repeat På/Av"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "Random På/Av"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Crossfade På/Av"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Oppdater databasen"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "Lagre spillelisten"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "Legg til URL eller fil til spillelisten"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Gå til rotmappe"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Gå ett nivå opp"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "Vis sangen"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Flytt opp"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Flytt ned"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Oppdater skjermbilde"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Endre søkeinnstillinger"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Automatisk sentrering på/av"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Neste skjerm"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Forrige skjerm"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Søk fremover"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Søk neste (fremover)"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Søk bakover"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "Søk neste (bakover)"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Artistskjerm"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Endre søkemodus"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Avbryt handling"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Oppdater sangtekster"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "Ikke definert"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Mellomrom"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Tilbaketast"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Del"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Opp"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Venstrepil"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Høyrepil"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Ins"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "%s-tasten satt til %s og %s"
@@ -872,22 +959,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "Terminalen mangler støtte for farger"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "Feil"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "Malformert hurtigtastdefinisjon"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "Uferdig hurtigtastkonfigurasjon"
 
@@ -895,56 +982,56 @@ msgstr "Uferdig hurtigtastkonfigurasjon"
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:179
+#: src/conf.c:180
 msgid "Bad time display type"
 msgstr "Ugyldig tidsvisningstype"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "Mangler '='"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "Ugyldig fargenavn"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "Uferdig fargedefinisjon"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "Ugyldig tall"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "Malformert fargedefinisjon"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "Ukjent skjermnavn"
 
-#: src/conf.c:465
+#: src/conf.c:468
 msgid "Unknown configuration parameter"
 msgstr "Ukjent konfiurasjonsparameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Jon Bergli Heier https://launchpad.net/~snakebite-jvnv\n"
 "  Ole R. Thorsen https://launchpad.net/~ole-rth"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr ""
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr ""
 
diff --git a/po/ncmpc.pot b/po/ncmpc.pot
index 27debce..5c31f5e 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: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+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"
@@ -47,24 +47,24 @@ msgstr ""
 msgid "press %s for the key editor"
 msgstr ""
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr ""
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr ""
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr ""
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr ""
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr ""
 
@@ -124,7 +124,7 @@ msgstr ""
 msgid "Database updated"
 msgstr ""
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr ""
 
@@ -132,11 +132,11 @@ msgstr ""
 msgid "Cleared playlist"
 msgstr ""
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr ""
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr ""
 
@@ -211,31 +211,31 @@ msgstr ""
 msgid "Unable to find '%s'"
 msgstr ""
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr ""
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr ""
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr ""
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr ""
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr ""
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr ""
@@ -243,22 +243,22 @@ msgstr ""
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr ""
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr ""
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr ""
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr ""
@@ -307,11 +307,11 @@ msgstr ""
 msgid "file"
 msgstr ""
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr ""
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 
 #: src/screen_keydef.c:82
 #, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr ""
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -432,83 +432,83 @@ msgstr ""
 msgid "Movement"
 msgstr ""
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr ""
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr ""
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr ""
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr ""
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr ""
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr ""
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr ""
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr ""
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr ""
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr ""
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr ""
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr ""
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr ""
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr ""
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr ""
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr ""
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr ""
 
@@ -538,42 +538,91 @@ msgstr ""
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr ""
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr ""
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr ""
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr ""
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr ""
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr ""
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr ""
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr ""
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+msgid "Number of artists"
+msgstr ""
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+msgid "DB last updated"
+msgstr ""
+
+#: src/screen_song.c:249
+msgid "Playtime"
+msgstr ""
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+msgid "Selected song"
+msgstr ""
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr ""
@@ -590,264 +639,296 @@ msgstr ""
 msgid "Move cursor down"
 msgstr ""
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+msgid "Move cursor to top of screen"
+msgstr ""
+
+#: src/command.c:82
+msgid "Move cursor to middle of screen"
+msgstr ""
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr ""
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr ""
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr ""
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr ""
 
-#: src/command.c:93
-msgid "Help screen"
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
 msgstr ""
 
 #: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
+msgid "Help screen"
+msgstr ""
+
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr ""
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr ""
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr ""
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr ""
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr ""
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr ""
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr ""
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr ""
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr ""
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr ""
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr ""
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr ""
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr ""
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr ""
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr ""
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr ""
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:151
-msgid "View the song"
-msgstr ""
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr ""
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr ""
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr ""
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr ""
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr ""
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr ""
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr ""
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr ""
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr ""
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr ""
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr ""
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr ""
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr ""
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr ""
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
@@ -871,22 +952,22 @@ msgid "Terminal lacks color capabilities"
 msgstr ""
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -894,52 +975,52 @@ msgstr ""
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:179
+#: src/conf.c:180
 msgid "Bad time display type"
 msgstr ""
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:465
+#: src/conf.c:468
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr ""
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr ""
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 604fbd9..070efe1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-17 14:55+0100\n"
 "Last-Translator: Max Arnold <amv_cbx@mail.ru>\n"
 "Language-Team: ru <ru@li.org>\n"
@@ -48,24 +48,24 @@ msgstr "
 msgid "press %s for the key editor"
 msgstr "%s - ÒÅÄÁËÔÏÒ ËÌÁ×ÉÛ"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "ðÏÍÏÝØ"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "ðÌÅÊÌÉÓÔ"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "îÁ×ÉÇÁÃÉÑ"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "éÓÐÏÌÎÉÔÅÌØ"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "ðÏÉÓË"
 
@@ -125,7 +125,7 @@ msgstr "
 msgid "Database updated"
 msgstr "âÁÚÁ ÏÂÎÏ×ÌÅÎÁ"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "ðÌÅÊÌÉÓÔ ÐÅÒÅÍÅÛÁÎ"
 
@@ -133,11 +133,11 @@ msgstr "
 msgid "Cleared playlist"
 msgstr "ðÌÅÊÌÉÓÔ ÏÞÉÝÅÎ"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "îÁÞÁÔÏ ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "éÄÅÔ ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ..."
 
@@ -212,31 +212,31 @@ msgstr "
 msgid "Unable to find '%s'"
 msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ '%s'"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "óÏÈÒÁÎÉÔØ ÐÌÅÊÌÉÓÔ ËÁË"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "úÁÍÅÎÉÔØ %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "ðÒÅÒ×ÁÎÏ"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "óÏÈÒÁÎÅÎÏ × %s"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "äÏÂÁ×ÉÔØ"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "ðÌÅÊÌÉÓÔ ÎÁ %s"
@@ -244,23 +244,23 @@ msgstr "
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 #, fuzzy
 msgid "Deleting this item is not possible"
 msgstr "õÄÁÌÅÎÉÅ ÜÔÏÇÏ ÜÌÅÍÅÎÔÁ ÎÅ×ÏÚÍÏÖÎÏ"
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "õÄÁÌÉÔØ ÐÌÅÊÌÉÓÔ %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "ðÌÅÊÌÉÓÔ ÕÄÁÌÅÎ"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "ïÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ %s ÚÁÐÕÝÅÎÏ"
@@ -309,11 +309,11 @@ msgstr "comment"
 msgid "file"
 msgstr "file"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "ëÏÍÐÏÚÉÃÉÑ"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "áÌØÂÏÍ"
 
@@ -380,8 +380,8 @@ msgid "Keybindings unchanged."
 msgstr "ëÌÁ×ÉÁÔÕÒÎÙÅ ËÏÍÂÉÎÁÃÉÉ ÎÅ ÉÚÍÅÎÉÌÉÓØ."
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "ïÛÉÂËÁ: îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÄÉÒÅËÔÏÒÉÀ ~/.ncmpc - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -434,83 +434,83 @@ msgstr "
 msgid "Movement"
 msgstr "ðÅÒÅÍÅÝÅÎÉÅ"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "çÌÏÂÁÌØÎÙÅ"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "üËÒÁÎ ÐÌÅÊÌÉÓÔÁ"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "÷ÏÓÐÒÏÉÚ×ÅÄÅÎÉÅ"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÏÍÐÏÚÉÃÉÀ ××ÅÒÈ"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÏÍÐÏÚÉÃÉÀ ×ÎÉÚ"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "ãÅÎÔÒÉÒÏ×ÁÔØ"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "üËÒÁÎ ÎÁ×ÉÇÁÃÉÉ"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "ðÅÒÅÊÔÉ × ÄÉÒÅËÔÏÒÉÀ/÷ÙÂÒÁÔØ É ÐÒÏÉÇÒÁÔØ ËÏÍÐÏÚÉÃÉÀ"
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "äÏÂÁ×ÉÔØ ËÏÍÐÏÚÉÃÉÀ × ÐÌÅÊÌÉÓÔ"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "õÄÁÌÉÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "üËÒÁÎ ÐÏÉÓËÁ"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "÷ÙÂÒÁÔØ É ÐÒÏÉÇÒÁÔØ"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "üËÒÁÎ ÔÅËÓÔÁ ÐÅÓÎÉ"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "ðÏËÁÚÁÔØ ÔÅËÓÔ"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "(ðÅÒÅ)ÚÁÇÒÕÚÉÔØ ÔÅËÓÔ"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr "ðÒÅÒ×ÁÔØ ÚÁÇÒÕÚËÕ"
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "ðÒÉÎÕÄÉÔÅÌØÎÏ ÚÁÇÒÕÚÉÔØ ÔÅËÓÔ"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "óÏÈÒÁÎÉÔØ ÔÅËÓÔ"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "üËÒÁÎ ÁÕÄÉÏ×ÙÈÏÄÏ×"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "÷ËÌ/×ÙËÌ ÁÕÄÉÏ×ÙÈÏÄ"
 
@@ -541,42 +541,95 @@ msgid "Output '%s' disabled"
 msgstr "áÕÄÉÏ×ÙÈÏÄ '%s' ×ÙËÌÀÞÅÎ"
 
 # Several translations for Song Viewer:
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr "éÎÆÏÒÍÁÃÉÑ Ï ËÏÍÐÏÚÉÃÉÉ"
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "ëÏÍÐÏÚÉÔÏÒ"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "îÁÚ×ÁÎÉÅ"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "äÉÓË"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "äÏÒÏÖËÁ"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "äÁÔÁ"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "öÁÎÒ"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "ëÏÍÍÅÎÔÁÒÉÊ"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr ""
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "áÌØÂÏÍÙ ÉÓÐÏÌÎÉÔÅÌÑ: %s"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "âÁÚÁ ÏÂÎÏ×ÌÅÎÁ"
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "÷ÏÓÐÒÏÉÚ×ÅÄÅÎÉÅ"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "üËÒÁÎ ËÌÁ×ÉÁÔÕÒÎÙÈ ËÏÍÂÉÎÁÃÉÊ"
@@ -593,264 +646,298 @@ msgstr "
 msgid "Move cursor down"
 msgstr "ëÕÒÓÏÒ ×ÎÉÚ"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "ëÕÒÓÏÒ ×ÎÉÚ"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "ëÕÒÓÏÒ ×ÎÉÚ"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "÷ ÎÁÞÁÌÏ"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "÷ ËÏÎÅÃ"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "îÁ ÓÔÒÁÎÉÃÕ ××ÅÒÈ"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "îÁ ÓÔÒÁÎÉÃÕ ×ÎÉÚ"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr ""
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "üËÒÁÎ ÐÏÍÏÝÉ"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "÷ÏÓÐÒÏÉÚ×ÅÓÔÉ/ðÅÒÅÊÔÉ × ÄÉÒÅËÔÏÒÉÀ"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "ðÁÕÚÁ"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "ïÓÔÁÎÏ×"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "õÄÁÌÉÔØ ÉÚ ÐÌÅÊÌÉÓÔÁ ×ÓÅ ËÏÍÐÏÚÉÃÉÉ ËÒÏÍÅ ÔÅËÕÝÅÊ"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "óÌÅÄÕÀÝÁÑ ËÏÍÐÏÚÉÃÉÑ"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "ðÒÅÄÙÄÕÝÁÑ ËÏÍÐÏÚÉÃÉÑ"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "ðÅÒÅÍÏÔËÁ ×ÐÅÒÅÄ"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "ðÅÒÅÍÏÔËÁ ÎÁÚÁÄ"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "õ×ÅÌÉÞÉÔØ ÇÒÏÍËÏÓÔØ"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "õÍÅÎØÛÉÔØ ÇÒÏÍËÏÓÔØ"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "ðÏÍÅÔÉÔØ/õÂÒÁÔØ ÐÏÍÅÔËÕ Ó ËÏÍÐÏÚÉÃÉÉ"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "äÏÂÁ×ÉÔØ ×ÓÅ ËÏÍÐÏÚÉÃÉÉ × ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "õÄÁÌÉÔØ ËÏÍÐÏÚÉÃÉÀ ÉÚ ÐÌÅÊÌÉÓÔÁ"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "ðÅÒÅÍÅÛÁÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "ïÞÉÓÔÉÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "÷ËÌ/÷ÙËÌ ÒÅÖÉÍ ÐÏ×ÔÏÒÁ"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "÷ËÌ/÷ÙËÌ ÓÌÕÞÁÊÎÙÊ ÒÅÖÉÍ"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "÷ËÌ/÷ÙËÌ ÒÅÖÉÍ ÐÌÁ×ÎÏÇÏ ÐÅÒÅÈÏÄÁ"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "ïÂÎÏ×ÉÔØ ÍÕÚÙËÁÌØÎÕÀ ÂÁÚÕ"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "óÏÈÒÁÎÉÔØ ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "äÏÂÁ×ÉÔØ url/ÆÁÊÌ × ÐÌÅÊÌÉÓÔ"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÄÉÒÅËÔÏÒÉÉ"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "ðÅÒÅÊÔÉ Ë ÒÏÄÉÔÅÌØÓËÏÊ ÄÉÒÅËÔÏÒÉÉ"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "ðÅÒÅÊÔÉ Ë ÆÁÊÌÕ ËÏÍÐÏÚÉÃÉÉ"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ××ÅÒÈ"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ×ÎÉÚ"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "ïÂÎÏ×ÉÔØ ÜËÒÁÎ"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "ðÅÒÅËÌÀÞÉÔØ ÒÅÖÉÍ ÐÏÉÓËÁ"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "÷ËÌ/÷ÙËÌ ÒÅÖÉÍ Á×ÔÏÃÅÎÔÒÉÒÏ×ÁÎÉÑ"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "óÌÅÄÕÀÝÉÊ ÜËÒÁÎ"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "ðÒÅÄÙÄÕÝÉÊ ÜËÒÁÎ"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "ðÏÉÓË ×ÐÅÒÅÄ"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "ðÒÏÄÏÌÖÉÔØ ÐÏÉÓË ×ÐÅÒ£Ä"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "ðÏÉÓË ÎÁÚÁÄ"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "ðÒÏÄÏÌÖÉÔØ ÐÏÉÓË ÎÁÚÁÄ"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "üËÒÁÎ ÉÓÐÏÌÎÉÔÅÌÅÊ"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "éÚÍÅÎÉÔØ ÐÏÌÅ ÄÌÑ ÐÏÉÓËÁ"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "ðÒÅÒ×ÁÔØ ÏÐÅÒÁÃÉÀ"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "ïÂÎÏ×ÉÔØ ÔÅËÓÔ"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "îÅ ÚÁÄÁÎÏ"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "ðÒÏÂÅÌ"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "÷×ÏÄ"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "÷×ÅÒÈ"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "÷ÎÉÚ"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "÷ÌÅ×Ï"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "÷ÐÒÁ×Ï"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "ëÌÁ×ÉÛÁ %s ÎÁÚÎÁÞÅÎÁ ÄÌÑ %s É %s"
@@ -874,22 +961,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "ôÅÒÍÉÎÁÌ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ Ã×ÅÔÁ"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "ïÛÉÂËÁ"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ËÌÁ×ÉÁÔÕÒÎÏÊ ËÏÍÂÉÎÁÃÉÉ"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "îÅÏÐÒÅÄÅÌ£ÎÎÏÅ ÚÎÁÞÅÎÉÅ ËÌÁ×ÉÁÔÕÒÎÏÊ ËÏÍÂÉÎÁÃÉÉ"
 
@@ -897,54 +984,54 @@ msgstr "
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:179
+#: src/conf.c:180
 msgid "Bad time display type"
 msgstr "îÅ×ÅÒÎÙÊ ÔÉÐ ÏÔÏÂÒÁÖÅÎÉÑ ×ÒÅÍÅÎÉ"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "ðÒÏÐÕÝÅÎ ÓÉÍ×ÏÌ '='"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "îÅ×ÅÒÎÏÅ ÎÁÚ×ÁÎÉÅ Ã×ÅÔÁ"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "îÅÏÐÒÅÄÅÌ£ÎÎÏÅ ÚÎÁÞÅÎÉÅ Ã×ÅÔÁ"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "îÅ×ÅÒÎÏÅ ÞÉÓÌÏ"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ Ã×ÅÔÁ"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "îÅÉÚ×ÅÓÔÎÏÅ ÎÁÚ×ÁÎÉÅ ÜËÒÁÎÁ"
 
-#: src/conf.c:465
+#: src/conf.c:468
 #, fuzzy
 msgid "Unknown configuration parameter"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ ËÏÎÆÉÇÕÒÁÃÉÉ"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr "ðÅÒÅ×ÏÄ: Max Arnold <lwarxx@gmail.com>"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr ""
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index 32c70ba..a471b37 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-17 14:55+0100\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com>\n"
 "Language-Team: sk <sk@li.org>\n"
@@ -46,24 +46,24 @@ msgstr "Pripojený k %s"
 msgid "press %s for the key editor"
 msgstr "stlačte %s pre editor klávesov"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "Playlist"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "Listovať"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "Interpret"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "Hľadanie"
 
@@ -123,7 +123,7 @@ msgstr "Prelínanie %d sekúnd"
 msgid "Database updated"
 msgstr "Databáza aktualizovaná"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "Zamiešaný playlist"
 
@@ -131,11 +131,11 @@ msgstr "Zamiešaný playlist"
 msgid "Cleared playlist"
 msgstr "Vyčistený playlist"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "Bola spustená aktualizácia databáze"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "Prebieha aktualizácia databáze..."
 
@@ -210,31 +210,31 @@ msgstr "Heslo"
 msgid "Unable to find '%s'"
 msgstr "Nepodarilo sa nájsť '%s'"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "Uložiť playlist ako"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Nahradiť %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Zrušené"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "Uložený %s"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "Pridať"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "Playlist na %s"
@@ -242,22 +242,22 @@ msgstr "Playlist na %s"
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr "Zmazanie tejto položky nie je možné"
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Vymazať playlist %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "Playlist vymazaný"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "Aktualizácia databáze %s začala"
@@ -306,11 +306,11 @@ msgstr "komentár"
 msgid "file"
 msgstr "súbor"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "Názov"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "Album"
 
@@ -377,8 +377,8 @@ msgid "Keybindings unchanged."
 msgstr "Priradenie klávesov sa nezmenilo."
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Chyba: Nepodarilo sa vytvoriť adresár ~/.ncmpc - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -431,83 +431,83 @@ msgstr "Upraviť klávesy pre %s"
 msgid "Movement"
 msgstr "Pohyb"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "Globálne"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "Okno playlistu"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "Prehrávať"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "Presunúť skladbu nahor"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "Presunúť skladbu nadol"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "Do stredu"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "Okno listovania"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "Vstúpiť do adresára/Vybrať a prehrať skladbu"
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "Pridať skladbu do playlistu"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "Vymazať playlist"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "Okno vyhľadávania"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "Vybrať a prehrať"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Okno textu piesne"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "Zobraziť text piesne"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "(Znovu)načítať text"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr "Zachytené prerušenie"
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "Explicitne sťahovať texty"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "Uložiť text piesne"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "Obrazovka výstupov"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "Povoliť/vypnúť výstup"
 
@@ -537,42 +537,95 @@ msgstr "Výstup '%s' povolený"
 msgid "Output '%s' disabled"
 msgstr "Výstup '%s' vypnutý"
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr "Prehliadač piesní"
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "Skladateľ"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "Názov"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "Disk"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "Stopa"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "Dátum"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "Žáner"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "Komentár"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr ""
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "Albumy od interpreta: %s"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "Databáza aktualizovaná"
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "Prehrávať"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "Zobraziť skladbu"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Okno nastavenia klávesov"
@@ -589,264 +642,298 @@ msgstr "Presunúť kurzor nahor"
 msgid "Move cursor down"
 msgstr "Presunúť kurzor nadol"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "Presunúť kurzor nadol"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "Presunúť kurzor nadol"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "End"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "Page up"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "Page down"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr ""
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "Okno s pomocou"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "Prehrať/Vstúpiť do adresára"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "Orezať"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "Ďalšia stopa"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "Predchádzajúca stopa"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "Posunúť vpred"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "Posunúť vzad"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "Pridať hlasitosť"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "Stíšiť"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "Vybrať/odvybrať skladbu v playliste"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "Vybrať všetky položky v zozname"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "Vymazať skladbu z playlistu"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "Zamiešať playlist"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "Vyčistiť playlist"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "Prepnúť režim opakovania"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "Prepnúť náhodný režim"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Prepnúť režím prelínania skladieb"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Spustiť aktualizáciu hudobnej databáze"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "Uložiť playlist"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "Pridať url/súbor do playlistu"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Prejsť do koreňového adresára"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Prejsť do nadradeného adresára"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "Zobraziť skladbu"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Nájsť skladbu v prehliadači"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Presunúť položku nahor"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Presunúť položku nadol"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Obnoviť obrazovku"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 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:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Prepnúť automatický režim centrovania"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Ďalšia obrazovka"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Predchádzajúca obrazovka"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Hľadať vpred"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Pokračovať v hľadaní vpred"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Hľadať vzad"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "Pokračovať v hľadaní vzad"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Okno interpreta"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Zmeniť režim vyhľadávania"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Akcia prerušenia"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Obnoviť text"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "Neurčené"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Medzera"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Hore"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Dole"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Vľavo"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Kláves %s priradený k %s a %s"
@@ -870,22 +957,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "Terminál nemá schopnosti zobrazovania farieb"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "Chyba"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "Chybne zadaná definícia klávesovej skratky"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "Neznámy príkaz"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "Neúplná konfigurácie klavesových skratiek"
 
@@ -893,53 +980,53 @@ 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:179
+#: src/conf.c:180
 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:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "Chýba '='"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "Nesprávny názov farby"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "Neúplná definícia farby"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "Neplatné číslo"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "Zle zadaná definícia farby"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "Neznámy názov obrazovky"
 
-#: src/conf.c:465
+#: src/conf.c:468
 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:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr "Jozef Riha <jose1711@gmail.com>"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr ""
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index beb5175..82ded2a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-17 14:55+0100\n"
 "Last-Translator: Björn Pettersson <bjorn@hygiena.org>\n"
 "Language-Team: sv <sv@li.org>\n"
@@ -48,24 +48,24 @@ msgstr "Ansluten till %s"
 msgid "press %s for the key editor"
 msgstr "tryck på %s för att korrigera"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "Spellista"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "Filer"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "Artist"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "Sök"
 
@@ -125,7 +125,7 @@ msgstr "Mjuk övergång %d sekunder"
 msgid "Database updated"
 msgstr "Databas uppdaterad"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "Spellistan slumpsorterades"
 
@@ -133,11 +133,11 @@ msgstr "Spellistan slumpsorterades"
 msgid "Cleared playlist"
 msgstr "Spellistan rensad"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "Databasuppdatering påbörjad"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "Databasen uppdateras..."
 
@@ -212,31 +212,31 @@ msgstr "Lösenord"
 msgid "Unable to find '%s'"
 msgstr "Kan inte hitta '%s'"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "Spara spellistan som"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, 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:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "Avbrutet"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "%s sparad"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spellista på %s"
@@ -244,22 +244,22 @@ msgstr "Spellista på %s"
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr "Du kan inte ta bort det här föremålet"
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Ta bort spellista %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "Spellista borttagen"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "Uppdaterar databasen ifrån %s"
@@ -308,11 +308,11 @@ msgstr "kommentar"
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "Album"
 
@@ -379,8 +379,8 @@ msgid "Keybindings unchanged."
 msgstr "Tangentdefinitioner oförändrade."
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Fel: Kan inte skapa katalog ~/.ncmpc - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -433,83 +433,83 @@ msgstr "Ändra tangenter för kommandot %s"
 msgid "Movement"
 msgstr "Navigation"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "Globala"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "Spellista"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "Starta/Spela markerad"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "Flytta spår uppåt"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "Flytta spår nedåt"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "Centrera"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "Välj katalog/Markera och spela upp"
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "Lägg till i spellista"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "Ta bort spellista"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "Databassökning"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "Lägg till spellistan och spela"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Texter"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "Visa texter"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "Ladda (om) texter"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr "Avbryt hämtning"
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "Ladda ner texter explicit"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "Spara texter"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "Utgångar"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "Slå på/av utgång"
 
@@ -539,42 +539,95 @@ msgstr "Utgång '%s' påslagen"
 msgid "Output '%s' disabled"
 msgstr "Utgång '%s' avslagen"
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr "Spår"
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "Kompositör"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "Namn"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "Skiva"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "Spår"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr ""
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "Album av artist: %s"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "Databas uppdaterad"
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "Starta/Spela markerad"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "Visa spår"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "Tangentdefinitioner"
@@ -591,264 +644,298 @@ msgstr "Markör uppåt"
 msgid "Move cursor down"
 msgstr "Markör nedåt"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "Markör nedåt"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "Markör nedåt"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "End"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "Markören en skärm uppåt"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "Markören en skärm nedåt"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr ""
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "Hjälp"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "Spela upp/Välj"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "Stoppa"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "Beskär"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "Nästa spår"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "Föregånde spår"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "Sök framåt"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "Sök bakåt"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "Höj volymen"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "Sänk volymen"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "Markera/avmarkera spår till spellistan"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "Markera alla listade föremål"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "Ta bort låt från spellista"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "Slumpsportera spellista"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "Rensa spellista"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "Repeat på/av"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "Slumpning på/av"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Mjuk övergång på/av"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Updatera musikdatabasen"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "Spara spellista"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "Lägg till url eller fil till spellistan"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "GÃ¥ till rotkatalogen"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Gå upp en nivå"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "Visa spår"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Hitta spår i Filer"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Flytta upp"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Flytta ner"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Uppdatera fönster"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Ändra sökinställningar"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering på/av"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Nästa skärm"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Tidigare skärm"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Sök"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Nästa träff"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Föregående träff"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "Upprepa sökning bakåt"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Artister"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Ändra måltyp för databassökning"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Avbryt handling"
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Uppdatera texter"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "Ej definierad"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Mellanslag"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Bakstegstangent"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Uppåtpil"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Nedåtpil"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Vänsterpil"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Högerpil"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+tabb"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tangent %s tilldelad %s och %s"
@@ -872,22 +959,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "Terminalen saknar stöd för färger"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "Fel"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "DÃ¥lig tangentdefinition"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "Inkomplett tangentdefinition"
 
@@ -895,45 +982,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:179
+#: src/conf.c:180
 msgid "Bad time display type"
 msgstr "Felaktigt tidsformat"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "Saknar '='"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "Felaktigt färgnamn"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "Inkomplett färgdefinition"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "Ogiltigt nummer"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "Felaktig färgdefinition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "Skärmnamn okänt"
 
-#: src/conf.c:465
+#: src/conf.c:468
 msgid "Unknown configuration parameter"
 msgstr "Okänd konfigurationsinställning"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -941,11 +1028,11 @@ msgstr ""
 "  Kalle Wallin https://launchpad.net/~kaw\n"
 "  nanker https://launchpad.net/~nanker"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr ""
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9c9020e..871d2dc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-02-17 14:52+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-14 15:51+0100\n"
 "PO-Revision-Date: 2009-02-17 17:15+0000\n"
 "Last-Translator: Gao Jie <kindmail@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -48,24 +48,24 @@ msgstr "连接到 %s"
 msgid "press %s for the key editor"
 msgstr "按 %s 编辑快捷键"
 
-#: src/screen.c:153 src/screen_help.c:219
+#: src/screen.c:153 src/screen_help.c:232
 msgid "Help"
 msgstr "帮助"
 
-#: src/screen.c:155 src/screen_play.c:477
+#: src/screen.c:155 src/screen_play.c:503
 msgid "Playlist"
 msgstr "列表"
 
 #. translators: caption of the browser screen
-#: src/screen.c:156 src/screen_file.c:213
+#: src/screen.c:156 src/screen_file.c:214
 msgid "Browse"
 msgstr "目录"
 
-#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:230
+#: src/screen.c:158 src/screen_search.c:80 src/screen_song.c:190
 msgid "Artist"
 msgstr "艺术家"
 
-#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:126
+#: src/screen.c:161 src/screen_search.c:309 src/screen_help.c:139
 msgid "Search"
 msgstr "查找"
 
@@ -125,7 +125,7 @@ msgstr "淡入淡出 %d 秒"
 msgid "Database updated"
 msgstr "数据库已更新"
 
-#: src/screen.c:748 src/screen_play.c:608
+#: src/screen.c:748 src/screen_play.c:638
 msgid "Shuffled playlist"
 msgstr "乱序播放列表"
 
@@ -133,11 +133,11 @@ msgstr "乱序播放列表"
 msgid "Cleared playlist"
 msgstr "清空播放列表"
 
-#: src/screen.c:769 src/screen_file.c:273
+#: src/screen.c:769 src/screen_file.c:274
 msgid "Database update started"
 msgstr "更新数据库中"
 
-#: src/screen.c:771 src/screen_file.c:280
+#: src/screen.c:771 src/screen_file.c:281
 msgid "Database update running..."
 msgstr "正在更新数据库..."
 
@@ -212,31 +212,31 @@ msgstr "密码"
 msgid "Unable to find '%s'"
 msgstr "找不到 '%s'"
 
-#: src/screen_play.c:233
+#: src/screen_play.c:259
 msgid "Save playlist as"
 msgstr "播放列表另存为"
 
-#: src/screen_play.c:266
+#: src/screen_play.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "替换 %s [%s/%s]? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_play.c:287 src/screen_file.c:147 src/screen_keydef.c:163
+#: src/screen_play.c:313 src/screen_file.c:148 src/screen_keydef.c:163
 msgid "Aborted"
 msgstr "已放弃"
 
 #. success
-#: src/screen_play.c:295
+#: src/screen_play.c:321
 #, c-format
 msgid "Saved %s"
 msgstr "保存到 %s"
 
-#: src/screen_play.c:371
+#: src/screen_play.c:397
 msgid "Add"
 msgstr "增加"
 
-#: src/screen_play.c:479
+#: src/screen_play.c:505
 #, c-format
 msgid "Playlist on %s"
 msgstr "%s 上的播放列表"
@@ -244,22 +244,22 @@ msgstr "%s 上的播放列表"
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:134
+#: src/screen_file.c:135
 msgid "Deleting this item is not possible"
 msgstr "此项目不能被删除"
 
-#: src/screen_file.c:141
+#: src/screen_file.c:142
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "确定要删除列表 %s[%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:156
+#: src/screen_file.c:157
 msgid "Playlist deleted"
 msgstr "播放列表已删除"
 
-#: src/screen_file.c:269
+#: src/screen_file.c:270
 #, c-format
 msgid "Database update of %s started"
 msgstr "开始更新数据库 %s"
@@ -308,11 +308,11 @@ msgstr "注释"
 msgid "file"
 msgstr "文件"
 
-#: src/screen_search.c:79 src/screen_song.c:231
+#: src/screen_search.c:79 src/screen_song.c:191
 msgid "Title"
 msgstr "标题"
 
-#: src/screen_search.c:81 src/screen_song.c:232
+#: src/screen_search.c:81 src/screen_song.c:192
 msgid "Album"
 msgstr "专辑"
 
@@ -379,8 +379,8 @@ msgid "Keybindings unchanged."
 msgstr "取消快捷键变更."
 
 #: src/screen_keydef.c:82
-#, c-format
-msgid "Error: Unable to create direcory ~/.ncmpc - %s"
+#, fuzzy, c-format
+msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "错误: 无法创建文件夹 ~/.ncmpc - %s"
 
 #: src/screen_keydef.c:91 src/screen_keydef.c:98
@@ -433,83 +433,83 @@ msgstr "为 %s 编辑快捷键"
 msgid "Movement"
 msgstr "移动"
 
-#: src/screen_help.c:65
+#: src/screen_help.c:78
 msgid "Global"
 msgstr "全局设定"
 
-#: src/screen_help.c:96 src/command.c:95
+#: src/screen_help.c:109 src/command.c:109
 msgid "Playlist screen"
 msgstr "列表页面"
 
-#: src/screen_help.c:98
+#: src/screen_help.c:111
 msgid "Play"
 msgstr "播放"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:114
 msgid "Move song up"
 msgstr "上移"
 
-#: src/screen_help.c:102
+#: src/screen_help.c:115
 msgid "Move song down"
 msgstr "下移"
 
-#: src/screen_help.c:105
+#: src/screen_help.c:118
 msgid "Center"
 msgstr "当前播放项居中显示"
 
-#: src/screen_help.c:110 src/command.c:97
+#: src/screen_help.c:123 src/command.c:111
 msgid "Browse screen"
 msgstr "目录页面"
 
-#: src/screen_help.c:112
+#: src/screen_help.c:125
 msgid "Enter directory/Select and play song"
 msgstr "进入选中目录/播放选中歌曲"
 
-#: src/screen_help.c:114 src/screen_help.c:129
+#: src/screen_help.c:127 src/screen_help.c:142
 msgid "Append song to playlist"
 msgstr "添加到播放列表"
 
-#: src/screen_help.c:116
+#: src/screen_help.c:129
 msgid "Delete playlist"
 msgstr "删除播放列表"
 
-#: src/screen_help.c:124 src/command.c:207
+#: src/screen_help.c:137 src/command.c:218
 msgid "Search screen"
 msgstr "查找页面"
 
-#: src/screen_help.c:127
+#: src/screen_help.c:140
 msgid "Select and play"
 msgstr "选中并播放"
 
-#: src/screen_help.c:136 src/command.c:214
+#: src/screen_help.c:149 src/command.c:228
 msgid "Lyrics screen"
 msgstr "歌词页面"
 
-#: src/screen_help.c:138
+#: src/screen_help.c:151
 msgid "View Lyrics"
 msgstr "查看歌词"
 
-#: src/screen_help.c:139
+#: src/screen_help.c:152
 msgid "(Re)load lyrics"
 msgstr "(重新)加载歌词"
 
-#: src/screen_help.c:140
+#: src/screen_help.c:153
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:141
+#: src/screen_help.c:154
 msgid "Explicitly download lyrics"
 msgstr "精确下载歌词"
 
-#: src/screen_help.c:142
+#: src/screen_help.c:155
 msgid "Save lyrics"
 msgstr "保存歌词"
 
-#: src/screen_help.c:147 src/command.c:225
+#: src/screen_help.c:160 src/command.c:239
 msgid "Outputs screen"
 msgstr "输出页面"
 
-#: src/screen_help.c:149
+#: src/screen_help.c:162
 msgid "Enable/disable output"
 msgstr "启用/禁用音频输出"
 
@@ -539,42 +539,95 @@ msgstr "启用 '%s' 输出"
 msgid "Output '%s' disabled"
 msgstr "禁用 '%s' 输出"
 
-#: src/screen_song.c:109
+#: src/screen_song.c:118
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:233
+#: src/screen_song.c:193
 msgid "Composer"
 msgstr "作曲"
 
-#: src/screen_song.c:234
+#: src/screen_song.c:194
 msgid "Name"
 msgstr "名字"
 
-#: src/screen_song.c:235
+#: src/screen_song.c:195
 msgid "Disc"
 msgstr "碟片"
 
-#: src/screen_song.c:236
+#: src/screen_song.c:196
 msgid "Track"
 msgstr "音轨"
 
-#: src/screen_song.c:237
+#: src/screen_song.c:197
 msgid "Date"
 msgstr "日期"
 
-#: src/screen_song.c:238
+#: src/screen_song.c:198
 msgid "Genre"
 msgstr "流派"
 
-#: src/screen_song.c:239
+#: src/screen_song.c:199
 msgid "Comment"
 msgstr "注释"
 
-#: src/screen_song.c:240
+#: src/screen_song.c:200
 msgid "Path"
 msgstr "路径"
 
+#: src/screen_song.c:201
+msgid "Bitrate"
+msgstr ""
+
+#: src/screen_song.c:228
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/screen_song.c:244
+#, fuzzy
+msgid "Number of artists"
+msgstr "%s 的专辑:"
+
+#: src/screen_song.c:245
+msgid "Number of albums"
+msgstr ""
+
+#: src/screen_song.c:246
+msgid "Number of songs"
+msgstr ""
+
+#: src/screen_song.c:247
+msgid "Uptime"
+msgstr ""
+
+#: src/screen_song.c:248
+#, fuzzy
+msgid "DB last updated"
+msgstr "数据库已更新"
+
+#: src/screen_song.c:249
+#, fuzzy
+msgid "Playtime"
+msgstr "播放"
+
+#: src/screen_song.c:250
+msgid "DB playtime"
+msgstr ""
+
+#: src/screen_song.c:266
+msgid "MPD statistics"
+msgstr ""
+
+#: src/screen_song.c:310
+#, fuzzy
+msgid "Selected song"
+msgstr "查看歌曲信息"
+
+#: src/screen_song.c:322
+msgid "Currently playing song"
+msgstr ""
+
 #: src/command.c:69
 msgid "Key configuration screen"
 msgstr "快捷键设置页面"
@@ -591,264 +644,298 @@ msgstr "向上移动光标"
 msgid "Move cursor down"
 msgstr "向下移动光标"
 
-#: src/command.c:80 src/command.c:267
+#: src/command.c:80
+#, fuzzy
+msgid "Move cursor to top of screen"
+msgstr "向下移动光标"
+
+#: src/command.c:82
+#, fuzzy
+msgid "Move cursor to middle of screen"
+msgstr "向下移动光标"
+
+#: src/command.c:84
+msgid "Move cursor to bottom of screen"
+msgstr ""
+
+#: src/command.c:86 src/command.c:281
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:82 src/command.c:269
+#: src/command.c:88 src/command.c:283
 msgid "End"
 msgstr "End"
 
-#: src/command.c:84
+#: src/command.c:90
 msgid "Page up"
 msgstr "上一页"
 
-#: src/command.c:86
+#: src/command.c:92
 msgid "Page down"
 msgstr "下一页"
 
-#: src/command.c:88
+#: src/command.c:94
 msgid "Visual selection"
 msgstr "可视化选择"
 
-#: src/command.c:93
+#: src/command.c:96
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/command.c:98
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/command.c:100
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/command.c:102
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/command.c:107
 msgid "Help screen"
 msgstr "帮助页面"
 
-#: src/command.c:102
+#: src/command.c:116
 msgid "Play/Enter directory"
 msgstr "播放/进入 目录"
 
-#: src/command.c:104
+#: src/command.c:118
 msgid "Pause"
 msgstr "暂停"
 
-#: src/command.c:106
+#: src/command.c:120
 msgid "Stop"
 msgstr "停止"
 
-#: src/command.c:108
+#: src/command.c:122
 msgid "Crop"
 msgstr "剪切"
 
-#: src/command.c:110
+#: src/command.c:124
 msgid "Next track"
 msgstr "下一曲"
 
-#: src/command.c:112
+#: src/command.c:126
 msgid "Previous track"
 msgstr "上一曲"
 
-#: src/command.c:114
+#: src/command.c:128
 msgid "Seek forward"
 msgstr "快进"
 
-#: src/command.c:116
+#: src/command.c:130
 msgid "Seek backward"
 msgstr "快退"
 
-#: src/command.c:118
+#: src/command.c:132
 msgid "Increase volume"
 msgstr "增加音量"
 
-#: src/command.c:120
+#: src/command.c:134
 msgid "Decrease volume"
 msgstr "降低音量"
 
-#: src/command.c:122
+#: src/command.c:136
 msgid "Select/deselect song in playlist"
 msgstr "添加/删除选中文件到播放列表"
 
-#: src/command.c:124
+#: src/command.c:138
 msgid "Select all listed items"
 msgstr "选中所有列出的项"
 
-#: src/command.c:126
+#: src/command.c:140
 msgid "Delete song from playlist"
 msgstr "从播放列表中删除歌曲"
 
-#: src/command.c:128
+#: src/command.c:142
 msgid "Shuffle playlist"
 msgstr "随机列表"
 
-#: src/command.c:130
+#: src/command.c:144
 msgid "Clear playlist"
 msgstr "清除播放列表"
 
-#: src/command.c:132
+#: src/command.c:146
 msgid "Toggle repeat mode"
 msgstr "切换重复模式"
 
-#: src/command.c:134
+#: src/command.c:148
 msgid "Toggle random mode"
 msgstr "切换随机模式"
 
-#: src/command.c:136
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "切换淡入淡出模式"
 
-#: src/command.c:138
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "更新此数据库"
 
-#: src/command.c:140
+#: src/command.c:154
 msgid "Save playlist"
 msgstr "保存播放列表"
 
-#: src/command.c:142
+#: src/command.c:156
 msgid "Add url/file to playlist"
 msgstr "添加链接/路径到播放列表"
 
-#: src/command.c:145
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "进入根目录"
 
-#: src/command.c:147
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "进入父目录"
 
-#: src/command.c:151
-msgid "View the song"
-msgstr "查看歌曲信息"
-
-#: src/command.c:155
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "定位到音乐所在目录"
 
-#: src/command.c:159
+#: src/command.c:168
 msgid "Move item up"
 msgstr "上移"
 
-#: src/command.c:161
+#: src/command.c:170
 msgid "Move item down"
 msgstr "下移"
 
-#: src/command.c:163
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "刷新页面"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:170
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "切换查找模式"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:174
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "切换自动居中模式"
 
-#: src/command.c:179
+#: src/command.c:188
 msgid "Next screen"
 msgstr "下一页面"
 
-#: src/command.c:181
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "上一页面"
 
-#: src/command.c:186
+#: src/command.c:192
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/command.c:197
 msgid "Forward find"
 msgstr "前向查找"
 
-#: src/command.c:188
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "查找下一个"
 
-#: src/command.c:190
+#: src/command.c:201
 msgid "Backward find"
 msgstr "后向查找"
 
-#: src/command.c:192
+#: src/command.c:203
 msgid "Backward find previous"
 msgstr "查找前一个"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:197
+#: src/command.c:208
 msgid "Jump to"
 msgstr "跳转到"
 
-#: src/command.c:203
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "艺术家页面"
 
-#: src/command.c:209
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "更改搜索模式"
 
+#: src/command.c:224
+msgid "View the selected and the currently playing song"
+msgstr ""
+
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:218
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:220
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "更新歌词"
 
-#: src/command.c:249
+#: src/command.c:263
 msgid "Undefined"
 msgstr "未定义的"
 
-#: src/command.c:251
+#: src/command.c:265
 msgid "Space"
 msgstr "Space"
 
-#: src/command.c:253
+#: src/command.c:267
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:255
+#: src/command.c:269
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:257
+#: src/command.c:271
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:259
+#: src/command.c:273
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:261
+#: src/command.c:275
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:263
+#: src/command.c:277
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:265
+#: src/command.c:279
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:271
+#: src/command.c:285
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:273
+#: src/command.c:287
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:275
+#: src/command.c:289
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:277
+#: src/command.c:291
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:279
+#: src/command.c:293
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:281
+#: src/command.c:295
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:492 src/command.c:498
+#: src/command.c:506 src/command.c:512
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
@@ -872,22 +959,22 @@ msgid "Terminal lacks color capabilities"
 msgstr "终端不支持彩色"
 
 #. To translators: prefix for error messages
-#: src/conf.c:90
+#: src/conf.c:91
 msgid "Error"
 msgstr "错误"
 
-#: src/conf.c:98 src/conf.c:107
+#: src/conf.c:99 src/conf.c:108
 msgid "Malformed hotkey definition"
 msgstr "不正确的快捷键定义"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:134
+#: src/conf.c:135
 msgid "Unknown command"
 msgstr "未知命令"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:147
+#: src/conf.c:148
 msgid "Incomplete hotkey configuration"
 msgstr "不完整的快捷键配置"
 
@@ -895,54 +982,54 @@ msgstr "不完整的快捷键配置"
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:179
+#: src/conf.c:180
 msgid "Bad time display type"
 msgstr "错误的时间显示格式"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:194
+#: src/conf.c:195
 msgid "Missing '='"
 msgstr "缺少 '='"
 
-#: src/conf.c:250
+#: src/conf.c:251
 msgid "Bad color name"
 msgstr "错误的颜色名"
 
-#: src/conf.c:259
+#: src/conf.c:260
 msgid "Incomplete color definition"
 msgstr "不完整的颜色定义"
 
-#: src/conf.c:265
+#: src/conf.c:266
 msgid "Invalid number"
 msgstr "无效的数字"
 
-#: src/conf.c:273
+#: src/conf.c:274
 msgid "Malformed color definition"
 msgstr "不正确的颜色定义"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:308
+#: src/conf.c:309
 msgid "Unknown screen name"
 msgstr "未知的页面名"
 
-#: src/conf.c:465
+#: src/conf.c:468
 msgid "Unknown configuration parameter"
 msgstr "未知的配置参数"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:219 src/options.c:222
+#: src/options.c:220 src/options.c:223
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Gao Jie https://launchpad.net/~kindmail"
 
-#: src/list_window.c:387
+#: src/list_window.c:476
 msgid "Visual selection disabled"
 msgstr "关闭可视选择模式"
 
-#: src/list_window.c:393
+#: src/list_window.c:482
 msgid "Visual selection enabled"
 msgstr "打开可视选择模式"