- updated portugese (thx to zup3r_vock)

and croation language - changed installer timeouts git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1696 b956fd51-792f-4845-bead-9b4dfca2ff2c
author: canni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c> 2009-04-25 16:05:33 +0000
committer: canni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c> 2009-04-25 16:05:33 +0000
commit: 81bd09278aeffe40bf73e3ee4c6613cbeada6859 (patch)
tree: 39e340f723c40a957689504d24431f767d3cf068
parent: d14c9c3a46da40a9f4737ddc4b9cef5d94b0fe74 (diff)
download: usdx-81bd09278aeffe40bf73e3ee4c6613cbeada6859.tar.gz
usdx-81bd09278aeffe40bf73e3ee4c6613cbeada6859.tar.xz
usdx-81bd09278aeffe40bf73e3ee4c6613cbeada6859.zip
4 files changed, 459 insertions, 107 deletions
diff --git a/game/languages/Croatian.ini b/game/languages/Croatian.ini
new file mode 100644
index 00000000..a781ee9e
--- /dev/null
+++ b/game/languages/Croatian.ini
@@ -0,0 +1,328 @@
+[Text]
+SING_LOADING=Učitavanje...
+
+SING_CHOOSE_MODE=Izaberi način igre
+SING_SING=pjevaj
+SING_SING_DESC=brza igra: pjevaj solo ili duet
+
+SING_MULTI=party
+SING_MULTI_DESC=pjevaj u party mode-u
+
+SING_TOOLS=alati
+
+SING_STATS=statistika
+SING_STATS_DESC=pogledaj statistiku
+
+SING_EDITOR=editor
+SING_EDITOR_DESC=napravi svoje pjesme
+
+SING_GAME_OPTIONS=opcije igre
+SING_GAME_OPTIONS_DESC=promijeni postavke
+
+SING_EXIT=izlaz
+SING_EXIT_DESC=izlaz iz igre
+
+SING_OPTIONS=opcije
+SING_OPTIONS_DESC=promijeni postavke
+SING_OPTIONS_WHEREAMI=Opcije
+
+SING_OPTIONS_GAME=igra
+SING_OPTIONS_GRAPHICS=video
+SING_OPTIONS_SOUND=audio
+SING_OPTIONS_LYRICS=tekstovi
+SING_OPTIONS_THEMES=teme
+SING_OPTIONS_RECORD=snimanje
+SING_OPTIONS_ADVANCED=ostalo
+SING_OPTIONS_EXIT=natrag
+
+SING_OPTIONS_GAME_WHEREAMI=Opcije Igre
+SING_OPTIONS_GAME_DESC=osnovne opcije igre
+SING_OPTIONS_GAME_PLAYERS=Br. igrača
+SING_OPTIONS_GAME_DIFFICULTY=Težina
+SING_OPTIONS_GAME_LANGUAGE=Jezik
+SING_OPTIONS_GAME_TABS=Tabovi
+SING_OPTIONS_GAME_SORTING=Sortiranje
+SING_OPTIONS_GAME_DEBUG=Debug
+
+SING_OPTIONS_GRAPHICS_WHEREAMI=Opcije Videa
+SING_OPTIONS_GRAPHICS_DESC=video opcije
+SING_OPTIONS_GRAPHICS_RESOLUTION=Rezolucija
+SING_OPTIONS_GRAPHICS_FULLSCREEN=Cijeli ekran
+SING_OPTIONS_GRAPHICS_DEPTH=Dubina boja
+SING_OPTIONS_GRAPHICS_OSCILLOSCOPE=Osciloskop
+SING_OPTIONS_GRAPHICS_LINEBONUS=Bonus linije
+SING_OPTIONS_GRAPHICS_MOVIE_SIZE=Veličina videa
+SING_OPTIONS_GRAPHICS_VISUALIZER=Vizualizacije
+
+SING_OPTIONS_SOUND_WHEREAMI=Opcije Zvuka
+SING_OPTIONS_SOUND_DESC=postavke zvuka
+SING_OPTIONS_SOUND_MIC_BOOST=Mic boost
+SING_OPTIONS_SOUND_CLICK_ASSIST=Pomoć klikovima
+SING_OPTIONS_SOUND_BEAT_CLICK=Klik na udarce
+SING_OPTIONS_SOUND_THRESHOLD=Threshold
+SING_OPTIONS_SOUND_TWO_PLAYERS_MODE=Igra za dva igrača
+SING_OPTIONS_SOUND_PREVIEWVOLUME=Glasnoća prikaza
+SING_OPTIONS_SOUND_PREVIEWFADING=Fade-in vrijeme
+SING_OPTIONS_SOUND_VOICEPASSTHROUGH=Microphone Playback
+SING_OPTIONS_SOUND_BACKGROUNDMUSIC=Pozadinska glazba
+
+SING_OPTIONS_LYRICS_WHEREAMI=Opcije Tekstova
+SING_OPTIONS_LYRICS_DESC=postavke tekstova
+SING_OPTIONS_LYRICS_FONT=Font
+SING_OPTIONS_LYRICS_EFFECT=Efekt
+SING_OPTIONS_LYRICS_SOLMIZATION=Solmizacija
+SING_OPTIONS_LYRICS_NOTELINES=Crtovlje
+
+SING_OPTIONS_THEMES_WHEREAMI=Opcije Tema
+SING_OPTIONS_THEMES_DESC=postavke tema i skinova
+SING_OPTIONS_THEMES_THEME=Tema
+SING_OPTIONS_THEMES_SKIN=Skin
+SING_OPTIONS_THEMES_COLOR=Boja
+
+SING_OPTIONS_RECORD_WHEREAMI=Opcije Snimanja
+SING_OPTIONS_RECORD_DESC=postavke mikrofona
+SING_OPTIONS_RECORD_CARD=Zv. kartica
+SING_OPTIONS_RECORD_INPUT=Ulaz
+SING_OPTIONS_RECORD_CHANNEL=Kanal
+
+SING_OPTIONS_ADVANCED_WHEREAMI=Ostale Opcije
+SING_OPTIONS_ADVANCED_DESC=ostale postavke
+SING_OPTIONS_ADVANCED_EFFECTSING=Efekti kod pjevanja
+SING_OPTIONS_ADVANCED_SCREENFADE=Fade-out ekrana
+SING_OPTIONS_ADVANCED_LOADANIMATION=Anim. tijekom učit.
+SING_OPTIONS_ADVANCED_ASKBEFOREDEL=Sigurn. pitanja
+SING_OPTIONS_ADVANCED_LINEBONUS=Bonus linije
+SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=Zapamti broj pjev.
+SING_OPTIONS_ADVANCED_ONSONGCLICK=Nakon pjesme
+SING_OPTIONS_ADVANCED_PARTYPOPUP=Auto party meni
+
+SING_EDIT=Editor
+SING_EDIT_MENU_DESCRIPTION=napravi svoje pjesme
+SING_EDIT_BUTTON_DESCRIPTION_CONVERT=Učitaj tekst iz midi datoteke
+SING_EDIT_BUTTON_DESCRIPTION_EXIT=natrag
+SING_EDIT_BUTTON_CONVERT=Učitaj
+SING_EDIT_BUTTON_EXIT=natrag
+SING_EDIT_NAVIGATE=upravljanje
+SING_EDIT_SELECT=odaberi
+SING_EDIT_EXIT=natrag
+
+SING_LEGEND_SELECT=odaberi
+SING_LEGEND_NAVIGATE=navigacija
+SING_LEGEND_CONTINUE=nastavi
+SING_LEGEND_ESC=natrag
+
+SING_PLAYER_DESC=unesi ime igrača
+SING_PLAYER_WHEREAMI=Imena igrača
+SING_PLAYER_ENTER_NAME=unesi ime
+
+SING_DIFFICULTY_DESC=odaberi težinu
+SING_DIFFICULTY_WHEREAMI=Težina
+SING_DIFFICULTY_CONTINUE=odabir pjesme
+SING_EASY=Lako
+SING_MEDIUM=Srednje
+SING_HARD=Teško
+
+SING_SONG_SELECTION_DESC=odaberi pjesmu
+SING_SONG_SELECTION_WHEREAMI=Odabir Pjesme
+SING_SONG_SELECTION_GOTO=idi na ..
+SING_SONG_SELECTION=odabir pjesme
+SING_SONG_SELECTION_MENU=meni
+SING_SONG_SELECTION_PLAYLIST=playlista
+SING_SONGS_IN_CAT=Pjesme
+PLAYLIST_CATTEXT=Playlista: %s
+
+SING_TIME=TIME
+SING_TOTAL=ukupno
+SING_MODE=pjevaj solo
+SING_NOTES=note
+SING_GOLDEN_NOTES=zlatne note
+SING_PHRASE_BONUS=bonus
+
+SING_MENU=Glavni Meni
+
+SONG_SCORE=bodovi
+SONG_SCORE_WHEREAMI=Rezultat
+
+SING_SCORE_TONE_DEAF=Bez sluha
+SING_SCORE_AMATEUR=Amater
+SING_SCORE_RISING_STAR=Zvijezda u usponu
+SING_SCORE_LEAD_SINGER=Vodeći pjevač
+SING_SCORE_HIT_ARTIST=Hit Artist
+SING_SCORE_SUPERSTAR=Superstar
+SING_SCORE_ULTRASTAR=Ultrastar
+SING_SCORE_WANNABE=Wannabe
+SING_SCORE_HOPEFUL=Pun nade
+
+SING_TOP_5_CHARTS=top 5 Igrača
+SING_TOP_5_CHARTS_WHEREAMI=top 5
+SING_TOP_5_CHARTS_CONTINUE=odabir pjesme
+
+POPUP_PERFECT=izvanredno!
+POPUP_AWESOME=predivno!
+POPUP_GREAT=odlično!
+POPUP_GOOD=dobro!
+POPUP_NOTBAD=nije loše!
+POPUP_BAD=loše!
+POPUP_POOR=jadno!
+POPUP_AWFUL=grozno!
+
+IMPLODE_GLUE1=, 
+IMPLODE_GLUE2= i 
+
+SONG_MENU_NAME_MAIN=Kolekcija pjesama
+SONG_MENU_PLAY=Pjevaj
+SONG_MENU_CHANGEPLAYERS=Promijeni igrače
+SONG_MENU_EDIT=Uredi
+SONG_MENU_MODI=Pjevaj Modi
+SONG_MENU_CANCEL=Poništi
+
+SONG_MENU_NAME_PLAYLIST=Playliste
+SONG_MENU_PLAYLIST_ADD=Dodaj Pjesmu
+SONG_MENU_PLAYLIST_DEL=Izbriši Pjesmu
+
+SONG_MENU_NAME_PLAYLIST_ADD=Dodaj Pjesmu
+SONG_MENU_PLAYLIST_ADD_NEW=na novu playlistu
+SONG_MENU_PLAYLIST_ADD_EXISTING=na postojeću playlistu
+SONG_MENU_PLAYLIST_NOEXISTING=Nema playlisti.
+
+SONG_MENU_NAME_PLAYLIST_NEW=Nova Playlista
+SONG_MENU_PLAYLIST_NEW_CREATE=Napravi
+SONG_MENU_PLAYLIST_NEW_UNNAMED=Bez imena
+
+SONG_MENU_NAME_PLAYLIST_DEL=Stvarno obrisati?
+SONG_MENU_YES=Da
+SONG_MENU_NO=Ne
+
+SONG_MENU_NAME_PLAYLIST_LOAD=Otvori Playlistu
+SONG_MENU_PLAYLIST_LOAD=otvori
+SONG_MENU_PLAYLIST_DELCURRENT=obriši trenutnu Playlistu
+
+SONG_MENU_NAME_PLAYLIST_DEL=Obriši Playlistu?
+
+SONG_MENU_NAME_PARTY_MAIN=Party Meni
+SONG_MENU_JOKER=Joker
+
+SONG_MENU_NAME_PARTY_JOKER=iskoristi joker
+
+SONG_JUMPTO_DESC=pretraži pjesme
+SONG_JUMPTO_TYPE_DESC=Traži :
+SONG_JUMPTO_TYPE1=Sve
+SONG_JUMPTO_TYPE2=Naslov
+SONG_JUMPTO_TYPE3=Izvođač
+SONG_JUMPTO_SONGSFOUND=%d pjes(a)ma nađeno
+SONG_JUMPTO_NOSONGSFOUND=Niti jedna pjesma nije pronađena.
+SONG_JUMPTO_HELP=Unesi tekst koji želiš tražiti.
+SONG_JUMPTO_CATTEXT=Traži: %s
+
+PARTY_MODE=party mod
+PARTY_DIFFICULTY=Težina
+PARTY_PLAYLIST=Playlist Mod
+PARTY_PLAYLIST_ALL=Sve pjesme
+PARTY_PLAYLIST_CATEGORY=Folder
+PARTY_PLAYLIST_PLAYLIST=Playliste
+PARTY_ROUNDS=Runde
+PARTY_TEAMS=Br. Timova
+PARTY_TEAMS_PLAYER1=Br. Igrača - Tim1
+PARTY_TEAMS_PLAYER2=Br. Igrača - Tim2
+PARTY_TEAMS_PLAYER3=Br. Igrača - Tim3
+
+PARTY_LEGEND_CONTINUE=nastavi
+
+PARTY_OPTIONS_DESC=postavke za party igru
+PARTY_OPTIONS_WHEREAMI=Party Opcije
+
+PARTY_PLAYER_DESC=unesi imena timova i igrača!
+PARTY_PLAYER_WHEREAMI=Party Imena
+PARTY_PLAYER_ENTER_NAME=unesi imena
+PARTY_PLAYER_LEGEND_CONTINUE=započni party-igru
+
+PARTY_ROUND_DESC=sljed. igrači za mikr.
+PARTY_ROUND_WHEREAMI=Party Sljed runda
+PARTY_ROUND_LEGEND_CONTINUE=započni rundu
+
+PARTY_SONG_WHEREAMI=Party Odabir pjesme	 
+PARTY_SONG_LEGEND_CONTINUE=pjevaj	 
+PARTY_SONG_MENU=party meni
+
+PARTY_SCORE_DESC=bodovi zadnje runde
+PARTY_SCORE_WHEREAMI=Party Bodovi
+
+PARTY_WIN_DESC=pobjednik party igre
+PARTY_WIN_WHEREAMI=Party Pobjednik
+PARTY_WIN_LEGEND_CONTINUE=natrag na glavni meni
+
+PARTY_ROUND=Runda
+PARTY_ROUND_WINNER=Pobjednik
+PARTY_NOTPLAYEDYET=nije još odigr.
+PARTY_NOBODY=nitko ni
+NEXT_ROUND=Sljed. runda:
+
+PARTY_DISMISSED=Izbacen!
+PARTY_SCORE_WINS=%s je
+PARTY_SCORE_WINS2=pobijedio!
+
+PLUGIN_HDL_NAME=Zadrži liniju
+PLUGIN_HDL_DESC=Nemoj biti gori od pokazivača na 'rating' baru.
+
+PLUGIN_UNTIL5000_NAME=Do 5000
+PLUGIN_UNTIL5000_DESC=Pobjeđuje onaj tko prvi dođe do 5000 bodova.
+
+PLUGIN_DUELL_NAME=Dvoboj
+PLUGIN_DUELL_DESC=Pjevaj dvoboj do 10000 bodova.
+
+PLUGIN_TEAMDUELL_NAME=Dvoboj timova
+PLUGIN_TEAMDUELL_DESC=Dodaj mikrofon!
+
+PLUGIN_BLIND_NAME=Slijepi način
+PLUGIN_BLIND_DESC=Dvoboj bez gledanja nota.
+
+PLUGIN_BLIND_NOSCORE_NAME=Slijepi način 2
+PLUGIN_BLIND_NOSCORE_DESC=Dvoboj bez gledanja nota i bodova.
+
+PLUGIN_MORE1000_NAME=1000 Više
+PLUGIN_MORE1000_DESC=Pjevajte dok jedan od igrača ne skupi 1000 bod više.
+
+STAT_MAIN=Statistika
+STAT_MAIN_DESC=General
+STAT_MAIN_WHEREAMI=Statistika
+
+STAT_OVERVIEW_INTRO=%0:s Statistika.  \n Zadnji reset je bio %2:.2d.%1:.2d.%3:d
+STAT_OVERVIEW_SONG=%0:d pjesama (%3:d sa Videom), od čega je %1:d pjesama otpjevano a %2:d nije.\n Najpopularnija pjesma je %5:s od %4:s.
+STAT_OVERVIEW_PLAYER=Od zadnjeg reseta bilo je %0:d različitih igrača.\n Najbolji igrač je %1:s sa prosjekom od %2:d bodova.\n %3:s je napravio/la najveći rezultat sa %4:d bodova.
+
+STAT_DETAIL=Statistika
+STAT_DETAIL_WHEREAMI=Detaljna statistika
+
+STAT_NEXT=Sljed. strana
+STAT_PREV=Preth. strana
+STAT_REVERSE=Obrnuti redoslijed
+STAT_PAGE=Strana %0:d od %1:d\n (%2:d od %3:d unosa)
+
+STAT_DESC_SCORES=HighScores
+STAT_DESC_SCORES_REVERSED=LowScores
+STAT_FORMAT_SCORES=%0:s - %1:d  [%2:s] \n (%3:s - %4:s)
+
+STAT_DESC_SINGERS=Najbolji pjevači
+STAT_DESC_SINGERS_REVERSED=Najgori pjevači
+STAT_FORMAT_SINGERS=%0:s \n Prosječni bodovi: %1:d
+
+STAT_DESC_SONGS=Popularne pjesme
+STAT_DESC_SONGS_REVERSED=Nepopularne pjesme
+STAT_FORMAT_SONGS=%0:s - %1:s \n %2:dx otpjevano
+
+STAT_DESC_BANDS=Popularni bendovi
+STAT_DESC_BANDS_REVERSED=Nepopularni bendovi
+STAT_FORMAT_BANDS=%0:s \n %1:dx otpjevano
+
+ERROR_CORRUPT_SONG_FILE_NOT_FOUND=Pjesma se ne može učitati: Datoteka nije nađena
+ERROR_CORRUPT_SONG_NO_NOTES=Pjesma se ne može učitati: Nije nađena niti jedna nota
+ERROR_CORRUPT_SONG_NO_BREAKS=Pjesma se ne može učitati: Nije nađen niti jedan 'linebreak'
+ERROR_CORRUPT_SONG_UNKNOWN_IN_LINE=Pjesma se ne može učitati: Greška u obradi linije %0:d
+
+MSG_ERROR_TITLE=Greška
+MSG_QUESTION_TITLE=Pitanje
+MSG_QUIT_USDX=Napustiti UltraStar?
+MSG_END_PARTY=Napustiti Party igru?
+ERROR_NO_SONGS=Nema učitanih pjesama
+ERROR_NO_PLUGINS=Nema učitanih pluginova
+ERROR_CORRUPT_SONG=Pjesma se ne može učitati.
+\ No newline at end of file
diff --git a/game/languages/old/Portuguese.ini b/game/languages/Portuguese.ini
index ac5cedd6..08a7184a 100644
--- a/game/languages/old/Portuguese.ini
+++ b/game/languages/Portuguese.ini
@@ -14,7 +14,7 @@ SING_STATS=Estatísticas
 SING_STATS_DESC=Ver Estatísticas
 
 SING_EDITOR=Editor
