interruption of lyrics loading + po blabla

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

1 files changed, 258 insertions, 136 deletions

diff --git a/po/no.po b/po/no.po
index 9ad676466..fd9be2b6e 100644
--- a/po/no.po
+++ b/po/no.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-04 21:55+0100\n"
+"POT-Creation-Date: 2006-08-05 20:19+0000\n"
 "PO-Revision-Date: 2004-06-05 18:16+0200\n"
 "Last-Translator: Ole R. Thorsen <ole.rth@gmail.com>\n"
 "Language-Team: no <no@li.org>\n"
@@ -16,124 +16,135 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/ncmpc.h:36
+#: src/ncmpc.h:42
 msgid "y"
 msgstr "j"
 
-#: src/ncmpc.h:37
+#: src/ncmpc.h:43
 msgid "n"
 msgstr ""
 
-#: src/main.c:133
+#: src/main.c:133 src/main.c:140
 msgid "Exiting..."
 msgstr "Avslutter..."
 
-#: src/main.c:266
+#: src/main.c:290
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
 msgstr "MPD versjon %d.%d.%d er for gammel - oppgrader til versjon 0.11.x \n"
 
-#: src/main.c:318
+#: src/main.c:342
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Kobler til %s... [Trykk %s for å avslutte]"
 
-#: src/main.c:330
+#: src/main.c:354
 #, c-format
 msgid "Connected to %s!"
 msgstr "Koblet til %s!"
 
-#: src/screen.c:170
+#: src/screen.c:224
 msgid ":Help  "
 msgstr ":Hjelp  "
 
-#: src/screen.c:174
+#: src/screen.c:228
 msgid ":Playlist  "
 msgstr ":Spilleliste  "
 
-#: src/screen.c:178
+#: src/screen.c:232
 msgid ":Browse  "
 msgstr ":Filer  "
 
-#: src/screen.c:183
+#: src/screen.c:237
+#, fuzzy
+msgid ":Artist  "
+msgstr ":Spilleliste  "
+
+#: src/screen.c:243
 msgid ":Search  "
 msgstr ":Søk  "
 
-#: src/screen.c:188
+#: src/screen.c:249
+#, fuzzy
+msgid ":Lyrics  "
+msgstr ":Spilleliste  "
+
+#: src/screen.c:254
 msgid "Volume n/a "
 msgstr "Volum: n/a "
 
-#: src/screen.c:192
+#: src/screen.c:258
 #, c-format
 msgid " Volume %d%%"
 msgstr " Volum: %d%%"
 
-#: src/screen.c:271
+#: src/screen.c:338
 msgid "Playing:"
 msgstr "Spiller:"
 
-#: src/screen.c:274
+#: src/screen.c:341
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/screen.c:390 src/screen.c:499
+#: src/screen.c:471 src/screen.c:580
+#, c-format
 msgid "Error: Screen to small!\n"
 msgstr "Feil: Terminalen er for liten!\n"
 
-#: src/screen.c:644
+#: src/screen.c:732
 msgid "Repeat is on"
 msgstr "Repeter er på"
 
-#: src/screen.c:645
+#: src/screen.c:733
 msgid "Repeat is off"
 msgstr "Repeter er av"
 
-#: src/screen.c:648
+#: src/screen.c:736
 msgid "Random is on"
 msgstr "Random er på"
 
-#: src/screen.c:649
+#: src/screen.c:737
 msgid "Random is off"
 msgstr "Random er av"
 
-#: src/screen.c:652
+#: src/screen.c:740
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:655
+#: src/screen.c:743
 msgid "Database updated!"
 msgstr "Databasen er oppdatert!"
 
-#: src/screen.c:817
+#: src/screen.c:905
 msgid "Shuffled playlist!"
 msgstr "Tilfeldigjort spillelisten!"
 
-#: src/screen.c:821
+#: src/screen.c:909
 msgid "Cleared playlist!"
 msgstr "Sletter spillelisten!"
 
-#: src/screen.c:839
+#: src/screen.c:927 src/screen_file.c:655
 msgid "Database update started!"
 msgstr "Oppdaterar databasen!"
 
-#: src/screen.c:842 src/screen_file.c:673
+#: src/screen.c:930 src/screen_file.c:663
 msgid "Database update running..."
 msgstr "Databasen oppdateres..."
 
