diff --git a/src/main/java/org/terasology/launcher/LauncherInitTask.java b/src/main/java/org/terasology/launcher/LauncherInitTask.java index f22f422ff..5575131dc 100644 --- a/src/main/java/org/terasology/launcher/LauncherInitTask.java +++ b/src/main/java/org/terasology/launcher/LauncherInitTask.java @@ -69,14 +69,15 @@ protected LauncherConfiguration call() { // init directories updateMessage(BundleUtils.getLabel("splash_initLauncherDirs")); - final Path launcherDirectory = getLauncherDirectory(os); + final Path installationDirectory = LauncherDirectoryUtils.getInstallationDirectory(); + final Path userDataDirectory = getLauncherDirectory(os); - final Path downloadDirectory = getDirectoryFor(org.terasology.launcher.util.LauncherManagedDirectory.DOWNLOAD, launcherDirectory); - final Path tempDirectory = getDirectoryFor(org.terasology.launcher.util.LauncherManagedDirectory.TEMP, launcherDirectory); - final Path cacheDirectory = getDirectoryFor(org.terasology.launcher.util.LauncherManagedDirectory.CACHE, launcherDirectory); + final Path downloadDirectory = getDirectoryFor(LauncherManagedDirectory.DOWNLOAD, userDataDirectory); + final Path tempDirectory = getDirectoryFor(LauncherManagedDirectory.TEMP, userDataDirectory); + final Path cacheDirectory = getDirectoryFor(LauncherManagedDirectory.CACHE, userDataDirectory); // launcher settings - final BaseLauncherSettings launcherSettings = getLauncherSettings(launcherDirectory); + final BaseLauncherSettings launcherSettings = getLauncherSettings(userDataDirectory); // validate the settings LauncherSettingsValidator.validate(launcherSettings); @@ -92,14 +93,14 @@ protected LauncherConfiguration call() { // game directories updateMessage(BundleUtils.getLabel("splash_initGameDirs")); - final Path gameDirectory = getGameDirectory(os, launcherSettings.getGameDirectory()); + final Path gameDirectory = getDirectoryFor(LauncherManagedDirectory.GAMES, installationDirectory); final Path gameDataDirectory = getGameDataDirectory(os, launcherSettings.getGameDataDirectory()); // TODO: Does this interact with any remote server for fetching/initializing the database? logger.trace("Setting up Package Manager"); final PackageManager packageManager = new PackageManager(); packageManager.initLocalStorage(gameDirectory, cacheDirectory); - packageManager.initDatabase(launcherDirectory, gameDirectory); + packageManager.initDatabase(userDataDirectory, gameDirectory); packageManager.syncDatabase(); logger.trace("Change LauncherSettings..."); @@ -111,7 +112,7 @@ protected LauncherConfiguration call() { logger.trace("Creating launcher frame..."); - return new LauncherConfiguration(launcherDirectory, downloadDirectory, tempDirectory, cacheDirectory, launcherSettings, packageManager); + return new LauncherConfiguration(userDataDirectory, downloadDirectory, tempDirectory, cacheDirectory, launcherSettings, packageManager); } catch (LauncherStartFailedException e) { logger.warn("Could not configure launcher."); } @@ -189,9 +190,11 @@ private boolean checkForLauncherUpdates(Path downloadDirectory, Path tempDirecto updateMessage(BundleUtils.getLabel("splash_launcherUpdateAvailable")); boolean foundLauncherInstallationDirectory = false; try { - updater.detectAndCheckLauncherInstallationDirectory(); + final Path installationDir = LauncherDirectoryUtils.getInstallationDirectory(); + FileUtils.ensureWritableDir(installationDir); + logger.trace("Launcher installation directory: {}", installationDir); foundLauncherInstallationDirectory = true; - } catch (URISyntaxException | IOException e) { + } catch (IOException e) { logger.error("The launcher installation directory can not be detected or used!", e); GuiUtils.showErrorMessageDialog(owner, BundleUtils.getLabel("message_error_launcherInstallationDirectory")); // Run launcher without an update. Don't throw a LauncherStartFailedException. @@ -220,41 +223,6 @@ private void showDownloadPage() { } } - private Path getGameDirectory(OperatingSystem os, Path settingsGameDirectory) throws LauncherStartFailedException { - logger.trace("Init GameDirectory..."); - Path gameDirectory = settingsGameDirectory; - if (gameDirectory != null) { - try { - FileUtils.ensureWritableDir(gameDirectory); - } catch (IOException e) { - logger.warn("The game directory can not be created or used! '{}'", gameDirectory, e); - GuiUtils.showWarningMessageDialog(owner, BundleUtils.getLabel("message_error_gameDirectory") + "\n" + gameDirectory); - - // Set gameDirectory to 'null' -> user has to choose new game directory - gameDirectory = null; - } - } - if (gameDirectory == null) { - logger.trace("Choose installation directory for the game..."); - updateMessage(BundleUtils.getLabel("splash_chooseGameDirectory")); - gameDirectory = GuiUtils.chooseDirectoryDialog(owner, LauncherDirectoryUtils.getApplicationDirectory(os, LauncherDirectoryUtils.GAME_APPLICATION_DIR_NAME), - BundleUtils.getLabel("message_dialog_title_chooseGameDirectory")); - if (gameDirectory == null || Files.notExists(gameDirectory)) { - logger.info("The new game directory is not approved. The TerasologyLauncher is terminated."); - Platform.exit(); - } - } - try { - FileUtils.ensureWritableDir(gameDirectory); - } catch (IOException e) { - logger.error("The game directory can not be created or used! '{}'", gameDirectory, e); - GuiUtils.showErrorMessageDialog(owner, BundleUtils.getLabel("message_error_gameDirectory") + "\n" + gameDirectory); - throw new LauncherStartFailedException(); - } - logger.debug("Game directory: {}", gameDirectory); - return gameDirectory; - } - private Path getGameDataDirectory(OperatingSystem os, Path settingsGameDataDirectory) throws LauncherStartFailedException { logger.trace("Init GameDataDirectory..."); Path gameDataDirectory = settingsGameDataDirectory; diff --git a/src/main/java/org/terasology/launcher/TerasologyLauncher.java b/src/main/java/org/terasology/launcher/TerasologyLauncher.java index 7cb7086ae..897080f76 100644 --- a/src/main/java/org/terasology/launcher/TerasologyLauncher.java +++ b/src/main/java/org/terasology/launcher/TerasologyLauncher.java @@ -21,8 +21,6 @@ import javafx.application.Platform; import javafx.concurrent.Task; import javafx.concurrent.Worker; -import javafx.concurrent.WorkerStateEvent; -import javafx.event.EventHandler; import javafx.fxml.FXMLLoader; import javafx.geometry.Pos; import javafx.geometry.Rectangle2D; @@ -101,22 +99,19 @@ public void start(final Stage initialStage) { showSplashStage(initialStage, launcherInitTask); Thread initThread = new Thread(launcherInitTask); - launcherInitTask.setOnSucceeded(new EventHandler() { - @Override - public void handle(final WorkerStateEvent workerStateEvent) { - try { - LauncherConfiguration config = launcherInitTask.getValue(); - if (config == null) { - throw new LauncherStartFailedException("Launcher configuration was `null`."); - } else if (config instanceof NullLauncherConfiguration) { - logger.info("Closing the launcher ... (empty configuration, probably due to update)"); - Platform.exit(); - } else { - showMainStage(config); - } - } catch (IOException | LauncherStartFailedException e) { - openCrashReporterAndExit(e); + launcherInitTask.setOnSucceeded(workerStateEvent -> { + try { + LauncherConfiguration config = launcherInitTask.getValue(); + if (config == null) { + throw new LauncherStartFailedException("Launcher configuration was `null`."); + } else if (config instanceof NullLauncherConfiguration) { + logger.info("Closing the launcher ... (empty configuration, probably due to update)"); + Platform.exit(); + } else { + showMainStage(config); } + } catch (IOException | LauncherStartFailedException e) { + openCrashReporterAndExit(e); } }); diff --git a/src/main/java/org/terasology/launcher/packages/PackageManager.java b/src/main/java/org/terasology/launcher/packages/PackageManager.java index 41ea9c215..70729336d 100644 --- a/src/main/java/org/terasology/launcher/packages/PackageManager.java +++ b/src/main/java/org/terasology/launcher/packages/PackageManager.java @@ -40,7 +40,6 @@ public class PackageManager { private static final Logger logger = LoggerFactory.getLogger(PackageManager.class); - private static final String INSTALL_DIRECTORY = "games"; private static final String SOURCES_FILENAME = "sources.json"; private static final String DATABASE_FILENAME = "packages.db"; private static final String CACHE_DIRECTORY = "cache"; @@ -58,7 +57,7 @@ public PackageManager() { /** * Sets up local storage for working with game packages and cache files. * - * @param gameDirectory directory path for storing game packages + * @param gameDirectory directory path for storing game packages * @param cacheDirectory directory path for storing cache files */ public void initLocalStorage(Path gameDirectory, Path cacheDirectory) { @@ -88,10 +87,10 @@ public void sync() { } // TODO: Move to constructor - public void initDatabase(Path launcherDir, Path gameDir) { - cacheDir = launcherDir.resolve(CACHE_DIRECTORY); - installDir = gameDir.resolve(INSTALL_DIRECTORY); - final Path sourcesFile = launcherDir.resolve(SOURCES_FILENAME); + public void initDatabase(final Path userDataDirectory, final Path gameInstallationDir) { + cacheDir = userDataDirectory.resolve(CACHE_DIRECTORY); + installDir = gameInstallationDir; + final Path sourcesFile = userDataDirectory.resolve(SOURCES_FILENAME); // Copy default sources file if necessary if (Files.notExists(sourcesFile)) { @@ -105,7 +104,7 @@ public void initDatabase(Path launcherDir, Path gameDir) { database = new PackageDatabase( sourcesFile, - launcherDir.resolve(DATABASE_FILENAME), + userDataDirectory.resolve(DATABASE_FILENAME), installDir ); } @@ -119,7 +118,7 @@ public void syncDatabase() { /** * Installs the mentioned package into the local repository. * - * @param target the package to be installed + * @param target the package to be installed * @param listener the object which is to be informed about task progress */ public void install(Package target, ProgressListener listener) throws IOException, DownloadException { diff --git a/src/main/java/org/terasology/launcher/updater/LauncherUpdater.java b/src/main/java/org/terasology/launcher/updater/LauncherUpdater.java index 2602cf951..e13b420d7 100644 --- a/src/main/java/org/terasology/launcher/updater/LauncherUpdater.java +++ b/src/main/java/org/terasology/launcher/updater/LauncherUpdater.java @@ -29,14 +29,11 @@ import org.terasology.launcher.github.GitHubClient; import org.terasology.launcher.github.GitHubRelease; import org.terasology.launcher.util.BundleUtils; -import org.terasology.launcher.util.FileUtils; import org.terasology.launcher.util.GuiUtils; import org.terasology.launcher.version.TerasologyLauncherVersionInfo; import java.io.IOException; -import java.net.URISyntaxException; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; @@ -83,14 +80,6 @@ public GitHubRelease updateAvailable() { return null; } - public void detectAndCheckLauncherInstallationDirectory() throws URISyntaxException, IOException { - final Path launcherLocation = Paths.get(LauncherUpdater.class.getProtectionDomain().getCodeSource().getLocation().toURI()); - logger.trace("Launcher location: {}", launcherLocation); - launcherInstallationDirectory = launcherLocation.getParent().getParent(); - FileUtils.ensureWritableDir(launcherInstallationDirectory); - logger.trace("Launcher installation directory: {}", launcherInstallationDirectory); - } - public boolean showUpdateDialog(Stage parentStage, final GitHubRelease release) { FutureTask dialog = getUpdateDialog(parentStage, release); diff --git a/src/main/java/org/terasology/launcher/util/FileUtils.java b/src/main/java/org/terasology/launcher/util/FileUtils.java index 106607486..abcb1ac23 100644 --- a/src/main/java/org/terasology/launcher/util/FileUtils.java +++ b/src/main/java/org/terasology/launcher/util/FileUtils.java @@ -145,7 +145,6 @@ public static void ensureEmptyDir(final Path directory) throws IOException { } } - /** * Checks whether the given path exists and is a readable directory. * diff --git a/src/main/java/org/terasology/launcher/util/LauncherDirectoryUtils.java b/src/main/java/org/terasology/launcher/util/LauncherDirectoryUtils.java index 2a7e6bdfd..0a5c9bb4b 100644 --- a/src/main/java/org/terasology/launcher/util/LauncherDirectoryUtils.java +++ b/src/main/java/org/terasology/launcher/util/LauncherDirectoryUtils.java @@ -22,6 +22,8 @@ import org.terasology.launcher.util.windows.SavedGamesPathFinder; import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -164,4 +166,18 @@ public static Path getGameDataDirectory(OperatingSystem os) { return gameDataDirectory; } + + public static Path getInstallationDirectory() { + final URL location = LauncherDirectoryUtils.class.getProtectionDomain().getCodeSource().getLocation(); + Path installationDirectory = null; + try { + final Path launcherLocation = Paths.get(location.toURI()); + logger.trace("Launcher location: {}", launcherLocation); + installationDirectory = launcherLocation.getParent().getParent(); + logger.trace("Launcher installation directory: {}", installationDirectory); + } catch (URISyntaxException e) { + logger.error("Could not determine launcher installation directory.", e); + } + return installationDirectory; + } } diff --git a/src/main/java/org/terasology/launcher/util/LauncherManagedDirectory.java b/src/main/java/org/terasology/launcher/util/LauncherManagedDirectory.java index 6f8dd6f7c..1beff0bf4 100644 --- a/src/main/java/org/terasology/launcher/util/LauncherManagedDirectory.java +++ b/src/main/java/org/terasology/launcher/util/LauncherManagedDirectory.java @@ -29,7 +29,8 @@ public enum LauncherManagedDirectory { //TODO add documentation what these folders are exactly used for TEMP(FileUtils::ensureEmptyDir, FileUtils::ensureWritableDir), CACHE(FileUtils::ensureWritableDir), - DOWNLOAD(FileUtils::ensureWritableDir); + DOWNLOAD(FileUtils::ensureWritableDir), + GAMES(FileUtils::ensureWritableDir); private final DirectoryCreator[] creators; private final String errorLabel; diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle.properties index 04e216460..429428ac5 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle.properties @@ -60,7 +60,6 @@ main_no= main_yes= message_deleteGame_title= message_dialog_title_chooseGameDataDirectory= -message_dialog_title_chooseGameDirectory= message_error_gameDataDirectory= message_error_gameDirectory= message_error_gameDownload_downloadExtract= @@ -74,7 +73,6 @@ message_error_loadSettings= message_error_operatingSystem= message_error_storeSettings= message_error_tempDirectory= -message_error_cacheDirectory= message_error_title= message_information_gameRunning= message_information_title= @@ -130,7 +128,6 @@ settings_launcher_title= settings_save= settings_title= splash_chooseGameDataDirectory= -splash_chooseGameDirectory= splash_createFrame= splash_launcherUpdateAvailable= splash_launcherUpdateCheck= diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_af.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_af.properties index b1be55f35..2a0e330e9 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_af.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_af.properties @@ -60,7 +60,6 @@ main_no=Geen main_yes=Ja message_deleteGame_title=Verwyder ge\u00EFnstalleerde spel message_dialog_title_chooseGameDataDirectory=Kies data directory vir die spel -message_dialog_title_chooseGameDirectory=Kies installasie directory for the game message_error_gameDataDirectory= message_error_gameDirectory= message_error_gameDownload_downloadExtract= @@ -127,7 +126,6 @@ settings_launcher_title= settings_save= settings_title= splash_chooseGameDataDirectory= -splash_chooseGameDirectory= splash_createFrame= splash_launcherUpdateAvailable= splash_launcherUpdateCheck= diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_cs.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_cs.properties index 669a1d89f..8d1b0505f 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_cs.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_cs.properties @@ -60,7 +60,6 @@ main_no=Ne main_yes=Ano message_deleteGame_title=Smazat nainstalovanou hru message_dialog_title_chooseGameDataDirectory=Vyberte adres\u00E1\u0159 um\u00EDst\u011Bn\u00ED hern\u00EDch dat -message_dialog_title_chooseGameDirectory=Vyberte adres\u00E1\u0159 instalace hry message_error_gameDataDirectory=Nelze vytvo\u0159it nebo pou\u017E\u00EDt adres\u00E1\u0159 hern\u00EDch dat! message_error_gameDirectory=Nelze vytvo\u0159it nebo pou\u017E\u00EDt adres\u00E1\u0159 instalace hry! message_error_gameDownload_downloadExtract=Proces sta\u017Een\u00ED a rozbalen\u00ED hry selhal. @@ -127,7 +126,6 @@ settings_launcher_title=Spou\u0161t\u011B\u010D settings_save=Ulo\u017Eit settings_title=Nastaven\u00ED splash_chooseGameDataDirectory=Vyberte adres\u00E1\u0159 hern\u00EDch dat -splash_chooseGameDirectory=Vyberte adres\u00E1\u0159 instalace hry splash_createFrame=Vytv\u00E1\u0159\u00EDm r\u00E1m spou\u0161t\u011B\u010De... splash_launcherUpdateAvailable=Je dostupn\u00E1 aktualizace spou\u0161t\u011B\u010De! splash_launcherUpdateCheck=Vyhledat aktualizace spou\u0161t\u011B\u010De... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_de.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_de.properties index 10bb1785f..8c574f626 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_de.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_de.properties @@ -60,7 +60,6 @@ main_no=Nein main_yes=Ja message_deleteGame_title=Installierte Version deinstallieren und l\u00F6schen message_dialog_title_chooseGameDataDirectory=Bitte Verzeichnis f\u00FCr die Spielst\u00E4nde ausw\u00E4hlen -message_dialog_title_chooseGameDirectory=Bitte ein Installationsverzeichnis ausw\u00E4hlen message_error_gameDataDirectory=Das Spielstandverzeichnis konnte leider nicht erzeugt oder genutzt werden! message_error_gameDirectory=Das Installationsverzeichnis konnte leider nicht erzeugt oder genutzt werden! message_error_gameDownload_downloadExtract=Das Spiel konnte leider nicht heruntergeladen und entpackt werden. @@ -132,7 +131,6 @@ splash_initGameDirs=Spiel-Ordner werden initialisiert ... splash_retrieveLauncherSettings=Rufe Launchereinstellungen ab ... splash_storeLauncherSettings=Speichere Launchereinstellungen ... splash_chooseGameDataDirectory=Datenverzeichnis f\u00FCr das Spiel ausw\u00E4hlen -splash_chooseGameDirectory=Installationsverzeichnis f\u00FCr das Spiel ausw\u00E4hlen splash_createFrame=Erstelle Launcher-Rahmen ... splash_launcherUpdateAvailable=Launcher-Aktualisierung verf\u00FCgbar! splash_launcherUpdateCheck=Nach Launcher-Aktualisierungen suchen ... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_en.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_en.properties index 08318ae56..e8f34a81e 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_en.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_en.properties @@ -60,7 +60,6 @@ main_no=No main_yes=Yes message_deleteGame_title=Delete installed game message_dialog_title_chooseGameDataDirectory=Choose data directory for the game -message_dialog_title_chooseGameDirectory=Choose installation directory for the game message_error_gameDataDirectory=Cannot create or use game data directory\! message_error_gameDirectory=Cannot create or use game installation directory\! message_error_gameDownload_downloadExtract=The game download and extraction process failed. @@ -131,7 +130,6 @@ settings_launcher_title=Launcher settings_save=Save settings_title=Settings splash_chooseGameDataDirectory=Choose data directory for the game -splash_chooseGameDirectory=Choose installation directory for the game splash_createFrame=Creating launcher frame... splash_launcherUpdateAvailable=Launcher update available\! splash_launcherUpdateCheck=Check for launcher updates... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_es.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_es.properties index 9c2b6c5ea..b0f7baba8 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_es.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_es.properties @@ -60,7 +60,6 @@ main_no=No main_yes=Si message_deleteGame_title=Borrar juego instalado message_dialog_title_chooseGameDataDirectory=Escoge un directorio de datos para el juego -message_dialog_title_chooseGameDirectory=Escoge un directorio de instalaci\u00F3n para el juego message_error_gameDataDirectory=\u00A1No se ha podido crear o utilizar el directorio donde se almacena los datos del juego! message_error_gameDirectory=\u00A1No se ha podido crear o usar el directorio donde se encuentra instalado el juego! message_error_gameDownload_downloadExtract=La descarga del juego y su proceso de extracci\u00F3n ha fallado. @@ -127,7 +126,6 @@ settings_launcher_title=Launcher settings_save=Guardar settings_title=Ajustes splash_chooseGameDataDirectory=Escoge un directorio de datos para el juego -splash_chooseGameDirectory=Escoge un directorio de instalaci\u00F3n para el juego splash_createFrame=Creando la ventana del launcher... splash_launcherUpdateAvailable=\u00A1Actualizaci\u00F3n del Launcher disponible! splash_launcherUpdateCheck=Comprobando actualizaciones del launcher... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_fr.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_fr.properties index 9dde6ff18..f717a832f 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_fr.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_fr.properties @@ -60,7 +60,6 @@ main_no=Non main_yes=Oui message_deleteGame_title=Supprimer le jeu install\u00E9 message_dialog_title_chooseGameDataDirectory=Choisir le dossier de donn\u00E9es pour le jeu -message_dialog_title_chooseGameDirectory=Choisir le r\u00E9pertoire d'installation pour le jeu message_error_gameDataDirectory=Le r\u00E9petroire du jeu n'a pas pu \u00EAtre cr\u00E9\u00E9 ou utilis\u00E9! message_error_gameDirectory=Le r\u00E9pertoire d'installation du jeu n'a pas pu \u00EAtre cr\u00E9\u00E9 ou utilis\u00E9! message_error_gameDownload_downloadExtract=Le processus de t\u00E9l\u00E9chargement et d'extraction du jeu a \u00E9chou\u00E9. @@ -127,7 +126,6 @@ settings_launcher_title=Lanceur settings_save=Sauvegarder settings_title=R\u00E9glages splash_chooseGameDataDirectory=Choisir le r\u00E9pertoire de donn\u00E9es pour le jeu -splash_chooseGameDirectory=Choisir le r\u00E9pertoire d'installation pour le jeu splash_createFrame=Cr\u00E9ation du cadre du lanceur\u2026 splash_launcherUpdateAvailable=Mise \u00E0 jour du lanceur disponible! splash_launcherUpdateCheck=V\u00E9rification des mises \u00E0 jour du lanceur\u2026 diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_gl.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_gl.properties index 0a4c85643..0e58393bd 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_gl.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_gl.properties @@ -60,7 +60,6 @@ main_no=Non main_yes=Si message_deleteGame_title=Eliminar xogo instalado message_dialog_title_chooseGameDataDirectory=Escolle o directorio de datos para o xogo -message_dialog_title_chooseGameDirectory=Escolle o directorio de instalaci\u00F3n do xogo message_error_gameDataDirectory=Non se puido crear ou usar o directorio de datos do xogo! message_error_gameDirectory=Non se puido crear ou usar o directorio de instalaci\u00F3n do xogo! message_error_gameDownload_downloadExtract=Fallou o proceso de descarga e extracci\u00F3n do xogo. @@ -127,7 +126,6 @@ settings_launcher_title=Lanzador settings_save=Gardar settings_title=Configuraci\u00F3n splash_chooseGameDataDirectory=Escolle o directorio de datos para o xogo -splash_chooseGameDirectory=Escolle o directorio de instalaci\u00F3n para o xogo splash_createFrame=Creando base do lanzador... splash_launcherUpdateAvailable=Actualizaci\u00F3n do lanzador dispo\u00F1ible! splash_launcherUpdateCheck=Buscando actualizaci\u00F3ns do lanzador... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_hu.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_hu.properties index 8ce01c2c5..e6a2389f7 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_hu.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_hu.properties @@ -37,7 +37,6 @@ main_no=Nem main_yes=Igen message_deleteGame_title=J\u00E1t\u00E9k let\u00F6rl\u00E9se message_dialog_title_chooseGameDataDirectory=V\u00E1lassz \u00FAtvonalat a j\u00E1t\u00E9k adatainak -message_dialog_title_chooseGameDirectory=V\u00E1lassz telep\u00EDt\u00E9si \u00FAtvonalat a j\u00E1t\u00E9khoz message_error_gameDataDirectory=Nem lehet l\u00E9trehozni, vagy haszn\u00E1lni a j\u00E1t\u00E9k adataihoz be\u00E1ll\u00EDtott mapp\u00E1t! message_error_gameDirectory=Nem lehet l\u00E9trehozni, vagy haszn\u00E1lni a j\u00E1t\u00E9k telep\u00EDt\u00E9s\u00E9hez be\u00E1ll\u00EDtott mapp\u00E1t! message_error_gameDownload_downloadExtract=A j\u00E1t\u00E9k let\u00F6lt\u00E9se \u00E9s kit\u00F6m\u00F6r\u00EDt\u00E9se sikertelen volt. @@ -104,7 +103,6 @@ settings_launcher_title=Ind\u00EDt\u00F3 settings_save=Ment\u00E9s settings_title=Be\u00E1ll\u00EDt\u00E1sok splash_chooseGameDataDirectory=V\u00E1lassz adat mapp\u00E1t a j\u00E1t\u00E9knak -splash_chooseGameDirectory=V\u00E1lassz telep\u00EDt\u00E9si \u00FAtvonalat a j\u00E1t\u00E9knak splash_createFrame=Ind\u00EDt\u00F3 v\u00E1z\u00E1nak \u00F6ssze\u00E1ll\u00EDt\u00E1sa... splash_launcherUpdateAvailable=Friss\u00EDt\u00E9s el\u00E9rhet\u0151 az ind\u00EDt\u00F3hoz! splash_launcherUpdateCheck=Ind\u00EDt\u00F3 friss\u00EDt\u00E9s\u00E9nek keres\u00E9se... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_it.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_it.properties index d47abaa28..e7c9e4376 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_it.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_it.properties @@ -60,7 +60,6 @@ main_no=No main_yes=S\u00EC message_deleteGame_title=Elimina gioco installato message_dialog_title_chooseGameDataDirectory=Scegli la cartella per i dati del gioco -message_dialog_title_chooseGameDirectory=Scegli la cartella d'installazione del gioco message_error_gameDataDirectory=Impossibile creare o usare la cartella per i dati del gioco! message_error_gameDirectory=Impossibile creare o usare la cartella d'installazione del gioco! message_error_gameDownload_downloadExtract=Il processo di scaricamento ed estrazione del gioco \u00E8 fallito. @@ -127,7 +126,6 @@ settings_launcher_title=Launcher settings_save=Salva settings_title=Preferenze splash_chooseGameDataDirectory=Scegli la cartella dei dati per il gioco -splash_chooseGameDirectory=Scegli la cartella d'installazione per il gioco splash_createFrame=Creazione della struttura del Launcher... splash_launcherUpdateAvailable=Aggiornamento del Launcher disponibile! splash_launcherUpdateCheck=Cerca aggiornamenti del Launcher... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_ja.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_ja.properties index 1ff951032..dbd69f4d3 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_ja.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_ja.properties @@ -60,7 +60,6 @@ main_no=\u3044\u3044\u3048 main_yes=\u306F\u3044 message_deleteGame_title=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u305F\u30B2\u30FC\u30E0\u3092\u524A\u9664 message_dialog_title_chooseGameDataDirectory=\u30B2\u30FC\u30E0\u306E\u30C7\u30FC\u30BF\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E -message_dialog_title_chooseGameDirectory=\u30B2\u30FC\u30E0\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E message_error_gameDataDirectory=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u4F5C\u6210\u304A\u3088\u3073\u30B2\u30FC\u30E0\u30C7\u30FC\u30BF\u306E\u4FDD\u5B58\u3092\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\uFF01 message_error_gameDirectory=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u4F5C\u6210\u304A\u3088\u3073\u30B2\u30FC\u30E0\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\uFF01 message_error_gameDownload_downloadExtract=\u30B2\u30FC\u30E0\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u306E\u89E3\u51CD\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002 @@ -127,7 +126,6 @@ settings_launcher_title=\u30E9\u30F3\u30C1\u30E3\u30FC settings_save=\u4FDD\u5B58 settings_title=\u8A2D\u5B9A splash_chooseGameDataDirectory=\u30B2\u30FC\u30E0\u306E\u30C7\u30FC\u30BF\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E -splash_chooseGameDirectory=\u30B2\u30FC\u30E0\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E splash_createFrame=\u30E9\u30F3\u30C1\u30E3\u30FC\u30D5\u30EC\u30FC\u30E0\u306E\u4F5C\u6210\u4E2D... splash_launcherUpdateAvailable=\u30E9\u30F3\u30C1\u30E3\u30FC\u306E\u66F4\u65B0\u304C\u3042\u308A\u307E\u3059\uFF01 splash_launcherUpdateCheck=\u30E9\u30F3\u30C1\u30E3\u30FC\u306E\u66F4\u65B0\u3092\u78BA\u8A8D\u4E2D... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_lt.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_lt.properties index 29373e9a8..296fd2cfc 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_lt.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_lt.properties @@ -60,7 +60,6 @@ main_no=Ne main_yes=Taip message_deleteGame_title=Pa\u0161alinti \u012Fdiegt\u0105 \u017Eaidim\u0105 message_dialog_title_chooseGameDataDirectory=Pasirinkite \u017Eaidimo duomen\u0173 katalog\u0105 -message_dialog_title_chooseGameDirectory=Pasirinkite \u017Eaidimo \u012Fdiegimo katalog\u0105 message_error_gameDataDirectory=Ne\u012Fmanoma sukurti arba panaudoti \u017Eaidimo duomen\u0173 katalogo! message_error_gameDirectory=Ne\u012Fmanoma sukurti arba panaudoti \u017Eaidimo instaliavimo katalogo! message_error_gameDownload_downloadExtract=\u017Daidimo parsiuntimo ir i\u0161pakavimo procesas nepavyko. @@ -127,7 +126,6 @@ settings_launcher_title=Paleidiklis settings_save=I\u0161saugoti settings_title=Nustatymai splash_chooseGameDataDirectory=Pasirinkite \u017Eaidimo duomen\u0173 katalog\u0105 -splash_chooseGameDirectory=Pasirinkite katalog\u0105 \u017Eaidimui splash_createFrame=Paleid\u017Eiu Paleidikl\u012F... splash_launcherUpdateAvailable=\u012Emanomas paleidiklio atnaujinimas! splash_launcherUpdateCheck=Ie\u0161kau paleidiklio atnaujinim\u0173... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_pl.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_pl.properties index 36aeb9884..c58850d2a 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_pl.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_pl.properties @@ -59,7 +59,6 @@ main_no=Nie main_yes=Tak message_deleteGame_title=Usu\u0144 zainstalowan\u0105 gr\u0119 message_dialog_title_chooseGameDataDirectory=Wybierz folder danych dla gry -message_dialog_title_chooseGameDirectory=Wybierz folder instalacji gry message_error_gameDataDirectory=Nie mo\u017Cna utworzy\u0107 lub u\u017Cy\u0107 folderu danych gry! message_error_gameDirectory=Nie mo\u017Cna utworzy\u0107 lub u\u017Cy\u0107 folderu instalacji gry! message_error_gameDownload_downloadExtract=Pobieranie i rozpakowywanie gry nie powiod\u0142o si\u0119. @@ -121,7 +120,6 @@ settings_launcher_title=Launcher settings_save=Zapisz settings_title=Ustawienia splash_chooseGameDataDirectory=Wybierz folder na dane gry -splash_chooseGameDirectory=Wybierz folder na instalacj\u0119 gry splash_createFrame=Tworzenie ramki launchera... splash_launcherUpdateAvailable=Dost\u0119pna aktualizacja launchera! splash_launcherUpdateCheck=Sprawdzanie aktualizacji launchera... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_pt.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_pt.properties index 0ff2b7987..6410b88cb 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_pt.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_pt.properties @@ -60,7 +60,6 @@ main_no=N\u00E3o main_yes=Sim message_deleteGame_title=Apagar jogo instalado message_dialog_title_chooseGameDataDirectory=Escolher diret\u00F3rio de dados para o jogo -message_dialog_title_chooseGameDirectory=Escolher o diret\u00F3rio de instala\u00E7\u00E3o para o jogo message_error_gameDataDirectory=N\u00E3o \u00E9 poss\u00EDvel criar ou usar o diret\u00F3rio de dados do jogo! message_error_gameDirectory=N\u00E3o \u00E9 poss\u00EDvel criar ou usar o diret\u00F3rio de instala\u00E7\u00E3o do jogo! message_error_gameDownload_downloadExtract=O processo de download do jogo e extra\u00E7\u00E3o falhou. @@ -127,7 +126,6 @@ settings_launcher_title=Lan\u00E7ador settings_save=Guardar settings_title=Op\u00E7\u00F5es splash_chooseGameDataDirectory=Escolha o diret\u00F3rio de dados para o jogo -splash_chooseGameDirectory=Escolha o diret\u00F3rio de instala\u00E7\u00E3o para o jogo splash_createFrame=Criando o quadro do lan\u00E7ador ... splash_launcherUpdateAvailable=Atualiza\u00E7\u00E3o do lan\u00E7ador dispon\u00EDvel! splash_launcherUpdateCheck=Verificar se h\u00E1 atualiza\u00E7\u00F5es do lan\u00E7ador ... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_ru.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_ru.properties index 4cf501789..b7aad4fd7 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_ru.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_ru.properties @@ -60,7 +60,6 @@ main_no=\u041D\u0435\u0442 main_yes=\u0414\u0430 message_deleteGame_title=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u0443\u044E \u0438\u0433\u0440\u0443 message_dialog_title_chooseGameDataDirectory=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0441 \u0438\u0433\u0440\u043E\u0439 -message_dialog_title_chooseGameDirectory=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0434\u043B\u044F \u0434\u0430\u043D\u043D\u044B\u0445 \u0438\u0433\u0440\u044B message_error_gameDataDirectory=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0441\u043E\u0437\u0434\u0430\u0442\u044C \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0434\u043B\u044F \u0438\u0433\u0440\u044B! message_error_gameDirectory=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0438\u0433\u0440\u0443 \u0432 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0439 \u043A\u0430\u0442\u0430\u043B\u043E\u0433! message_error_gameDownload_downloadExtract=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432\u043E \u0432\u0440\u0435\u043C\u044F \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0438 \u0438\u0433\u0440\u044B. @@ -127,7 +126,6 @@ settings_launcher_title=\u041B\u0430\u0443\u043D\u0447\u0435\u0440 settings_save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C settings_title=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 splash_chooseGameDataDirectory=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0434\u043B\u044F \u0434\u0430\u043D\u043D\u044B\u0445 \u0438\u0433\u0440\u044B -splash_chooseGameDirectory=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0434\u043B\u044F \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0438 \u0438\u0433\u0440\u044B splash_createFrame=\u0421\u043E\u0437\u0434\u0430\u0451\u0442\u0441\u044F \u043E\u043A\u043D\u043E \u041B\u0430\u0443\u043D\u0447\u0435\u0440\u0430... splash_launcherUpdateAvailable=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u043E \u043D\u043E\u0432\u043E\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u041B\u0430\u0443\u043D\u0447\u0435\u0440\u0430! splash_launcherUpdateCheck=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0439 \u0434\u043B\u044F \u041B\u0430\u0443\u043D\u0447\u0435\u0440\u0430... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_tr.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_tr.properties index 0691c6f41..b6e3ec48e 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_tr.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_tr.properties @@ -60,7 +60,6 @@ main_no=Hay\u0131r main_yes=Evet message_deleteGame_title=Y\u00FCkl\u00FC oyunlar\u0131 sil message_dialog_title_chooseGameDataDirectory=Oyun verileri i\u00E7in klas\u00F6r se\u00E7 -message_dialog_title_chooseGameDirectory=Oyun y\u00FCkleme konumunu se\u00E7 message_error_gameDataDirectory=Veri klas\u00F6r\u00FC olu\u015Fturulam\u0131yor ya da kullan\u0131lam\u0131yor! message_error_gameDirectory=Oyun y\u00FCkleme klas\u00F6r\u00FC olu\u015Fturulam\u0131yor ya da kullan\u0131lam\u0131yor! message_error_gameDownload_downloadExtract=Oyun indirme ve \u00E7\u0131kartma i\u015Flemi ba\u015Far\u0131s\u0131z oldu. @@ -127,7 +126,6 @@ settings_launcher_title=Aray\u00FCz settings_save=Kaydet settings_title=Ayarlar splash_chooseGameDataDirectory=Oyun veri dosyalar\u0131 i\u00E7in konum se\u00E7 -splash_chooseGameDirectory=Oyunu y\u00FCkleme konumunu se\u00E7 splash_createFrame=Aray\u00FCz ayarlan\u0131yor... splash_launcherUpdateAvailable=Aray\u00FCz g\u00FCncellemesi mevcut! splash_launcherUpdateCheck=Aray\u00FCz g\u00FCncellemelerini denetle... diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_uk.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_uk.properties index 92187d848..f15771c81 100644 --- a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_uk.properties +++ b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_uk.properties @@ -60,7 +60,6 @@ main_no=\u041D\u0456 main_yes=\u0422\u0430\u043A message_deleteGame_title=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438 \u0433\u0440\u0443 message_dialog_title_chooseGameDataDirectory=\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044C \u043F\u0430\u043F\u043A\u0443 \u0434\u043B\u044F \u0434\u0430\u043D\u0438\u0445 \u0433\u0440\u0438 -message_dialog_title_chooseGameDirectory=\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044C \u043F\u0430\u043F\u043A\u0443 \u0434\u043B\u044F \u0433\u0440\u0438 message_error_gameDataDirectory=\u041D\u0435 \u0432\u0434\u0430\u043B\u043E\u0441\u044C \u0441\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u0430\u0431\u043E \u0437\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0443 \u043F\u0430\u043F\u043A\u0443 \u0434\u0430\u043D\u0438\u0445 \u0433\u0440\u0438! message_error_gameDirectory=\u041D\u0435 \u0432\u0434\u0430\u043B\u043E\u0441\u044C \u0441\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u0430\u0431\u043E \u0437\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0443 \u043F\u0430\u043F\u043A\u0443 \u0433\u0440\u0438! message_error_gameDownload_downloadExtract=\u041F\u043E\u043C\u0438\u043B\u043A\u0430 \u043F\u0456\u0434 \u0447\u0430\u0441 \u0432\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044F \u0430\u0431\u043E \u0440\u043E\u0437\u043F\u0430\u043A\u043E\u0432\u0443\u0432\u0430\u043D\u043D\u044F \u0433\u0440\u0438. @@ -129,7 +128,6 @@ settings_launcher_title=\u041B\u0430\u0443\u043D\u0447\u0435\u0440 settings_save=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 settings_title=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F splash_chooseGameDataDirectory=\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044C \u043F\u0430\u043F\u043A\u0443 \u0434\u043B\u044F \u0434\u0430\u043D\u0438\u0445 \u0433\u0440\u0438 -splash_chooseGameDirectory=\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044C \u043F\u0430\u043F\u043A\u0443 \u0434\u043B\u044F \u0432\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044F \u0433\u0440\u0438 splash_createFrame=\u0421\u0442\u0432\u043E\u0440\u044E\u044E \u0432\u0456\u043A\u043D\u043E \u043B\u0430\u0443\u043D\u0447\u0435\u0440\u0430... splash_launcherUpdateAvailable=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u0435 \u043E\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044F! splash_launcherUpdateCheck=\u0428\u0443\u043A\u0430\u0442\u0438 \u043E\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044F \u043B\u0430\u0443\u043D\u0447\u0435\u0440\u0430...