-SING_EDITOR_DESC=Criar cançőes
+SING_EDITOR_DESC=Criar cançăo
 
 SING_GAME_OPTIONS=Opçőes de Jogo
 SING_GAME_OPTIONS_DESC=Alterar configuraçőes de Jogo
@@ -39,23 +39,26 @@ SING_OPTIONS_GAME_WHEREAMI=Opçőes de Jogo
 SING_OPTIONS_GAME_DESC=Configuraçőes Gerais do Jogo
 SING_OPTIONS_GAME_PLAYERS=Jogadores
 SING_OPTIONS_GAME_DIFFICULTY=Dificuldade
-SING_OPTIONS_GAME_LANGUAGE=Linguagem
-SING_OPTIONS_GAME_TABS=Tabulatura
+SING_OPTIONS_GAME_LANGUAGE=Idioma
+SING_OPTIONS_GAME_TABS=Subpastas
 SING_OPTIONS_GAME_SORTING=Ordenaçăo
 SING_OPTIONS_GAME_DEBUG=Modo Debug
 
 SING_OPTIONS_GRAPHICS_WHEREAMI=Opçăo de Gráficos
-SING_OPTIONS_GRAPHICS_DESC=configuraçăo de Gráficos
+SING_OPTIONS_GRAPHICS_DESC=Configuraçăo dos Gráficos
 SING_OPTIONS_GRAPHICS_RESOLUTION=Resoluçăo
 SING_OPTIONS_GRAPHICS_FULLSCREEN=Ecră Total
 SING_OPTIONS_GRAPHICS_DEPTH=Profundidade