-#: src/screen.c:855
+#: src/screen.c:943
 msgid "Find mode: Wrapped"
 msgstr "Søkt rundt (starter på ny)"
 
-#: src/screen.c:856
+#: src/screen.c:944
 msgid "Find mode: Normal"
 msgstr "Søk normalt (til slutt/begynnelse)"
 
-#: src/screen.c:861
+#: src/screen.c:949
 msgid "Auto center mode: On"
 msgstr "Automatisk sentrering er på"
 
-#: src/screen.c:862
+#: src/screen.c:950
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er av"
 
@@ -145,121 +156,187 @@ msgstr "Søk: "
 msgid "Find backward: "
 msgstr "Søk (bakover): "
 
-#: src/screen_utils.c:165
+#: src/screen_utils.c:166
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Fant ikke '%s'"
 
-#: src/screen_play.c:155
+#: src/screen_play.c:156
 msgid "Save playlist as: "
 msgstr "Lagre spillelisten som: "
 
-#: src/screen_play.c:185
+#: src/screen_play.c:186
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Erstatt '%s' [%s/%s] ? "
 
-#: src/screen_play.c:199 src/screen_file.c:319 src/screen_keydef.c:162
+#: src/screen_play.c:200 src/screen_file.c:313 src/screen_keydef.c:162
 msgid "Aborted!"
 msgstr "Avbrutt!"
 
 #. success
-#: src/screen_play.c:205
+#: src/screen_play.c:206
 #, c-format
 msgid "Saved %s"
 msgstr "Lagret %s"
 
-#: src/screen_play.c:269
+#: src/screen_play.c:270
 msgid "Add: "
 msgstr "Legg til: "
 
-#: src/screen_play.c:324
+#: src/screen_play.c:325
 msgid "Playlist"
 msgstr "Spilleliste"
 
-#: src/screen_play.c:326
+#: src/screen_play.c:327
 #, c-format
 msgid "Playlist on %s"
 msgstr "Spilleliste på %s"
 
-#: src/screen_file.c:282
+#: src/screen_file.c:256
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Henter spilleliste %s..."
 
-#: src/screen_file.c:304
+#: src/screen_file.c:298
 msgid "You can only delete playlists!"
 msgstr "Du kan bare slette spillelister!"
 
-#: src/screen_file.c:311
+#: src/screen_file.c:305
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slette '%s' [%s/%s] ? "
 
-#: src/screen_file.c:327
+#: src/screen_file.c:321
 msgid "Playlist deleted!"
 msgstr "Spillelisten slettet!"
 
-#: src/screen_file.c:346 src/screen_file.c:467 src/screen_file.c:493
+#: src/screen_file.c:340 src/screen_file.c:461 src/screen_file.c:487
 #, c-format
 msgid "Adding '%s' to playlist\n"
 msgstr "Legger '%s' til spillelisten\n"
 
-#: src/screen_file.c:397
+#: src/screen_file.c:391
 #, c-format
 msgid "Adding directory %s...\n"
 msgstr "Legger til mappen %s...\n"
 
-#: src/screen_file.c:569
+#: src/screen_file.c:552
 #, c-format
 msgid "Browse: %s"
 msgstr "Filer: %s"
 
-#: src/screen_file.c:658
+#: src/screen_file.c:644
 msgid "Screen updated!"
 msgstr "pppdatert!"
 
-#: src/screen_file.c:665
+#: src/screen_file.c:652
 #, c-format
 msgid "Database update of %s started!"
 msgstr "oppdaterer databasen ifra %s!"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:56
+msgid "artist"
+msgstr ""
+
+#: src/screen_search.c:57
+msgid "album"
+msgstr ""
+
+#: src/screen_search.c:58
+#, fuzzy
+msgid "title"
+msgstr "Tittel"
+
+#: src/screen_search.c:59
+#, fuzzy
+msgid "track"
+msgstr "Neste"
+
+#: src/screen_search.c:60
+#, fuzzy
+msgid "name"
+msgstr "Filnavn"
+
+#: src/screen_search.c:61
+msgid "genre"
+msgstr ""
+
+#: src/screen_search.c:62
+msgid "date"
+msgstr ""
+
+#: src/screen_search.c:63
+msgid "composer"
+msgstr ""
+
+#: src/screen_search.c:64
+msgid "performer"
+msgstr ""
+
+#: src/screen_search.c:65
+msgid "comment"
+msgstr ""
+
+#: src/screen_search.c:66
+#, fuzzy
+msgid "file"
+msgstr "Tittel"
+
+#: src/screen_search.c:100
 msgid "Title"
 msgstr "Tittel"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:101
 msgid "Artist"
 msgstr ""
 
