diff --git a/app/app.ejs b/app/app.ejs index b76ee774..0ab4e871 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -40,8 +40,11 @@
+ +
diff --git a/app/assets/images/backgrounds/0.jpg b/app/assets/images/backgrounds/0.jpg deleted file mode 100644 index 66a2c12a..00000000 Binary files a/app/assets/images/backgrounds/0.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/0.png b/app/assets/images/backgrounds/0.png new file mode 100644 index 00000000..d05817da Binary files /dev/null and b/app/assets/images/backgrounds/0.png differ diff --git a/app/assets/images/backgrounds/1.jpg b/app/assets/images/backgrounds/1.jpg deleted file mode 100644 index e343cbe2..00000000 Binary files a/app/assets/images/backgrounds/1.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/1.png b/app/assets/images/backgrounds/1.png new file mode 100644 index 00000000..199eec03 Binary files /dev/null and b/app/assets/images/backgrounds/1.png differ diff --git a/app/assets/images/backgrounds/2.jpg b/app/assets/images/backgrounds/2.jpg deleted file mode 100644 index 7a13e771..00000000 Binary files a/app/assets/images/backgrounds/2.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/2.png b/app/assets/images/backgrounds/2.png new file mode 100644 index 00000000..cd759aa9 Binary files /dev/null and b/app/assets/images/backgrounds/2.png differ diff --git a/app/assets/images/backgrounds/3.jpg b/app/assets/images/backgrounds/3.jpg deleted file mode 100644 index 5c7be569..00000000 Binary files a/app/assets/images/backgrounds/3.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/4.jpg b/app/assets/images/backgrounds/4.jpg deleted file mode 100644 index 1db7800e..00000000 Binary files a/app/assets/images/backgrounds/4.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/5.jpg b/app/assets/images/backgrounds/5.jpg deleted file mode 100644 index beb4b148..00000000 Binary files a/app/assets/images/backgrounds/5.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/6.jpg b/app/assets/images/backgrounds/6.jpg deleted file mode 100644 index acdaa73a..00000000 Binary files a/app/assets/images/backgrounds/6.jpg and /dev/null differ diff --git a/app/assets/images/backgrounds/7.jpg b/app/assets/images/backgrounds/7.jpg deleted file mode 100644 index cc48f72f..00000000 Binary files a/app/assets/images/backgrounds/7.jpg and /dev/null differ diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 82df968a..1a0b7d1c 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -124,7 +124,7 @@ document.getElementById('avatarOverlay').onclick = (e) => { // Bind selected account function updateSelectedAccount(authUser){ - let username = 'No Account Selected' + let username = 'Aucun compte sélectionné' if(authUser != null){ if(authUser.displayName != null){ username = authUser.displayName @@ -144,14 +144,14 @@ function updateSelectedServer(serv){ } ConfigManager.setSelectedServer(serv != null ? serv.getID() : null) ConfigManager.save() - server_selection_button.innerHTML = '\u2022 ' + (serv != null ? serv.getName() : 'No Server Selected') + server_selection_button.innerHTML = '\u2022 ' + (serv != null ? serv.getName() : 'Aucun serveur sélectionné') if(getCurrentView() === VIEWS.settings){ animateModsTabRefresh() } setLaunchEnabled(serv != null) } // Real text is set in uibinder.js on distributionIndexDone. -server_selection_button.innerHTML = '\u2022 Loading..' +server_selection_button.innerHTML = '\u2022 Chargement..' server_selection_button.onclick = (e) => { e.target.blur() toggleServerSelection(true) @@ -324,10 +324,10 @@ function asyncSystemScan(mcVersion, launchAfter = true){ // If the result is null, no valid Java installation was found. // Show this information to the user. setOverlayContent( - 'No Compatible
Java Installation Found', - 'In order to join WesterosCraft, you need a 64-bit installation of Java 8. Would you like us to install a copy?', - 'Install Java', - 'Install Manually' + `Aucune installation
Java compatible n'a été trouvée`, + `Vous avez besoin d'une installation 64 bits de Java 8. Souhaitez-vous que nous en installions une copie ?`, + 'Installer Java', + 'Installer manuellement' ) setOverlayHandler(() => { setLaunchDetails('Préparation du téléchargement Java..') @@ -339,10 +339,10 @@ function asyncSystemScan(mcVersion, launchAfter = true){ $('#overlayContent').fadeOut(250, () => { //$('#overlayDismiss').toggle(false) setOverlayContent( - 'Java is Required
to Launch', - 'A valid x64 installation of Java 8 is required to launch.

Please refer to our Java Management Guide for instructions on how to manually install Java.', - 'I Understand', - 'Go Back' + 'Java est requis
pour lancer', + `Une installation x64 valide de Java 8 est requise pour le lancement.

Veuillez vous référer à notre Guide de gestion Java pour obtenir des instructions sur l'installation manuelle de Java.`, + 'Je comprends', + 'Retour' ) setOverlayHandler(() => { toggleLaunchArea(false) @@ -385,9 +385,9 @@ function asyncSystemScan(mcVersion, launchAfter = true){ // Oracle JRE enqueue failed. Probably due to a change in their website format. // User will have to follow the guide to install Java. setOverlayContent( - 'Unexpected Issue:
Java Download Failed', - 'Unfortunately we\'ve encountered an issue while attempting to install Java. You will need to manually install a copy. Please check out our Troubleshooting Guide for more details and instructions.', - 'I Understand' + 'Problème inattendu :
Échec du téléchargement Java', + `Malheureusement, nous avons rencontré un problème lors de la tentative d'installation de Java. Vous devrez installer manuellement une copie. Veuillez consulter notre Guide de dépannage pour plus de détails et d'instructions.`, + 'Je comprends' ) setOverlayHandler(() => { toggleOverlay(false) @@ -522,12 +522,12 @@ function dlAsync(login = true){ }) aEx.on('error', (err) => { loggerLaunchSuite.error('Error during launch', err) - showLaunchFailure('Error During Launch', err.message || 'See console (CTRL + Shift + i) for more details.') + showLaunchFailure('Erreur lors du lancement', err.message || 'Voir console (CTRL + Maj + i) pour plus de détails.') }) aEx.on('close', (code, signal) => { if(code !== 0){ loggerLaunchSuite.error(`AssetExec exited with code ${code}, assuming error.`) - showLaunchFailure('Error During Launch', 'See console (CTRL + Shift + i) for more details.') + showLaunchFailure('Erreur lors du lancement', 'Voir console (CTRL + Maj + i) pour plus de détails.') } }) @@ -611,13 +611,13 @@ function dlAsync(login = true){ if(m.error.code === 'ENOENT'){ showLaunchFailure( - 'Download Error', - 'Could not connect to the file server. Ensure that you are connected to the internet and try again.' + 'Erreur de téléchargement', + 'Impossible de se connecter au serveur de fichiers. Assurez-vous que vous êtes connecté à Internet et réessayez.' ) } else { showLaunchFailure( - 'Download Error', - 'Check the console (CTRL + Shift + i) for more details. Please try again.' + 'Erreur de téléchargement', + 'Vérifiez la console (CTRL + Maj + i) pour plus de détails. Veuillez réessayer.' ) } @@ -636,7 +636,7 @@ function dlAsync(login = true){ loggerLaunchSuite.error('Error during validation:', m.result) loggerLaunchSuite.error('Error during launch', m.result.error) - showLaunchFailure('Error During Launch', 'Please check the console (CTRL + Shift + i) for more details.') + showLaunchFailure('Erreur lors du lancement', 'Veuillez vérifier la console (CTRL + Maj + i) pour plus de détails.') allGood = false } @@ -693,7 +693,7 @@ function dlAsync(login = true){ data = data.trim() if(data.indexOf('Could not find or load main class net.minecraft.launchwrapper.Launch') > -1){ loggerLaunchSuite.error('Game launch failed, LaunchWrapper was not downloaded properly.') - showLaunchFailure('Error During Launch', 'The main file, LaunchWrapper, failed to download properly. As a result, the game cannot launch.

To fix this issue, temporarily turn off your antivirus software and launch the game again.

If you have time, please submit an issue and let us know what antivirus software you use. We\'ll contact them and try to straighten things out.') + showLaunchFailure('Erreur lors du lancement', `Le fichier principal, LaunchWrapper, n'a pas pu être téléchargé correctement. Par conséquent, le jeu ne peut pas se lancer.

Pour résoudre ce problème, désactivez temporairement votre logiciel antivirus et relancez le jeu.

Si vous avez le temps, veuillez soumettez un problème et faites-nous savoir quel logiciel antivirus vous utilisez. Nous allons les contacter et essayer d'arranger les choses.`) } } @@ -723,7 +723,7 @@ function dlAsync(login = true){ } catch(err) { loggerLaunchSuite.error('Error during launch', err) - showLaunchFailure('Error During Launch', 'Please check the console (CTRL + Shift + i) for more details.') + showLaunchFailure('Erreur lors du lancement', 'Veuillez vérifier la console (CTRL + Maj + i) pour plus de détails.') } } @@ -752,7 +752,7 @@ function dlAsync(login = true){ }, (err) => { loggerLaunchSuite.error('Unable to refresh distribution index.', err) if(DistroManager.getDistribution() == null){ - showLaunchFailure('Fatal Error', 'Could not load a copy of the distribution index. See the console (CTRL + Shift + i) for more details.') + showLaunchFailure('Erreur fatale', `Impossible de charger une copie de l'index de distribution. Voir la console (CTRL + Maj + i) pour plus de détails.`) // Disconnect from AssetExec aEx.disconnect() diff --git a/app/assets/js/scripts/login.js b/app/assets/js/scripts/login.js index 724f09c4..534385ec 100644 --- a/app/assets/js/scripts/login.js +++ b/app/assets/js/scripts/login.js @@ -223,8 +223,8 @@ loginButton.addEventListener('click', () => { // Uh oh. msftLoginLogger.error('Unhandled error during login.', displayableError) actualDisplayableError = { - title: 'Unknown Error During Login', - desc: 'An unknown error has occurred. Please see the console for details.' + title: 'Erreur inconnue lors de la connexion', + desc: `Une erreur inconnue s'est produite. Veuillez consulter la console pour plus de détails.` } } diff --git a/app/assets/js/scripts/overlay.js b/app/assets/js/scripts/overlay.js index cf2c5c98..b597ae82 100644 --- a/app/assets/js/scripts/overlay.js +++ b/app/assets/js/scripts/overlay.js @@ -289,7 +289,7 @@ function populateServerListings(){ - Main Server + Serveur Principal ` : ''} diff --git a/app/assets/js/scripts/settings.js b/app/assets/js/scripts/settings.js index d673cf48..44e3a273 100644 --- a/app/assets/js/scripts/settings.js +++ b/app/assets/js/scripts/settings.js @@ -350,8 +350,8 @@ ipcRenderer.on(MSFT_OPCODE.REPLY_LOGIN, (_, ...arguments_) => { // Unexpected error. setOverlayContent( - 'Something Went Wrong', - 'Microsoft authentication failed. Please try again.', + `Quelque chose s'est mal passé`, + `L'authentification Microsoft a échoué. Veuillez réessayer.`, 'OK' ) setOverlayHandler(() => { @@ -406,8 +406,8 @@ ipcRenderer.on(MSFT_OPCODE.REPLY_LOGIN, (_, ...arguments_) => { // Uh oh. msftLoginLogger.error('Unhandled error during login.', displayableError) actualDisplayableError = { - title: 'Unknown Error During Login', - desc: 'An unknown error has occurred. Please see the console for details.' + title: 'Erreur inconnue lors de la connexion', + desc: `Une erreur inconnue s'est produite. Veuillez consulter la console pour plus de détails.` } } @@ -437,11 +437,11 @@ function bindAuthAccountSelect(){ for(let i=0; iThis is Your Last Account', - 'In order to use the launcher you must be logged into at least one account. You will need to login again after.

Are you sure you want to log out?', - 'I\'m Sure', - 'Cancel' + 'Avertissement
Ceci est votre dernier compte', + 'Pour utiliser le lanceur, vous devez être connecté à au moins un compte. Vous devrez vous reconnecter après.

Voulez-vous vraiment vous déconnecter ?', + 'Je suis sûr', + 'Annuler' ) setOverlayHandler(() => { processLogOut(val, isLastAccount) @@ -531,8 +531,8 @@ ipcRenderer.on(MSFT_OPCODE.REPLY_LOGOUT, (_, ...arguments_) => { // Unexpected error. setOverlayContent( - 'Something Went Wrong', - 'Microsoft logout failed. Please try again.', + `Quelque chose s'est mal passé`, + 'La déconnexion de Microsoft a échoué. Veuillez réessayer.', 'OK' ) setOverlayHandler(() => { @@ -587,12 +587,12 @@ function refreshAuthAccountSelected(uuid){ const selBtn = val.getElementsByClassName('settingsAuthAccountSelect')[0] if(uuid === val.getAttribute('uuid')){ selBtn.setAttribute('selected', '') - selBtn.innerHTML = 'Selected Account ✔' + selBtn.innerHTML = 'Compte sélectionné ✔' } else { if(selBtn.hasAttribute('selected')){ selBtn.removeAttribute('selected') } - selBtn.innerHTML = 'Select Account' + selBtn.innerHTML = 'Sélectionnez un compte' } }) } @@ -624,7 +624,7 @@ function populateAuthAccounts(){
-
Username
+
Nom d'utilisateur
${acc.displayName}
@@ -633,9 +633,9 @@ function populateAuthAccounts(){
- +
- +
@@ -849,7 +849,7 @@ function resolveDropinModsForUI(){
${dropin.name}
- +
@@ -877,8 +877,8 @@ function bindDropinModsRemoveButton(){ document.getElementById(fullName).remove() } else { setOverlayContent( - `Failed to Delete
Drop-in Mod ${fullName}`, - 'Make sure the file is not in use and try again.', + `Échec de la suppression
Mod d'insertion ${fullName}`, + `Assurez-vous que le fichier n'est pas utilisé et réessayez.`, 'Okay' ) setOverlayHandler(null) @@ -932,7 +932,7 @@ function saveDropinModConfiguration(){ DropinModUtil.toggleDropinMod(CACHE_SETTINGS_MODS_DIR, dropin.fullName, dropinUIEnabled).catch(err => { if(!isOverlayVisible()){ setOverlayContent( - 'Failed to Toggle
One or More Drop-in Mods', + `Impossible de basculer
un ou plusieurs mods d'insertion`, err.message, 'Okay' ) @@ -1068,7 +1068,7 @@ function loadSelectedServerOnModsTab(){ - Main Server + Serveur Principal ` : ''} @@ -1324,12 +1324,12 @@ function populateJavaExecDetails(execPath){ if(v.valid){ const vendor = v.vendor != null ? ` (${v.vendor})` : '' if(v.version.major < 9) { - settingsJavaExecDetails.innerHTML = `Selected: Java ${v.version.major} Update ${v.version.update} (x${v.arch})${vendor}` + settingsJavaExecDetails.innerHTML = `Sélectionné : Java ${v.version.major} Mettre à jour ${v.version.update} (x${v.arch})${vendor}` } else { - settingsJavaExecDetails.innerHTML = `Selected: Java ${v.version.major}.${v.version.minor}.${v.version.revision} (x${v.arch})${vendor}` + settingsJavaExecDetails.innerHTML = `Sélectionné : Java ${v.version.major}.${v.version.minor}.${v.version.revision} (x${v.arch})${vendor}` } } else { - settingsJavaExecDetails.innerHTML = 'Invalid Selection' + settingsJavaExecDetails.innerHTML = 'Selection invalide' } }) } @@ -1380,11 +1380,11 @@ function isPrerelease(version){ function populateVersionInformation(version, valueElement, titleElement, checkElement){ valueElement.innerHTML = version if(isPrerelease(version)){ - titleElement.innerHTML = 'Pre-release' + titleElement.innerHTML = 'Avant-première' titleElement.style.color = '#ff886d' checkElement.style.background = '#ff886d' } else { - titleElement.innerHTML = 'Stable Release' + titleElement.innerHTML = 'Version stable' titleElement.style.color = null checkElement.style.background = null } @@ -1423,7 +1423,7 @@ function populateReleaseNotes(){ }, timeout: 2500 }).catch(err => { - settingsAboutChangelogText.innerHTML = 'Failed to load release notes.' + settingsAboutChangelogText.innerHTML = 'Échec du chargement des notes de version.' }) } @@ -1471,27 +1471,27 @@ function settingsUpdateButtonStatus(text, disabled = false, handler = null){ */ function populateSettingsUpdateInformation(data){ if(data != null){ - settingsUpdateTitle.innerHTML = `New ${isPrerelease(data.version) ? 'Pre-release' : 'Release'} Available` + settingsUpdateTitle.innerHTML = `Nouvelle ${isPrerelease(data.version) ? 'Pre-version' : 'Version'} Disponible` settingsUpdateChangelogCont.style.display = null settingsUpdateChangelogTitle.innerHTML = data.releaseName settingsUpdateChangelogText.innerHTML = data.releaseNotes populateVersionInformation(data.version, settingsUpdateVersionValue, settingsUpdateVersionTitle, settingsUpdateVersionCheck) if(process.platform === 'darwin'){ - settingsUpdateButtonStatus('Download from GitHubClose the launcher and run the dmg to update.', false, () => { + settingsUpdateButtonStatus('Télécharger depuis GitHubFermez le lanceur et exécutez le dmg pour mettre à jour.', false, () => { shell.openExternal(data.darwindownload) }) } else { - settingsUpdateButtonStatus('Downloading..', true) + settingsUpdateButtonStatus('Téléchargement..', true) } } else { - settingsUpdateTitle.innerHTML = 'You Are Running the Latest Version' + settingsUpdateTitle.innerHTML = 'Vous utilisez la dernière version' settingsUpdateChangelogCont.style.display = 'none' populateVersionInformation(remote.app.getVersion(), settingsUpdateVersionValue, settingsUpdateVersionTitle, settingsUpdateVersionCheck) - settingsUpdateButtonStatus('Check for Updates', false, () => { + settingsUpdateButtonStatus('Vérifier les mises à jour', false, () => { if(!isDev){ ipcRenderer.send('autoUpdateAction', 'checkForUpdate') - settingsUpdateButtonStatus('Checking for Updates..', true) + settingsUpdateButtonStatus('Vérification des mises à jour..', true) } }) } diff --git a/app/assets/js/scripts/uibinder.js b/app/assets/js/scripts/uibinder.js index f47b8fa6..1a7a1440 100644 --- a/app/assets/js/scripts/uibinder.js +++ b/app/assets/js/scripts/uibinder.js @@ -69,7 +69,7 @@ function showMainUI(data){ refreshServerStatus() setTimeout(() => { document.getElementById('frameBar').style.backgroundColor = 'rgba(0, 0, 0, 0.5)' - document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.jpg')` + document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.png')` $('#main').show() const isLoggedIn = Object.keys(ConfigManager.getAuthAccounts()).length > 0 @@ -114,9 +114,9 @@ function showFatalStartupError(){ $('#loadingContainer').fadeOut(250, () => { document.getElementById('overlayContainer').style.background = 'none' setOverlayContent( - 'Fatal Error: Unable to Load Distribution Index', - 'A connection could not be established to our servers to download the distribution index. No local copies were available to load.

The distribution index is an essential file which provides the latest server information. The launcher is unable to start without it. Ensure you are connected to the internet and relaunch the application.', - 'Close' + `Erreur fatale : impossible de charger l'index de distribution`, + `A connection could not be established to our servers to download the distribution index. No local copies were available to load.

The distribution index is an essential file which provides the latest server information. The launcher is unable to start without it. Ensure you are connected to the internet and relaunch the application.`, + 'Fermer' ) setOverlayHandler(() => { const window = remote.getCurrentWindow() @@ -328,10 +328,10 @@ async function validateSelectedAccount(){ ConfigManager.save() const accLen = Object.keys(ConfigManager.getAuthAccounts()).length setOverlayContent( - 'Failed to Refresh Login', - `We were unable to refresh the login for ${selectedAcc.displayName}. Please ${accLen > 0 ? 'select another account or ' : ''} login again.`, - 'Login', - 'Select Another Account' + `Échec de l'actualisation de la connexion`, + `Nous n'avons pas pu actualiser la connexion pour ${selectedAcc.displayName}. S'il te plaît ${accLen > 0 ? 'sélectionnez un autre compte ou ' : ''} reconnectez-vous.`, + 'Connexion', + 'Sélectionnez un autre compte' ) setOverlayHandler(() => { diff --git a/app/assets/js/scripts/uicore.js b/app/assets/js/scripts/uicore.js index 71a5aa19..4f6f716a 100644 --- a/app/assets/js/scripts/uicore.js +++ b/app/assets/js/scripts/uicore.js @@ -44,7 +44,7 @@ if(!isDev){ switch(arg){ case 'checking-for-update': loggerAutoUpdater.log('Checking for update..') - settingsUpdateButtonStatus('Checking for Updates..', true) + settingsUpdateButtonStatus('Vérification des mises à jour..', true) break case 'update-available': loggerAutoUpdaterSuccess.log('New update available', info.version) @@ -58,7 +58,7 @@ if(!isDev){ break case 'update-downloaded': loggerAutoUpdaterSuccess.log('Update ' + info.version + ' ready to be installed.') - settingsUpdateButtonStatus('Install Now', false, () => { + settingsUpdateButtonStatus('Installer maintenant', false, () => { if(!isDev){ ipcRenderer.send('autoUpdateAction', 'installUpdateNow') } @@ -67,7 +67,7 @@ if(!isDev){ break case 'update-not-available': loggerAutoUpdater.log('No new update found.') - settingsUpdateButtonStatus('Check for Updates') + settingsUpdateButtonStatus('Vérifier les mises à jour') break case 'ready': updateCheckListener = setInterval(() => { diff --git a/app/assets/lang/en_US.json b/app/assets/lang/en_US.json index 4c7032a9..80acabaa 100644 --- a/app/assets/lang/en_US.json +++ b/app/assets/lang/en_US.json @@ -1,6 +1,6 @@ { "html": { - "avatarOverlay": "Edit" + "avatarOverlay": "Modifier" }, "js": { "login": { diff --git a/app/settings.ejs b/app/settings.ejs index 524c015c..e1c6ff25 100644 --- a/app/settings.ejs +++ b/app/settings.ejs @@ -72,7 +72,7 @@