diff --git a/Languages/czech.lang b/Languages/czech.lang index fd429d95..eff40d43 100644 --- a/Languages/czech.lang +++ b/Languages/czech.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Stažení potisku DVD" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "" @@ -783,8 +783,8 @@ msgstr "" msgid "Downloading Full LQ Covers" msgstr "" -msgid "Downloading custom Discarts" -msgstr "Stahuji upravené potisky" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "Stahuji soubor ..." @@ -792,8 +792,8 @@ msgstr "Stahuji soubor ..." msgid "Downloading image:" msgstr "Stahuji obrázek:" -msgid "Downloading original Discarts" -msgstr "Stahuji originální potisky" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "Stahuji stránku:" @@ -1026,7 +1026,7 @@ msgstr "Formát" msgid "Formatting, please wait..." msgstr "Formátuji, cekejte prosím ..." -msgid "Found missing images." +msgid "Found missing images" msgstr "" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "" msgid "No favorites selected." msgstr "Oblíbené nejsou oznaceny" -msgid "No file missing!" +msgid "No files missing!" msgstr "Nechybí žádný soubor!" msgid "No games found on the disc" diff --git a/Languages/danish.lang b/Languages/danish.lang index fc340f13..0f6c1443 100644 --- a/Languages/danish.lang +++ b/Languages/danish.lang @@ -651,6 +651,9 @@ msgstr "Disk 1" msgid "Disc 2" msgstr "Disk 2" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Download Disk-billede" @@ -675,9 +678,6 @@ msgstr "Disk-valg Prompt" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "Disk2 skal installeres in ukomprimeret format for at virke med DM(L) v2.6+, er du sikker på du vil installere i komprimeret format?" -msgid "Discarts" -msgstr "Disk-billeder" - msgid "DiskFlip" msgstr "" @@ -783,8 +783,8 @@ msgstr "Downloader Fuld HQ Covers" msgid "Downloading Full LQ Covers" msgstr "Downloader Fuld LQ Covers" -msgid "Downloading custom Discarts" -msgstr "Downloader brugerdefinerede Diskbilleder" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "Downloader fil..." @@ -792,8 +792,8 @@ msgstr "Downloader fil..." msgid "Downloading image:" msgstr "Downloader billede:" -msgid "Downloading original Discarts" -msgstr "Downloader org. Diskbilleder" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "Downloader pagelist:" @@ -1026,7 +1026,7 @@ msgstr "Formatér" msgid "Formatting, please wait..." msgstr "Formaterer, vent venligst..." -msgid "Found missing images." +msgid "Found missing images" msgstr "Fundet manglende billeder" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "Ingen Disk indsat." msgid "No favorites selected." msgstr "Ingen favoritter er valgt." -msgid "No file missing!" +msgid "No files missing!" msgstr "Ingen filer mangler!" msgid "No games found on the disc" diff --git a/Languages/dutch.lang b/Languages/dutch.lang index be59f19a..ed0f0d9f 100644 --- a/Languages/dutch.lang +++ b/Languages/dutch.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Download disk labels" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "Disc2 moet in een ongecomprimeerd formaat worden opgeslagen om te werken met DM (L) V2.6+, weet je zeker dat je wilt installeren in een gecomprimeerd formaat?" -msgid "Discarts" -msgstr "Disk afbeeldingen" - msgid "DiskFlip" msgstr "" @@ -783,8 +783,8 @@ msgstr "HQ volledige hoesjes downloaden" msgid "Downloading Full LQ Covers" msgstr "LQ volledige hoesjes downloaden " -msgid "Downloading custom Discarts" -msgstr "Aangepaste disc afbeeldingen downloaden" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "Bestand downloaden..." @@ -792,8 +792,8 @@ msgstr "Bestand downloaden..." msgid "Downloading image:" msgstr "Afbeelding downloaden:" -msgid "Downloading original Discarts" -msgstr "Originele disc afbeeldingen downloaden" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "Paginalijst downloaden:" @@ -1026,8 +1026,8 @@ msgstr "Formatteer" msgid "Formatting, please wait..." msgstr "Bezig met formatteren..." -msgid "Found missing images." -msgstr "Missende plaatje gevonden." +msgid "Found missing images" +msgstr "Missende plaatje gevonden" msgid "Frame" msgstr "Rand" @@ -1572,7 +1572,7 @@ msgstr "Geen schijf ingevoerd." msgid "No favorites selected." msgstr "Geen favorieten geselecteerd." -msgid "No file missing!" +msgid "No files missing!" msgstr "Geen missende bestanden!" msgid "No games found on the disc" diff --git a/Languages/english.lang b/Languages/english.lang index 39ed0dea..5a5b793e 100644 --- a/Languages/english.lang +++ b/Languages/english.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "" @@ -783,7 +783,7 @@ msgstr "" msgid "Downloading Full LQ Covers" msgstr "" -msgid "Downloading custom Discarts" +msgid "Downloading Custom Disc Artwork" msgstr "" msgid "Downloading file..." @@ -792,7 +792,7 @@ msgstr "" msgid "Downloading image:" msgstr "" -msgid "Downloading original Discarts" +msgid "Downloading Original Disc Artwork" msgstr "" msgid "Downloading pagelist:" @@ -1026,7 +1026,7 @@ msgstr "" msgid "Formatting, please wait..." msgstr "" -msgid "Found missing images." +msgid "Found missing images" msgstr "" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "" msgid "No favorites selected." msgstr "" -msgid "No file missing!" +msgid "No files missing!" msgstr "" msgid "No games found on the disc" diff --git a/Languages/finnish.lang b/Languages/finnish.lang index e0af88c0..435b1539 100644 --- a/Languages/finnish.lang +++ b/Languages/finnish.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Levykuvien lataus" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "Levynvaihto" @@ -783,7 +783,7 @@ msgstr "" msgid "Downloading Full LQ Covers" msgstr "" -msgid "Downloading custom Discarts" +msgid "Downloading Custom Disc Artwork" msgstr "" msgid "Downloading file..." @@ -792,7 +792,7 @@ msgstr "" msgid "Downloading image:" msgstr "" -msgid "Downloading original Discarts" +msgid "Downloading Original Disc Artwork" msgstr "" msgid "Downloading pagelist:" @@ -1026,7 +1026,7 @@ msgstr "Formatoi" msgid "Formatting, please wait..." msgstr "Formatoi, odota..." -msgid "Found missing images." +msgid "Found missing images" msgstr "" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "" msgid "No favorites selected." msgstr "" -msgid "No file missing!" +msgid "No files missing!" msgstr "Ei tiedostoja kadoksissa!" msgid "No games found on the disc" diff --git a/Languages/french.lang b/Languages/french.lang index 4ad8e76d..61680a96 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -651,6 +651,9 @@ msgstr "Disque 1" msgid "Disc 2" msgstr "Disque 2" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Téléch. des labels DVD" @@ -675,9 +678,6 @@ msgstr "Demander choix du disque" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "Le disque 2 doit être installé dans un format non compressé pour fonctionner avec DM(L) v2.6+, voulez-vous vraiment l'installer compressé ?" -msgid "Discarts" -msgstr "Labels DVD" - msgid "DiskFlip" msgstr "Disque uniquement" @@ -783,8 +783,8 @@ msgstr "Téléch. des jaquettes complètes HD" msgid "Downloading Full LQ Covers" msgstr "Téléch. des jaquettes complètes SD" -msgid "Downloading custom Discarts" -msgstr "Téléch. des labels DVD persos" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "Téléchargement du fichier..." @@ -792,8 +792,8 @@ msgstr "Téléchargement du fichier..." msgid "Downloading image:" msgstr "Téléchargement de l'image:" -msgid "Downloading original Discarts" -msgstr "Téléch. des labels DVD originaux" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "Téléch. liste des thèmes :" @@ -1026,8 +1026,8 @@ msgstr "Formater" msgid "Formatting, please wait..." msgstr "Formatage en cours, veuillez patienter..." -msgid "Found missing images." -msgstr "Images manquantes trouvées." +msgid "Found missing images" +msgstr "Images manquantes trouvées" msgid "Frame" msgstr "image" @@ -1572,7 +1572,7 @@ msgstr "Aucun disque inséré." msgid "No favorites selected." msgstr "Pas de favoris sélectionnés" -msgid "No file missing!" +msgid "No files missing!" msgstr "Aucun fichier manquant !" msgid "No games found on the disc" diff --git a/Languages/german.lang b/Languages/german.lang index 7bbeb5d4..bce044cb 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -651,6 +651,9 @@ msgstr "Disk 1" msgid "Disc 2" msgstr "Disk 2" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Disk Cover Download" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "Disk 2 muss unkomprimiert sein, um mit DM(L) 2.6+ zu funktionieren. Sicher, dass du die Disk komprimiert installieren möchtest?" -msgid "Discarts" -msgstr "Diskbilder" - msgid "DiskFlip" msgstr "DiskFlip" @@ -783,8 +783,8 @@ msgstr "Lade Box HQ Cover herunter" msgid "Downloading Full LQ Covers" msgstr "Lade Box LQ Cover herunter" -msgid "Downloading custom Discarts" -msgstr "Lade Community Diskcover herunter" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "Lade Datei herunter..." @@ -792,8 +792,8 @@ msgstr "Lade Datei herunter..." msgid "Downloading image:" msgstr "Lade Bilder herunter:" -msgid "Downloading original Discarts" -msgstr "Lade Diskcover herunter" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "Lade Seitenliste herunter:" @@ -1026,8 +1026,8 @@ msgstr "Formatieren" msgid "Formatting, please wait..." msgstr "Formatiere, bitte warten..." -msgid "Found missing images." -msgstr "Fehlende Bilder gefunden." +msgid "Found missing images" +msgstr "Fehlende Bilder gefunden" msgid "Frame" msgstr "Frame" @@ -1572,7 +1572,7 @@ msgstr "Keine DVD eingelegt" msgid "No favorites selected." msgstr "Keine Favoriten ausgewählt" -msgid "No file missing!" +msgid "No files missing!" msgstr "Keine Datei fehlt!" msgid "No games found on the disc" diff --git a/Languages/greek.lang b/Languages/greek.lang index b47b2948..260af6ab 100644 --- a/Languages/greek.lang +++ b/Languages/greek.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Λήψη ετικετών δίσκων" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "Ετικέτες δίσκου" - msgid "DiskFlip" msgstr "Περιστροφή" @@ -783,8 +783,8 @@ msgstr "Λήψη ολοκληρων εξωφύλλων σε υψηλή ποιό msgid "Downloading Full LQ Covers" msgstr "Λήψη ολοκληρων εξωφύλλων σε χαμηλή ποιότητα..." -msgid "Downloading custom Discarts" -msgstr "Λήψη τροποποιημένων ετικετών δίσκων" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "Λήψη αρχείου..." @@ -792,8 +792,8 @@ msgstr "Λήψη αρχείου..." msgid "Downloading image:" msgstr "Λήψη εικόνας:" -msgid "Downloading original Discarts" -msgstr "Λήψη αυθεντικών ετικετών δίσκων" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "Λήψη διάταξης σελιδών:" @@ -1026,8 +1026,8 @@ msgstr "Ανασυγκρότηση (format)" msgid "Formatting, please wait..." msgstr "Ανασυγκρότηση (format), παρακαλώ περιμένετε..." -msgid "Found missing images." -msgstr "Βρέθηκαν οι εικόνες που λείπουν." +msgid "Found missing images" +msgstr "Βρέθηκαν οι εικόνες που λείπουν" msgid "Frame" msgstr "Καρέ" @@ -1572,7 +1572,7 @@ msgstr "Δεν εισήχθη δίσκος." msgid "No favorites selected." msgstr "Δεν επιλέχθηκαν αγαπημένα." -msgid "No file missing!" +msgid "No files missing!" msgstr "Δεν λείπει κανένα αρχείο!" msgid "No games found on the disc" diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang index 912551dc..92f8160a 100644 --- a/Languages/hungarian.lang +++ b/Languages/hungarian.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Lemezfotó letöltése" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "Lemezforgatás" @@ -783,7 +783,7 @@ msgstr "" msgid "Downloading Full LQ Covers" msgstr "" -msgid "Downloading custom Discarts" +msgid "Downloading Custom Disc Artwork" msgstr "" msgid "Downloading file..." @@ -792,7 +792,7 @@ msgstr "" msgid "Downloading image:" msgstr "Kép letöltése:" -msgid "Downloading original Discarts" +msgid "Downloading Original Disc Artwork" msgstr "" msgid "Downloading pagelist:" @@ -1026,7 +1026,7 @@ msgstr "Formázás" msgid "Formatting, please wait..." msgstr "Formatálás folyamatban, kérlek várj..." -msgid "Found missing images." +msgid "Found missing images" msgstr "" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "" msgid "No favorites selected." msgstr "" -msgid "No file missing!" +msgid "No files missing!" msgstr "Egy fájl sem hiányzik!" msgid "No games found on the disc" diff --git a/Languages/italian.lang b/Languages/italian.lang index 88d09989..134fa843 100644 --- a/Languages/italian.lang +++ b/Languages/italian.lang @@ -651,6 +651,9 @@ msgstr "Disco 1" msgid "Disc 2" msgstr "Disco 2" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Scarica immagine disco" @@ -675,9 +678,6 @@ msgstr "Prompt di selezione disco" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "Il disco 2 deve essere installato in formato non compresso per funzionare con DM(L) v2.6+, sicuro di volerlo installare in formato compresso?" -msgid "Discarts" -msgstr "Dischi" - msgid "DiskFlip" msgstr "Rotazione dischi" @@ -783,8 +783,8 @@ msgstr "Scaricando copertine intere HQ..." msgid "Downloading Full LQ Covers" msgstr "Scaricando copertine intere LQ..." -msgid "Downloading custom Discarts" -msgstr "Scaricando immagini disco personalizzate" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "Scaricando file..." @@ -792,8 +792,8 @@ msgstr "Scaricando file..." msgid "Downloading image:" msgstr "Scaricando immagine:" -msgid "Downloading original Discarts" -msgstr "Scaricando immagini disco originali" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "Scaricando l'anteprima di:" @@ -1026,8 +1026,8 @@ msgstr "Formatta" msgid "Formatting, please wait..." msgstr "Formattando, attendere prego..." -msgid "Found missing images." -msgstr "Trovate le immagini mancanti." +msgid "Found missing images" +msgstr "Trovate le immagini mancanti" msgid "Frame" msgstr "Frame" @@ -1572,7 +1572,7 @@ msgstr "Nessun disco inserito." msgid "No favorites selected." msgstr "Nessun preferito selezionato." -msgid "No file missing!" +msgid "No files missing!" msgstr "Nessun file mancante!" msgid "No games found on the disc" diff --git a/Languages/japanese.lang b/Languages/japanese.lang index d0e00f51..1d86b23e 100644 --- a/Languages/japanese.lang +++ b/Languages/japanese.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "使用するディスク画像" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "破棄" - msgid "DiskFlip" msgstr "ディスクの回転風" @@ -783,8 +783,8 @@ msgstr "ﾌﾙｶﾊﾞｰ(精細)をﾀﾞｳﾝﾛｰﾄﾞ中" msgid "Downloading Full LQ Covers" msgstr "ﾌﾙｶﾊﾞｰ(普通)をﾀﾞｳﾝﾛｰﾄﾞ中" -msgid "Downloading custom Discarts" -msgstr "ｶｽﾀﾑﾚｰﾍﾞﾙをﾀﾞｳﾝﾛｰﾄﾞ中" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "ダウンロード中です..." @@ -792,8 +792,8 @@ msgstr "ダウンロード中です..." msgid "Downloading image:" msgstr "画像をダウンロード中" -msgid "Downloading original Discarts" -msgstr "公式ﾚｰﾍﾞﾙをダウンロード中" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "リストをダウンロード中:" @@ -1026,7 +1026,7 @@ msgstr "初期化" msgid "Formatting, please wait..." msgstr "初期化中です、お待ち下さい..." -msgid "Found missing images." +msgid "Found missing images" msgstr "不足画像が見つかりました" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "ディスクが挿入されていません" msgid "No favorites selected." msgstr "お気に入りはありません" -msgid "No file missing!" +msgid "No files missing!" msgstr "必要ありません" msgid "No games found on the disc" diff --git a/Languages/korean.lang b/Languages/korean.lang index 231cf778..5ad4db08 100644 --- a/Languages/korean.lang +++ b/Languages/korean.lang @@ -651,6 +651,9 @@ msgstr "디스크 1" msgid "Disc 2" msgstr "디스크 2" +msgid "Disc Artwork" +msgstr "디스크 아트워크" + msgid "Disc Artwork Download" msgstr "디스크 삽화 다운로드" @@ -675,9 +678,6 @@ msgstr "디스크-선택 프롬프트" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "DM(L) v2.6 이상에서 작동하려면 디스크2를 압축되지 않은 포맷으로 설치해야 합니다. 압축된 형식으로 설치 하겠습니까?" -msgid "Discarts" -msgstr "디스크삽화" - msgid "DiskFlip" msgstr "디스크플립" @@ -783,8 +783,8 @@ msgstr "전체 고품질 커버 다운로드" msgid "Downloading Full LQ Covers" msgstr "전체 저품질 커버 다운로드" -msgid "Downloading custom Discarts" -msgstr "커스텀 디스크삽화 다운로드" +msgid "Downloading Custom Disc Artwork" +msgstr "사용자 지정 디스크 아트워크 다운로드" msgid "Downloading file..." msgstr "파일 다운로드 중 입니다..." @@ -792,8 +792,8 @@ msgstr "파일 다운로드 중 입니다..." msgid "Downloading image:" msgstr "이미지 다운로드" -msgid "Downloading original Discarts" -msgstr "원본 디스크삽화 다운로드" +msgid "Downloading Original Disc Artwork" +msgstr "원본 디스크 아트워크 다운로드" msgid "Downloading pagelist:" msgstr "페이지목록 다운로드:" @@ -1026,8 +1026,8 @@ msgstr "포맷" msgid "Formatting, please wait..." msgstr "포맷중입니다, 잠시 기다려 주세요..." -msgid "Found missing images." -msgstr "누락된 이미지를 찾았습니다." +msgid "Found missing images" +msgstr "누락된 이미지를 찾았습니다" msgid "Frame" msgstr "프레임" @@ -1572,7 +1572,7 @@ msgstr "디스크가 들어있지 않습니다." msgid "No favorites selected." msgstr "선택한 즐겨찾기가 없습니다." -msgid "No file missing!" +msgid "No files missing!" msgstr "누락된 파일이 없습니다!" msgid "No games found on the disc" diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang index 9466ab0e..b5be963c 100644 --- a/Languages/norwegian.lang +++ b/Languages/norwegian.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Platebilde nedlasting" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "Snu plate" @@ -783,8 +783,8 @@ msgstr "Laster ned HQ fullcover" msgid "Downloading Full LQ Covers" msgstr "Laster ned LQ fullcover" -msgid "Downloading custom Discarts" -msgstr "Laster ned custom platebilde" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "Laster ned fil..." @@ -792,8 +792,8 @@ msgstr "Laster ned fil..." msgid "Downloading image:" msgstr "Laster ned bilde:" -msgid "Downloading original Discarts" -msgstr "Laster ned originale platebilde" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "Laster ned sideliste:" @@ -1026,8 +1026,8 @@ msgstr "Formatér" msgid "Formatting, please wait..." msgstr "Formaterer, vennligst vent..." -msgid "Found missing images." -msgstr "Funnet manglende bilder." +msgid "Found missing images" +msgstr "Funnet manglende bilder" msgid "Frame" msgstr "" @@ -1572,7 +1572,7 @@ msgstr "" msgid "No favorites selected." msgstr "Ingen favoritter valgt." -msgid "No file missing!" +msgid "No files missing!" msgstr "Ingen filer mangler!" msgid "No games found on the disc" diff --git a/Languages/polish.lang b/Languages/polish.lang index d6bdc957..a8ffea45 100644 --- a/Languages/polish.lang +++ b/Languages/polish.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Pobierz obrazki" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "Obrot plytami" @@ -783,7 +783,7 @@ msgstr "" msgid "Downloading Full LQ Covers" msgstr "" -msgid "Downloading custom Discarts" +msgid "Downloading Custom Disc Artwork" msgstr "" msgid "Downloading file..." @@ -792,7 +792,7 @@ msgstr "" msgid "Downloading image:" msgstr "Pobieranie obrazka:" -msgid "Downloading original Discarts" +msgid "Downloading Original Disc Artwork" msgstr "" msgid "Downloading pagelist:" @@ -1026,7 +1026,7 @@ msgstr "Sformatuj" msgid "Formatting, please wait..." msgstr "Formatowanie, prosze czekac..." -msgid "Found missing images." +msgid "Found missing images" msgstr "" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "" msgid "No favorites selected." msgstr "" -msgid "No file missing!" +msgid "No files missing!" msgstr "Brak plikow do pobrania" msgid "No games found on the disc" diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang index b329971d..57692869 100644 --- a/Languages/portuguese_br.lang +++ b/Languages/portuguese_br.lang @@ -651,6 +651,9 @@ msgstr "Disco 1" msgid "Disc 2" msgstr "Disco 2" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Baixar Imagens Disco" @@ -675,9 +678,6 @@ msgstr "Perguntar o disco a iniciar" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "O Disco 2 precisa ser descomprimido para funcionar nessa versão do DIOS MIOS. Tem certeza de que quer instalar usando compressão?" -msgid "Discarts" -msgstr "Etiquetas de Disco" - msgid "DiskFlip" msgstr "Voltar Disco" @@ -783,8 +783,8 @@ msgstr "Baixando Capas Completas HQ" msgid "Downloading Full LQ Covers" msgstr "Baixando Capas Completas LQ" -msgid "Downloading custom Discarts" -msgstr "Baixando Etiquetas de Disco Personalizadas" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "Baixando arquivo..." @@ -792,8 +792,8 @@ msgstr "Baixando arquivo..." msgid "Downloading image:" msgstr "Baixando imagem:" -msgid "Downloading original Discarts" -msgstr "Baixando Imagens de Disco Originais" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "Baixando a lista:" @@ -1026,7 +1026,7 @@ msgstr "Formatar" msgid "Formatting, please wait..." msgstr "Formatando, por favor aguarde..." -msgid "Found missing images." +msgid "Found missing images" msgstr "Imagens faltando encontradas" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "Nenhum disco inserido" msgid "No favorites selected." msgstr "Nenhum favorito selecionado" -msgid "No file missing!" +msgid "No files missing!" msgstr "Nenhum arquivo faltando!" msgid "No games found on the disc" diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang index 2553bef1..864de583 100644 --- a/Languages/portuguese_pt.lang +++ b/Languages/portuguese_pt.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Descarregar Imagens Disco" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "Voltar Disco" @@ -783,8 +783,8 @@ msgstr "A Descarregar Capas Completas HQ" msgid "Downloading Full LQ Covers" msgstr "A Descarregar Capas Completas LQ" -msgid "Downloading custom Discarts" -msgstr "A Descarregar Imagens Disco Personalizadas" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "A Descarregar ficheiro..." @@ -792,8 +792,8 @@ msgstr "A Descarregar ficheiro..." msgid "Downloading image:" msgstr "A Descarregar imagem:" -msgid "Downloading original Discarts" -msgstr "A Descarregar Imagens Disco Originais" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "A Descarregar a lista:" @@ -1026,8 +1026,8 @@ msgstr "Formatar" msgid "Formatting, please wait..." msgstr "A Formatar, por favor aguarde..." -msgid "Found missing images." -msgstr "Imagens em falta encontradas." +msgid "Found missing images" +msgstr "Imagens em falta encontradas" msgid "Frame" msgstr "" @@ -1572,7 +1572,7 @@ msgstr "Nenhum disco inserido." msgid "No favorites selected." msgstr "Nenhum favorito seleccionado" -msgid "No file missing!" +msgid "No files missing!" msgstr "Nenhum ficheiro em falta!" msgid "No games found on the disc" diff --git a/Languages/russian.lang b/Languages/russian.lang index a6c839c0..c0e90f09 100644 --- a/Languages/russian.lang +++ b/Languages/russian.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Загрузка изображений диска" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "ДискФлип" @@ -783,7 +783,7 @@ msgstr "" msgid "Downloading Full LQ Covers" msgstr "" -msgid "Downloading custom Discarts" +msgid "Downloading Custom Disc Artwork" msgstr "" msgid "Downloading file..." @@ -792,7 +792,7 @@ msgstr "" msgid "Downloading image:" msgstr "Загружается картинка:" -msgid "Downloading original Discarts" +msgid "Downloading Original Disc Artwork" msgstr "" msgid "Downloading pagelist:" @@ -1026,7 +1026,7 @@ msgstr "Форматировать" msgid "Formatting, please wait..." msgstr "Форматирую, пожалуйста подождите..." -msgid "Found missing images." +msgid "Found missing images" msgstr "" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "" msgid "No favorites selected." msgstr "" -msgid "No file missing!" +msgid "No files missing!" msgstr "Файл не найден!" msgid "No games found on the disc" diff --git a/Languages/schinese.lang b/Languages/schinese.lang index 6d227758..e1ede8d3 100644 --- a/Languages/schinese.lang +++ b/Languages/schinese.lang @@ -651,6 +651,9 @@ msgstr "光盘 1" msgid "Disc 2" msgstr "光盘 2" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "光盘图片下载" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "DM(L) v2.6 或以上版本需要将光盘 2 安装为非压缩格式，是否仍然以压缩格式安装？" -msgid "Discarts" -msgstr "光盘图片" - msgid "DiskFlip" msgstr "光盘滑动" @@ -783,8 +783,8 @@ msgstr "正在下载高清晰完整封面" msgid "Downloading Full LQ Covers" msgstr "正在下载低清晰完整封面" -msgid "Downloading custom Discarts" -msgstr "正在下载自制光盘封面" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "正在下载文件 ..." @@ -792,8 +792,8 @@ msgstr "正在下载文件 ..." msgid "Downloading image:" msgstr "正在下载图片：" -msgid "Downloading original Discarts" -msgstr "正在下载原始光盘封面" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "正在下载分页列表：" @@ -1026,7 +1026,7 @@ msgstr "格式化" msgid "Formatting, please wait..." msgstr "格式化中，请稍候 ..." -msgid "Found missing images." +msgid "Found missing images" msgstr "找到缺少的图片。" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "未插入光盘。" msgid "No favorites selected." msgstr "未选择收藏。" -msgid "No file missing!" +msgid "No files missing!" msgstr "没有缺少文件！" msgid "No games found on the disc" diff --git a/Languages/spanish.lang b/Languages/spanish.lang index 6e2744c4..fd659a02 100644 --- a/Languages/spanish.lang +++ b/Languages/spanish.lang @@ -651,6 +651,9 @@ msgstr "Disco 1" msgid "Disc 2" msgstr "Disco 2" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Descarga Imagen Discos" @@ -675,9 +678,6 @@ msgstr "Aviso selección de disco" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "DM(L) v2.6+ necesita el Disco 2 sin compresión, ¿estás seguro de instalarlo comprimido?" -msgid "Discarts" -msgstr "Discos" - msgid "DiskFlip" msgstr "GiraDiscos" @@ -783,8 +783,8 @@ msgstr "Descargando covers HQ completos" msgid "Downloading Full LQ Covers" msgstr "Descargando covers LQ completos" -msgid "Downloading custom Discarts" -msgstr "Descargando Discarts personalizados" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "Descargando archivo..." @@ -792,8 +792,8 @@ msgstr "Descargando archivo..." msgid "Downloading image:" msgstr "Descargando imagen:" -msgid "Downloading original Discarts" -msgstr "Descargando discarts originales" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "Descargando lista de páginas:" @@ -1026,8 +1026,8 @@ msgstr "Formateo" msgid "Formatting, please wait..." msgstr "Formateando, por favor espera..." -msgid "Found missing images." -msgstr "Se encontraron las imágenes faltantes." +msgid "Found missing images" +msgstr "Se encontraron las imágenes faltantes" msgid "Frame" msgstr "Marco" @@ -1572,7 +1572,7 @@ msgstr "No hay un disco insertado" msgid "No favorites selected." msgstr "Ningún favorito seleccionado." -msgid "No file missing!" +msgid "No files missing!" msgstr "¡No faltan archivos!" msgid "No games found on the disc" diff --git a/Languages/swedish.lang b/Languages/swedish.lang index 691c9da3..31e9c88f 100644 --- a/Languages/swedish.lang +++ b/Languages/swedish.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Skivbildsnedladdning" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "Vänd Skiva" @@ -783,7 +783,7 @@ msgstr "" msgid "Downloading Full LQ Covers" msgstr "" -msgid "Downloading custom Discarts" +msgid "Downloading Custom Disc Artwork" msgstr "" msgid "Downloading file..." @@ -792,7 +792,7 @@ msgstr "" msgid "Downloading image:" msgstr "Laddar ner bild:" -msgid "Downloading original Discarts" +msgid "Downloading Original Disc Artwork" msgstr "" msgid "Downloading pagelist:" @@ -1026,7 +1026,7 @@ msgstr "Formatera" msgid "Formatting, please wait..." msgstr "Formaterar, Vänta..." -msgid "Found missing images." +msgid "Found missing images" msgstr "" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "" msgid "No favorites selected." msgstr "" -msgid "No file missing!" +msgid "No files missing!" msgstr "Inga filer saknas!" msgid "No games found on the disc" diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang index 605c1ba6..2ab46cc2 100644 --- a/Languages/tchinese.lang +++ b/Languages/tchinese.lang @@ -651,6 +651,9 @@ msgstr "光碟 1" msgid "Disc 2" msgstr "光碟 2" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "下載光碟圖片" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "光碟2 需被安裝為未壓縮格式才可用DM(L) v2.6+執行，確定要安裝為壓縮格式嗎？" -msgid "Discarts" -msgstr "光碟封面" - msgid "DiskFlip" msgstr "光碟滑動" @@ -783,8 +783,8 @@ msgstr "下載完整高畫質封面" msgid "Downloading Full LQ Covers" msgstr "下載完整低畫質封面" -msgid "Downloading custom Discarts" -msgstr "下載自製光碟圖片" +msgid "Downloading Custom Disc Artwork" +msgstr "" msgid "Downloading file..." msgstr "下載檔案中..." @@ -792,8 +792,8 @@ msgstr "下載檔案中..." msgid "Downloading image:" msgstr "下載圖片：" -msgid "Downloading original Discarts" -msgstr "下載原始光碟圖片" +msgid "Downloading Original Disc Artwork" +msgstr "" msgid "Downloading pagelist:" msgstr "下載頁面清單：" @@ -1026,7 +1026,7 @@ msgstr "格式化" msgid "Formatting, please wait..." msgstr "格式化中, 請稍候..." -msgid "Found missing images." +msgid "Found missing images" msgstr "找到缺少圖片。" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "未插入光碟。" msgid "No favorites selected." msgstr "沒有選取最愛。" -msgid "No file missing!" +msgid "No files missing!" msgstr "沒有檔案缺少！" msgid "No games found on the disc" diff --git a/Languages/thai.lang b/Languages/thai.lang index 3fd01bc6..8b6f1a9a 100644 --- a/Languages/thai.lang +++ b/Languages/thai.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "ดาวน์โหลดภาพแผ่น" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "สลับด้านแผ่น" @@ -783,7 +783,7 @@ msgstr "" msgid "Downloading Full LQ Covers" msgstr "" -msgid "Downloading custom Discarts" +msgid "Downloading Custom Disc Artwork" msgstr "" msgid "Downloading file..." @@ -792,7 +792,7 @@ msgstr "" msgid "Downloading image:" msgstr "ภาพที่กำลังดาวน์โหลด:" -msgid "Downloading original Discarts" +msgid "Downloading Original Disc Artwork" msgstr "" msgid "Downloading pagelist:" @@ -1026,7 +1026,7 @@ msgstr "ฟอร์แมต" msgid "Formatting, please wait..." msgstr "กำลังฟอร์แมต,รอสักครู่..." -msgid "Found missing images." +msgid "Found missing images" msgstr "" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "" msgid "No favorites selected." msgstr "" -msgid "No file missing!" +msgid "No files missing!" msgstr "ไม่มีไฟล์ที่หายไป" msgid "No games found on the disc" diff --git a/Languages/turkish.lang b/Languages/turkish.lang index f0867e82..c521ab3a 100644 --- a/Languages/turkish.lang +++ b/Languages/turkish.lang @@ -651,6 +651,9 @@ msgstr "" msgid "Disc 2" msgstr "" +msgid "Disc Artwork" +msgstr "" + msgid "Disc Artwork Download" msgstr "Disk Görseli Indirme" @@ -675,9 +678,6 @@ msgstr "" msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?" msgstr "" -msgid "Discarts" -msgstr "" - msgid "DiskFlip" msgstr "DiskÇevir" @@ -783,7 +783,7 @@ msgstr "" msgid "Downloading Full LQ Covers" msgstr "" -msgid "Downloading custom Discarts" +msgid "Downloading Custom Disc Artwork" msgstr "" msgid "Downloading file..." @@ -792,7 +792,7 @@ msgstr "" msgid "Downloading image:" msgstr "İndirilen resim:" -msgid "Downloading original Discarts" +msgid "Downloading Original Disc Artwork" msgstr "" msgid "Downloading pagelist:" @@ -1026,7 +1026,7 @@ msgstr "Biçimlendir" msgid "Formatting, please wait..." msgstr "Biçimlendiriliyor, bekleyiniz..." -msgid "Found missing images." +msgid "Found missing images" msgstr "" msgid "Frame" @@ -1572,7 +1572,7 @@ msgstr "" msgid "No favorites selected." msgstr "" -msgid "No file missing!" +msgid "No files missing!" msgstr "Kayıp dosya yok!" msgid "No games found on the disc" diff --git a/source/network/ImageDownloader.cpp b/source/network/ImageDownloader.cpp index e48d4ecc..c520f179 100644 --- a/source/network/ImageDownloader.cpp +++ b/source/network/ImageDownloader.cpp @@ -29,6 +29,7 @@ #include "usbloader/GetMissingGameFiles.hpp" #include "utils/StringTools.h" #include "usbloader/GameList.h" +#include "wstring.hpp" #include "gecko.h" #define VALID_IMAGE(x) (!(x->size == 36864 || x->size <= 1024 || x->size == 7386 || x->size <= 1174 || x->size == 4446 || x->data == NULL)) @@ -37,7 +38,7 @@ void ImageDownloader::DownloadImages() { bool showBanner = (Settings.LoaderMode & MODE_GCGAMES); - int choice = CheckboxWindow(tr( "Cover Download" ), 0, tr( "3D Covers" ), tr( "Flat Covers" ), tr("Full Covers"), tr( "Discarts" ), showBanner ? tr( "Custom Banners" ) : 0, 0, showBanner ? 0x1F : 0xF); // ask for download choice + int choice = CheckboxWindow(tr( "Cover Download" ), 0, tr( "3D Covers" ), tr( "Flat Covers" ), tr("Full Covers"), tr( "Disc Artwork" ), showBanner ? tr( "Custom Banners" ) : 0, 0, showBanner ? 0x1F : 0xF); // ask for download choice if (choice == 0 || choice == CheckedNone) return; @@ -55,13 +56,13 @@ void ImageDownloader::Start() if(MissingImagesCount == 0) { - WindowPrompt(tr( "No file missing!" ), 0, tr("OK")); + WindowPrompt(tr( "No files missing!" ), 0, tr("OK")); return; } u32 TotalDownloadCount = MissingImagesCount; - if (WindowPrompt(tr("Found missing images."), fmt(tr("%i missing files"), TotalDownloadCount), tr( "Yes" ), tr( "No" )) == 0) + if (WindowPrompt(tr("Found missing images"), fmt(tr("%i missing files"), TotalDownloadCount), tr( "Yes" ), tr( "No" )) == 0) return; if (!IsNetworkInit() && !NetworkInitPrompt()) @@ -113,9 +114,9 @@ void ImageDownloader::FindMissingImages() if(choices & CheckedBox4) { const char * downloadURL = (Settings.discart == DISCARTS_ORIGINALS || Settings.discart == DISCARTS_ORIGINALS_CUSTOMS ) ? Settings.URL_Discs : Settings.URL_DiscsCustom; - const char * progressTitle = (Settings.discart == DISCARTS_ORIGINALS || Settings.discart == DISCARTS_ORIGINALS_CUSTOMS ) ? tr("Downloading original Discarts") : tr("Downloading custom Discarts"); + const char * progressTitle = (Settings.discart == DISCARTS_ORIGINALS || Settings.discart == DISCARTS_ORIGINALS_CUSTOMS ) ? tr("Downloading Original Disc Artwork") : tr("Downloading Custom Disc Artwork"); const char * backupURL = (Settings.discart == DISCARTS_ORIGINALS_CUSTOMS || Settings.discart == DISCARTS_CUSTOMS_ORIGINALS) ? ((Settings.discart == DISCARTS_ORIGINALS_CUSTOMS) ? Settings.URL_DiscsCustom : Settings.URL_Discs) : NULL; - const char * backupProgressTitle = (Settings.discart == DISCARTS_ORIGINALS_CUSTOMS || Settings.discart == DISCARTS_CUSTOMS_ORIGINALS) ? ((Settings.discart == DISCARTS_ORIGINALS_CUSTOMS) ? tr("Downloading custom Discarts") : tr("Downloading original Discarts")) : NULL; + const char * backupProgressTitle = (Settings.discart == DISCARTS_ORIGINALS_CUSTOMS || Settings.discart == DISCARTS_CUSTOMS_ORIGINALS) ? ((Settings.discart == DISCARTS_ORIGINALS_CUSTOMS) ? tr("Downloading Custom Disc Artwork") : tr("Downloading Original Disc Artwork")) : NULL; FindMissing(Settings.disc_path, downloadURL, backupURL, progressTitle, backupProgressTitle, ".png"); } @@ -186,13 +187,14 @@ int ImageDownloader::DownloadProcess(int TotalDownloadCount) if(MissingImages[i].gameID.size() < 3) continue; + gprintf("Searching for %s%s\n", MissingImages[i].gameID.c_str(), MissingImages[i].fileExt); struct download file = {}; DownloadImage(MissingImages[i].downloadURL, MissingImages[i].gameID.c_str(), MissingImages[i].fileExt, &file); if(file.size <= 0) { if(MissingImages[i].backupURL) { - gprintf("Trying backup URL.\n"); + gprintf("Trying backup URL\n"); MissingImages[i].downloadURL = MissingImages[i].backupURL; MissingImages[i].backupURL = NULL; MissingImages[i].progressTitle = MissingImages[i].backupProgressTitle; @@ -202,7 +204,6 @@ int ImageDownloader::DownloadProcess(int TotalDownloadCount) continue; } - gprintf(" - OK\n"); char imgPath[200]; snprintf(imgPath, sizeof(imgPath), "%s/%s%s", MissingImages[i].writepath, MissingImages[i].gameID.c_str(), MissingImages[i].fileExt); @@ -214,7 +215,7 @@ int ImageDownloader::DownloadProcess(int TotalDownloadCount) MissingImagesCount--; } MEM2_free(file.data); - gprintf("File saved successfully (%s%s)\n", MissingImages[i].gameID.c_str(), MissingImages[i].fileExt); + gprintf(" - Saved %s%s\n", MissingImages[i].gameID.c_str(), MissingImages[i].fileExt); //! Remove the image from the vector since it's done MissingImages.erase(MissingImages.begin()+i); @@ -226,129 +227,186 @@ int ImageDownloader::DownloadProcess(int TotalDownloadCount) void ImageDownloader::DownloadImage(const char *url, const char *gameID, const char *fileExt, struct download *file) { - char CheckedRegion[10]; + char region[3]; char downloadURL[512]; - bool PAL = false; if(strcmp(fileExt, ".bnr") == 0) { snprintf(downloadURL, sizeof(downloadURL), "%s%s.bnr", url, gameID); - gprintf("%s\n", downloadURL); + gprintf(" - Trying: %s\n", downloadURL); downloadfile(downloadURL, file); if(file->size > 132 && IsValidBanner(file->data)) // 132 = IMET magic location in the banner with u8 header return; snprintf(downloadURL, sizeof(downloadURL), "%s%.3s.bnr", url, gameID); - gprintf(" - Not found. trying ID3: %s\n", downloadURL); + gprintf(" - Trying ID3: %s\n", downloadURL); downloadfile(downloadURL, file); if(file->size > 132 && IsValidBanner(file->data)) return; - gprintf(" - Not found.\n"); + gprintf(" - Not found\n"); return; } - //Creates URL depending from which Country the game is + // Try to find PAL covers matching the loaders language switch (gameID[3]) { - case 'J': - sprintf(downloadURL, "%sJA/%s.png", url, gameID); - sprintf(CheckedRegion, "JA"); + case 'P': // Europe + case 'D': // Germany + case 'F': // France + case 'H': // Netherlands + case 'I': // Italy + case 'L': // Japanese import to Europe + case 'M': // American import to Europe + case 'R': // Russia + case 'S': // Spain + case 'U': // Australia + case 'V': // Scandinavia + case 'X': // Europe / USA special releases + case 'Y': // Europe / USA special releases + case 'Z': // Europe / USA special releases + sprintf(region, "%.2s", Settings.db_language); break; - case 'W': - sprintf(downloadURL, "%sZH/%s.png", url, gameID); - sprintf(CheckedRegion, "ZH"); + case 'E': // US + case 'N': // Japanese import to US + sprintf(region, "US"); break; - case 'K': - sprintf(downloadURL, "%sKO/%s.png", url, gameID); - sprintf(CheckedRegion, "KO"); + case 'J': // Japan + sprintf(region, "JA"); break; - case 'P': - case 'D': - case 'F': - case 'I': - case 'S': - case 'H': - case 'U': - case 'X': - case 'Y': - case 'Z': - sprintf(downloadURL, "%s%s/%s.png", url, Settings.db_language, gameID); - sprintf(CheckedRegion, "%s", Settings.db_language); - PAL = true; - break; - case 'E': - sprintf(downloadURL, "%sUS/%s.png", url, gameID); - sprintf(CheckedRegion, "US"); - break; - default: - strcpy(downloadURL, ""); - strcpy(CheckedRegion, ""); + case 'K': // Korea + case 'Q': // Japanese import to Korea + case 'T': // American import to Korea + sprintf(region, "KO"); + break; + case 'W': // Taiwan / Hong Kong / Macau + sprintf(region, "ZH"); break; + default: // Custom games? + sprintf(region, "EN"); } - - gprintf("%s\n", downloadURL); + sprintf(downloadURL, "%s%s/%s.png", url, region, gameID); + gprintf(" - Trying: %s\n", downloadURL); downloadfile(downloadURL, file); - if(VALID_IMAGE(file)) + if (VALID_IMAGE(file)) return; - if(PAL && strcmp(CheckedRegion, "EN") != 0) + // Try to find covers matching our systems language + std::vector v; + char syslang[3] = {0}; + switch (CONF_GetLanguage()) { - snprintf(downloadURL, sizeof(downloadURL), "%sEN/%s.png", url, gameID); - gprintf(" - Not found.\n%s\n", downloadURL); + case CONF_LANG_GERMAN: + sprintf(syslang, "DE"); + break; + case CONF_LANG_FRENCH: + sprintf(syslang, "FR"); + break; + case CONF_LANG_SPANISH: + sprintf(syslang, "SE"); + break; + case CONF_LANG_ITALIAN: + sprintf(syslang, "IT"); + break; + case CONF_LANG_DUTCH: + sprintf(syslang, "NL"); + break; + } + if (syslang[0] != '\0' && strncmp(syslang, region, 2) != 0) + { + sprintf(downloadURL, "%s%s/%s.png", url, syslang, gameID); + gprintf(" - Trying: %s\n", downloadURL); downloadfile(downloadURL, file); - if(VALID_IMAGE(file)) + if (VALID_IMAGE(file)) return; } - else if(strcmp(CheckedRegion, "") == 0) + + // Try to find covers matching the games region e.g. SGWD7K + char gameregion[3] = {0}; + switch (gameID[3]) { - const char * lang = Settings.db_language; - - if(strcmp(lang, "EN") == 0 && CONF_GetRegion() == CONF_REGION_US) - lang = "US"; - - snprintf(downloadURL, sizeof(downloadURL), "%s%s/%s.png", url, lang, gameID); - gprintf(" - Not found.\n%s\n", downloadURL); + case 'D': // Germany + sprintf(gameregion, "DE"); + break; + case 'F': // France + sprintf(gameregion, "FR"); + break; + case 'H': // Netherlands + sprintf(gameregion, "NL"); + break; + case 'I': // Italy + sprintf(gameregion, "IT"); + break; + case 'R': // Russia + sprintf(gameregion, "RU"); + break; + case 'S': // Spain + sprintf(gameregion, "ES"); + break; + case 'U': // Australia + sprintf(gameregion, "AU"); + break; + case 'V': // Scandinavia + sprintf(gameregion, "DK"); + break; + } + if (gameregion[0] != '\0' && strncmp(gameregion, region, 2) != 0 && strncmp(gameregion, syslang, 2) != 0) + { + sprintf(downloadURL, "%s%s/%s.png", url, gameregion, gameID); + gprintf(" - Trying: %s\n", downloadURL); downloadfile(downloadURL, file); - if(VALID_IMAGE(file)) + if (VALID_IMAGE(file)) return; + } - snprintf(downloadURL, sizeof(downloadURL), "%sOTHER/%s.png", url, gameID); - gprintf(" - Not found.\n%s\n", downloadURL); - downloadfile(downloadURL, file); - if(VALID_IMAGE(file)) - return; - - if(gameID[3] == 'R') // no english cover found, try russian + // Might be a special US release + if (gameID[3] == 'X' || gameID[3] == 'Y' || gameID[3] == 'Z') + { + if (strncmp(region, "US", 2) != 0) { - lang = "RU"; - snprintf(downloadURL, sizeof(downloadURL), "%s%s/%s.png", url, lang, gameID); - gprintf(" - Not found.\n%s\n", downloadURL); + sprintf(downloadURL, "%sUS/%s.png", url, gameID); + gprintf(" - Trying: %s\n", downloadURL); downloadfile(downloadURL, file); - if(VALID_IMAGE(file)) - return; - } - - if(gameID[3] == 'V') // no English cover found, try Finnish and Swedish - { - lang = "FI"; - snprintf(downloadURL, sizeof(downloadURL), "%s%s/%s.png", url, lang, gameID); - gprintf(" - Not found.\n%s\n", downloadURL); - downloadfile(downloadURL, file); - if(VALID_IMAGE(file)) - return; - - lang = "SE"; - snprintf(downloadURL, sizeof(downloadURL), "%s%s/%s.png", url, lang, gameID); - gprintf(" - Not found.\n%s\n", downloadURL); - downloadfile(downloadURL, file); - if(VALID_IMAGE(file)) + if (VALID_IMAGE(file)) return; } } - gprintf(" - Not found.\n"); + // The game might only have an English cover available + if (strncmp(region, "EN", 2) != 0) + { + sprintf(downloadURL, "%sEN/%s.png", url, gameID); + gprintf(" - Trying: %s\n", downloadURL); + downloadfile(downloadURL, file); + if (VALID_IMAGE(file)) + return; + } + + // Try Finnish and Swedish + if (gameID[3] == 'V') + { + snprintf(downloadURL, sizeof(downloadURL), "%sFI/%s.png", url, gameID); + gprintf(" - Trying: %s\n", downloadURL); + downloadfile(downloadURL, file); + if (VALID_IMAGE(file)) + return; + + snprintf(downloadURL, sizeof(downloadURL), "%sSE/%s.png", url, gameID); + gprintf(" - Trying: %s\n", downloadURL); + downloadfile(downloadURL, file); + if (VALID_IMAGE(file)) + return; + } + + // Final attempt + snprintf(downloadURL, sizeof(downloadURL), "%sother/%s.png", url, gameID); + gprintf(" - Trying: %s\n", downloadURL); + downloadfile(downloadURL, file); + if (VALID_IMAGE(file)) + return; + + gprintf(" - Not found\n"); } void ImageDownloader::CreateCSVLog() diff --git a/source/network/https.c b/source/network/https.c index aec3205f..5b3fddae 100644 --- a/source/network/https.c +++ b/source/network/https.c @@ -503,6 +503,9 @@ void downloadfile(const char *url, struct download *buffer) gprintf("Using: %s - %s\n", wolfSSL_get_version(httpinfo.ssl), wolfSSL_CIPHER_get_name(cipher)); #endif } + // Save the session + if (httpinfo.use_https) + session = wolfSSL_get_session(httpinfo.ssl); // Send our request char request[2300]; int ret, len; @@ -593,9 +596,6 @@ void downloadfile(const char *url, struct download *buffer) https_close(&httpinfo); return; } - // Save the session - if (httpinfo.use_https) - session = wolfSSL_get_session(httpinfo.ssl); // Finished https_close(&httpinfo); #ifdef DEBUG_NETWORK