+SING_OPTIONS_GRAPHICS_VISUALIZER=Visualizador
 SING_OPTIONS_GRAPHICS_OSCILLOSCOPE=Osciloscópio
 SING_OPTIONS_GRAPHICS_LINEBONUS=Linha Bonus
-SING_OPTIONS_GRAPHICS_MOVIE_SIZE=Tamanho do Filme
+SING_OPTIONS_GRAPHICS_MOVIE_SIZE=Tamanho do Vídeo
 
 SING_OPTIONS_SOUND_WHEREAMI=Opçőes de Som
-SING_OPTIONS_SOUND_DESC=configuraçăo de Som
-SING_OPTIONS_SOUND_MIC_BOOST=Microfone boost
+SING_OPTIONS_SOUND_DESC=Configuraçăo do Som
+SING_OPTIONS_SOUND_VOICEPASSTHROUGH=Playback Microfone
+SING_OPTIONS_SOUND_BACKGROUNDMUSIC=Música de Fundo
+SING_OPTIONS_SOUND_MIC_BOOST=Microfone Boost
 SING_OPTIONS_SOUND_CLICK_ASSIST=Click de Ajuda
 SING_OPTIONS_SOUND_BEAT_CLICK=Click de Batida
 SING_OPTIONS_SOUND_THRESHOLD=Threshold