-#: src/screen_search.c:52
+#: src/screen_search.c:102
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:53
+#: src/screen_search.c:103
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/screen_search.c:114
+#: src/screen_search.c:244
+#, c-format
+msgid "Bad search tag %s"
+msgstr ""
+
+#: src/screen_search.c:251
+#, c-format
+msgid "No argument for search tag %s"
+msgstr ""
+
+#: src/screen_search.c:323
 msgid "Search: "
 msgstr "Søk: "
 
-#: src/screen_search.c:162
+#. if( pattern==NULL )
+#. search_new(screen, c);
+#. else
+#: src/screen_search.c:379
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Trykk på %s for ett nytt søk"
 
-#: src/screen_search.c:214
+#: src/screen_search.c:435
+#, fuzzy, c-format
+msgid "Search: %s"
+msgstr "Søk: "
+
+#: src/screen_search.c:438
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Søk: Resultater %s [%s]"
 
-#: src/screen_search.c:218
+#: src/screen_search.c:442
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Trykk på %s for ett nytt søk [%s]"
 
-#: src/screen_search.c:252
+#: src/screen_search.c:476
 #, c-format
 msgid "Search mode: %s"
 msgstr "Søk etter: %s"
@@ -344,308 +421,351 @@ msgstr "Klokke"
 msgid "Keys - Movement"
 msgstr "Taster - Navigasjon"
 
-#: src/screen_help.c:68
+#: src/screen_help.c:69
 msgid "Keys - Global"
 msgstr "Taster - Globale"
 
-#: src/screen_help.c:95
+#: src/screen_help.c:96
 msgid "Keys - Playlist screen"
 msgstr "Taster - Spilliste"
 
-#: src/screen_help.c:97
+#: src/screen_help.c:98
 msgid "Play"
 msgstr "Start/spill markert"
 
-#: src/screen_help.c:100
+#: src/screen_help.c:101
 msgid "Move song up"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:101
+#: src/screen_help.c:102
 msgid "Move song down"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:104
+#: src/screen_help.c:105
 msgid "Center"
 msgstr "Sentrer"
 
-#: src/screen_help.c:109
+#: src/screen_help.c:110
 msgid "Keys - Browse screen"
 msgstr "Taster - Filer"
 
-#: src/screen_help.c:111
+#: src/screen_help.c:112
 msgid "Enter directory/Select and play song"
 msgstr "Velg bibliotek/Legg til spillisten og spill sang"
 
-#: src/screen_help.c:113
+#: src/screen_help.c:115
 msgid "Delete playlist"
 msgstr "Slett spilleliste"
 
-#: src/screen_help.c:119
+#: src/screen_help.c:121
 msgid "Keys - Search screen"
 msgstr "Taster - Database søk"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:123
 msgid "Search"
 msgstr "Søk"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:124
 msgid "Select and play"
 msgstr "Legg til spillelisten og spill"
 
-#: src/screen_help.c:208
+#: src/screen_help.c:131
+#, fuzzy
+msgid "Keys - Lyrics screen"
+msgstr "Taster - Spilliste"
+
+#: src/screen_help.c:133
+msgid "View Lyrics"
+msgstr ""
+
+#: src/screen_help.c:134
+msgid "(Re)load lyrics"
+msgstr ""
+
+#: src/screen_help.c:135
+msgid "Interrupt retrieval"
+msgstr ""
+
+#: src/screen_help.c:218
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/command.c:70
+#: src/screen_lyrics.c:421
+msgid "Lyrics  [No connection]"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+msgid "Lyrics  [Not found]"
+msgstr ""
+
+#: src/screen_lyrics.c:423
+msgid "Lyrics  [retrieving]"
+msgstr ""
+
+#: src/command.c:71
 msgid "Key configuration screen"
 msgstr "Tastaturkonfigurasjon"
 
