diff --git a/data/GameHub.css b/data/GameHub.css index 9710b40c..c8081579 100644 --- a/data/GameHub.css +++ b/data/GameHub.css @@ -116,6 +116,10 @@ padding-bottom: 6px; padding-top: 6px; } +.description-header +{ + padding-bottom: 0; +} list .h4 { padding-left: 6px; @@ -134,4 +138,9 @@ button label list:not(:backdrop) row:selected:focus label.category-label { color: alpha(#ffffff, 0.8); +} + +list.installers-list +{ + background: transparent; } \ No newline at end of file diff --git a/data/com.github.tkashkin.gamehub.appdata.xml.in b/data/com.github.tkashkin.gamehub.appdata.xml.in index 3a810f91..6fbf7cf4 100644 --- a/data/com.github.tkashkin.gamehub.appdata.xml.in +++ b/data/com.github.tkashkin.gamehub.appdata.xml.in @@ -41,6 +41,12 @@ + + +

Yet another locale fix

+

Installers cache management

+ +

Fix crash for GOG "games" like Hotline Miami 2: Wrong Number - Digital Comics

diff --git a/debian/changelog b/debian/changelog index 47c123b9..1a2dd5d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +com.github.tkashkin.gamehub (0.5.7) xenial; urgency=low + + * Yet another locale fix + * Installers cache management + + -- tkashkin Sat, 21 Jul 2018 02:39:34 +0300 + com.github.tkashkin.gamehub (0.5.6) xenial; urgency=low * Fix crash for GOG "games" like Hotline Miami 2 Digital Comics diff --git a/debian/rules b/debian/rules index 0b1126b4..a5f40ef6 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ override_dh_auto_clean: override_dh_auto_configure: mkdir -p debian/build - cd debian/build && meson --prefix=/usr ../.. + cd debian/build && meson --prefix=/usr -Ddistro=debian ../.. override_dh_auto_build: cd debian/build && ninja -v diff --git a/meson.build b/meson.build index 9ed58925..0b2417bc 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('com.github.tkashkin.gamehub', 'vala', 'c', version: '0.5.6') +project('com.github.tkashkin.gamehub', 'vala', 'c', version: '0.5.7') i18n = import('i18n') gnome = import('gnome') diff --git a/meson_options.txt b/meson_options.txt index c292e6d8..4db4ec0f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('distro', type: 'combo', choices: ['generic', 'debian', 'arch'], value: 'debian') +option('distro', type: 'combo', choices: ['generic', 'debian', 'arch'], value: 'generic') option('flatpak', type: 'boolean', value: false) option('runtime', type: 'string', value: '') diff --git a/po/com.github.tkashkin.gamehub.pot b/po/com.github.tkashkin.gamehub.pot index 0726eae6..3386de87 100644 --- a/po/com.github.tkashkin.gamehub.pot +++ b/po/com.github.tkashkin.gamehub.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: com.github.tkashkin.gamehub\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-20 17:06+0300\n" +"POT-Creation-Date: 2018-07-21 01:58+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,28 +34,28 @@ msgstr "" msgid "Manage your Steam, GOG and Humble Bundle games in one place." msgstr "" -#: src/data/Game.vala:74 +#: src/data/Game.vala:75 msgid "Installed" msgstr "" -#: src/data/Game.vala:75 +#: src/data/Game.vala:76 msgid "Installing" msgstr "" -#: src/data/Game.vala:76 +#: src/data/Game.vala:77 msgid "Download started" msgstr "" -#: src/data/Game.vala:77 +#: src/data/Game.vala:78 msgid "Download finished" msgstr "" -#: src/data/Game.vala:80 +#: src/data/Game.vala:81 #, c-format msgid "Downloading: %d%% (%s / %s)" msgstr "" -#: src/data/Game.vala:82 +#: src/data/Game.vala:83 msgid "Not installed" msgstr "" @@ -70,7 +70,7 @@ msgid "" msgstr "" #: src/ui/dialogs/SettingsDialog.vala:13 src/ui/views/WelcomeView.vala:34 -#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:141 +#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:143 msgid "Settings" msgstr "" @@ -98,18 +98,41 @@ msgstr "" msgid "GOG games directory" msgstr "" -#: src/ui/dialogs/SettingsDialog.vala:47 +#: src/ui/dialogs/SettingsDialog.vala:43 +msgid "GOG installers cache" +msgstr "" + +#: src/ui/dialogs/SettingsDialog.vala:48 msgid "Humble Bundle games directory" msgstr "" -#: src/ui/dialogs/SettingsDialog.vala:61 +#: src/ui/dialogs/SettingsDialog.vala:49 +msgid "Humble Bundle installers cache" +msgstr "" + +#: src/ui/dialogs/SettingsDialog.vala:63 #: src/ui/dialogs/GameDetailsDialog.vala:31 msgid "Close" msgstr "" -#: src/ui/dialogs/GameInstallDialog.vala:33 -#: src/ui/dialogs/GameInstallDialog.vala:128 -#: src/ui/views/GameDetailsView/GameDetailsView.vala:158 +#: src/ui/dialogs/SettingsDialog.vala:180 +msgid "Open" +msgstr "" + +#: src/ui/dialogs/SettingsDialog.vala:187 +msgid "Clear" +msgstr "" + +#: src/ui/dialogs/SettingsDialog.vala:203 +#, c-format +msgid "%llu installer; %s" +msgid_plural "%llu installers; %s" +msgstr[0] "" +msgstr[1] "" + +#: src/ui/dialogs/GameInstallDialog.vala:31 +#: src/ui/dialogs/GameInstallDialog.vala:131 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 msgid "Install" msgstr "" @@ -117,11 +140,16 @@ msgstr "" msgid "Select game installer" msgstr "" -#: src/ui/dialogs/GameInstallDialog.vala:121 +#: src/ui/dialogs/GameInstallDialog.vala:92 +#, c-format +msgid "Installer size: %s" +msgstr "" + +#: src/ui/dialogs/GameInstallDialog.vala:124 msgid "Cancel" msgstr "" -#: src/ui/dialogs/GameInstallDialog.vala:125 +#: src/ui/dialogs/GameInstallDialog.vala:128 msgid "Import" msgstr "" @@ -183,41 +211,41 @@ msgstr "" msgid "Downloads" msgstr "" -#: src/ui/views/GamesView/GamesView.vala:136 +#: src/ui/views/GamesView/GamesView.vala:138 msgid "Search" msgstr "" -#: src/ui/views/GamesView/GamesView.vala:192 +#: src/ui/views/GamesView/GamesView.vala:194 #, c-format msgid "%u game" msgid_plural "%u games" msgstr[0] "" msgstr[1] "" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:120 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:122 msgid "Description" msgstr "" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:159 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:163 msgid "Run" msgstr "" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:160 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:164 msgid "Open installation directory" msgstr "" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:161 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:165 msgid "Open store page" msgstr "" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:166 msgid "Uninstall" msgstr "" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:229 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:235 msgid "Language" msgstr "" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:232 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:238 msgid "Languages" msgstr "" diff --git a/po/de.po b/po/de.po index 0c0f9c02..b1e2a444 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: com.github.tkashkin.gamehub\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-20 17:06+0300\n" +"POT-Creation-Date: 2018-07-21 01:58+0300\n" "PO-Revision-Date: 2018-07-14 00:51+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -33,28 +33,28 @@ msgstr "Alle Spiele an einem Ort" msgid "Manage your Steam, GOG and Humble Bundle games in one place." msgstr "Verwalten Sie Ihre Steam, GOG und Humble Bundle Spiele an einem Ort." -#: src/data/Game.vala:74 +#: src/data/Game.vala:75 msgid "Installed" msgstr "Installiert" -#: src/data/Game.vala:75 +#: src/data/Game.vala:76 msgid "Installing" msgstr "Wird installiert" -#: src/data/Game.vala:76 +#: src/data/Game.vala:77 msgid "Download started" msgstr "Download ist gestartet" -#: src/data/Game.vala:77 +#: src/data/Game.vala:78 msgid "Download finished" msgstr "Download ist beendet" -#: src/data/Game.vala:80 +#: src/data/Game.vala:81 #, c-format msgid "Downloading: %d%% (%s / %s)" msgstr "Herunterladen: %d%% (%s / %s)" -#: src/data/Game.vala:82 +#: src/data/Game.vala:83 msgid "Not installed" msgstr "Nicht installiert" @@ -71,7 +71,7 @@ msgstr "" "Logge dich in dein Konto im Steam-Client ein und kehre zu GameHub zurück" #: src/ui/dialogs/SettingsDialog.vala:13 src/ui/views/WelcomeView.vala:34 -#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:141 +#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:143 msgid "Settings" msgstr "Einstellungen" @@ -100,18 +100,40 @@ msgstr "Steam-Installationsordner" msgid "GOG games directory" msgstr "GOG Spieleordner" -#: src/ui/dialogs/SettingsDialog.vala:47 +#: src/ui/dialogs/SettingsDialog.vala:43 +msgid "GOG installers cache" +msgstr "GOG Installateure Cache" + +#: src/ui/dialogs/SettingsDialog.vala:48 msgid "Humble Bundle games directory" msgstr "Humble Bundle Spieleordner" -#: src/ui/dialogs/SettingsDialog.vala:61 +#: src/ui/dialogs/SettingsDialog.vala:49 +msgid "Humble Bundle installers cache" +msgstr "Humble Bundle Installateure Cache" + +#: src/ui/dialogs/SettingsDialog.vala:63 #: src/ui/dialogs/GameDetailsDialog.vala:31 msgid "Close" msgstr "Schließen" -#: src/ui/dialogs/GameInstallDialog.vala:33 -#: src/ui/dialogs/GameInstallDialog.vala:128 -#: src/ui/views/GameDetailsView/GameDetailsView.vala:158 +#: src/ui/dialogs/SettingsDialog.vala:180 +msgid "Open" +msgstr "Öffnen" + +#: src/ui/dialogs/SettingsDialog.vala:187 +msgid "Clear" +msgstr "Löschen" + +#: src/ui/dialogs/SettingsDialog.vala:203 +msgid "%llu installer; %s" +msgid_plural "%llu installers; %s" +msgstr[0] "%llu Installer; %s" +msgstr[1] "%llu Installateure; %s" + +#: src/ui/dialogs/GameInstallDialog.vala:31 +#: src/ui/dialogs/GameInstallDialog.vala:131 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 msgid "Install" msgstr "Installieren" @@ -119,11 +141,15 @@ msgstr "Installieren" msgid "Select game installer" msgstr "Wähle das Spiel-Installationsprogramm aus" -#: src/ui/dialogs/GameInstallDialog.vala:121 +#: src/ui/dialogs/GameInstallDialog.vala:92 +msgid "Installer size: %s" +msgstr "Größe des Installationsprogramms: %s" + +#: src/ui/dialogs/GameInstallDialog.vala:124 msgid "Cancel" msgstr "Abbrechen" -#: src/ui/dialogs/GameInstallDialog.vala:125 +#: src/ui/dialogs/GameInstallDialog.vala:128 msgid "Import" msgstr "Einführen" @@ -185,42 +211,42 @@ msgstr "Spiele von %s" msgid "Downloads" msgstr "Downloads" -#: src/ui/views/GamesView/GamesView.vala:136 +#: src/ui/views/GamesView/GamesView.vala:138 msgid "Search" msgstr "Suche" -#: src/ui/views/GamesView/GamesView.vala:192 +#: src/ui/views/GamesView/GamesView.vala:194 #, c-format msgid "%u game" msgid_plural "%u games" msgstr[0] "%u Spiel" msgstr[1] "%u Spiele" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:120 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:122 msgid "Description" -msgstr "" +msgstr "Beschreibung" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:159 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:163 msgid "Run" msgstr "Ausführen" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:160 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:164 msgid "Open installation directory" msgstr "Installationsordner öffnen" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:161 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:165 msgid "Open store page" msgstr "Shopseite öffnen" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:166 msgid "Uninstall" msgstr "Deinstallieren" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:229 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:235 msgid "Language" msgstr "Sprache" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:232 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:238 msgid "Languages" msgstr "Sprachen" diff --git a/po/id.po b/po/id.po index 32dfdaf3..9d6249d5 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: com.github.tkashkin.gamehub\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-20 17:06+0300\n" +"POT-Creation-Date: 2018-07-21 01:58+0300\n" "PO-Revision-Date: 2018-07-14 22:01+0700\n" "Last-Translator: Kukuh Syafaat \n" "Language-Team: \n" @@ -34,28 +34,28 @@ msgstr "Semua permainan Anda di satu tempat" msgid "Manage your Steam, GOG and Humble Bundle games in one place." msgstr "Kelola permainan Steam, GOG, dan Humble Bundle Anda di satu tempat." -#: src/data/Game.vala:74 +#: src/data/Game.vala:75 msgid "Installed" msgstr "Terpasang" -#: src/data/Game.vala:75 +#: src/data/Game.vala:76 msgid "Installing" msgstr "Memasang" -#: src/data/Game.vala:76 +#: src/data/Game.vala:77 msgid "Download started" msgstr "Unduhan dimulai" -#: src/data/Game.vala:77 +#: src/data/Game.vala:78 msgid "Download finished" msgstr "Unduhan selesai" -#: src/data/Game.vala:80 +#: src/data/Game.vala:81 #, c-format msgid "Downloading: %d%% (%s / %s)" msgstr "Mengunduh: %d%% (%s / %s)" -#: src/data/Game.vala:82 +#: src/data/Game.vala:83 msgid "Not installed" msgstr "Tidak terpasang" @@ -72,7 +72,7 @@ msgstr "" "Masuk ke akun Anda di klien Steam dan kembali ke GameHub" #: src/ui/dialogs/SettingsDialog.vala:13 src/ui/views/WelcomeView.vala:34 -#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:141 +#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:143 msgid "Settings" msgstr "Pengaturan" @@ -100,18 +100,39 @@ msgstr "Direktori instalasi Steam" msgid "GOG games directory" msgstr "Direktori permainan GOG" -#: src/ui/dialogs/SettingsDialog.vala:47 +#: src/ui/dialogs/SettingsDialog.vala:43 +msgid "GOG installers cache" +msgstr "Penginstal cache GOG" + +#: src/ui/dialogs/SettingsDialog.vala:48 msgid "Humble Bundle games directory" msgstr "Direktori permainan Humble Bundle" -#: src/ui/dialogs/SettingsDialog.vala:61 +#: src/ui/dialogs/SettingsDialog.vala:49 +msgid "Humble Bundle installers cache" +msgstr "Penginstal cache Humble Bundle" + +#: src/ui/dialogs/SettingsDialog.vala:63 #: src/ui/dialogs/GameDetailsDialog.vala:31 msgid "Close" msgstr "Tutup" -#: src/ui/dialogs/GameInstallDialog.vala:33 -#: src/ui/dialogs/GameInstallDialog.vala:128 -#: src/ui/views/GameDetailsView/GameDetailsView.vala:158 +#: src/ui/dialogs/SettingsDialog.vala:180 +msgid "Open" +msgstr "Buka" + +#: src/ui/dialogs/SettingsDialog.vala:187 +msgid "Clear" +msgstr "Bersih" + +#: src/ui/dialogs/SettingsDialog.vala:203 +msgid "%llu installer; %s" +msgid_plural "%llu installers; %s" +msgstr[0] "%llu pemasang; %s" + +#: src/ui/dialogs/GameInstallDialog.vala:31 +#: src/ui/dialogs/GameInstallDialog.vala:131 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 msgid "Install" msgstr "Pasang" @@ -119,11 +140,15 @@ msgstr "Pasang" msgid "Select game installer" msgstr "Pilih pemasang permainan" -#: src/ui/dialogs/GameInstallDialog.vala:121 +#: src/ui/dialogs/GameInstallDialog.vala:92 +msgid "Installer size: %s" +msgstr "Ukuran penginstal: %s" + +#: src/ui/dialogs/GameInstallDialog.vala:124 msgid "Cancel" msgstr "Batal" -#: src/ui/dialogs/GameInstallDialog.vala:125 +#: src/ui/dialogs/GameInstallDialog.vala:128 msgid "Import" msgstr "Impor" @@ -185,41 +210,41 @@ msgstr "%s permainan" msgid "Downloads" msgstr "Unduh" -#: src/ui/views/GamesView/GamesView.vala:136 +#: src/ui/views/GamesView/GamesView.vala:138 msgid "Search" msgstr "Cari" -#: src/ui/views/GamesView/GamesView.vala:192 +#: src/ui/views/GamesView/GamesView.vala:194 #, c-format msgid "%u game" msgid_plural "%u games" msgstr[0] "%u permainan" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:120 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:122 msgid "Description" msgstr "Deskripsi" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:159 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:163 msgid "Run" msgstr "Jalankan" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:160 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:164 msgid "Open installation directory" msgstr "Buka direktori pemasangan" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:161 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:165 msgid "Open store page" msgstr "Buka halaman toko" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:166 msgid "Uninstall" msgstr "Copot pemasangan" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:229 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:235 msgid "Language" msgstr "Bahasa" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:232 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:238 msgid "Languages" msgstr "Bahasa" diff --git a/po/pl.po b/po/pl.po index 5ae893c7..4179cb30 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: com.github.tkashkin.gamehub\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-20 17:06+0300\n" +"POT-Creation-Date: 2018-07-21 01:58+0300\n" "PO-Revision-Date: 2018-07-14 00:51+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -34,28 +34,28 @@ msgstr "Wszystkie gry w jednym miejscu" msgid "Manage your Steam, GOG and Humble Bundle games in one place." msgstr "Zarządzaj grami Steam, GOG i Humble Bundle w jednym miejscu" -#: src/data/Game.vala:74 +#: src/data/Game.vala:75 msgid "Installed" msgstr "Zainstalowana" -#: src/data/Game.vala:75 +#: src/data/Game.vala:76 msgid "Installing" msgstr "Instalacja" -#: src/data/Game.vala:76 +#: src/data/Game.vala:77 msgid "Download started" msgstr "Pobieranie rozpoczęte" -#: src/data/Game.vala:77 +#: src/data/Game.vala:78 msgid "Download finished" msgstr "Pobieranie zakończone" -#: src/data/Game.vala:80 +#: src/data/Game.vala:81 #, c-format msgid "Downloading: %d%% (%s / %s)" msgstr "Ściąganie: %d%% (%s / %s)" -#: src/data/Game.vala:82 +#: src/data/Game.vala:83 msgid "Not installed" msgstr "Nie zainstalowana" @@ -72,7 +72,7 @@ msgstr "" "Zaloguj się do swojego konta w kliencie Steam i wróć do GameHub" #: src/ui/dialogs/SettingsDialog.vala:13 src/ui/views/WelcomeView.vala:34 -#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:141 +#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:143 msgid "Settings" msgstr "Ustawienia" @@ -100,18 +100,41 @@ msgstr "Katalog instalacji Steam" msgid "GOG games directory" msgstr "Katalog gier GOG" -#: src/ui/dialogs/SettingsDialog.vala:47 +#: src/ui/dialogs/SettingsDialog.vala:43 +msgid "GOG installers cache" +msgstr "Pamięć podręczna instalatorów GOG" + +#: src/ui/dialogs/SettingsDialog.vala:48 msgid "Humble Bundle games directory" msgstr "Katalog gier Humble Bundle" -#: src/ui/dialogs/SettingsDialog.vala:61 +#: src/ui/dialogs/SettingsDialog.vala:49 +msgid "Humble Bundle installers cache" +msgstr "Pamięć podręczna instalatorów Humble Bundle" + +#: src/ui/dialogs/SettingsDialog.vala:63 #: src/ui/dialogs/GameDetailsDialog.vala:31 msgid "Close" msgstr "Zamknij" -#: src/ui/dialogs/GameInstallDialog.vala:33 -#: src/ui/dialogs/GameInstallDialog.vala:128 -#: src/ui/views/GameDetailsView/GameDetailsView.vala:158 +#: src/ui/dialogs/SettingsDialog.vala:180 +msgid "Open" +msgstr "Otwórz" + +#: src/ui/dialogs/SettingsDialog.vala:187 +msgid "Clear" +msgstr "Oczyścić" + +#: src/ui/dialogs/SettingsDialog.vala:203 +msgid "%llu installer; %s" +msgid_plural "%llu installers; %s" +msgstr[0] "%llu instalator; %s" +msgstr[1] "%llu instalatora; %s" +msgstr[2] "%llu instalatorów; %s" + +#: src/ui/dialogs/GameInstallDialog.vala:31 +#: src/ui/dialogs/GameInstallDialog.vala:131 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 msgid "Install" msgstr "Instaluj" @@ -119,11 +142,15 @@ msgstr "Instaluj" msgid "Select game installer" msgstr "Wybierz instalator gry" -#: src/ui/dialogs/GameInstallDialog.vala:121 +#: src/ui/dialogs/GameInstallDialog.vala:92 +msgid "Installer size: %s" +msgstr "Rozmiar instalatora: %s" + +#: src/ui/dialogs/GameInstallDialog.vala:124 msgid "Cancel" msgstr "Anuluj" -#: src/ui/dialogs/GameInstallDialog.vala:125 +#: src/ui/dialogs/GameInstallDialog.vala:128 msgid "Import" msgstr "Importuj" @@ -185,11 +212,11 @@ msgstr "Gry z %s" msgid "Downloads" msgstr "Pliki do pobrania" -#: src/ui/views/GamesView/GamesView.vala:136 +#: src/ui/views/GamesView/GamesView.vala:138 msgid "Search" msgstr "Szukaj" -#: src/ui/views/GamesView/GamesView.vala:192 +#: src/ui/views/GamesView/GamesView.vala:194 #, c-format msgid "%u game" msgid_plural "%u games" @@ -197,32 +224,31 @@ msgstr[0] "%u gra" msgstr[1] "%u gry" msgstr[2] "%u gier" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:120 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:122 msgid "Description" -msgstr "" +msgstr "Opis" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:159 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:163 msgid "Run" msgstr "Uruchom" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:160 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:164 msgid "Open installation directory" msgstr "Otwórz katalog instalacyjny" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:161 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:165 msgid "Open store page" msgstr "Otwórz stronę sklepu" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 -#, fuzzy +#: src/ui/views/GameDetailsView/GameDetailsView.vala:166 msgid "Uninstall" msgstr "Odinstaluj" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:229 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:235 msgid "Language" msgstr "Język" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:232 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:238 msgid "Languages" msgstr "Języki" diff --git a/po/pt_BR.po b/po/pt_BR.po index ae0d4288..308e8a0c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: com.github.tkashkin.gamehub\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-20 17:06+0300\n" +"POT-Creation-Date: 2018-07-21 01:58+0300\n" "PO-Revision-Date: 2018-07-13 16:18+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -33,28 +33,28 @@ msgstr "Todos os seus jogos em um só lugar" msgid "Manage your Steam, GOG and Humble Bundle games in one place." msgstr "Gerencie seus jogos Steam, GOG e Humble Bundle em um só lugar." -#: src/data/Game.vala:74 +#: src/data/Game.vala:75 msgid "Installed" msgstr "Instalado" -#: src/data/Game.vala:75 +#: src/data/Game.vala:76 msgid "Installing" msgstr "Instalando" -#: src/data/Game.vala:76 +#: src/data/Game.vala:77 msgid "Download started" msgstr "Começou a baixar" -#: src/data/Game.vala:77 +#: src/data/Game.vala:78 msgid "Download finished" msgstr "Jogo baixado com sucesso" -#: src/data/Game.vala:80 +#: src/data/Game.vala:81 #, c-format msgid "Downloading: %d%% (%s / %s)" msgstr "Baixando: %d%% (%s / %s)" -#: src/data/Game.vala:82 +#: src/data/Game.vala:83 msgid "Not installed" msgstr "Não instalado" @@ -71,7 +71,7 @@ msgstr "" "Entre na sua conta no cliente Steam e retorne ao GameHub" #: src/ui/dialogs/SettingsDialog.vala:13 src/ui/views/WelcomeView.vala:34 -#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:141 +#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:143 msgid "Settings" msgstr "Configurações" @@ -81,7 +81,8 @@ msgstr "Use o tema escuro" #: src/ui/dialogs/SettingsDialog.vala:34 msgid "Steam API keys have limited number of uses per day" -msgstr "As chaves da API do Steam têm um número limitado de utilizações por dia" +msgstr "" +"As chaves da API do Steam têm um número limitado de utilizações por dia" #: src/ui/dialogs/SettingsDialog.vala:34 msgid "Generate key" @@ -99,18 +100,40 @@ msgstr "Diretório de instalação do Steam" msgid "GOG games directory" msgstr "Diretório de jogos GOG" -#: src/ui/dialogs/SettingsDialog.vala:47 +#: src/ui/dialogs/SettingsDialog.vala:43 +msgid "GOG installers cache" +msgstr "Cache de instaladores do GOG" + +#: src/ui/dialogs/SettingsDialog.vala:48 msgid "Humble Bundle games directory" msgstr "Diretório de jogos Humble Bundle" -#: src/ui/dialogs/SettingsDialog.vala:61 +#: src/ui/dialogs/SettingsDialog.vala:49 +msgid "Humble Bundle installers cache" +msgstr "Cache de instaladores do Humble Bundle" + +#: src/ui/dialogs/SettingsDialog.vala:63 #: src/ui/dialogs/GameDetailsDialog.vala:31 msgid "Close" msgstr "Fechar" -#: src/ui/dialogs/GameInstallDialog.vala:33 -#: src/ui/dialogs/GameInstallDialog.vala:128 -#: src/ui/views/GameDetailsView/GameDetailsView.vala:158 +#: src/ui/dialogs/SettingsDialog.vala:180 +msgid "Open" +msgstr "Abrir" + +#: src/ui/dialogs/SettingsDialog.vala:187 +msgid "Clear" +msgstr "Limpar" + +#: src/ui/dialogs/SettingsDialog.vala:203 +msgid "%llu installer; %s" +msgid_plural "%llu installers; %s" +msgstr[0] "%llu instalador; %s" +msgstr[1] "%llu instaladores; %s" + +#: src/ui/dialogs/GameInstallDialog.vala:31 +#: src/ui/dialogs/GameInstallDialog.vala:131 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 msgid "Install" msgstr "Instalar" @@ -118,11 +141,15 @@ msgstr "Instalar" msgid "Select game installer" msgstr "Selecione o instalador do jogo" -#: src/ui/dialogs/GameInstallDialog.vala:121 +#: src/ui/dialogs/GameInstallDialog.vala:92 +msgid "Installer size: %s" +msgstr "Tamanho do instalador: %s" + +#: src/ui/dialogs/GameInstallDialog.vala:124 msgid "Cancel" msgstr "Cancelar" -#: src/ui/dialogs/GameInstallDialog.vala:125 +#: src/ui/dialogs/GameInstallDialog.vala:128 msgid "Import" msgstr "Importar" @@ -184,42 +211,42 @@ msgstr "%s jogos" msgid "Downloads" msgstr "Baixado" -#: src/ui/views/GamesView/GamesView.vala:136 +#: src/ui/views/GamesView/GamesView.vala:138 msgid "Search" msgstr "Pesquisar" -#: src/ui/views/GamesView/GamesView.vala:192 +#: src/ui/views/GamesView/GamesView.vala:194 #, c-format msgid "%u game" msgid_plural "%u games" msgstr[0] "%u jogo" msgstr[1] "%u jogos" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:120 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:122 msgid "Description" -msgstr "" +msgstr "Descrição" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:159 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:163 msgid "Run" msgstr "Correr" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:160 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:164 msgid "Open installation directory" msgstr "Abra o diretório de instalação" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:161 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:165 msgid "Open store page" msgstr "Abra a página da loja" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:166 msgid "Uninstall" msgstr "Desinstalar" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:229 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:235 msgid "Language" msgstr "Língua" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:232 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:238 msgid "Languages" msgstr "Línguas" diff --git a/po/ru.po b/po/ru.po index c0a244c2..077a59e8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: com.github.tkashkin.gamehub\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-20 17:06+0300\n" +"POT-Creation-Date: 2018-07-21 01:58+0300\n" "PO-Revision-Date: 2018-05-27 03:39+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -34,28 +34,28 @@ msgstr "Все игры в одном месте" msgid "Manage your Steam, GOG and Humble Bundle games in one place." msgstr "Управляйте играми из Steam, GOG и Humble Bundle в одном месте" -#: src/data/Game.vala:74 +#: src/data/Game.vala:75 msgid "Installed" msgstr "Установлена" -#: src/data/Game.vala:75 +#: src/data/Game.vala:76 msgid "Installing" msgstr "Установка" -#: src/data/Game.vala:76 +#: src/data/Game.vala:77 msgid "Download started" msgstr "Загрузка начата" -#: src/data/Game.vala:77 +#: src/data/Game.vala:78 msgid "Download finished" msgstr "Загрузка завершена" -#: src/data/Game.vala:80 +#: src/data/Game.vala:81 #, c-format msgid "Downloading: %d%% (%s / %s)" msgstr "Загрузка: %d%% (%s / %s)" -#: src/data/Game.vala:82 +#: src/data/Game.vala:83 msgid "Not installed" msgstr "Не установлена" @@ -72,7 +72,7 @@ msgstr "" "Войдите в ваш аккаунт в клиенте Steam и вернитесь в GameHub" #: src/ui/dialogs/SettingsDialog.vala:13 src/ui/views/WelcomeView.vala:34 -#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:141 +#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:143 msgid "Settings" msgstr "Настройки" @@ -100,18 +100,41 @@ msgstr "Папка установки Steam" msgid "GOG games directory" msgstr "Папка игр GOG" -#: src/ui/dialogs/SettingsDialog.vala:47 +#: src/ui/dialogs/SettingsDialog.vala:43 +msgid "GOG installers cache" +msgstr "Кэш установщиков GOG" + +#: src/ui/dialogs/SettingsDialog.vala:48 msgid "Humble Bundle games directory" msgstr "Папка игр Humble Bundle" -#: src/ui/dialogs/SettingsDialog.vala:61 +#: src/ui/dialogs/SettingsDialog.vala:49 +msgid "Humble Bundle installers cache" +msgstr "Кэш установщиков Humble Bundle" + +#: src/ui/dialogs/SettingsDialog.vala:63 #: src/ui/dialogs/GameDetailsDialog.vala:31 msgid "Close" msgstr "Закрыть" -#: src/ui/dialogs/GameInstallDialog.vala:33 -#: src/ui/dialogs/GameInstallDialog.vala:128 -#: src/ui/views/GameDetailsView/GameDetailsView.vala:158 +#: src/ui/dialogs/SettingsDialog.vala:180 +msgid "Open" +msgstr "Открыть" + +#: src/ui/dialogs/SettingsDialog.vala:187 +msgid "Clear" +msgstr "Очистить" + +#: src/ui/dialogs/SettingsDialog.vala:203 +msgid "%llu installer; %s" +msgid_plural "%llu installers; %s" +msgstr[0] "%llu установщик; %s" +msgstr[1] "%llu установщика; %s" +msgstr[2] "%llu установщиков; %s" + +#: src/ui/dialogs/GameInstallDialog.vala:31 +#: src/ui/dialogs/GameInstallDialog.vala:131 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 msgid "Install" msgstr "Установить" @@ -119,11 +142,15 @@ msgstr "Установить" msgid "Select game installer" msgstr "Выберите установочный файл игры" -#: src/ui/dialogs/GameInstallDialog.vala:121 +#: src/ui/dialogs/GameInstallDialog.vala:92 +msgid "Installer size: %s" +msgstr "Размер установщика: %s" + +#: src/ui/dialogs/GameInstallDialog.vala:124 msgid "Cancel" msgstr "Отмена" -#: src/ui/dialogs/GameInstallDialog.vala:125 +#: src/ui/dialogs/GameInstallDialog.vala:128 msgid "Import" msgstr "Импортировать" @@ -185,11 +212,11 @@ msgstr "Игры из %s" msgid "Downloads" msgstr "Загрузки" -#: src/ui/views/GamesView/GamesView.vala:136 +#: src/ui/views/GamesView/GamesView.vala:138 msgid "Search" msgstr "Поиск" -#: src/ui/views/GamesView/GamesView.vala:192 +#: src/ui/views/GamesView/GamesView.vala:194 #, c-format msgid "%u game" msgid_plural "%u games" @@ -197,31 +224,31 @@ msgstr[0] "%u игра" msgstr[1] "%u игры" msgstr[2] "%u игр" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:120 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:122 msgid "Description" msgstr "Описание" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:159 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:163 msgid "Run" msgstr "Запустить" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:160 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:164 msgid "Open installation directory" msgstr "Открыть папку установки" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:161 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:165 msgid "Open store page" msgstr "Открыть страницу в магазине" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:166 msgid "Uninstall" msgstr "Удалить" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:229 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:235 msgid "Language" msgstr "Язык" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:232 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:238 msgid "Languages" msgstr "Языки" diff --git a/po/uk.po b/po/uk.po index 0b5f3bfd..10db8b04 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: com.github.tkashkin.gamehub\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-20 17:06+0300\n" +"POT-Creation-Date: 2018-07-21 01:58+0300\n" "PO-Revision-Date: 2018-07-14 00:51+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -34,28 +34,28 @@ msgstr "Всі ігри в одному місці" msgid "Manage your Steam, GOG and Humble Bundle games in one place." msgstr "Керуйте іграми з Steam, GOG і Humble Bundle в одному місці." -#: src/data/Game.vala:74 +#: src/data/Game.vala:75 msgid "Installed" msgstr "Встановлено" -#: src/data/Game.vala:75 +#: src/data/Game.vala:76 msgid "Installing" msgstr "Встановлення" -#: src/data/Game.vala:76 +#: src/data/Game.vala:77 msgid "Download started" msgstr "Завантаження розпочато" -#: src/data/Game.vala:77 +#: src/data/Game.vala:78 msgid "Download finished" msgstr "Завантаження завершено" -#: src/data/Game.vala:80 +#: src/data/Game.vala:81 #, c-format msgid "Downloading: %d%% (%s / %s)" msgstr "Завантаження: %d%% (%s / %s)" -#: src/data/Game.vala:82 +#: src/data/Game.vala:83 msgid "Not installed" msgstr "Не встановлено" @@ -72,7 +72,7 @@ msgstr "" "Увійдіть у свій обліковий запис у клієнті Steam і поверніться до GameHub" #: src/ui/dialogs/SettingsDialog.vala:13 src/ui/views/WelcomeView.vala:34 -#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:141 +#: src/ui/views/WelcomeView.vala:59 src/ui/views/GamesView/GamesView.vala:143 msgid "Settings" msgstr "Налаштування" @@ -100,18 +100,42 @@ msgstr "Каталог встановлення Steam" msgid "GOG games directory" msgstr "Каталог ігор GOG" -#: src/ui/dialogs/SettingsDialog.vala:47 +#: src/ui/dialogs/SettingsDialog.vala:43 +msgid "GOG installers cache" +msgstr "Кеш інсталяторів GOG" + +#: src/ui/dialogs/SettingsDialog.vala:48 msgid "Humble Bundle games directory" msgstr "Каталог ігор Humble Bundle" -#: src/ui/dialogs/SettingsDialog.vala:61 +#: src/ui/dialogs/SettingsDialog.vala:49 +msgid "Humble Bundle installers cache" +msgstr "Кеш інсталяторів Humble Bundle" + +#: src/ui/dialogs/SettingsDialog.vala:63 #: src/ui/dialogs/GameDetailsDialog.vala:31 msgid "Close" msgstr "Закрити" -#: src/ui/dialogs/GameInstallDialog.vala:33 -#: src/ui/dialogs/GameInstallDialog.vala:128 -#: src/ui/views/GameDetailsView/GameDetailsView.vala:158 +#: src/ui/dialogs/SettingsDialog.vala:180 +msgid "Open" +msgstr "Відкрити" + +#: src/ui/dialogs/SettingsDialog.vala:187 +msgid "Clear" +msgstr "Очистити" + +#: src/ui/dialogs/SettingsDialog.vala:203 +#, fuzzy, c-format +msgid "%llu installer; %s" +msgid_plural "%llu installers; %s" +msgstr[0] "%llu інсталятор; %s" +msgstr[1] "%llu інсталятори; %s" +msgstr[2] "%llu інсталяторів; %s" + +#: src/ui/dialogs/GameInstallDialog.vala:31 +#: src/ui/dialogs/GameInstallDialog.vala:131 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 msgid "Install" msgstr "Встановити" @@ -119,11 +143,16 @@ msgstr "Встановити" msgid "Select game installer" msgstr "Виберіть інсталятора гри" -#: src/ui/dialogs/GameInstallDialog.vala:121 +#: src/ui/dialogs/GameInstallDialog.vala:92 +#, fuzzy, c-format +msgid "Installer size: %s" +msgstr "Встановити %s" + +#: src/ui/dialogs/GameInstallDialog.vala:124 msgid "Cancel" msgstr "Скасувати" -#: src/ui/dialogs/GameInstallDialog.vala:125 +#: src/ui/dialogs/GameInstallDialog.vala:128 msgid "Import" msgstr "Імпортувати" @@ -185,11 +214,11 @@ msgstr "Ігри з %s" msgid "Downloads" msgstr "Завантаження" -#: src/ui/views/GamesView/GamesView.vala:136 +#: src/ui/views/GamesView/GamesView.vala:138 msgid "Search" msgstr "Пошук" -#: src/ui/views/GamesView/GamesView.vala:192 +#: src/ui/views/GamesView/GamesView.vala:194 #, c-format msgid "%u game" msgid_plural "%u games" @@ -197,31 +226,31 @@ msgstr[0] "%u гра" msgstr[1] "%u гри" msgstr[2] "%u ігор" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:120 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:122 msgid "Description" -msgstr "" +msgstr "Опис" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:159 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:163 msgid "Run" msgstr "Запустити" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:160 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:164 msgid "Open installation directory" msgstr "Відкрити каталог встановлення" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:161 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:165 msgid "Open store page" msgstr "Відкрити сторінку магазину" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:162 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:166 msgid "Uninstall" msgstr "Видалити" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:229 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:235 msgid "Language" msgstr "Мова" -#: src/ui/views/GameDetailsView/GameDetailsView.vala:232 +#: src/ui/views/GameDetailsView/GameDetailsView.vala:238 msgid "Languages" msgstr "Мови" diff --git a/src/ProjectConfig.vala.in b/src/ProjectConfig.vala.in index b115950a..56001fbb 100644 --- a/src/ProjectConfig.vala.in +++ b/src/ProjectConfig.vala.in @@ -3,6 +3,8 @@ using Gtk; namespace GameHub.ProjectConfig { public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@; + public const string GETTEXT_DIR = @GETTEXT_DIR@; + public const string PROJECT_NAME = @PROJECT_NAME@; public const string VERSION = @VERSION@; diff --git a/src/app.vala b/src/app.vala index 6f4cd72c..7392cb0e 100644 --- a/src/app.vala +++ b/src/app.vala @@ -41,8 +41,7 @@ namespace GameHub #endif Intl.setlocale(LocaleCategory.ALL, ""); - Intl.bindtextdomain(ProjectConfig.GETTEXT_PACKAGE, ProjectConfig.DATADIR + "/locale"); - Intl.bind_textdomain_codeset(ProjectConfig.GETTEXT_PACKAGE, "UTF-8"); + Intl.bindtextdomain(ProjectConfig.GETTEXT_PACKAGE, ProjectConfig.GETTEXT_DIR); Intl.textdomain(ProjectConfig.GETTEXT_PACKAGE); FSUtils.make_dirs(); diff --git a/src/data/Game.vala b/src/data/Game.vala index 9d97263b..f0915759 100644 --- a/src/data/Game.vala +++ b/src/data/Game.vala @@ -47,6 +47,7 @@ namespace GameHub.Data public string id { get; protected set; } public string os { get; protected set; } public string file { get; protected set; } + public int64 file_size { get; protected set; } public virtual string name { get { return id; } } } diff --git a/src/data/sources/gog/GOGGame.vala b/src/data/sources/gog/GOGGame.vala index 65055c77..998efef7 100644 --- a/src/data/sources/gog/GOGGame.vala +++ b/src/data/sources/gog/GOGGame.vala @@ -208,6 +208,7 @@ namespace GameHub.Data.Sources.GOG lang = json.get_string_member("language"); lang_full = json.get_string_member("language_full"); file = json.get_array_member("files").get_object_element(0).get_string_member("downlink"); + file_size = json.get_int_member("total_size"); } } } diff --git a/src/data/sources/humble/HumbleGame.vala b/src/data/sources/humble/HumbleGame.vala index 348a50c8..06d2c196 100644 --- a/src/data/sources/humble/HumbleGame.vala +++ b/src/data/sources/humble/HumbleGame.vala @@ -292,6 +292,7 @@ namespace GameHub.Data.Sources.Humble os = platform; dl_name = download.get_string_member("name"); file = download.get_object_member("url").get_string_member("web"); + file_size = download.get_int_member("file_size"); } } } diff --git a/src/meson.build b/src/meson.build index dfcf2abe..583f6ab0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,9 +1,10 @@ conf_data = configuration_data() conf_data.set_quoted('PROJECT_NAME', meson.project_name()) conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +conf_data.set_quoted('GETTEXT_DIR', get_option('prefix') + '/' + get_option('localedir')) conf_data.set_quoted('VERSION', meson.project_version()) conf_data.set_quoted('PREFIX', get_option('prefix')) -conf_data.set_quoted('DATADIR', get_option('datadir')) +conf_data.set_quoted('DATADIR', get_option('prefix') + '/' + get_option('datadir')) conf_data.set_quoted('RUNTIME', get_option('runtime')) project_config = configure_file( input: 'ProjectConfig.vala.in', diff --git a/src/ui/dialogs/GameInstallDialog.vala b/src/ui/dialogs/GameInstallDialog.vala index fb3b9752..1eecb211 100644 --- a/src/ui/dialogs/GameInstallDialog.vala +++ b/src/ui/dialogs/GameInstallDialog.vala @@ -56,6 +56,7 @@ namespace GameHub.UI.Dialogs title_hbox.add(icon); title_hbox.add(title_vbox); + title_vbox.add(subtitle_label); content.add(title_hbox); @@ -63,7 +64,8 @@ namespace GameHub.UI.Dialogs Utils.load_image.begin(icon, game.icon, "icon"); installers_list = new ListBox(); - installers_list.margin_start = 64; + installers_list.get_style_context().add_class("installers-list"); + installers_list.margin_start = 56; installers_list.margin_top = 8; installers_list.margin_bottom = 8; @@ -83,9 +85,12 @@ namespace GameHub.UI.Dialogs if(installers.size > 1) { subtitle_label.label = _("Select game installer"); - title_vbox.add(subtitle_label); content.add(installers_list); } + else + { + subtitle_label.label = _("Installer size: %s").printf(format_size(installers[0].file_size)); + } destroy.connect(() => { if(!is_finished) canceled(); }); @@ -140,10 +145,19 @@ namespace GameHub.UI.Dialogs { this.installer = installer; - var label = new Label(installer.name); - label.xpad = 16; - label.ypad = 4; - child = label; + var box = new Box(Orientation.HORIZONTAL, 0); + box.margin_start = box.margin_end = box.margin_end = 8; + box.margin_top = box.margin_bottom = 4; + + var name = new Label(installer.name); + name.hexpand = true; + name.halign = Align.START; + + var size = new Label(format_size(installer.file_size)); + size.halign = Align.END; + box.add(name); + box.add(size); + child = box; } } } diff --git a/src/ui/dialogs/SettingsDialog.vala b/src/ui/dialogs/SettingsDialog.vala index 0553e40f..9457c0aa 100644 --- a/src/ui/dialogs/SettingsDialog.vala +++ b/src/ui/dialogs/SettingsDialog.vala @@ -40,11 +40,13 @@ namespace GameHub.UI.Dialogs #if !FLATPAK add_file_chooser(_("GOG games directory"), FileChooserAction.SELECT_FOLDER, paths.gog_games, v => { paths.gog_games = v; }); #endif + add_cache_directory(_("GOG installers cache"), FSUtils.Paths.GOG.Installers); add_separator(); add_header_with_checkbox("Humble Bundle", humble_auth.enabled, v => { humble_auth.enabled = v; }); #if !FLATPAK add_file_chooser(_("Humble Bundle games directory"), FileChooserAction.SELECT_FOLDER, paths.humble_games, v => { paths.humble_games = v; }); + add_cache_directory(_("Humble Bundle installers cache"), FSUtils.Paths.Humble.Installers); #endif content.pack_start(box, false, false, 0); @@ -95,7 +97,7 @@ namespace GameHub.UI.Dialogs hbox.add(entry); add_widget(hbox); } - + private void add_file_chooser(string text, FileChooserAction mode, string val, owned EntryAction action, bool create=true) { var chooser = new FileChooserButton(text, mode); @@ -166,6 +168,59 @@ namespace GameHub.UI.Dialogs add_widget(hbox); } + private void add_cache_directory(string name, string path) + { + var bbox = new Box(Orientation.HORIZONTAL, 2); + bbox.set_size_request(280, -1); + + var size_label = new Label(null); + size_label.margin_end = 8; + size_label.halign = Align.START; + + var open_btn = new Button(); + open_btn.label = _("Open"); + open_btn.clicked.connect(() => { + Utils.open_uri(FSUtils.file(path).get_uri()); + }); + + var clear_btn = new Button(); + clear_btn.get_style_context().add_class(STYLE_CLASS_DESTRUCTIVE_ACTION); + clear_btn.label = _("Clear"); + + var label = new Label(name); + label.halign = Align.START; + label.hexpand = true; + + bbox.pack_start(size_label); + bbox.pack_start(open_btn, false); + bbox.pack_start(clear_btn, false); + + SourceFunc calc_size = () => { + try + { + uint64 dir_size; + uint64 files; + FSUtils.file(path).measure_disk_usage(FileMeasureFlags.NONE, null, null, out dir_size, null, out files); + size_label.label = ngettext("%llu installer; %s", "%llu installers; %s", (ulong) files).printf(files, format_size(dir_size)); + clear_btn.sensitive = dir_size > 32; + } + catch(Error e){} + return false; + }; + + calc_size(); + + clear_btn.clicked.connect(() => { + FSUtils.rm(path, "*"); + calc_size(); + }); + + var hbox = new Box(Orientation.HORIZONTAL, 12); + hbox.add(label); + hbox.add(bbox); + add_widget(hbox); + } + private void add_separator() { add_widget(new Separator(Orientation.HORIZONTAL)); @@ -179,5 +234,6 @@ namespace GameHub.UI.Dialogs private delegate void SwitchAction(bool active); private delegate void EntryAction(string val); + private delegate void ButtonAction(); } } diff --git a/src/ui/views/GameDetailsView/GameDetailsView.vala b/src/ui/views/GameDetailsView/GameDetailsView.vala index 97c41bc4..6c0e73fb 100644 --- a/src/ui/views/GameDetailsView/GameDetailsView.vala +++ b/src/ui/views/GameDetailsView/GameDetailsView.vala @@ -59,7 +59,7 @@ namespace GameHub.UI.Views private Box custom_info; - private const string CSS_LIGHT = "background: rgb(245, 245, 245); color: black"; + private const string CSS_LIGHT = "background: rgb(245, 245, 245); color: rgb(66, 66, 66)"; private const string CSS_DARK = "background: rgb(59, 63, 69); color: white"; construct @@ -83,8 +83,8 @@ namespace GameHub.UI.Views content = new Box(Orientation.VERTICAL, 0); content.margin_start = content.margin_end = 8; - var title_hbox = new Box(Orientation.HORIZONTAL, 16); - title_hbox.margin_start = title_hbox.margin_end = 8; + var title_hbox = new Box(Orientation.HORIZONTAL, 15); + title_hbox.margin_start = title_hbox.margin_end = 7; icon = new AutoSizeImage(); icon.set_constraint(48, 48, 1); @@ -120,11 +120,13 @@ namespace GameHub.UI.Views title_hbox.add(src_icon); description_header = new Granite.HeaderLabel(_("Description")); - description_header.xpad = 8; + description_header.margin_start = description_header.margin_end = 7; + description_header.get_style_context().add_class("description-header"); description = new WebView(); description.hexpand = true; description.vexpand = false; //(!is_dialog); + description.sensitive = false; description.get_settings().hardware_acceleration_policy = HardwareAccelerationPolicy.NEVER; custom_info = new Box(Orientation.VERTICAL, 0); @@ -135,7 +137,7 @@ namespace GameHub.UI.Views ui_settings.notify["dark-theme"].connect(() => { description.user_content_manager.remove_all_style_sheets(); var style = ui_settings.dark_theme ? CSS_DARK : CSS_LIGHT; - description.user_content_manager.add_style_sheet(new UserStyleSheet(@"body{overflow: hidden; font-size: 0.8em; line-height: 1.4; $(style)} h1,h2,h3{line-height: 1.2;} ul{padding: 4px 0 4px 16px;}", UserContentInjectedFrames.TOP_FRAME, UserStyleLevel.USER, null, null)); + description.user_content_manager.add_style_sheet(new UserStyleSheet(@"body{overflow: hidden; font-size: 0.8em; margin: 7px; line-height: 1.4; $(style)} h1,h2,h3{line-height: 1.2;} ul{padding: 4px 0 4px 16px;}", UserContentInjectedFrames.TOP_FRAME, UserStyleLevel.USER, null, null)); }); ui_settings.notify_property("dark-theme");