@@ -64,56 +67,69 @@ SING_OPTIONS_SOUND_PREVIEWVOLUME=Preview Volume
 SING_OPTIONS_SOUND_PREVIEWFADING=Preview Fading
 
 SING_OPTIONS_LYRICS_WHEREAMI=Opçőes de Letras
-SING_OPTIONS_LYRICS_DESC=configuraçăo de Letras
+SING_OPTIONS_LYRICS_DESC=Configuraçăo de Letras
 SING_OPTIONS_LYRICS_FONT=Fonte
 SING_OPTIONS_LYRICS_EFFECT=Efeitos
-SING_OPTIONS_LYRICS_SOLMIZATION=Solmization
+SING_OPTIONS_LYRICS_SOLMIZATION=Solfejo
+SING_OPTIONS_LYRICS_NOTELINES=Pauta
 
 SING_OPTIONS_THEMES_WHEREAMI=Opçăo de Tema
-SING_OPTIONS_THEMES_DESC=configuraçăo de tema e skin
+SING_OPTIONS_THEMES_DESC=Configuraçăo de tema e skin
 SING_OPTIONS_THEMES_THEME=Tema
 SING_OPTIONS_THEMES_SKIN=Skin
 SING_OPTIONS_THEMES_COLOR=Côr
 
 SING_OPTIONS_RECORD_WHEREAMI=Opçőes de Gravaçăo
