ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1110 from LuigiBlood/64dd_2 

[UI] Update English and French & fix Save Slot string preventing emulation
This commit is contained in:
zilmar 2016-06-06 08:03:56 +10:00
parent 4d1f65c18d b40174e2f4
commit bfec79e047
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lang/English.pj.Lang
View File

@ -51,6 +51,7 @@
#132# "R&esume" #132# "R&esume"
#133# "&Soft Reset" #133# "&Soft Reset"
#134# "&Hard Reset" #134# "&Hard Reset"
#135# "Swap &Disk"
//Options Menu //Options Menu
#140# "&Options" #140# "&Options"
@ -235,6 +236,7 @@
#466# "Speed display:" #466# "Speed display:"
#467# "Check if Project64 is already running" #467# "Check if Project64 is already running"
#468# "Unique Game Save Directory" #468# "Unique Game Save Directory"
#469# "64DD IPL ROM Path:"
//ROM Browser Tab //ROM Browser Tab
#480# "Max # of ROMs remembered (0-10):" #480# "Max # of ROMs remembered (0-10):"

5
Lang/French.pj.Lang
View File

@ -51,6 +51,7 @@
#132# "R&eprendre" #132# "R&eprendre"
#133# "Redémarrage &logiciel" #133# "Redémarrage &logiciel"
#134# "Redémarrage &matériel" #134# "Redémarrage &matériel"
#135# "Changer &disque"
//Options Menu //Options Menu
#140# "&Options" #140# "&Options"
@ -96,7 +97,7 @@
#212# "Éditer les paramètres du jeu" #212# "Éditer les paramètres du jeu"
#213# "Éditer les cheats" #213# "Éditer les cheats"
#214# "Plugin graphique" #214# "Plugin graphique"
#215# "Lancer le Jeu avec le Disque" #215# "Lancer le jeu avec un disque"
//Alternate Name to save Slot //Alternate Name to save Slot
#220# "Emplacement de sauvegarde - Défaut" #220# "Emplacement de sauvegarde - Défaut"
@ -234,6 +235,8 @@
#465# "Afficher la vitesse" #465# "Afficher la vitesse"
#466# "Vitesse affichée :" #466# "Vitesse affichée :"
#467# "Vérifier si Project64 est déjà lancé" #467# "Vérifier si Project64 est déjà lancé"
#468# "Répertoire de sauvegarde unique"
#469# "Chemin vers 64DD IPL ROM:"
//ROM Browser Tab //ROM Browser Tab
#480# "Max de ROM à retenir (0-10) :" #480# "Max de ROM à retenir (0-10) :"

4
Source/Project64/UserInterface/MainMenuClass.cpp
View File

@ -684,11 +684,11 @@ std::wstring CMainMenu::GetSaveSlotString(int Slot)
{ {
if (Slot > 0) if (Slot > 0)
{ {
FileName.SetNameExtension(stdstr_f("%s.pj%d",g_Settings->LoadStringVal(Game_GameName), Slot).c_str()); FileName.SetNameExtension(stdstr_f("%s.pj%d", g_Settings->LoadStringVal(Game_GameName).c_str(), Slot).c_str());
} }
else else
{ {
FileName.SetNameExtension(stdstr_f("%s.pj",g_Settings->LoadStringVal(Game_GameName)).c_str()); FileName.SetNameExtension(stdstr_f("%s.pj", g_Settings->LoadStringVal(Game_GameName).c_str()).c_str());
} }
if (g_Settings->LoadBool(Setting_AutoZipInstantSave)) if (g_Settings->LoadBool(Setting_AutoZipInstantSave))