-#: src/command.c:73
+#: src/command.c:74
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/command.c:77
+#: src/command.c:78
 msgid "Move cursor up"
 msgstr "Flytt markør opp"
 
-#: src/command.c:79
+#: src/command.c:80
 msgid "Move cursor down"
 msgstr "Flytt markør ned"
 
-#: src/command.c:81
+#: src/command.c:82
 msgid "Home "
 msgstr "Markøren til den første raden"
 
-#: src/command.c:83
+#: src/command.c:84
 msgid "End "
 msgstr "Markøren til den siste raden"
 
-#: src/command.c:85
+#: src/command.c:86
 msgid "Page up"
 msgstr "Markøren en side opp"
 
-#: src/command.c:87
+#: src/command.c:88
 msgid "Page down"
 msgstr "Markøren en side ned"
 
-#: src/command.c:92
+#: src/command.c:93
 msgid "Help screen"
 msgstr "Hjelp"
 
-#: src/command.c:94
+#: src/command.c:95
 msgid "Playlist screen"
 msgstr "Spilleliste"
 
-#: src/command.c:96
+#: src/command.c:97
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/command.c:101
+#: src/command.c:102
 msgid "Play/Enter directory"
 msgstr "Spill/Velg mappe"
 
-#: src/command.c:103
+#: src/command.c:104
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:105
+#: src/command.c:106
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/command.c:107
+#: src/command.c:108
 msgid "Next track"
 msgstr "Neste"
 
-#: src/command.c:109
+#: src/command.c:110
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:111
+#: src/command.c:112
 msgid "Seek forward"
 msgstr "Spol/Søk framover"
 
-#: src/command.c:113
+#: src/command.c:114
 msgid "Seek backward"
 msgstr "Spol/Søk tilbake"
 
-#: src/command.c:115
+#: src/command.c:116
 msgid "Increase volume"
 msgstr "Øk volumet"
 
-#: src/command.c:117
+#: src/command.c:118
 msgid "Decrease volume"
 msgstr "Demp volumet"
 
-#: src/command.c:119
+#: src/command.c:120
 msgid "Select/deselect song in playlist"
 msgstr "Legg til/Fjern fra spillelisten"
 
-#: src/command.c:121
+#: src/command.c:122
 msgid "Delete song from playlist"
 msgstr "Ta bort/slett"
 
-#: src/command.c:123
+#: src/command.c:124
 msgid "Shuffle playlist"
 msgstr "Tilfeldiggjør spilleliste"
 
-#: src/command.c:125
+#: src/command.c:126
 msgid "Clear playlist"
 msgstr "Tøm spillelisten"
 
-#: src/command.c:127
+#: src/command.c:128
 msgid "Toggle repeat mode"
 msgstr "Repeat På/Av"
 
-#: src/command.c:129
+#: src/command.c:130
 msgid "Toggle random mode"
 msgstr "Random På/Av"
 
-#: src/command.c:131
+#: src/command.c:132
 msgid "Toggle crossfade mode"
 msgstr "Crossfade På/Av"
 
-#: src/command.c:133
+#: src/command.c:134
 msgid "Start a music database update"
 msgstr "Oppdater databasen"
 
-#: src/command.c:135
+#: src/command.c:136
 msgid "Save playlist"
 msgstr "Lagre spillelisten"
 
-#: src/command.c:137
+#: src/command.c:138
 msgid "Add url/file to playlist"
 msgstr "Legg til URL eller fil til spillelisten"
 
-#: src/command.c:142
+#: src/command.c:143
 msgid "Move item up"
 msgstr "Flytt opp"
 
-#: src/command.c:144
+#: src/command.c:145
 msgid "Move item down"
 msgstr "Flytt ned"
 
-#: src/command.c:146
+#: src/command.c:147
 msgid "Update screen"
 msgstr "Oppdater"
 
-#: src/command.c:151
+#: src/command.c:152
 msgid "Toggle find mode"
 msgstr "Endre søk instillninger"
 
-#: src/command.c:153
+#: src/command.c:154
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering På/Av"
 