-SING_OPTIONS_RECORD_DESC=configuraçăo do microfone
+SING_OPTIONS_RECORD_DESC=Configuraçăo do Microfone
 SING_OPTIONS_RECORD_CARD=Placa de Som
 SING_OPTIONS_RECORD_INPUT=Entrada
 SING_OPTIONS_RECORD_CHANNEL=Canal
 
 SING_OPTIONS_ADVANCED_WHEREAMI=Opçőes Avançadas
-SING_OPTIONS_ADVANCED_DESC=opçőes avançadas
+SING_OPTIONS_ADVANCED_DESC=Outras Opçőes
 SING_OPTIONS_ADVANCED_EFFECTSING=Efeitos
 SING_OPTIONS_ADVANCED_SCREENFADE=Fade do Ecră
-SING_OPTIONS_ADVANCED_LOADANIMATION=Abrir Animaçăo
+SING_OPTIONS_ADVANCED_LOADANIMATION=Animaçăo
 SING_OPTIONS_ADVANCED_ASKBEFOREDEL=Segurança
 SING_OPTIONS_ADVANCED_LINEBONUS=Linha de Bónus
 SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=
 SING_OPTIONS_ADVANCED_ONSONGCLICK=Escolha da Cançăo
 SING_OPTIONS_ADVANCED_PARTYPOPUP=Menu de Festa
 
-SING_LEGEND_SELECT=seleccionar
-SING_LEGEND_NAVIGATE=navegar
-SING_LEGEND_CONTINUE=continuar
-SING_LEGEND_ESC=voltar
+SING_EDIT=Editor
+SING_EDIT_MENU_DESCRIPTION=Cria a tua própria cançăo
 
-SING_PLAYER_DESC=introduza nome(s) de jogador(es)
+SING_EDIT_BUTTON_DESCRIPTION_CONVERT=Importar texto de um arquivo MIDI
+SING_EDIT_BUTTON_DESCRIPTION_EXIT=Voltar
+SING_EDIT_BUTTON_CONVERT=Importar
+SING_EDIT_BUTTON_EXIT=Voltar
+
+SING_EDIT_NAVIGATE=Navegar
+SING_EDIT_SELECT=Seleccionar
+SING_EDIT_EXIT=Voltar
+
+SING_LEGEND_SELECT=Seleccionar
+SING_LEGEND_NAVIGATE=Navegar
+SING_LEGEND_CONTINUE=Continuar
+SING_LEGEND_ESC=Voltar
+
+SING_PLAYER_DESC=Introduza o(s) nome(s) do(s) jogador(es)
 SING_PLAYER_WHEREAMI=Nome dos Jogadores
-SING_PLAYER_ENTER_NAME=introduzir nome
+SING_PLAYER_ENTER_NAME=Introduzir Nome
 
-SING_DIFFICULTY_DESC=escolha a dificuldade
+SING_DIFFICULTY_DESC=Nível de Dificuldade
 SING_DIFFICULTY_WHEREAMI=Dificuldade
 SING_DIFFICULTY_CONTINUE=para a escolha da cançăo
 SING_EASY=Fácil
 SING_MEDIUM=Médio
 SING_HARD=Difícil
 
-SING_SONG_SELECTION_DESC=escolha a cançăo
-SING_SONG_SELECTION_WHEREAMI=Escolha de Cançăo
-SING_SONG_SELECTION_GOTO=ir para ..
-SING_SONG_SELECTION=escolha de cançăo
-SING_SONG_SELECTION_MENU=menu
-SING_SONG_SELECTION_PLAYLIST=playlist
+SING_SONG_SELECTION_DESC=Escolha a cançăo
+SING_SONG_SELECTION_WHEREAMI=Selecçăo da Cançăo
+SING_SONG_SELECTION_GOTO=Ir para ..
+SING_SONG_SELECTION=Selecçăo da Cançăo
+SING_SONG_SELECTION_MENU=Menu
+SING_SONG_SELECTION_PLAYLIST=Playlist
 SING_SONGS_IN_CAT=Cançőes
 PLAYLIST_CATTEXT=Playlist: %s
 
@@ -131,14 +147,15 @@ SONG_SCORE_WHEREAMI=Pontuaçăo
 
 SING_SCORE_TONE_DEAF=Ouvido Mouco
 SING_SCORE_AMATEUR=Amador
+SING_SCORE_WANNABE=Promessa
+SING_SCORE_HOPEFUL=Artista
 SING_SCORE_RISING_STAR=Estrela em Ascençăo
 SING_SCORE_LEAD_SINGER=Cantor Principal
-SING_SCORE_HIT_ARTIST=Artista 
 SING_SCORE_SUPERSTAR=SuperStar
 SING_SCORE_ULTRASTAR=UltraStar
 
-SING_TOP_5_CHARTS=5 melhores Jogadores
-SING_TOP_5_CHARTS_WHEREAMI=5 melhores
+SING_TOP_5_CHARTS=5 Melhores Jogadores
+SING_TOP_5_CHARTS_WHEREAMI=Top 5
 SING_TOP_5_CHARTS_CONTINUE=para a escolha da Cançăo
 
 POPUP_PERFECT=Perfeito!
@@ -147,13 +164,13 @@ POPUP_GREAT=Óptimo!
 POPUP_GOOD=Bom!
 POPUP_NOTBAD=Nada Mal!
 POPUP_BAD=Mau!
-POPUP_POOR=Fraco!
+POPUP_POOR=Péssimo!
 POPUP_AWFUL=Horrível!
 
 IMPLODE_GLUE1=, 
 IMPLODE_GLUE2= e 
 
-SONG_MENU_NAME_MAIN=menu de cançőes
+SONG_MENU_NAME_MAIN=Menu de cançőes
 SONG_MENU_PLAY=Cantar
 SONG_MENU_CHANGEPLAYERS=Mudar Jogadores
 SONG_MENU_EDIT=Editar
@@ -173,7 +190,7 @@ SONG_MENU_NAME_PLAYLIST_NEW=Nova Playlist
 SONG_MENU_PLAYLIST_NEW_CREATE=Criar
 SONG_MENU_PLAYLIST_NEW_UNNAMED=Sem nome
 
