diff --git a/src/fios.cpp b/src/fios.cpp --- a/src/fios.cpp +++ b/src/fios.cpp @@ -38,7 +38,7 @@ extern bool FiosIsRoot(const char *path) extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb); extern bool FiosIsHiddenFile(const struct dirent *ent); extern void FiosGetDrives(); -extern bool FiosGetDiskFreeSpace(const char *path, uint32 *tot); +extern bool FiosGetDiskFreeSpace(const char *path, uint64 *tot); /* get the name of an oldstyle savegame */ extern void GetOldSaveGameName(char *title, const char *path, const char *file); @@ -79,7 +79,7 @@ void FiosFreeSavegameList() * @param total_free total free space in megabytes, optional (can be NULL) * @return StringID describing the path (free space or failure) */ -StringID FiosGetDescText(const char **path, uint32 *total_free) +StringID FiosGetDescText(const char **path, uint64 *total_free) { *path = _fios_path; return FiosGetDiskFreeSpace(*path, total_free) ? STR_4005_BYTES_FREE : STR_4006_UNABLE_TO_READ_DRIVE; diff --git a/src/fios.h b/src/fios.h --- a/src/fios.h +++ b/src/fios.h @@ -100,7 +100,7 @@ void FiosFreeSavegameList(); /* Browse to. Returns a filename w/path if we reached a file. */ char *FiosBrowseTo(const FiosItem *item); /* Return path, free space and stringID */ -StringID FiosGetDescText(const char **path, uint32 *total_free); +StringID FiosGetDescText(const char **path, uint64 *total_free); /* Delete a name */ bool FiosDelete(const char *name); /* Make a filename from a name */ diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1534,7 +1534,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Haal maatskappy informasie... ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} Klient{P "" e} voor jou -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes afgelaai dusver +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} afgelaai dusver STR_NETWORK_DISCONNECT :{BLACK}Loskoppel @@ -1998,7 +1998,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Uitvee STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Spektator, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte{P "" s} vry +STR_4005_BYTES_FREE :{BLACK}{BYTES} vry STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Kan nie skyf lees nie STR_4007_GAME_SAVE_FAILED :{WHITE}Speletjie Spaar Misluk{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Onbekwaam om lêer te uitvee diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1546,7 +1546,6 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}جلب معلومات اللعبة.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}جلب معلومات الشركة.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM}انتظار اللاعبين السابقين -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} كيلوبايت محملة حتى لآن STR_NETWORK_DISCONNECT :{BLACK}فصل @@ -2017,7 +2016,6 @@ STR_4002_SAVE :{BLACK}حفظ STR_4003_DELETE :{BLACK}حذف STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :المشاهدين, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} ميجا بايت متاحة STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}لا يمكن قرائة القرص STR_4007_GAME_SAVE_FAILED :{WHITE}فشل حفظ اللعبة{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}لا يمكن حذف الملف diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1548,7 +1548,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Obtendo informações do jogo.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Obtendo informações da empresa.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} cliente{P "" s} à sua frente -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes obtidos até agora +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} obtidos até agora STR_NETWORK_DISCONNECT :{BLACK}Desconectar @@ -2019,7 +2019,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Remover STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Espectador, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabytes livres +STR_4005_BYTES_FREE :{BLACK}{BYTES} livres STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Incapaz de ler unidade STR_4007_GAME_SAVE_FAILED :{WHITE}Falha ao Salvar Jogo{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Incapaz de remover o arquivo diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1536,7 +1536,6 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Сваляне инфо за играта.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Сваляне инфо за компанията.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} клиент{P "" и} срещу вас -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} кбайта свалено до момента STR_NETWORK_DISCONNECT :{BLACK}Изключване @@ -2006,7 +2005,7 @@ STR_4002_SAVE :{BLACK}Запази STR_4003_DELETE :{BLACK}Изтрий STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Наблюдател, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} мегабайт{P "" а} свободно +STR_4005_BYTES_FREE :{BLACK}{BYTES} свободно STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Не може да прочете диска STR_4007_GAME_SAVE_FAILED :{WHITE}Запазването на играта е неуспешно{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Изтриването на файла е неуспешно diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1547,7 +1547,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Obtenint informació del joc.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Obtenint informació de l'empresa.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} client{P "" s} rivals -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes descarregats fins ara +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} descarregats fins ara STR_NETWORK_DISCONNECT :{BLACK}Desconnecta @@ -2018,7 +2018,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Esborra STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Espectator, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabytes lliures +STR_4005_BYTES_FREE :{BLACK}{BYTES} lliures STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Impossible llegir la unitat de disc STR_4007_GAME_SAVE_FAILED :{WHITE}Desat del Joc erroni{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Impossible esborrar l'arxiu diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1613,7 +1613,6 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Dohvaćanje podataka o igri.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Dohvaćanje podataka o tvrtki.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klijen{P t ta ata} {P je su je} prije Vas -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK} Do sad je preuzeto {NUM} / {NUM} kilobajta STR_NETWORK_DISCONNECT :{BLACK}Odspoji @@ -2084,7 +2083,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Obriši STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Gledatelj, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabajt{P "" a a} slobod{P an na no} +STR_4005_BYTES_FREE :{BLACK}{BYTES} slobod{P an na no} STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Ne mogu pročitati disk STR_4007_GAME_SAVE_FAILED :{WHITE}Spremanje igre nije uspjelo{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Ne mogu obrisati datoteku diff --git a/src/lang/czech.txt b/src/lang/czech.txt --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1615,7 +1615,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Přijímání informací o hře... STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Přijímání informací o společnosti... ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klient{P "" i ů} před námi -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kB staženo +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} staženo STR_NETWORK_DISCONNECT :{BLACK}Odpojit se @@ -2086,7 +2086,7 @@ STR_4002_SAVE :{BLACK}Uložit STR_4003_DELETE :{BLACK}Smazat STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Pozorovatel, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} MB voln{P ý é ých} +STR_4005_BYTES_FREE :{BLACK}{BYTES} voln{P ý é ých} STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Nemohu číst z jednotky STR_4007_GAME_SAVE_FAILED :{WHITE}Uložení hry selhalo{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Nemohu smazat soubor diff --git a/src/lang/danish.txt b/src/lang/danish.txt --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1535,7 +1535,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Henter selskabsinfo.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klient{P "" er} foran dig -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes hentet indtil videre +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} hentet indtil videre STR_NETWORK_DISCONNECT :{BLACK}Afbryd forbindelse @@ -2005,7 +2005,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Slet STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Tilskuer, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabytes fri +STR_4005_BYTES_FREE :{BLACK}{BYTES} fri STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Kan ikke læse drevet STR_4007_GAME_SAVE_FAILED :{WHITE}Fejl under gemning af spil{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Kan ikke slette fil diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1547,7 +1547,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Ophalen bedrijfsinformatie... ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} speler{P "" s} voor ons -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes opgehaald +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} opgehaald STR_NETWORK_DISCONNECT :{BLACK}Verbinding verbroken @@ -2018,7 +2018,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Verwijderen STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Toeschouwer, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabytes vrij +STR_4005_BYTES_FREE :{BLACK}{BYTES} vrij STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Kan niet lezen van schijf STR_4007_GAME_SAVE_FAILED :{WHITE}Opslaan Spel Mislukt{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Kan bestand niet verwijderen diff --git a/src/lang/english.txt b/src/lang/english.txt --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1547,7 +1547,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Fetching company info.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} client{P "" s} in front of you -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes downloaded so far +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} downloaded so far STR_NETWORK_DISCONNECT :{BLACK}Disconnect @@ -2018,7 +2018,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Delete STR_4004 :{COMPANY}, {STRING1} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Spectator, {SKIP}{STRING1} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte{P "" s} free +STR_4005_BYTES_FREE :{BLACK}{BYTES} free STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Unable to read drive STR_4007_GAME_SAVE_FAILED :{WHITE}Game Save Failed{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Unable to delete file diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1547,7 +1547,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Fetching company info.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} client{P "" s} in front of us -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes downloaded so far +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} downloaded so far STR_NETWORK_DISCONNECT :{BLACK}Disconnect @@ -2018,7 +2018,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Delete STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Spectator, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte{P "" s} free +STR_4005_BYTES_FREE :{BLACK}{BYTES} free STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Unable to read drive STR_4007_GAME_SAVE_FAILED :{WHITE}Game Save Failed{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Unable to delete file diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1425,7 +1425,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Kaptante kompaniajn informojn.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} kliento{P "" j} antaŭ vi -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kilobitokoj ĝis nun elŝutiĝis +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} ĝis nun elŝutiĝis STR_NETWORK_DISCONNECT :{BLACK}Malkonektu @@ -1820,7 +1820,7 @@ STR_4001_LOAD_GAME :{WHITE}Ŝarĝu Ludon STR_4002_SAVE :{BLACK}Konservu STR_4003_DELETE :{BLACK}Forviŝu STR_4004 :{COMPANY} je {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabitoko{P "" j} libera{P "" j} +STR_4005_BYTES_FREE :{BLACK}{BYTES} libera{P "" j} STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Ne eblas legi diskon STR_4007_GAME_SAVE_FAILED :{WHITE}Ludkonservado Fiaskis{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Ne eblas forviŝi dosieron diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1559,7 +1559,6 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Hangin mängu infot... STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Hangin ettevõtte infot... ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klient{P "" i} sinu ees -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}Senini laaditud alla {NUM} / {NUM} kbaiti STR_NETWORK_DISCONNECT :{BLACK}Katkesta @@ -2011,7 +2010,7 @@ STR_4001_LOAD_GAME :{WHITE}Laadi mäng STR_4002_SAVE :{BLACK}Salvesta STR_4003_DELETE :{BLACK}Kustuta STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabaiti{P "" i} vaba +STR_4005_BYTES_FREE :{BLACK}{BYTES} vaba STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Ei suuda kettalt lugeda STR_4007_GAME_SAVE_FAILED :{WHITE}Mängu salvestamine nurjus{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Faili ei saa kustutada diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1547,7 +1547,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Haetaan yhtiötiedot... ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} pelaaja{P "" a} jonossa -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kt ladattu +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} ladattu STR_NETWORK_DISCONNECT :{BLACK}Pura yhteys @@ -2018,7 +2018,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Poista STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Katsoja, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megatavu{P "" a} vapaana +STR_4005_BYTES_FREE :{BLACK}{BYTES} vapaana STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Asemaa ei voi lukea. STR_4007_GAME_SAVE_FAILED :{WHITE}Tallennus epäonnistui.{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Tiedostoa ei voi poistaa. diff --git a/src/lang/french.txt b/src/lang/french.txt --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1548,7 +1548,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Rapatriement des infos sur la compagnie.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} client{P "" s} avant vous -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} ko téléchargés +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} téléchargés STR_NETWORK_DISCONNECT :{BLACK}Déconnecter @@ -2019,7 +2019,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Supprimer STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Spectateur, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} Mo libre{P "" s} +STR_4005_BYTES_FREE :{BLACK}{BYTES} libre{P "" s} STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Impossible d'accéder au disque STR_4007_GAME_SAVE_FAILED :{WHITE}La sauvegarde à échoué{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Impossible de supprimer le fichier diff --git a/src/lang/galician.txt b/src/lang/galician.txt --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1509,7 +1509,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Descargando información da partida.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Descargando información da compañía.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} cliente{P "" s} diante de ti -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes descargados +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} descargados STR_NETWORK_DISCONNECT :{BLACK}Desconectar @@ -1961,7 +1961,7 @@ STR_4001_LOAD_GAME STR_4002_SAVE :{BLACK}Grabar STR_4003_DELETE :{BLACK}Borrar STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte{P "" s} libre{P "" s} +STR_4005_BYTES_FREE :{BLACK}{BYTES} libre{P "" s} STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}No se pode lee-la unidade STR_4007_GAME_SAVE_FAILED :{WHITE}Grabación da partida fallida{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Non se pode borra-lo arquivo diff --git a/src/lang/german.txt b/src/lang/german.txt --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1509,7 +1509,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Firmeninformationen holen... ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} Teilnehmer vor Ihnen -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} KB bisher heruntergeladen +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} bisher heruntergeladen STR_NETWORK_DISCONNECT :{BLACK}Trennen @@ -1961,7 +1961,7 @@ STR_4001_LOAD_GAME STR_4002_SAVE :{BLACK}Speichern STR_4003_DELETE :{BLACK}Löschen STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} Megabyte{P "" s} frei +STR_4005_BYTES_FREE :{BLACK}{BYTES} frei STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Laufwerk nicht betriebsbereit STR_4007_GAME_SAVE_FAILED :{WHITE}Spielspeicherung fehlgeschlagen{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Datei kann nicht gelöscht werden diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1613,7 +1613,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Játékinfó lekérése.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Céginfó lekérése.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} kliensre várunk, hogy befejezze -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kilobájt lett eddig letöltve +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} lett eddig letöltve STR_NETWORK_DISCONNECT :{BLACK}Megszakít @@ -2084,7 +2084,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Töröl STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Megfigyelő, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabájt szabad +STR_4005_BYTES_FREE :{BLACK}{BYTES} szabad STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Nem olvasható a meghajtó STR_4007_GAME_SAVE_FAILED :{WHITE}A mentés nem sikerült{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Nem sikerült törölni a fájlt diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1505,7 +1505,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Næ í upplýsingar um leik.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Næ í upplýsingar um fyrirtæki.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} þjónar fyrir framan þig -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kílóbæti niðurhöluð hingaðtil +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} niðurhöluð hingaðtil STR_NETWORK_DISCONNECT :{BLACK}Aftengjast @@ -1954,7 +1954,7 @@ STR_4001_LOAD_GAME STR_4002_SAVE :{BLACK}Vista STR_4003_DELETE :{BLACK}Eyða STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabæti laus +STR_4005_BYTES_FREE :{BLACK}{BYTES} laus STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Get ekki lesið af drifi STR_4007_GAME_SAVE_FAILED :{WHITE}Vistun leiks mistókst{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Get ekki eytt skrá diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1547,7 +1547,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Mengambil informasi perusahaan.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klien di depanmu -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} KiB terunduh +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} terunduh STR_NETWORK_DISCONNECT :{BLACK}Putuskan @@ -2018,7 +2018,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Hapus STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Penonton, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte bebas +STR_4005_BYTES_FREE :{BLACK}{BYTES} bebas STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Tidak dapat membaca drive STR_4007_GAME_SAVE_FAILED :{WHITE}Penyimpanan Game gagal{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Tidak mampu untuk menghapus file/berkas diff --git a/src/lang/italian.txt b/src/lang/italian.txt --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1549,7 +1549,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Recupero informazioni compagnie.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} client in attesa -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbyte scaricati +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} scaricati STR_NETWORK_DISCONNECT :{BLACK}Disconnetti @@ -2020,7 +2020,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Elimina STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Spettatore, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte liber{P o i} +STR_4005_BYTES_FREE :{BLACK}{BYTES} liber{P o i} STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Impossibile leggere dall'unità STR_4007_GAME_SAVE_FAILED :{WHITE}Salvataggio fallito{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Impossibile eliminare il file diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1533,7 +1533,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}ゲーム情報を読み込み中... STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}会社情報を読み込み中... ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}先に {NUM} 人のプレヤーがいる -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM}／{NUM} kb がダウンロードした +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES}／{BYTES} がダウンロードした STR_NETWORK_DISCONNECT :{BLACK}接続を解除 @@ -1989,7 +1989,7 @@ STR_4001_LOAD_GAME :{WHITE}ゲームを開く STR_4002_SAVE :{BLACK}保存 STR_4003_DELETE :{BLACK}削除 STR_4004 :{COMPANY}、{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} MB 使用可能 +STR_4005_BYTES_FREE :{BLACK}{BYTES} 使用可能 STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}ドライブが読み込めません STR_4007_GAME_SAVE_FAILED :{WHITE}ゲームの保存に失敗しました{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}ファイルを削除できません diff --git a/src/lang/korean.txt b/src/lang/korean.txt --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1533,7 +1533,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}게임 정보 가져오는 중.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}회사 정보 가져오는 중.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM}명의 접속자가 앞에서 대기중입니다. -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} Kb 다운로드 +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} 다운로드 STR_NETWORK_DISCONNECT :{BLACK}접속 끊기 @@ -2001,7 +2001,7 @@ STR_4002_SAVE :{BLACK}저장 STR_4003_DELETE :{BLACK}파일 삭제 STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :관전자, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} Mb 남음 +STR_4005_BYTES_FREE :{BLACK}{BYTES} 남음 STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}드라이브를 읽을 수 없음 STR_4007_GAME_SAVE_FAILED :{WHITE}게임 저장 실패{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}파일을 삭제할 수 없음 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1507,7 +1507,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Pieņemu spēles informāciju.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Pieņemu kompānijas informāciju.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klient{P s i u} tavā priekšā -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbaiti lejuplādēti līdz šim +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} lejuplādēti līdz šim STR_NETWORK_DISCONNECT :{BLACK}Atvienoties @@ -1959,7 +1959,7 @@ STR_4001_LOAD_GAME :{WHITE}Ielādēt spēli STR_4002_SAVE :{BLACK}Saglabāt STR_4003_DELETE :{BLACK}Dzēst STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabait{P s i u} brīv{P s i u} +STR_4005_BYTES_FREE :{BLACK}{BYTES} brīv{P s i u} STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Nevar lasīt disku STR_4007_GAME_SAVE_FAILED :{WHITE}Spēles saglabāšana neizdevās{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Nevar dzēst failu diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1541,7 +1541,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Gaunama kompanijos informacija.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} vartotoj{P as ai ų} prieš tave -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} Kb parsiusta +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} parsiusta STR_NETWORK_DISCONNECT :{BLACK}Atsijungti @@ -2000,7 +2000,7 @@ STR_4001_LOAD_GAME :{WHITE}Įkelti žaidimą STR_4002_SAVE :{BLACK}Išsaugoti STR_4003_DELETE :{BLACK}Šalinti STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} Mb laisva +STR_4005_BYTES_FREE :{BLACK}{BYTES} laisva STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Negali pasiekti disko STR_4007_GAME_SAVE_FAILED :{WHITE}Zaidimo issaugoti nepavyko{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Failo ištrinti nepavyko diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1531,7 +1531,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Henter firmaoversikt.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klient{P "" er} foran oss -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} KB lastet ned så langt +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} lastet ned så langt STR_NETWORK_DISCONNECT :{BLACK}Koble fra @@ -1999,7 +1999,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Slett STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Tilskuer, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte ledig +STR_4005_BYTES_FREE :{BLACK}{BYTES} ledig STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Kan ikke lese fra disk STR_4007_GAME_SAVE_FAILED :{WHITE}Lagring av spillet mislyktes{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Kan ikke slette fil diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1518,7 +1518,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Hentar firmaoversikt.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klient{P "" ar} føre oss -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kB lasta ned så langt +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} lasta ned så langt STR_NETWORK_DISCONNECT :{BLACK}Koble frå @@ -1977,7 +1977,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Slett STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Tilskuar, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte ledig +STR_4005_BYTES_FREE :{BLACK}{BYTES} ledig STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Kan ikkje lese frå disk STR_4007_GAME_SAVE_FAILED :{WHITE}Lagring av spelet mislukkast{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Kan ikkje slette fil diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -1547,7 +1547,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Etchingfay ompanycay infoway.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} ient{P "" s}clay inway ontfray ofway ouyay -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} yteskbay ownloadedday osay arfay +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} ownloadedday osay arfay STR_NETWORK_DISCONNECT :{BLACK}Isconnectday @@ -2018,7 +2018,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Eleteday STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Ectatorspay, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} egabyte{P "" s}may eefray +STR_4005_BYTES_FREE :{BLACK}{BYTES} eefray STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Unableway otay eadray ivedray STR_4007_GAME_SAVE_FAILED :{WHITE}Amegay Avesay Ailedfay{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Unableway otay eleteday ilefay diff --git a/src/lang/polish.txt b/src/lang/polish.txt --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1621,7 +1621,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Uzyskiwanie informacji o firmach.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klient{P "" ów ów} chce się przyłączyć -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kB dotąd pobranych +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} dotąd pobranych STR_NETWORK_DISCONNECT :{BLACK}Rozłącz @@ -2091,7 +2091,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Usuń STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Obserwator, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} MB wolnego miejsca +STR_4005_BYTES_FREE :{BLACK}{BYTES} wolnego miejsca STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Nie można odczytać napędu STR_4007_GAME_SAVE_FAILED :{WHITE}Nie można zapisać gry{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Nie można usunąć pliku diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1519,7 +1519,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}A obter a informação de jogo.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}A obter a informação da Companhia.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} cliente{P "" s} à sua frente -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes obtidos até agora +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} obtidos até agora STR_NETWORK_DISCONNECT :{BLACK}Desligar @@ -1987,7 +1987,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Eliminar STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Espectador, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabytes livres +STR_4005_BYTES_FREE :{BLACK}{BYTES} livres STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Não é possível ler unidade STR_4007_GAME_SAVE_FAILED :{WHITE}Falha ao Guardar Jogo{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Não é possível eliminar ficheiro diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1547,7 +1547,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Preluare info companie.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} clien{P t ţi} înaintea noastră -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes descărcaţi până acum +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} descărcaţi până acum STR_NETWORK_DISCONNECT :{BLACK}Deconectare @@ -2018,7 +2018,7 @@ STR_4002_SAVE :{BLACK}Salvează STR_4003_DELETE :{BLACK}Şterge STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Spectator, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte{P "" s} liberi +STR_4005_BYTES_FREE :{BLACK}{BYTES} liberi STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Discul nu a putut fi citit STR_4007_GAME_SAVE_FAILED :{WHITE}Salvarea jocului eşuată{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Ştergerea jocului eşuată diff --git a/src/lang/russian.txt b/src/lang/russian.txt --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1510,7 +1510,6 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Получение информации об игре.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Получение информации о компании.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}готовится присоединиться {NUM} клиентов -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} кбайт загружено STR_NETWORK_DISCONNECT :{BLACK}Отключиться @@ -1962,7 +1961,6 @@ STR_4001_LOAD_GAME :{WHITE}Загрузить игру STR_4002_SAVE :{BLACK}Сохранить STR_4003_DELETE :{BLACK}Удалить STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} Мб свободно STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Не удалось прочитать диск STR_4007_GAME_SAVE_FAILED :{WHITE}Невозможно сохранить игру{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Невозможно удалить файл diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1508,7 +1508,6 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}获取游戏信息 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}获取公司信息 ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}您前面还有 {NUM} 个客户端 -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}目前已下载 {NUM} / {NUM} 千字节 STR_NETWORK_DISCONNECT :{BLACK}断开 @@ -1960,7 +1959,7 @@ STR_4001_LOAD_GAME :{WHITE}读取存档 STR_4002_SAVE :{BLACK}保存 STR_4003_DELETE :{BLACK}删除 STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte(s) 可用 +STR_4005_BYTES_FREE :{BLACK}{BYTES} 可用 STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}不能读取驱动器 STR_4007_GAME_SAVE_FAILED :{WHITE}保存游戏失败{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}不能删除文件 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1604,7 +1604,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Prijem informacii o spolocnosti.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klient{P "" e i} pred nami -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kB stiahnute +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} stiahnute STR_NETWORK_DISCONNECT :{BLACK}Odpojit sa @@ -2075,7 +2075,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Vymazat STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Pozorovateľ, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabajtov volnych +STR_4005_BYTES_FREE :{BLACK}{BYTES} volnych STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Zariadenie je necitatelne STR_4007_GAME_SAVE_FAILED :{WHITE}Ulozenie hry zlyhalo{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Subor sa neda vymazat diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1587,7 +1587,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Iščem informacije o igri.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Iščem informacije o podjetju... ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} gost{P "" a i ov} je pred tabo -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytov prenesenih +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} prenesenih STR_NETWORK_DISCONNECT :{BLACK}Odklopi @@ -2059,7 +2059,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Izbriši STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Gledalec, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabajt{P "" a i ov} prosto +STR_4005_BYTES_FREE :{BLACK}{BYTES} prosto STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Nemogoče branje pogona STR_4007_GAME_SAVE_FAILED :{WHITE}Shranjevanje igre ni uspelo{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Nemogoče brisanje datoteke diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1548,7 +1548,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Recibiendo información del juego.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Recibiendo información empresa.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} cliente{P "" s} delante de usted -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes descargados +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} descargados STR_NETWORK_DISCONNECT :{BLACK}Desconectado @@ -2019,7 +2019,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Borrar STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Espectador, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabytes libres +STR_4005_BYTES_FREE :{BLACK}{BYTES} libres STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}No es posible leer la unidad STR_4007_GAME_SAVE_FAILED :{WHITE}Error guardando juego{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}No es posible borrar el fichero diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1508,7 +1508,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Hämtar spelinfo.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Hämtar företagsinfo.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} klient{P "" er} före oss -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbyte nerladdat hittills +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} nerladdat hittills STR_NETWORK_DISCONNECT :{BLACK}Frånkopplad @@ -1960,7 +1960,7 @@ STR_4001_LOAD_GAME STR_4002_SAVE :{BLACK}Spara STR_4003_DELETE :{BLACK}Ta bort STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte{P "" s} ledigt +STR_4005_BYTES_FREE :{BLACK}{BYTES} ledigt STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Kan inte läsa från disk STR_4007_GAME_SAVE_FAILED :{WHITE}Sparandet av spelet misslyckades{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Kan inte ta bort filen diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1508,7 +1508,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}正在取得遊戲資訊.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}正在取得公司資訊.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}在您之前有 {NUM} 個用戶端 -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kb 已下載 +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} 已下載 STR_NETWORK_DISCONNECT :{BLACK}斷線 @@ -1960,7 +1960,7 @@ STR_4001_LOAD_GAME :{WHITE}載入遊戲 STR_4002_SAVE :{BLACK}儲存 STR_4003_DELETE :{BLACK}刪除 STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}空間尚有 {COMMA} MB +STR_4005_BYTES_FREE :{BLACK}空間尚有 {BYTES} STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}無法讀取磁碟 STR_4007_GAME_SAVE_FAILED :{WHITE}遊戲儲存失敗{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}無法刪除檔案 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1547,7 +1547,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1 STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Şirket bilgisi aliniyor.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} -> önünde olan oyuncular -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} KB indirildi +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} indirildi STR_NETWORK_DISCONNECT :{BLACK}Bağlantıyı kes @@ -2018,7 +2018,7 @@ STR_4002_SAVE STR_4003_DELETE :{BLACK}Sil STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Gözlemci, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} MB bos +STR_4005_BYTES_FREE :{BLACK}{BYTES} bos STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Sürücü okunamıyor STR_4007_GAME_SAVE_FAILED :{WHITE}Oyun kaydedilemedi{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Dosya silinemedi diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1650,7 +1650,6 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Запит інформації про гру.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Запит інформації про компанію.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} клієнт{P "" и ів} перед вами -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} кілобайт завантажено STR_NETWORK_DISCONNECT :{BLACK}Роз'єднання @@ -2118,7 +2117,6 @@ STR_4002_SAVE :{BLACK}Зберегти STR_4003_DELETE :{BLACK}Видалити STR_4004 :{COMPANY}, {STRING} STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME :Спостерігач, {SKIP}{STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} мегабайт{P "" и ""} вільно STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Неможливо прочитати пристрій STR_4007_GAME_SAVE_FAILED :{WHITE}Помилка запису гри{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Неможливо стерти файл diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt --- a/src/lang/unfinished/greek.txt +++ b/src/lang/unfinished/greek.txt @@ -1583,7 +1583,7 @@ STR_4000_SAVE_GAME :{WHITE}Αποθήκευση Παιχνιδιού STR_4001_LOAD_GAME :{WHITE}Φόρτωση Παιχνιδιού STR_4002_SAVE :{BLACK}Αποθήκευση STR_4003_DELETE :{BLACK}Διαγραφή -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte{P "" s} ελεύθερα +STR_4005_BYTES_FREE :{BLACK}{BYTES} ελεύθερα STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Αδύνατη η ανάγνωση του δίσκου STR_4007_GAME_SAVE_FAILED :{WHITE}Αποθήκευση Παιχνιδιού Απέτυχε{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Αδύνατη η διαγραφή του αρχείου diff --git a/src/lang/unfinished/hebrew.txt b/src/lang/unfinished/hebrew.txt --- a/src/lang/unfinished/hebrew.txt +++ b/src/lang/unfinished/hebrew.txt @@ -1571,7 +1571,6 @@ STR_4000_SAVE_GAME :{WHITE}שמור משחק STR_4001_LOAD_GAME :{WHITE}טען משחק STR_4002_SAVE :{BLACK}שמור STR_4003_DELETE :{BLACK}מחק -STR_4005_BYTES_FREE :{BLACK} פנויים {COMMA} מגבייטים STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}לא ניתן לקרוא מהדיסק STR_4007_GAME_SAVE_FAILED :{WHITE}שמירת המשחק נכשלה{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}לא ניתן למחוק את הקובץ diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt --- a/src/lang/unfinished/malay.txt +++ b/src/lang/unfinished/malay.txt @@ -928,7 +928,7 @@ STR_NETWORK_LANG_DUTCH ############ Leave those lines in this order!! ############ End of leave-in-this-order -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kbytes dimuat turun setakat ini +STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{BYTES} / {BYTES} dimuat turun setakat ini STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Masukkan jumlah wang anda hendak memberikan diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -885,7 +885,6 @@ STR_4000_SAVE_GAME :{WHITE}ذخیره ی بازی STR_4001_LOAD_GAME :{WHITE}ادامه ی بازی STR_4002_SAVE :{BLACK}ذخیره STR_4003_DELETE :{BLACK}حذف -STR_4005_BYTES_FREE :{BLACK}{COMMA} megabyte{P "" s} free STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}درایو خوانده می شود STR_4007_GAME_SAVE_FAILED :{WHITE}بازی ذخیره نشد{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}فایل حذف نمی شود diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1508,7 +1508,6 @@ STR_NETWORK_CONNECTING_SPECIAL_1 :{BLACK}Estyn gwybodaeth gêm.. STR_NETWORK_CONNECTING_SPECIAL_2 :{BLACK}Estyn gwybodaeth cwmnïau.. ############ End of leave-in-this-order STR_NETWORK_CONNECTING_WAITING :{BLACK}{NUM} cleient{P "" iau}o'ch blaen -STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / {NUM} kdid wedi'i llwytho i lawr hyd yn hyn STR_NETWORK_DISCONNECT :{BLACK}Datgysylltu @@ -1958,7 +1957,6 @@ STR_4001_LOAD_GAME :{WHITE}Llwytho Gêm STR_4002_SAVE :{BLACK}Cadw STR_4003_DELETE :{BLACK}Dileu STR_4004 :{COMPANY}, {STRING} -STR_4005_BYTES_FREE :{BLACK}{COMMA} megadid yn rhydd STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Methu darllen y gyriant STR_4007_GAME_SAVE_FAILED :{WHITE}Methwyd â Chadw Gêm{}{STRING} STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Methu Dileu Ffeil diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -1388,7 +1388,7 @@ static void DrawFiosTexts(uint maxw) { static const char *path = NULL; static StringID str = STR_4006_UNABLE_TO_READ_DRIVE; - static uint32 tot = 0; + static uint64 tot = 0; if (_fios_path_changed) { str = FiosGetDescText(&path, &tot); diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -556,8 +556,8 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER _frame_counter = _frame_counter_server = _frame_counter_max = p->Recv_uint32(); - _network_join_kbytes = 0; - _network_join_kbytes_total = p->Recv_uint32() / 1024; + _network_join_bytes = 0; + _network_join_bytes_total = p->Recv_uint32(); /* If the network connection has been closed due to loss of connection * or when _network_join_kbytes_total is 0, the join status window will @@ -565,7 +565,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER * that. If kbytes_total is 0, the packet must be malformed as a * savegame less than 1 kilobyte is practically impossible. */ if (MY_CLIENT->has_quit) return NETWORK_RECV_STATUS_CONN_LOST; - if (_network_join_kbytes_total == 0) return NETWORK_RECV_STATUS_MALFORMED_PACKET; + if (_network_join_bytes_total == 0) return NETWORK_RECV_STATUS_MALFORMED_PACKET; _network_join_status = NETWORK_JOIN_STATUS_DOWNLOADING; InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0); @@ -581,7 +581,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER return NETWORK_RECV_STATUS_SAVEGAME; } - _network_join_kbytes = ftell(file_pointer) / 1024; + _network_join_bytes = ftell(file_pointer); InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0); } diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1765,8 +1765,8 @@ void ShowNetworkNeedPassword(NetworkPass // Vars needed for the join-GUI NetworkJoinStatus _network_join_status; uint8 _network_join_waiting; -uint16 _network_join_kbytes; -uint16 _network_join_kbytes_total; +uint32 _network_join_bytes; +uint32 _network_join_bytes_total; struct NetworkJoinStatusWindow : Window { NetworkJoinStatusWindow(const WindowDesc *desc) : Window(desc) @@ -1791,12 +1791,12 @@ struct NetworkJoinStatusWindow : Window progress = 15; // third stage is 15% break; case NETWORK_JOIN_STATUS_DOWNLOADING: - SetDParam(0, _network_join_kbytes); - SetDParam(1, _network_join_kbytes_total); + SetDParam(0, _network_join_bytes); + SetDParam(1, _network_join_bytes_total); DrawStringCentered(125, 46, STR_NETWORK_CONNECTING_DOWNLOADING, TC_GREY); /* Fallthrough */ default: /* Waiting is 15%, so the resting receivement of map is maximum 70% */ - progress = 15 + _network_join_kbytes * (100 - 15) / _network_join_kbytes_total; + progress = 15 + _network_join_bytes * (100 - 15) / _network_join_bytes_total; } /* Draw nice progress bar :) */ diff --git a/src/network/network_internal.h b/src/network/network_internal.h --- a/src/network/network_internal.h +++ b/src/network/network_internal.h @@ -111,8 +111,8 @@ extern bool _network_first_time; // Vars needed for the join-GUI extern NetworkJoinStatus _network_join_status; extern uint8 _network_join_waiting; -extern uint16 _network_join_kbytes; -extern uint16 _network_join_kbytes_total; +extern uint32 _network_join_bytes; +extern uint32 _network_join_bytes_total; extern uint32 _network_last_host_ip; extern uint8 _network_reconnect; diff --git a/src/os2.cpp b/src/os2.cpp --- a/src/os2.cpp +++ b/src/os2.cpp @@ -87,7 +87,7 @@ void FiosGetDrives() #endif } -bool FiosGetDiskFreeSpace(const char *path, uint32 *tot) +bool FiosGetDiskFreeSpace(const char *path, uint64 *tot) { #ifndef __INNOTEK_LIBC__ struct diskfree_t free; @@ -100,14 +100,14 @@ bool FiosGetDiskFreeSpace(const char *pa return false; #else - uint32 free = 0; + uint64 free = 0; #ifdef HAS_STATVFS { struct statvfs s; if (statvfs(path, &s) != 0) return false; - free = (uint64)s.f_frsize * s.f_bavail >> 20; + free = (uint64)s.f_frsize * s.f_bavail; } #endif if (tot != NULL) *tot = free; diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp --- a/src/strgen/strgen.cpp +++ b/src/strgen/strgen.cpp @@ -489,6 +489,7 @@ static const CmdStruct _cmd_structs[] = // Numbers {"COMMA", EmitSingleChar, SCC_COMMA, 1, 0}, // Number with comma {"NUM", EmitSingleChar, SCC_NUM, 1, 0}, // Signed number + {"BYTES", EmitSingleChar, SCC_BYTES, 1, 0}, // Unsigned number with "bytes", i.e. "1.02 MiB or 123 KiB" {"CURRENCY", EmitSingleChar, SCC_CURRENCY, 1, 0}, diff --git a/src/strings.cpp b/src/strings.cpp --- a/src/strings.cpp +++ b/src/strings.cpp @@ -264,6 +264,43 @@ static char *FormatHexNumber(char *buff, return buff + seprintf(buff, last, "0x%x", (uint32)number); } +/** + * Format a given number as a number of bytes with the SI prefix. + * @param buff the buffer to write to + * @param number the number of bytes to write down + * @param last the last element in the buffer + * @return till where we wrote + */ +static char *FormatBytes(char *buff, int64 number, const char *last) +{ + assert(number >= 0); + + /* 0 2^10 2^20 2^30 2^40 2^50 2^60 */ + const char *siUnits[] = { "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB" }; + int id = 1; + while (number >= 1024 * 1024) { + number /= 1024; + id++; + } + + if (number < 1024) { + id = 0; + buff += seprintf(buff, last, "%i", (int)number); + } else if (number < 1024 * 10) { + buff += seprintf(buff, last, "%i.%02i", (int)number / 1024, (int)(number % 1024) * 100 / 1024); + } else if (number < 1024 * 100) { + buff += seprintf(buff, last, "%i.%01i", (int)number / 1024, (int)(number % 1024) * 10 / 1024); + } else { + assert(number < 1024 * 1024); + buff += seprintf(buff, last, "%i", (int)number / 1024); + } + + assert(id < lengthof(siUnits)); + buff += seprintf(buff, last, " %s", siUnits[id]); + + return buff; +} + static char *FormatYmdString(char *buff, Date date, const char *last) { YearMonthDay ymd; @@ -820,6 +857,10 @@ static char *FormatString(char *buff, co buff = FormatHexNumber(buff, GetInt64(&argv), last); break; + case SCC_BYTES: // {BYTES} + buff = FormatBytes(buff, GetInt64(&argv), last); + break; + case SCC_CURRENCY: // {CURRENCY} buff = FormatGenericCurrency(buff, _currency, GetInt64(&argv), false, last); break; @@ -1585,9 +1626,4 @@ void CheckForMissingGlyphsInLoadedLangua ShowErrorMessage(INVALID_STRING_ID, STR_JUST_RAW_STRING, 0, 0); } #endif - } - - -/* --- Handling of saving/loading string IDs from old savegames --- */ - diff --git a/src/table/control_codes.h b/src/table/control_codes.h --- a/src/table/control_codes.h +++ b/src/table/control_codes.h @@ -66,6 +66,7 @@ enum StringControlCode { SCC_COMMA, SCC_NUM, SCC_HEX, + SCC_BYTES, SCC_STRING_ID, SCC_RAW_STRING_POINTER, diff --git a/src/unix.cpp b/src/unix.cpp --- a/src/unix.cpp +++ b/src/unix.cpp @@ -63,9 +63,9 @@ void FiosGetDrives() return; } -bool FiosGetDiskFreeSpace(const char *path, uint32 *tot) +bool FiosGetDiskFreeSpace(const char *path, uint64 *tot) { - uint32 free = 0; + uint64 free = 0; #ifdef HAS_STATVFS # ifdef __APPLE__ @@ -76,7 +76,7 @@ bool FiosGetDiskFreeSpace(const char *pa struct statvfs s; if (statvfs(path, &s) != 0) return false; - free = (uint64)s.f_frsize * s.f_bavail >> 20; + free = (uint64)s.f_frsize * s.f_bavail; } #endif if (tot != NULL) *tot = free; diff --git a/src/win32.cpp b/src/win32.cpp --- a/src/win32.cpp +++ b/src/win32.cpp @@ -843,7 +843,7 @@ bool FiosIsHiddenFile(const struct diren return (ent->dir->fd.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0; } -bool FiosGetDiskFreeSpace(const char *path, uint32 *tot) +bool FiosGetDiskFreeSpace(const char *path, uint64 *tot) { UINT sem = SetErrorMode(SEM_FAILCRITICALERRORS); // disable 'no-disk' message box bool retval = false; @@ -852,7 +852,7 @@ bool FiosGetDiskFreeSpace(const char *pa _sntprintf(root, lengthof(root), _T("%c:") _T(PATHSEP), path[0]); if (tot != NULL && GetDiskFreeSpace(root, &spc, &bps, &nfc, &tnc)) { - *tot = ((spc * bps) * (uint64)nfc) >> 20; + *tot = ((spc * bps) * (uint64)nfc); retval = true; }