-#: src/command.c:158
+#: src/command.c:159
 msgid "Next screen"
 msgstr "Neste skjerm"
 
-#: src/command.c:160
+#: src/command.c:161
 msgid "Previous screen"
 msgstr "Forrige skjerm"
 
-#: src/command.c:165
+#: src/command.c:166
 msgid "Forward find"
 msgstr "Søk"
 
-#: src/command.c:167
+#: src/command.c:168
 msgid "Forward find next"
 msgstr "Fremover Søking"
 
-#: src/command.c:169
+#: src/command.c:170
 msgid "Backward find"
 msgstr "Søk bakover"
 
-#: src/command.c:171
+#: src/command.c:172
 msgid "Backward find previous"
 msgstr "Bakover Søk forrige"
 
-#: src/command.c:177
+#: src/command.c:178
+#, fuzzy
+msgid "Artist screen"
+msgstr "Spilleliste"
+
+#: src/command.c:182
 msgid "Search screen"
 msgstr "Database søk"
 
-#: src/command.c:179
+#: src/command.c:184
 msgid "Change search mode"
 msgstr "Endre søkemodus"
 
-#: src/command.c:184
+#: src/command.c:189
 msgid "Clock screen"
 msgstr "Klokke"
 
-#: src/command.c:206
+#: src/command.c:193
+#, fuzzy
+msgid "Lyrics screen"
+msgstr "Spilleliste"
+
+#: src/command.c:195
+msgid "Interrupt action"
+msgstr ""
+
+#: src/command.c:218
 msgid "Undefined"
 msgstr "Ikke Definert"
 
-#: src/command.c:208
+#: src/command.c:220
 msgid "Space"
 msgstr "Mellomrom"
 
-#: src/command.c:210
+#: src/command.c:222
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:212
+#: src/command.c:224
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:214
+#: src/command.c:226
 msgid "Delete"
 msgstr "Del"
 
-#: src/command.c:216
+#: src/command.c:228
 msgid "Up"
 msgstr "Opp"
 
-#: src/command.c:218
+#: src/command.c:230
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:220
+#: src/command.c:232
 msgid "Left"
 msgstr "Venstrepil"
 
-#: src/command.c:222
+#: src/command.c:234
 msgid "Right"
 msgstr "Høyrepil"
 
-#: src/command.c:224
+#: src/command.c:236
 msgid "Home"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:238
 msgid "End"
 msgstr ""
 
-#: src/command.c:228
+#: src/command.c:240
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:230
+#: src/command.c:242
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:232
+#: src/command.c:244
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:234
+#: src/command.c:246
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:236
+#: src/command.c:248
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:238
+#: src/command.c:250
 msgid "Insert"
 msgstr "Ins"
 
-#: src/command.c:488
+#: src/command.c:500
 #, c-format
 msgid "Key %s assigned to %s and %s (press %s for the key editor)"
 msgstr "%s tildelt kommandoen %s og %s (trykk %s for å rette)"
 
-#: src/command.c:495 src/command.c:502
+#: src/command.c:507 src/command.c:514
 #, c-format
 msgid "Error: Key %s assigned to %s and %s !!!\n"
 msgstr "Feil: Tasten %s er tildelt både %s og %s !!!\n"
@@ -661,21 +781,23 @@ msgid "Warning: Unknown color field - %s\n"
 msgstr "Advarsel: %s er ikke definert.\n"
 
 #: src/colors.c:267
+#, c-format
 msgid "Terminal lacks support for changing colors!\n"
 msgstr "Terminalen mangler støtte for omdefinering av farger!\n"
 
 #: src/colors.c:284
+#, c-format
 msgid "Terminal lacks color capabilities!\n"
 msgstr "Terminalen mangler støtte for farger!\n"
 
-#: src/support.c:168
+#: src/support.c:187
 #, c-format
 msgid "Error: Unable to convert characters to %s"
 msgstr "Feil ved konvertering av tegn fra UTF-8 til %s"
 
-#: src/support.c:197
+#: src/support.c:216
 msgid "Error: Unable to convert characters to UTF-8"
 msgstr "Feil ved konvertering av tegn til UTF-8"
 
-msgid "Enter directory"
-msgstr "Velg mappe"
+#~ msgid "Enter directory"
+#~ msgstr "Velg mappe"