-SONG_MENU_NAME_PLAYLIST_DELITEM=Apagar mesmo?
+SONG_MENU_NAME_PLAYLIST_DEL=Apagar mesmo?
 SONG_MENU_YES=Sim
 SONG_MENU_NO=Năo
 
@@ -186,9 +203,9 @@ SONG_MENU_NAME_PLAYLIST_DEL=Apagar Playlist?
 SONG_MENU_NAME_PARTY_MAIN=Menu de Festa
 SONG_MENU_JOKER=Joker
 
-SONG_MENU_NAME_PARTY_JOKER=usar joker
+SONG_MENU_NAME_PARTY_JOKER=Usar Joker
 
-SONG_JUMPTO_DESC=procurar Cançăo
+SONG_JUMPTO_DESC=Procurar
 SONG_JUMPTO_TYPE_DESC=Procurar por:
 SONG_JUMPTO_TYPE1=Todos
 SONG_JUMPTO_TYPE2=Título
@@ -198,7 +215,7 @@ SONG_JUMPTO_NOSONGSFOUND=Nenhuma Cançăo encontrada
 SONG_JUMPTO_HELP=Escreva para procurar
 SONG_JUMPTO_CATTEXT=Procurar por: %s
 
-PARTY_MODE=modo Festa
+PARTY_MODE=Modo Festa
 PARTY_DIFFICULTY=Dificuldade
 PARTY_PLAYLIST=Modo Playlist
 PARTY_PLAYLIST_ALL=Todas as Cançőes
@@ -210,40 +227,40 @@ PARTY_TEAMS_PLAYER1=Jogador Equipa1
 PARTY_TEAMS_PLAYER2=Jogador Equipa2
 PARTY_TEAMS_PLAYER3=Jogador Equipa3
 
-PARTY_LEGEND_CONTINUE=continuar
+PARTY_LEGEND_CONTINUE=Continuar
 
-PARTY_OPTIONS_DESC=configuraçőes para o modo festa
+PARTY_OPTIONS_DESC=Configuraçőes para o Modo Festa
 PARTY_OPTIONS_WHEREAMI=Opçőes de Festa
 
-PARTY_PLAYER_DESC=inserir nomes de jogadores e equipas
+PARTY_PLAYER_DESC=Inserir nomes de jogadores e equipas
 PARTY_PLAYER_WHEREAMI=Nomes de Festa
-PARTY_PLAYER_ENTER_NAME=inserir nomes
-PARTY_PLAYER_LEGEND_CONTINUE=iniciar Festa
+PARTY_PLAYER_ENTER_NAME=Inserir nomes
+PARTY_PLAYER_LEGEND_CONTINUE=Iniciar Festa
 
-PARTY_ROUND_DESC=Jogadores seguintes para os microsfones
-PARTY_ROUND_WHEREAMIFesta - Ronda seguinte
-PARTY_ROUND_LEGEND_CONTINUE=inicio da Ronda
+PARTY_ROUND_DESC=Jogadores seguintes para os microfones
+PARTY_ROUND_WHEREAMI=Ronda seguinte
+PARTY_ROUND_LEGEND_CONTINUE=Inicio da Ronda
 
-PARTY_SONG_WHEREAMI=Escolha da Cançăo - Festa 	 
-PARTY_SONG_LEGEND_CONTINUE=cantar
-PARTY_SONG_MENU=menu Festa
+PARTY_SONG_WHEREAMI=Escolha da Cançăo 	 
+PARTY_SONG_LEGEND_CONTINUE=Cantar
+PARTY_SONG_MENU=Menu Festa
 
-PARTY_SCORE_DESC=pontuaçăo da última ronda
+PARTY_SCORE_DESC=Pontuaçăo da última ronda
 PARTY_SCORE_WHEREAMI=Pontos da Festa
 
-PARTY_WIN_DESC=vencedor do Jogo Festa
+PARTY_WIN_DESC=Vencedor do Jogo Festa
 PARTY_WIN_WHEREAMI=Vencedor da Festa
-PARTY_WIN_LEGEND_CONTINUE=voltar ao menu principal
+PARTY_WIN_LEGEND_CONTINUE=Voltar ao Menu Principal
 
 PARTY_ROUND=Ronda
 PARTY_ROUND_WINNER=Vencedor
-PARTY_NOTPLAYEDYET=ainda năo tocadas
-PARTY_NOBODY=ninguém
+PARTY_NOTPLAYEDYET=Năo tocada
+PARTY_NOBODY=Ninguém
 NEXT_ROUND=Ronda seguinte:
 
 PARTY_DISMISSED=Dispensado!
 PARTY_SCORE_WINS=%s 
-PARTY_SCORE_WINS2=ganhou!
+PARTY_SCORE_WINS2=Ganhou!
 
 PLUGIN_HDL_NAME=Manter a linha
 PLUGIN_HDL_DESC=Năo piorar o ponteiro que é mostrado na barra de pontuaçăo
@@ -254,6 +271,9 @@ PLUGIN_UNTIL5000_DESC=Quem obter primeiro 5000 pontos ganha a partida
 PLUGIN_DUELL_NAME=Duelo
 PLUGIN_DUELL_DESC=Fazer um Duelo até aos 10000 pontos.
 
+PLUGIN_TEAMDUELL_NAME=Duelo de equipa
+PLUGIN_TEAMDUELL_DESC=Passa o Microfone!
+
 PLUGIN_BLIND_NAME=Modo Cego
 PLUGIN_BLIND_DESC=Duelo sem ver as notas.
 
@@ -263,7 +283,7 @@ STAT_MAIN_WHEREAMI=Estatísticas
 
 STAT_OVERVIEW_INTRO=%0:s Estatisticas.  \n Último Reset a %2:.2d.%1:.2d.%3:d
 STAT_OVERVIEW_SONG=%0:d Cançőes(%3:d com Video), das quais %1:d já tocaram e %2:d ainda năo tocaram.\n A Cançăo mais popular é %5:s de %4:s.
