diff --git a/appveyor.yml b/appveyor.yml index 8923de52..862526e5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.16.2-{build}-{branch} +version: 0.16.3-{build}-{branch} pull_requests: do_not_increment_build_number: true @@ -6,7 +6,7 @@ pull_requests: skip_tags: true image: - - Ubuntu1804 + - Ubuntu clone_folder: ~/build/GameHub diff --git a/data/com.github.tkashkin.gamehub.changelog.xml b/data/com.github.tkashkin.gamehub.changelog.xml index 8d623052..4547af6e 100644 --- a/data/com.github.tkashkin.gamehub.changelog.xml +++ b/data/com.github.tkashkin.gamehub.changelog.xml @@ -1,7 +1,7 @@ - +
    -
  • 0.16.1: New Steam libraryfolders format (#558)
    • +
  • 0.16.3: Collection: Expand $game everywhere (#632, #635)
 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 37371a78..64fbf548 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -com.github.tkashkin.gamehub (0.16.1) focal; urgency=low - * 0.16.1 +com.github.tkashkin.gamehub (0.16.3) focal; urgency=low + * 0.16.3: Collection: Expand $game everywhere (#632, #635) - -- Anatoliy Kashkin Sun, 19 Sep 2021 22:18:30 +0300 \ No newline at end of file + -- Anatoliy Kashkin Tue, 24 May 2022 22:18:06 +0300 \ No newline at end of file diff --git a/debian/changelog.in b/debian/changelog.in index 2fb1d33d..75f437ff 100644 --- a/debian/changelog.in +++ b/debian/changelog.in @@ -1,4 +1,4 @@ -com.github.tkashkin.gamehub (0.16.1~$VERSION_SUFFIX) $DISTRO; urgency=low - * 0.16.1 +com.github.tkashkin.gamehub (0.16.3~$VERSION_SUFFIX) $DISTRO; urgency=low + * 0.16.3: Collection: Expand $game everywhere (#632, #635) - -- Anatoliy Kashkin Sun, 19 Sep 2021 22:18:30 +0300 \ No newline at end of file + -- Anatoliy Kashkin Tue, 24 May 2022 22:18:06 +0300 \ No newline at end of file diff --git a/meson.build b/meson.build index 9531287d..fdd97b91 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('com.github.tkashkin.gamehub', 'vala', 'c', version: '0.16.2') +project('com.github.tkashkin.gamehub', 'vala', 'c', version: '0.16.3') i18n = import('i18n') gnome = import('gnome') diff --git a/po/ar.po b/po/ar.po index 761cf5db..f4477614 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2,13 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the com.github.tkashkin.gamehub package. # Omar Aglan , 2019. -# abidin toumi , 2019, 2020. +# abidin toumi , 2019, 2020, 2022. msgid "" msgstr "" "Project-Id-Version: com.github.tkashkin.gamehub\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-26 06:40+0300\n" -"PO-Revision-Date: 2020-10-13 16:26+0000\n" +"PO-Revision-Date: 2022-05-01 09:12+0000\n" "Last-Translator: abidin toumi \n" "Language-Team: Arabic \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Weblate 4.3-dev\n" +"X-Generator: Weblate 4.12.1\n" #: src/app.vala:91 msgid "Show help" @@ -720,9 +720,8 @@ msgstr "DLC" #: src/ui/dialogs/SettingsDialog/pages/general/Collection.vala:73 #: src/ui/views/GameDetailsView/blocks/GOGDetails.vala:197 -#, fuzzy msgid "Bonus content" -msgstr "المحتوى المكافأة" +msgstr "المحتوى الإضافي" #: src/ui/dialogs/SettingsDialog/pages/general/Collection.vala:84 msgid "Variable syntax: $var or ${var}" @@ -1368,13 +1367,13 @@ msgstr[4] "%u لعبة" msgstr[5] "%u ألعاب" #: src/ui/views/GamesView/GamesView.vala:553 -#, c-format, fuzzy +#, c-format msgctxt "games_view_subtitle_filtered_games" msgid "%1$u / %2$s" msgstr "%1$u / %2$s" #: src/ui/views/GamesView/GamesView.vala:557 -#, c-format, fuzzy +#, c-format msgctxt "games_view_subtitle" msgid "%1$s: %2$s" msgstr "%1$s: %2$s" diff --git a/po/de.po b/po/de.po index 3299f533..35020b03 100644 --- a/po/de.po +++ b/po/de.po @@ -13,13 +13,15 @@ # Sascha Bohrmann , 2020. # Jeannette L , 2020. # J. Lavoie , 2020, 2021. +# 3ole , 2022. +# Sematre , 2022. msgid "" msgstr "" "Project-Id-Version: com.github.tkashkin.gamehub\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-26 06:40+0300\n" -"PO-Revision-Date: 2021-09-25 02:34+0000\n" -"Last-Translator: J. Lavoie \n" +"PO-Revision-Date: 2022-05-02 12:12+0000\n" +"Last-Translator: Sematre \n" "Language-Team: German \n" "Language: de\n" @@ -27,7 +29,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.9-dev\n" +"X-Generator: Weblate 4.12.1\n" #: src/app.vala:91 msgid "Show help" @@ -254,7 +256,7 @@ msgstr "%s Spiele" #: src/data/sources/steam/Steam.vala:43 msgid "Your SteamID will be read from Steam configuration file" -msgstr "Ihre SteamID wird aus der Steam-Konfigurationsdatei gelesen" +msgstr "Deine SteamID wird aus der Steam-Konfigurationsdatei gelesen" #: src/data/sources/steam/Steam.vala:46 msgid "" @@ -262,7 +264,7 @@ msgid "" "Login into your account in Steam client and return to GameHub" msgstr "" "Steam-Konfigurationsdatei nicht gefunden.\n" -"Bitte melden Sie sich in Steam an" +"Bitte melde dich im Steam-Client an und kehre dann zu GameHub zurück" #: src/data/sources/gog/GOGGame.vala:983 #, c-format @@ -280,7 +282,7 @@ msgid "" "Make sure your Humble Monthly subscription is active." msgstr "" "Die Download-URL von Trove kann nicht abgerufen werden.\n" -"Stellen Sie sicher, dass Ihr Humble Monthly Abonnement aktiv ist." +"Stelle sicher, dass dein Humble Monthly Abonnement aktiv ist." #: src/data/sources/itch/ItchDownloader.vala:192 #, c-format @@ -1050,7 +1052,7 @@ msgstr "Anwendungsversion und Umgebungsinformationen kopieren" #: src/ui/dialogs/SettingsDialog/pages/About.vala:78 #: src/ui/views/WelcomeView.vala:57 msgid "All your games in one place" -msgstr "Alle Ihre Spiele an einem Ort" +msgstr "Alle deine Spiele an einem Ort" #: src/ui/dialogs/SettingsDialog/pages/About.vala:92 msgctxt "about_link" @@ -1219,6 +1221,10 @@ msgid "" "\n" "Path: %s" msgstr "" +"Nutzung von Overlays in diesem Verzeichnis könnte gefährlich sein\n" +"Ab hier bist du auf dich allein gestellt\n" +"\n" +"Verzeichnis: %s" #: src/ui/dialogs/GameFSOverlaysDialog.vala:187 #, c-format @@ -1249,34 +1255,29 @@ msgstr "Fehlerhafter Installer: Prüfsummenfehler in" #: src/ui/dialogs/ImportEmulatedGamesDialog.vala:57 #: src/ui/views/GamesView/AddGamePopover.vala:105 -#, fuzzy msgid "Import emulated games" -msgstr "Keine vom Benutzer hinzugefügten Spiele" +msgstr "Emulierte Spiele importieren" #: src/ui/dialogs/ImportEmulatedGamesDialog.vala:75 -#, fuzzy msgid "Select directory with emulated games" -msgstr "Ordner auswählen" +msgstr "Ordner mit emulierten Spielen auswählen" #: src/ui/dialogs/ImportEmulatedGamesDialog.vala:83 -#, fuzzy msgid "Detected games" -msgstr "Keine vom Benutzer hinzugefügten Spiele" +msgstr "Entdeckte Spiele" #: src/ui/dialogs/ImportEmulatedGamesDialog.vala:107 -#, fuzzy msgid "Select all" -msgstr "Installationsprogramm auswählen" +msgstr "Alle auswählen" #: src/ui/dialogs/ImportEmulatedGamesDialog.vala:115 -#, fuzzy msgid "Select directory to import" -msgstr "Ordner auswählen" +msgstr "Zu importierenden Ordner auswählen" #: src/ui/dialogs/GameTweaksDialog.vala:40 -#, fuzzy, c-format +#, c-format msgid "%s: Tweaks" -msgstr "%s: Overlays" +msgstr "%s: Tweaks" #: src/ui/views/WelcomeView.vala:52 msgid "No enabled game sources" @@ -1374,13 +1375,13 @@ msgstr[1] "%u Spiele" #, c-format msgctxt "games_view_subtitle_filtered_games" msgid "%1$u / %2$s" -msgstr "" +msgstr "%1$u / %2$s" #: src/ui/views/GamesView/GamesView.vala:557 #, c-format msgctxt "games_view_subtitle" msgid "%1$s: %2$s" -msgstr "" +msgstr "%1$s: / %2$s" #: src/ui/views/GamesView/GamesView.vala:568 msgid "No user-added games" @@ -1414,22 +1415,21 @@ msgid "" "No games were loaded from Steam. Set your games list privacy to public or " "use your own Steam API key in settings." msgstr "" -"Es wurden keine Spiele von Steam geladen. Stellen Sie Ihre Spieleliste auf " -"öffentlich oder verwenden Sie Ihren eigenen Steam-API-Schlüssel." +"Es wurden keine Spiele von Steam geladen. Stelle deine Spieleliste auf " +"öffentlich oder lege deinen Steam API-Schlüssel in den Einstellungen fest." #: src/ui/views/GamesView/GamesView.vala:628 msgid "Privacy" msgstr "Datenschutz" #: src/ui/views/GamesView/GamesView.vala:739 -#, fuzzy msgid "Downloading images" -msgstr "Herunterladen" +msgstr "Bilder werden heruntergeladen" #: src/ui/views/GamesView/GamesView.vala:753 -#, fuzzy, c-format +#, c-format msgid "Downloading image: %s" -msgstr "Herunterladen" +msgstr "Lade Bild: %s" #: src/ui/views/GamesView/DownloadProgressView.vala:131 #: src/ui/views/GameDetailsView/GameDetailsPage.vala:162 @@ -1460,9 +1460,8 @@ msgid "Tags" msgstr "Tags" #: src/ui/views/GamesView/FiltersPopover.vala:353 -#, fuzzy msgid "All platforms" -msgstr "Plattform" +msgstr "Alle Plattformen" #: src/ui/views/GamesView/AddGamePopover.vala:77 msgid "Select game executable" @@ -1473,9 +1472,8 @@ msgid "Select game directory" msgstr "Spielverzeichnis auswählen" #: src/ui/views/GamesView/AddGamePopover.vala:111 -#, fuzzy msgid "Download game images" -msgstr "Herunterladen" +msgstr "Spielebilder herunterladen" #: src/ui/views/GamesView/GameContextMenu.vala:87 msgid "Details" @@ -1508,9 +1506,8 @@ msgstr "Bonus-Sammelverzeichnis öffnen" #: src/ui/views/GamesView/GameContextMenu.vala:160 #: src/ui/views/GameDetailsView/GameDetailsPage.vala:239 -#, fuzzy msgid "Open screenshots directory" -msgstr "Präfixverzeichnis öffnen" +msgstr "Screenshotordner öffnen" #: src/ui/views/GamesView/GameContextMenu.vala:167 #: src/ui/views/GameDetailsView/MultipleGamesDetailsView.vala:167 @@ -1523,39 +1520,39 @@ msgid "Properties" msgstr "Eigenschaften" #: src/ui/views/GameDetailsView/MultipleGamesDetailsView.vala:100 -#, fuzzy, c-format +#, c-format msgid "%d game selected" msgid_plural "%d games selected" -msgstr[0] "%s: keine Installationsprogramme verfügbare" -msgstr[1] "%s: keine Installationsprogramme verfügbare" +msgstr[0] "%d: Spiel ausgewählt" +msgstr[1] "%d: Spiele ausgewählt" #: src/ui/views/GameDetailsView/MultipleGamesDetailsView.vala:144 -#, fuzzy, c-format +#, c-format msgid "%d game will be installed" msgid_plural "%d games will be installed" -msgstr[0] "%s: keine Installationsprogramme verfügbare" -msgstr[1] "%s: keine Installationsprogramme verfügbare" +msgstr[0] "%d: Spiel wird installiert" +msgstr[1] "%d: Spiele werden installiert" #: src/ui/views/GameDetailsView/MultipleGamesDetailsView.vala:154 -#, fuzzy, c-format +#, c-format msgid "%d game will be downloaded" msgid_plural "%d games will be downloaded" -msgstr[0] "%s: keine Installationsprogramme verfügbare" -msgstr[1] "%s: keine Installationsprogramme verfügbare" +msgstr[0] "%d Spiel wird heruntergeladen" +msgstr[1] "%d Spiele werden heruntergeladen" #: src/ui/views/GameDetailsView/MultipleGamesDetailsView.vala:161 -#, fuzzy, c-format +#, c-format msgid "Image for %d game will be searched" msgid_plural "Images for %d games will be searched" -msgstr[0] "%s: keine Installationsprogramme verfügbare" -msgstr[1] "%s: keine Installationsprogramme verfügbare" +msgstr[0] "Suche nach Bildern für %d Spiele" +msgstr[1] "Suche nach Bildern für %d Spielen" #: src/ui/views/GameDetailsView/MultipleGamesDetailsView.vala:168 -#, fuzzy, c-format +#, c-format msgid "%d game will be uninstalled" msgid_plural "%d games will be uninstalled" -msgstr[0] "%s: keine Installationsprogramme verfügbare" -msgstr[1] "%s: keine Installationsprogramme verfügbare" +msgstr[0] "%d Spiel wird deinstalliert" +msgstr[1] "%d Spiele werden deinstalliert" #: src/ui/views/GameDetailsView/MultipleGamesDetailsView.vala:174 msgid "Refresh" @@ -1620,9 +1617,9 @@ msgid "Languages" msgstr "Sprachen" #: src/ui/views/GameDetailsView/blocks/GOGDetails.vala:147 -#, fuzzy, c-format +#, c-format msgid "%u DLCs cannot be installed" -msgstr "%s: fehlerhafter Installer" +msgstr "%u DLCs können nicht installiert werden" #: src/ui/views/GameDetailsView/blocks/SteamDetails.vala:71 msgid "Category" @@ -1669,10 +1666,9 @@ msgid "Release date" msgstr "Veröffentlichungsdatum" #: src/ui/views/GameDetailsView/blocks/IGDBInfo.vala:133 -#, fuzzy msgctxt "igdb" msgid "Platforms" -msgstr "Plattform" +msgstr "Plattformen" #: src/ui/views/GameDetailsView/blocks/IGDBInfo.vala:139 msgctxt "igdb" @@ -1714,18 +1710,16 @@ msgid "Select file" msgstr "Datei auswählen" #: src/ui/widgets/ImagesDownloadPopover.vala:74 -#, fuzzy msgid "No images" -msgstr "Bilder" +msgstr "Keine Bilder" #: src/ui/widgets/ImagesDownloadPopover.vala:74 -#, fuzzy msgid "" "There are no images found for this game\n" "Make sure game name is correct" msgstr "" "Es wurden keine Bilder für dieses Spiel gefunden.\n" -"Stellen Sie sicher, dass der Spielname korrekt ist" +"Stelle sicher, dass der Spielname korrekt ist" #: src/ui/widgets/ImagesDownloadPopover.vala:94 msgid "Search images:" @@ -1744,14 +1738,12 @@ msgid "Add tag" msgstr "Tag hinzufügen" #: src/ui/widgets/TweaksList.vala:86 -#, fuzzy msgid "No description" -msgstr "Beschreibung" +msgstr "Keine Beschreibung" #: src/ui/widgets/TweaksList.vala:124 -#, fuzzy msgid "Edit file" -msgstr "Datei auswählen" +msgstr "Datei bearbeiten" #: src/utils/Utils.vala:456 src/utils/Utils.vala:464 #, c-format @@ -1766,10 +1758,10 @@ msgid "%dm" msgstr "%d m" #: src/utils/Utils.vala:464 -#, fuzzy, c-format +#, c-format msgctxt "time" msgid "%ds" -msgstr "%d h" +msgstr "%ds" #: src/settings/UI.vala:153 msgctxt "grid_size_preset" @@ -1794,7 +1786,7 @@ msgstr "GOG (Vertikal)" #: src/settings/UI.vala:157 msgctxt "grid_size_preset" msgid "Square" -msgstr "" +msgstr "Quadrat" #: src/settings/UI.vala:158 #, fuzzy @@ -1828,10 +1820,10 @@ msgid "Download failed" msgstr "Download fehlgeschlagen" #: src/utils/downloader/Downloader.vala:208 -#, fuzzy, c-format +#, c-format msgctxt "dl_status" msgid "Downloading: %s" -msgstr "Herunterladen" +msgstr "Lade herunter: %s" #: src/utils/downloader/Downloader.vala:210 #, fuzzy @@ -1840,16 +1832,15 @@ msgid "Downloading" msgstr "Herunterladen" #: src/utils/downloader/Downloader.vala:214 -#, fuzzy, c-format +#, c-format msgctxt "dl_status" msgid "Paused: %s" -msgstr "Angehalten: %d %% (%s / %s)" +msgstr "Angehalten:%s" #: src/utils/downloader/Downloader.vala:216 -#, fuzzy msgctxt "dl_status" msgid "Paused" -msgstr "Download anhalten" +msgstr "Angehalten" #: src/utils/downloader/Downloader.vala:218 msgctxt "dl_status" @@ -1858,10 +1849,10 @@ msgstr "Download abgebrochen" #. TRANSLATORS: Download progress template. %1$d - percentage, %2$s / %3$s - downloaded portion and total file size, %4$s - download speed #: src/utils/downloader/Downloader.vala:262 -#, fuzzy, c-format +#, c-format msgctxt "dl_status" msgid "%1$d%% (%2$s / %3$s) [%4$s/s]" -msgstr "Herunterladen: %d %% (%s / %s) [%s/s]" +msgstr "%1$d%% (%2$s / %3$s) [%4$s/s]" #~ msgid "Disable esync" #~ msgstr "esync deaktivieren" diff --git a/scripts/build.sh b/scripts/build.sh index ee54df87..eeb21743 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,7 +1,7 @@ #!/bin/bash _GH_RDNN="com.github.tkashkin.gamehub" -_GH_VERSION="0.16.0" +_GH_VERSION="0.16.3" _GH_BRANCH="${APPVEYOR_REPO_BRANCH:-$(git symbolic-ref --short -q HEAD)}" _GH_COMMIT="$(git rev-parse HEAD)" @@ -24,10 +24,10 @@ _GPG_PACKAGE="gnupg1" export CFLAGS="$CFLAGS -O0" export DEB_BUILD_OPTIONS="noopt nostrip nocheck" -if [[ "$APPVEYOR_BUILD_WORKER_IMAGE" = "Ubuntu1804" ]]; then - _DEB_TARGET_DISTRO_NAMES=("bionic" "focal" "groovy" "hirsute") - _DEB_TARGET_DISTRO_VERSIONS=("18.04" "20.04" "20.10" "21.04") - _BUILD_IMAGE="bionic" +if [[ "$APPVEYOR_BUILD_WORKER_IMAGE" = "Ubuntu" ]]; then + _DEB_TARGET_DISTRO_NAMES=("bionic" "focal" "impish" "jammy" "kinetic") + _DEB_TARGET_DISTRO_VERSIONS=("18.04" "20.04" "21.10" "22.04" "22.10") + _BUILD_IMAGE="jammy" else source "/etc/os-release" _DEB_TARGET_DISTRO_ID="$ID" diff --git a/scripts/launchpad/dput.cf b/scripts/launchpad/dput.cf index 4e21bc94..c20a9824 100644 --- a/scripts/launchpad/dput.cf +++ b/scripts/launchpad/dput.cf @@ -19,16 +19,23 @@ incoming = ~tkashkin/ubuntu/gamehub/focal login = anonymous allow_unsigned_uploads = 1 -[gamehub_groovy] +[gamehub_impish] fqdn = ppa.launchpad.net method = ftp -incoming = ~tkashkin/ubuntu/gamehub/groovy +incoming = ~tkashkin/ubuntu/gamehub/impish login = anonymous allow_unsigned_uploads = 1 -[gamehub_hirsute] +[gamehub_jammy] fqdn = ppa.launchpad.net method = ftp -incoming = ~tkashkin/ubuntu/gamehub/hirsute +incoming = ~tkashkin/ubuntu/gamehub/jammy login = anonymous allow_unsigned_uploads = 1 + +[gamehub_kinetic] +fqdn = ppa.launchpad.net +method = ftp +incoming = ~tkashkin/ubuntu/gamehub/kinetic +login = anonymous +allow_unsigned_uploads = 1 \ No newline at end of file diff --git a/src/utils/FSUtils.vala b/src/utils/FSUtils.vala index c90b72da..f662590d 100644 --- a/src/utils/FSUtils.vala +++ b/src/utils/FSUtils.vala @@ -188,6 +188,7 @@ namespace GameHub.Utils variables.set("platform_name", platform == null ? "." : platform.name()); variables.set("platform", platform == null ? "." : platform.id()); variables.set("game_dir", expand_game_dir(g, platform)); + variables.set("game", g); return FSUtils.expand(instance.dlc, null, variables); } public static string expand_installers(string game, string? dlc=null, Platform? platform=null) @@ -206,6 +207,7 @@ namespace GameHub.Utils { variables.set("game_dir", expand_dlc(g, platform) + "/" + d); } + variables.set("game", g); return FSUtils.expand(instance.installers, null, variables); } public static string expand_bonus(string game, string? dlc=null) @@ -222,6 +224,7 @@ namespace GameHub.Utils { variables.set("game_dir", expand_dlc(g) + "/" + d); } + variables.set("game", g); return FSUtils.expand(instance.bonus, null, variables); } @@ -267,6 +270,7 @@ namespace GameHub.Utils variables.set("platform_name", platform == null ? "." : platform.name()); variables.set("platform", platform == null ? "." : platform.id()); variables.set("game_dir", expand_game_dir(g, platform)); + variables.set("game", g); return FSUtils.expand(instance.installers, null, variables); }