-STAT_OVERVIEW_PLAYER=Desde o último Reset houve %0:d Jogador(es) diferente(s).\n O Melhor Jogador é %1:s com a Pontuaçăo média de %2:d Pontos.\n %3:s teve a Pontuaçăo mais alta com %4:d Pontos.
+STAT_OVERVIEW_PLAYER=Desde o último Reset houve %0:d Jogador(es) diferente(s).\n O Melhor Jogador é %1:s com a Pontuaçăo Média de %2:d Pontos.\n %3:s teve a Pontuaçăo mais alta com %4:d Pontos.
 
 STAT_DETAIL=Estatísticas
 STAT_DETAIL_WHEREAMI=Estatísticas Detalhadas
@@ -282,17 +302,21 @@ STAT_DESC_SINGERS_REVERSED=Piores Cantores
 STAT_FORMAT_SINGERS=%0:s \n Pontuaçăo Média: %1:d
 
 STAT_DESC_SONGS=Top Cançőes
-STAT_DESC_SONGS_REVERSED=Cançőes menos populares
-STAT_FORMAT_SONGS=%0:s - %1:s \n %2:dx cantaram
+STAT_DESC_SONGS_REVERSED=Cançőes Menos Populares
+STAT_FORMAT_SONGS=%0:s - %1:s \n %2:dx Cantaram
 
 STAT_DESC_BANDS=Top Bandas
-STAT_DESC_BANDS_REVERSED=Bandas menos populares
+STAT_DESC_BANDS_REVERSED=Bandas Menos Populares
 STAT_FORMAT_BANDS=%0:s \n %1:dx Cantaram
 
 MSG_ERROR_TITLE=Erro
 MSG_QUESTION_TITLE=Questăo
 MSG_QUIT_USDX=Deseja mesmo sair do UltraStar?
-MSG_END_PARTY=Deseja mesmo terminar o modo Festa?
+MSG_END_PARTY=Deseja mesmo terminar o Modo Festa?
 ERROR_NO_SONGS=Nenhuma Cançăo lida
 ERROR_NO_PLUGINS=Nenhum Plugin lido
-ERROR_CORRUPT_SONG=Cançăo năo pôde ser lida.
-\ No newline at end of file
+ERROR_CORRUPT_SONG=Cançăo năo pôde ser lida!
+ERROR_CORRUPT_SONG_FILE_NOT_FOUND=A cançăo năo foi encontrada!
+ERROR_CORRUPT_SONG_NO_NOTES=A cançăo năo tem notas!
+ERROR_CORRUPT_SONG_NO_BREAKS=A cançăo năo tem quebras de linha!
+ERROR_CORRUPT_SONG_UNKNOWN_IN_LINE=Erro durante o parsing da linha %0:d
+\ No newline at end of file
diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi
index 07b064ba..a6f37e2a 100644
--- a/installer/UltraStar Deluxe.nsi
+++ b/installer/UltraStar Deluxe.nsi
@@ -374,7 +374,7 @@ Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip
+  NSISdl::download /TIMEOUT=50000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -401,7 +401,7 @@ Section /o "Dead Smiling Pirates - I 18" g2Section2
    SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_song2} $TEMP\Song-I-18.zip
+  NSISdl::download /TIMEOUT=50000 ${download_song2} $TEMP\Song-I-18.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -428,7 +428,7 @@ Section /o "Monkey Shines" s2_sub1_Section1
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -449,7 +449,7 @@ Section /o "I Crush Everything" s2_sub1_Section2
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -470,7 +470,7 @@ Section /o "Not About You" s2_sub1_Section3
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -492,7 +492,7 @@ Section /o "Mr. Fancy Pants" s2_sub1_Section4
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -513,7 +513,7 @@ Section /o "Big Bad World One" s2_sub1_Section5
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -534,7 +534,7 @@ Section /o "Flickr" s2_sub1_Section6
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -555,7 +555,7 @@ Section /o "My Beige Bear" s2_sub1_Section7
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -576,7 +576,7 @@ Section /o "The Future Soon" s2_sub1_Section8
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -597,7 +597,7 @@ Section /o "Ikea" s2_sub1_Section9
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -618,7 +618,7 @@ Section /o "Furry Old Lobster" s2_sub1_Section10
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -639,7 +639,7 @@ Section /o "Code Monkey" s2_sub1_Section11
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -660,7 +660,7 @@ Section /o "I´m Your Moon" s2_sub1_Section12
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -681,7 +681,7 @@ Section /o "First Of May" s2_sub1_Section13
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -702,7 +702,7 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -723,7 +723,7 @@ Section /o "A Talk With George" s2_sub1_Section15
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -744,7 +744,7 @@ Section /o "Creepy Doll" s2_sub1_Section16
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -765,7 +765,7 @@ Section /o "That Spells DNA" s2_sub1_Section17
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -786,7 +786,7 @@ Section /o "When You Go" s2_sub1_Section18
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -807,7 +807,7 @@ Section /o "Better" s2_sub1_Section19
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -828,7 +828,7 @@ Section /o "Shop Vac" s2_sub1_Section20
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -849,7 +849,7 @@ Section /o "I Feel Fantastic" s2_sub1_Section21
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -870,7 +870,7 @@ Section /o "Re: Your Brains" s2_sub1_Section22
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -891,7 +891,7 @@ Section /o "Skullcrusher Mountain" s2_sub1_Section23
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -912,7 +912,7 @@ Section /o "Chiron Beta Prime" s2_sub1_Section24
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -941,7 +941,7 @@ Section /o "Joshua Morin - On The Run" g2Section3
    SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_song3} $TEMP\Song-On-the-run.zip
+  NSISdl::download /TIMEOUT=50000 ${download_song3} $TEMP\Song-On-the-run.zip
 
   Pop $R0 ;Get the return value
     StrCmp $R0 "success" dlok
@@ -963,7 +963,7 @@ Section /o "Pornophonique - Space Invaders" g2Section4
    SetOutPath "$INSTDIR\Songs\Pornophonique - Space Invaders\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_song4} $TEMP\Song-Space-Invaders.zip
+  NSISdl::download /TIMEOUT=50000 ${download_song4} $TEMP\Song-Space-Invaders.zip
 
   Pop $R0 ;Get the return value
     StrCmp $R0 "success" dlok
@@ -986,7 +986,7 @@ Section /o "Shearer - 69" s2_sub2_Section1
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub2_song1} $TEMP\Song-Shearer-69.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $TEMP\Song-Shearer-69.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1007,7 +1007,7 @@ Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1028,7 +1028,7 @@ Section /o "Shearer - Can't stop it" s2_sub2_Section3
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1049,7 +1049,7 @@ Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1070,7 +1070,7 @@ Section /o "Shearer - In My Hand" s2_sub2_Section5
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1091,7 +1091,7 @@ Section /o "Shearer - Man Song" s2_sub2_Section6
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub2_song6} $TEMP\Song-Shearer-MS.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $TEMP\Song-Shearer-MS.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1112,7 +1112,7 @@ Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1133,7 +1133,7 @@ Section /o "Shearer - Stay With Me" s2_sub2_Section8
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1154,7 +1154,7 @@ Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1179,7 +1179,7 @@ Section /o "Steven Dunston - Northern Star" g2Section5
    SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_song5} $TEMP\Song-Northern-Star.zip
+  NSISdl::download /TIMEOUT=50000 ${download_song5} $TEMP\Song-Northern-Star.zip
 
   Pop $R0 ;Get the return value
     StrCmp $R0 "success" dlok
@@ -1203,7 +1203,7 @@ Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1225,7 +1225,7 @@ Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2
    SetOutPath "$INSTDIR\Songs\"
 
 ; Download song:
-  NSISdl::download /TIMEOUT=30000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.zip
+  NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.zip
  
   Pop $R0
     StrCmp $R0 "success" dlok
@@ -1254,7 +1254,7 @@ SectionGroup $(name_section3) Section3
    AddSize 1291
 
 ; Download theme orange:
-  NSISdl::download /TIMEOUT=30000 ${download_theme1} $TEMP\Theme-Orange.zip
+  NSISdl::download /TIMEOUT=50000 ${download_theme1} $TEMP\Theme-Orange.zip
 
   Pop $R0 ;Get the return value
     StrCmp $R0 "success" dlok
@@ -1272,7 +1272,7 @@ SectionEnd
   AddSize 1905
 
 ; Download theme Streetlight:
-  NSISdl::download /TIMEOUT=30000 ${download_theme2} $TEMP\Theme-Streetlight.zip
+  NSISdl::download /TIMEOUT=50000 ${download_theme2} $TEMP\Theme-Streetlight.zip
 
   Pop $R0 ;Get the return value
     StrCmp $R0 "success" dlok
@@ -1291,7 +1291,7 @@ SectionEnd
 
 ; Download theme Vistar:
 
-  NSISdl::download /TIMEOUT=30000 ${download_theme3} $TEMP\Theme-Vistar.zip
+  NSISdl::download /TIMEOUT=50000 ${download_theme3} $TEMP\Theme-Vistar.zip
 
   Pop $R0 ;Get the return value
    StrCmp $R0 "success" dlok
@@ -1310,7 +1310,7 @@ SectionEnd
 
 ; Download theme BlueSensation:
 
-  NSISdl::download /TIMEOUT=30000 ${download_theme4} $TEMP\Theme-BlueSensation.zip
+  NSISdl::download /TIMEOUT=50000 ${download_theme4} $TEMP\Theme-BlueSensation.zip
 
   Pop $R0 ;Get the return value
    StrCmp $R0 "success" dlok
@@ -1330,7 +1330,7 @@ SectionEnd
 
 ; Download theme WhiteSensation:
 
-  NSISdl::download /TIMEOUT=30000 ${download_theme7} $TEMP\Theme-WhiteSensation.zip
+  NSISdl::download /TIMEOUT=50000 ${download_theme7} $TEMP\Theme-WhiteSensation.zip
 
   Pop $R0 ;Get the return value
    StrCmp $R0 "success" dlok
@@ -1349,7 +1349,7 @@ SectionEnd
 
 ; Download theme WiiStar:
 
-  NSISdl::download /TIMEOUT=30000 ${download_theme5} $TEMP\Theme-WiiStar.zip
+  NSISdl::download /TIMEOUT=50000 ${download_theme5} $TEMP\Theme-WiiStar.zip
 
   Pop $R0 ;Get the return value
    StrCmp $R0 "success" dlok
@@ -1368,7 +1368,7 @@ SectionEnd
 
 ; Download theme iStar:
 
-  NSISdl::download /TIMEOUT=30000 ${download_theme6} $TEMP\Theme-iStar.zip
+  NSISdl::download /TIMEOUT=50000 ${download_theme6} $TEMP\Theme-iStar.zip
 
   Pop $R0 ;Get the return value
    StrCmp $R0 "success" dlok
diff --git a/installer/Update.nsi b/installer/Update.nsi
index b8e5a458..e916d3e9 100644
--- a/installer/Update.nsi
+++ b/installer/Update.nsi
@@ -46,9 +46,9 @@ OutFile "ultrastardx-update.exe"
 
 InstallDir "$PROGRAMFILES\${name}"
 
-; Windows Vista:
+; Windows Vista / Windows 7:
 
-RequestExecutionLevel user
+RequestExecutionLevel admin
 
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
 ; Interface Settings
author	canni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c>	2009-04-25 16:05:33 +0000
committer	canni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c>	2009-04-25 16:05:33 +0000
commit	81bd09278aeffe40bf73e3ee4c6613cbeada6859 (patch)
tree	39e340f723c40a957689504d24431f767d3cf068
parent	d14c9c3a46da40a9f4737ddc4b9cef5d94b0fe74 (diff)
download	usdx-81bd09278aeffe40bf73e3ee4c6613cbeada6859.tar.gz usdx-81bd09278aeffe40bf73e3ee4c6613cbeada6859.tar.xz usdx-81bd09278aeffe40bf73e3ee4c6613cbeada6859.zip