diff --git a/common/modules/pkgselect/CMakeLists.txt b/common/modules/pkgselect/CMakeLists.txt index 74fa2b3..2ea9424 100644 --- a/common/modules/pkgselect/CMakeLists.txt +++ b/common/modules/pkgselect/CMakeLists.txt @@ -5,12 +5,12 @@ include(FeatureSummary) set( CMAKE_CXX_STANDARD 17 ) set( CMAKE_CXX_STANDARD_REQUIRED ON ) -set( CALAMARES_VERSION_REQUIRED 3.3.0 ) +set( CALAMARES_VERSION_REQUIRED 3.3.9 ) find_package(ECM ${ECM_VERSION} NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) include(KDEInstallDirs) -find_package(KF5 REQUIRED COMPONENTS CoreAddons) +find_package(KF6 REQUIRED COMPONENTS CoreAddons) find_package(Calamares ${CALAMARES_VERSION_REQUIRED} NO_CMAKE_PACKAGE_REGISTRY) if (NOT TARGET Calamares::calamares OR NOT TARGET Calamares::calamaresui) find_package(Calamares ${CALAMARES_VERSION_REQUIRED} REQUIRED) diff --git a/common/snap-seed-glue/go.mod b/common/snap-seed-glue/go.mod deleted file mode 100644 index ac4aac1..0000000 --- a/common/snap-seed-glue/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module snap-seed-glue - -go 1.22.1 - -require github.com/snapcore/snapd v0.0.0-20240328101726-fdc222fc37a0 diff --git a/common/snap-seed-glue/main.go b/common/snap-seed-glue/main.go deleted file mode 100644 index cf95ab1..0000000 --- a/common/snap-seed-glue/main.go +++ /dev/null @@ -1,289 +0,0 @@ -package main - -// Copyright (C) 2024 Simon Quigley -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -import ( - "flag" - "fmt" - "io/ioutil" - "log" - "os" - "os/exec" - "path/filepath" - "strings" - - "github.com/snapcore/snapd/snap" - "github.com/snapcore/snapd/interfaces/builtin" - "gopkg.in/yaml.v2" -) - -type seed struct { - Snaps []struct { - Name string `yaml:"name"` - Channel string `yaml:"channel"` - File string `yaml:"file"` - } `yaml:"snaps"` -} - -func main() { - snap.SanitizePlugsSlots = builtin.SanitizePlugsSlots - - var seed_directory string - flag.StringVar(&seed_directory, "seed", "/var/lib/snapd/seed", "Specify the seed directory") - flag.Parse() - - snap_set := make(map[string]bool) - - snaps_dir := filepath.Join(seed_directory, "snaps") - assertions_dir := filepath.Join(seed_directory, "assertions") - seed_yaml := filepath.Join(seed_directory, "seed.yaml") - - ensure_seed_yaml(seed_yaml) - - existing_snaps_in_yaml := load_existing_snaps(seed_yaml) - - for _, snap_info := range flag.Args() { - parts := strings.SplitN(snap_info, "=", 2) - snap_name := parts[0] - channel := "stable" // Default to stable if no channel is specified - if len(parts) == 2 { - channel = parts[1] - } - process_snap_with_prereqs(snap_name, channel, &snap_set, snaps_dir, assertions_dir, seed_yaml, existing_snaps_in_yaml) - } - - essentialSnaps := []string{"snapd", "bare"} - for _, snapName := range essentialSnaps { - if !existing_snaps_in_yaml[snapName] { - process_snap_with_prereqs(snapName, "stable", &snap_set, snaps_dir, assertions_dir, seed_yaml, existing_snaps_in_yaml) - } - } - - update_seed_yaml(snaps_dir, seed_yaml, snap_set, existing_snaps_in_yaml) - - remove_state_json(filepath.Join(seed_directory, "..", "state.json")) - ensure_assertions(assertions_dir) - validate_seed(seed_yaml) -} - -func ensure_seed_yaml(seed_yaml string) { - if _, err := os.Stat(seed_yaml); os.IsNotExist(err) { - file, err := os.Create(seed_yaml) - if err != nil { - log.Fatalf("Failed to create seed.yaml: %v", err) - } - defer file.Close() - file.WriteString("snaps:\n") - } -} - -func load_existing_snaps(seed_yaml string) map[string]bool { - file, err := ioutil.ReadFile(seed_yaml) - if err != nil { - log.Fatalf("Failed to read seed.yaml: %v", err) - } - - var seed_data seed - if err := yaml.Unmarshal(file, &seed_data); err != nil { - log.Fatalf("Failed to parse seed.yaml: %v", err) - } - - existing := make(map[string]bool) - for _, snap := range seed_data.Snaps { - existing[snap.Name] = true - } - return existing -} - -func update_seed_yaml(snaps_dir, seed_yaml string, snap_set map[string]bool, existing_snaps map[string]bool) { - seed_data := load_seed_data(seed_yaml) - - for snap_name := range snap_set { - if !existing_snaps[snap_name] { - snap_files, err := filepath.Glob(filepath.Join(snaps_dir, fmt.Sprintf("%s_*.snap", snap_name))) - if err != nil || len(snap_files) == 0 { - log.Printf("No snap file found for %s", snap_name) - return - } - - snap_file := filepath.Base(snap_files[0]) - log.Printf(snap_file) - - // FIXME: should put the real name of the channel in here - seed_data.Snaps = append(seed_data.Snaps, struct { - Name string `yaml:"name"` - Channel string `yaml:"channel"` - File string `yaml:"file"` - }{snap_name, "latest/stable", snap_file}) - } - } - - // Marshal to YAML and write back to file - data, err := yaml.Marshal(&seed_data) - if err != nil { - log.Fatalf("Failed to marshal seed data to YAML: %v", err) - } - - if err := ioutil.WriteFile(seed_yaml, data, 0644); err != nil { - log.Fatalf("Failed to write updated seed.yaml: %v", err) - } -} - -func load_seed_data(seed_yaml string) seed { - file, err := ioutil.ReadFile(seed_yaml) - if err != nil { - log.Fatalf("Failed to read seed.yaml: %v", err) - } - - var seed_data seed - if err := yaml.Unmarshal(file, &seed_data); err != nil { - log.Fatalf("Failed to parse seed.yaml: %v", err) - } - return seed_data -} - -func remove_state_json(state_json_path string) { - if _, err := os.Stat(state_json_path); err == nil { - os.Remove(state_json_path) - } -} - -func validate_seed(seed_yaml string) { - cmd := exec.Command("snap", "debug", "validate-seed", seed_yaml) - if err := cmd.Run(); err != nil { - log.Printf("Error validating seed: %v", err) - } -} - -func process_snap_with_prereqs(snap_name, channel string, snap_set *map[string]bool, snaps_dir, assertions_dir, seed_yaml string, existing_snaps_in_yaml map[string]bool) { - if (*snap_set)[snap_name] { - return - } - - // Download the snap if not already processed or listed in seed.yaml - if !existing_snaps_in_yaml[snap_name] { - cmd := exec.Command("snap", "download", snap_name, "--channel="+channel, "--target-directory="+snaps_dir) - if err := cmd.Run(); err != nil { - log.Printf("Error downloading snap %s from channel %s: %v", snap_name, channel, err) - return - } - } - - snap_files, err := filepath.Glob(filepath.Join(snaps_dir, fmt.Sprintf("%s_*.snap", snap_name))) - if err != nil || len(snap_files) == 0 { - log.Printf("No snap file found for %s in channel %s", snap_name, channel) - return - } - - snap_file := snap_files[0] - - cmd := exec.Command("unsquashfs", "-n", "-d", filepath.Join(snaps_dir, fmt.Sprintf("%s_meta", snap_name)), snap_file, "meta/snap.yaml") - if err := cmd.Run(); err != nil { - log.Printf("Error extracting meta/snap.yaml from snap %s: %v", snap_name, err) - return - } - - yaml_data, err := ioutil.ReadFile(filepath.Join(snaps_dir, fmt.Sprintf("%s_meta/meta/snap.yaml", snap_name))) - if err != nil { - log.Printf("Error reading snap.yaml file for %s: %v", snap_name, err) - return - } - - info, err := snap.InfoFromSnapYaml(yaml_data) - if err != nil { - log.Printf("Error parsing snap.yaml data for %s: %v", snap_name, err) - return - } - - (*snap_set)[snap_name] = true - - tracker := snap.SimplePrereqTracker{} - missing_provider_content_tags := tracker.MissingProviderContentTags(info, nil) - for provider_snap := range missing_provider_content_tags { - if !(*snap_set)[provider_snap] { - process_snap_with_prereqs(provider_snap, "stable", snap_set, snaps_dir, assertions_dir, seed_yaml, existing_snaps_in_yaml) - } - } - - if info.Base != "" && !(*snap_set)[info.Base] { - process_snap_with_prereqs(info.Base, "stable", snap_set, snaps_dir, assertions_dir, seed_yaml, existing_snaps_in_yaml) - } - - assert_files, err := filepath.Glob(filepath.Join(snaps_dir, "*.assert")) - for _, file := range assert_files { - target_path := filepath.Join(assertions_dir, filepath.Base(file)) - err := os.Rename(file, target_path) - if err != nil { - log.Printf("Failed to move %s to %s: %v", file, assertions_dir, err) - } - } - - os.RemoveAll(filepath.Join(snaps_dir, fmt.Sprintf("%s_meta", snap_name))) -} - -func ensure_assertions(assertions_dir string) { - model := "generic-classic" - brand := "generic" - series := "16" - - model_assertion_path := filepath.Join(assertions_dir, "model") - account_key_assertion_path := filepath.Join(assertions_dir, "account-key") - account_assertion_path := filepath.Join(assertions_dir, "account") - - // Check and generate model assertion - if _, err := os.Stat(model_assertion_path); os.IsNotExist(err) { - output, err := exec.Command("snap", "known", "--remote", "model", "series="+series, "model="+model, "brand-id="+brand).CombinedOutput() - if err != nil { - log.Fatalf("Failed to fetch model assertion: %v, Output: %s", err, string(output)) - } - ioutil.WriteFile(model_assertion_path, output, 0644) - } - - // Generate account-key assertion if not exists - if _, err := os.Stat(account_key_assertion_path); os.IsNotExist(err) { - signKeySha3 := grep_pattern(model_assertion_path, "sign-key-sha3-384: ") - output, err := exec.Command("snap", "known", "--remote", "account-key", "public-key-sha3-384="+signKeySha3).CombinedOutput() - if err != nil { - log.Fatalf("Failed to fetch account-key assertion: %v, Output: %s", err, string(output)) - } - ioutil.WriteFile(account_key_assertion_path, output, 0644) - } - - // Generate account assertion if not exists - if _, err := os.Stat(account_assertion_path); os.IsNotExist(err) { - accountId := grep_pattern(account_key_assertion_path, "account-id: ") - output, err := exec.Command("snap", "known", "--remote", "account", "account-id="+accountId).CombinedOutput() - if err != nil { - log.Fatalf("Failed to fetch account assertion: %v, Output: %s", err, string(output)) - } - ioutil.WriteFile(account_assertion_path, output, 0644) - } -} - -func grep_pattern(filePath, pattern string) string { - content, err := ioutil.ReadFile(filePath) - if err != nil { - log.Fatalf("Failed to read from file %s: %v", filePath, err) - } - lines := strings.Split(string(content), "\n") - for _, line := range lines { - if strings.Contains(line, pattern) { - parts := strings.SplitN(line, ":", 2) - if len(parts) == 2 { - return strings.TrimSpace(parts[1]) - } - } - } - log.Fatalf("Pattern %s not found in file %s", pattern, filePath) - return "" -} diff --git a/debian/changelog b/debian/changelog index 192bf25..cd7f210 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ calamares-settings-ubuntu (1:25.04.1) UNRELEASED; urgency=medium * Welcome to Plucky Puffin! + * Port to Qt 6. -- Simon Quigley Tue, 15 Oct 2024 21:05:10 -0500 diff --git a/debian/control b/debian/control index 479546c..f724f55 100644 --- a/debian/control +++ b/debian/control @@ -3,22 +3,20 @@ Section: devel Priority: optional Maintainer: Lubuntu Developers Uploaders: Simon Quigley -Build-Depends: calamares (>= 3.3.5), +Build-Depends: calamares (>= 3.3.9), cmake, debhelper-compat (= 13), extra-cmake-modules, - golang-github-snapcore-snapd-dev (>= 2.62), - golang-go, - golang-gopkg-yaml.v2-dev, intltool, - libkf5coreaddons-dev, - libqt5svg5-dev, + libkf6coreaddons-dev, + libqt6svg6-dev, libyaml-cpp-dev, - qtbase5-dev, - qtdeclarative5-dev, - qttools5-dev, - qttools5-dev-tools -Standards-Version: 4.6.2 + qt6-base-dev, + qt6-declarative-dev, + qt6-l10n-tools, + qt6-tools-dev, + qt6-tools-dev-tools +Standards-Version: 4.7.0 Homepage: https://code.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu Vcs-Browser: https://git.lubuntu.me/Lubuntu/calamares-settings-ubuntu/ Vcs-Git: https://git.lubuntu.me/Lubuntu/calamares-settings-ubuntu.git @@ -52,8 +50,8 @@ Description: Lubuntu Calamares Settings and Branding Package: calamares-settings-ubuntu-unity Architecture: all Depends: calamares-settings-ubuntu-common (>= ${binary:Version}), - qt5-style-kvantum, - qt5-style-kvantum-themes, + qt6-style-kvantum, + qt6-style-kvantum-themes, ${misc:Depends} Conflicts: calamares-settings-ubuntu-flavor Provides: calamares-settings-ubuntu-flavor @@ -65,14 +63,14 @@ Description: Ubuntu Unity Calamares Settings and Branding Package: calamares-settings-ubuntu-common Architecture: any -Depends: calamares (>= 3.2.14~), +Depends: calamares (>= 3.3.9), cryptsetup, kdialog, keyutils, python3, python3-distro, - qml-module-qtquick-window2, - qml-module-qtquick2, + qml6-module-qtquick, + qml6-module-qtquick-window, squashfs-tools, sudo, ${misc:Depends}, diff --git a/debian/rules b/debian/rules index ea0abdf..0f2c5e3 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ override_dh_auto_configure: override_dh_auto_build: make; (cd $(PKGSELECT)/build && $(MAKE)) - (cd common/snap-seed-glue && go build -gcflags="all=-N -l" -ldflags="-compressdwarf=false" -o snap-seed-glue main.go) override_dh_auto_clean: dh_auto_clean @@ -40,7 +39,6 @@ override_dh_missing: chmod 644 $(MODULES_DIR)/pkgselect/libcalamares_viewmodule_pkgselect.so chmod 644 $(MODULES_DIR)/pkgselect/module.desc mkdir -pv debian/calamares-settings-ubuntu-common/usr/bin/ - cp -v common/snap-seed-glue/snap-seed-glue debian/calamares-settings-ubuntu-common/usr/bin/snap-seed-glue mkdir -pv debian/calamares-settings-ubuntu-common/usr/libexec/ cp -v common/fixconkeys-part1 debian/calamares-settings-ubuntu-common/usr/libexec/fixconkeys-part1 cp -v common/fixconkeys-part2 debian/calamares-settings-ubuntu-common/usr/libexec/fixconkeys-part2 diff --git a/kubuntu/branding/kubuntu/branding.desc b/kubuntu/branding/kubuntu/branding.desc index 4e1b90c..1e33b82 100644 --- a/kubuntu/branding/kubuntu/branding.desc +++ b/kubuntu/branding/kubuntu/branding.desc @@ -6,10 +6,10 @@ windowExpanding: fullscreen strings: productName: Kubuntu shortProductName: Kubuntu - version: 24.10 - shortVersion: oracular + version: 25.04 + shortVersion: plucky versionedName: Kubuntu - shortVersionedName: Kubuntu 24.10 + shortVersionedName: Kubuntu 25.04 bootloaderEntryName: Kubuntu productUrl: https://kubuntu.org/ supportUrl: https://kubuntu.org/contact/ diff --git a/kubuntu/kubuntu-calamares.desktop.in b/kubuntu/kubuntu-calamares.desktop.in index a3d4054..0d7caab 100644 --- a/kubuntu/kubuntu-calamares.desktop.in +++ b/kubuntu/kubuntu-calamares.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Version=1.0 -_Name=Install Kubuntu 24.10 +_Name=Install Kubuntu 25.04 _GenericName=Install Kubuntu Exec=sudo -E /usr/bin/calamares-launch-normal _Comment=Calamares — System Installer diff --git a/kubuntu/oem/calamares-launch-oem.desktop b/kubuntu/oem/calamares-launch-oem.desktop index 007906f..3988923 100644 --- a/kubuntu/oem/calamares-launch-oem.desktop +++ b/kubuntu/oem/calamares-launch-oem.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Install Kubuntu 24.10 (OEM mode) +Name=Install Kubuntu 25.04 (OEM mode) Exec=sudo -E /usr/bin/calamares-launch-oem Icon=system-software-install Terminal=false diff --git a/kubuntu/po/ar.po b/kubuntu/po/ar.po index 9a64783..c052b0d 100644 --- a/kubuntu/po/ar.po +++ b/kubuntu/po/ar.po @@ -16,8 +16,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "تثبيت كوبونتو 24.10" +msgid "Install Kubuntu 25.04" +msgstr "تثبيت كوبونتو 25.04" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/be.po b/kubuntu/po/be.po index c8e38a2..c63f161 100644 --- a/kubuntu/po/be.po +++ b/kubuntu/po/be.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" +msgid "Install Kubuntu 25.04" msgstr "" #: ../kubuntu-calamares.desktop.in.h:2 diff --git a/kubuntu/po/ca.po b/kubuntu/po/ca.po index 25629e3..9774df4 100644 --- a/kubuntu/po/ca.po +++ b/kubuntu/po/ca.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "Instal·lar Kubuntu 24.10" +msgid "Install Kubuntu 25.04" +msgstr "Instal·lar Kubuntu 25.04" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/calamares-settings-kubuntu.pot b/kubuntu/po/calamares-settings-kubuntu.pot index 1520647..cef5ebc 100644 --- a/kubuntu/po/calamares-settings-kubuntu.pot +++ b/kubuntu/po/calamares-settings-kubuntu.pot @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" +msgid "Install Kubuntu 25.04" msgstr "" #: ../kubuntu-calamares.desktop.in.h:2 diff --git a/kubuntu/po/da.po b/kubuntu/po/da.po index db8a86f..14544fb 100644 --- a/kubuntu/po/da.po +++ b/kubuntu/po/da.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "Installer Kubuntu 24.10" +msgid "Install Kubuntu 25.04" +msgstr "Installer Kubuntu 25.04" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/de.po b/kubuntu/po/de.po index da23380..9cabf7b 100644 --- a/kubuntu/po/de.po +++ b/kubuntu/po/de.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "Kubuntu 24.10 installieren" +msgid "Install Kubuntu 25.04" +msgstr "Kubuntu 25.04 installieren" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/el.po b/kubuntu/po/el.po index f95f2d8..66cf01a 100644 --- a/kubuntu/po/el.po +++ b/kubuntu/po/el.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" +msgid "Install Kubuntu 25.04" msgstr "" #: ../kubuntu-calamares.desktop.in.h:2 diff --git a/kubuntu/po/es.po b/kubuntu/po/es.po index a021f41..08dee93 100644 --- a/kubuntu/po/es.po +++ b/kubuntu/po/es.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "Instalar Kubuntu 24.10" +msgid "Install Kubuntu 25.04" +msgstr "Instalar Kubuntu 25.04" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/et.po b/kubuntu/po/et.po index 15e0276..f725c16 100644 --- a/kubuntu/po/et.po +++ b/kubuntu/po/et.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" +msgid "Install Kubuntu 25.04" msgstr "" #: ../kubuntu-calamares.desktop.in.h:2 diff --git a/kubuntu/po/eu.po b/kubuntu/po/eu.po index eab9526..5248950 100644 --- a/kubuntu/po/eu.po +++ b/kubuntu/po/eu.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" +msgid "Install Kubuntu 25.04" msgstr "" #: ../kubuntu-calamares.desktop.in.h:2 diff --git a/kubuntu/po/fr.po b/kubuntu/po/fr.po index c12f171..47b5d44 100644 --- a/kubuntu/po/fr.po +++ b/kubuntu/po/fr.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "Installer Kubuntu 24.10" +msgid "Install Kubuntu 25.04" +msgstr "Installer Kubuntu 25.04" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/gl.po b/kubuntu/po/gl.po index 18b0307..849994d 100644 --- a/kubuntu/po/gl.po +++ b/kubuntu/po/gl.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" +msgid "Install Kubuntu 25.04" msgstr "" #: ../kubuntu-calamares.desktop.in.h:2 diff --git a/kubuntu/po/it.po b/kubuntu/po/it.po index 60851ba..e07f5e3 100644 --- a/kubuntu/po/it.po +++ b/kubuntu/po/it.po @@ -20,8 +20,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "Installa Kubuntu 24.10" +msgid "Install Kubuntu 25.04" +msgstr "Installa Kubuntu 25.04" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/ko.po b/kubuntu/po/ko.po index 331a8bd..c3f78c3 100644 --- a/kubuntu/po/ko.po +++ b/kubuntu/po/ko.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" +msgid "Install Kubuntu 25.04" msgstr "" #: ../kubuntu-calamares.desktop.in.h:2 diff --git a/kubuntu/po/no.po b/kubuntu/po/no.po index a74317d..3962cac 100644 --- a/kubuntu/po/no.po +++ b/kubuntu/po/no.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "Installer Kubuntu 24.10" +msgid "Install Kubuntu 25.04" +msgstr "Installer Kubuntu 25.04" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/pl.po b/kubuntu/po/pl.po index 7be0c98..7621ba5 100644 --- a/kubuntu/po/pl.po +++ b/kubuntu/po/pl.po @@ -16,8 +16,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "Zainstaluj Kubuntu 24.10" +msgid "Install Kubuntu 25.04" +msgstr "Zainstaluj Kubuntu 25.04" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/pt.po b/kubuntu/po/pt.po index 4937ec9..a899e84 100644 --- a/kubuntu/po/pt.po +++ b/kubuntu/po/pt.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "Instalar o Kubuntu 24.10" +msgid "Install Kubuntu 25.04" +msgstr "Instalar o Kubuntu 25.04" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/pt_BR.po b/kubuntu/po/pt_BR.po index 99d875f..66f6162 100644 --- a/kubuntu/po/pt_BR.po +++ b/kubuntu/po/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" -msgstr "Instalar Kubuntu 24.10" +msgid "Install Kubuntu 25.04" +msgstr "Instalar Kubuntu 25.04" #: ../kubuntu-calamares.desktop.in.h:2 msgid "Install Kubuntu" diff --git a/kubuntu/po/ru.po b/kubuntu/po/ru.po index 1520647..cef5ebc 100644 --- a/kubuntu/po/ru.po +++ b/kubuntu/po/ru.po @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" +msgid "Install Kubuntu 25.04" msgstr "" #: ../kubuntu-calamares.desktop.in.h:2 diff --git a/kubuntu/po/zh-hans.po b/kubuntu/po/zh-hans.po index 1520647..cef5ebc 100644 --- a/kubuntu/po/zh-hans.po +++ b/kubuntu/po/zh-hans.po @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../kubuntu-calamares.desktop.in.h:1 -msgid "Install Kubuntu 24.10" +msgid "Install Kubuntu 25.04" msgstr "" #: ../kubuntu-calamares.desktop.in.h:2 diff --git a/lubuntu/branding/lubuntu/branding.desc b/lubuntu/branding/lubuntu/branding.desc index 83b8d7b..0cbb9b9 100644 --- a/lubuntu/branding/lubuntu/branding.desc +++ b/lubuntu/branding/lubuntu/branding.desc @@ -6,10 +6,10 @@ windowExpanding: fullscreen strings: productName: Lubuntu shortProductName: Lubuntu - version: 24.10 - shortVersion: oracular + version: 25.04 + shortVersion: plucky versionedName: Lubuntu - shortVersionedName: Lubuntu 24.10 + shortVersionedName: Lubuntu 25.04 bootloaderEntryName: Ubuntu productUrl: https://lubuntu.me/ supportUrl: https://lubuntu.me/links/ diff --git a/lubuntu/branding/lubuntu/lang/Makefile b/lubuntu/branding/lubuntu/lang/Makefile index 941ab3d..d903373 100755 --- a/lubuntu/branding/lubuntu/lang/Makefile +++ b/lubuntu/branding/lubuntu/lang/Makefile @@ -4,7 +4,7 @@ LANGUAGES := ar ca de es eu gl be da el et fr ko pl pt pt_BR all: for i in $(LANGUAGES); do \ - /usr/lib/qt5/bin/lrelease "calamares-lubuntu_$$i.ts"; \ + /usr/lib/qt6/bin/lrelease "calamares-lubuntu_$$i.ts"; \ rm calamares-lubuntu_$$i.ts; \ done diff --git a/lubuntu/lubuntu-calamares.desktop.in b/lubuntu/lubuntu-calamares.desktop.in index 25bda15..68fa674 100644 --- a/lubuntu/lubuntu-calamares.desktop.in +++ b/lubuntu/lubuntu-calamares.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Version=1.0 -_Name=Install Lubuntu 24.10 +_Name=Install Lubuntu 25.04 _GenericName=Install Lubuntu Exec=sudo -E /usr/bin/calamares-launch-normal _Comment=Calamares — System Installer diff --git a/lubuntu/oem/calamares-launch-oem.desktop b/lubuntu/oem/calamares-launch-oem.desktop index 6bdf274..c3875e7 100644 --- a/lubuntu/oem/calamares-launch-oem.desktop +++ b/lubuntu/oem/calamares-launch-oem.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Install Lubuntu 24.10 (OEM mode) +Name=Install Lubuntu 25.04 (OEM mode) Exec=sudo -E /usr/bin/calamares-launch-oem Icon=system-software-install Terminal=false diff --git a/lubuntu/po/ar.po b/lubuntu/po/ar.po index cc141c8..50084e1 100644 --- a/lubuntu/po/ar.po +++ b/lubuntu/po/ar.po @@ -16,8 +16,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "تنصيب لوبينتو 24.10" +msgid "Install Lubuntu 25.04" +msgstr "تنصيب لوبينتو 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/be.po b/lubuntu/po/be.po index 7ea3a92..c3d1ad1 100644 --- a/lubuntu/po/be.po +++ b/lubuntu/po/be.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" +msgid "Install Lubuntu 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/lubuntu/po/ca.po b/lubuntu/po/ca.po index 1c83b58..76504a9 100644 --- a/lubuntu/po/ca.po +++ b/lubuntu/po/ca.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "Instal·lar Lubuntu 24.10" +msgid "Install Lubuntu 25.04" +msgstr "Instal·lar Lubuntu 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/calamares-settings-lubuntu.pot b/lubuntu/po/calamares-settings-lubuntu.pot index f5cc89f..0e70493 100644 --- a/lubuntu/po/calamares-settings-lubuntu.pot +++ b/lubuntu/po/calamares-settings-lubuntu.pot @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" +msgid "Install Lubuntu 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/lubuntu/po/da.po b/lubuntu/po/da.po index 0974c74..a17d7e3 100644 --- a/lubuntu/po/da.po +++ b/lubuntu/po/da.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "Installer Lubuntu 24.10" +msgid "Install Lubuntu 25.04" +msgstr "Installer Lubuntu 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/de.po b/lubuntu/po/de.po index d67ffcf..d19e5aa 100644 --- a/lubuntu/po/de.po +++ b/lubuntu/po/de.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "Lubuntu 24.10 installieren" +msgid "Install Lubuntu 25.04" +msgstr "Lubuntu 25.04 installieren" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/el.po b/lubuntu/po/el.po index 148cb8d..37695a4 100644 --- a/lubuntu/po/el.po +++ b/lubuntu/po/el.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" +msgid "Install Lubuntu 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/lubuntu/po/es.po b/lubuntu/po/es.po index 64fade8..847bd7d 100644 --- a/lubuntu/po/es.po +++ b/lubuntu/po/es.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "Instalar Lubuntu 24.10" +msgid "Install Lubuntu 25.04" +msgstr "Instalar Lubuntu 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/et.po b/lubuntu/po/et.po index 1de5641..16607b6 100644 --- a/lubuntu/po/et.po +++ b/lubuntu/po/et.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" +msgid "Install Lubuntu 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/lubuntu/po/eu.po b/lubuntu/po/eu.po index f24afec..3578dc9 100644 --- a/lubuntu/po/eu.po +++ b/lubuntu/po/eu.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" +msgid "Install Lubuntu 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/lubuntu/po/fr.po b/lubuntu/po/fr.po index f983705..41adab3 100644 --- a/lubuntu/po/fr.po +++ b/lubuntu/po/fr.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "Installer Lubuntu 24.10" +msgid "Install Lubuntu 25.04" +msgstr "Installer Lubuntu 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/gl.po b/lubuntu/po/gl.po index d7e3f4e..8521e6a 100644 --- a/lubuntu/po/gl.po +++ b/lubuntu/po/gl.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" +msgid "Install Lubuntu 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/lubuntu/po/it.po b/lubuntu/po/it.po index 47823e8..0c45cb5 100644 --- a/lubuntu/po/it.po +++ b/lubuntu/po/it.po @@ -20,8 +20,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "Installa Lubuntu 24.10" +msgid "Install Lubuntu 25.04" +msgstr "Installa Lubuntu 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/ko.po b/lubuntu/po/ko.po index e7aee96..3a18568 100644 --- a/lubuntu/po/ko.po +++ b/lubuntu/po/ko.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" +msgid "Install Lubuntu 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/lubuntu/po/no.po b/lubuntu/po/no.po index 6a3d157..86f536d 100644 --- a/lubuntu/po/no.po +++ b/lubuntu/po/no.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "Installer Lubuntu 24.10" +msgid "Install Lubuntu 25.04" +msgstr "Installer Lubuntu 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/pl.po b/lubuntu/po/pl.po index b0eaa5f..41218c6 100644 --- a/lubuntu/po/pl.po +++ b/lubuntu/po/pl.po @@ -16,8 +16,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "Zainstaluj Lubuntu 24.10" +msgid "Install Lubuntu 25.04" +msgstr "Zainstaluj Lubuntu 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/pt.po b/lubuntu/po/pt.po index c18c8c8..5ce1372 100644 --- a/lubuntu/po/pt.po +++ b/lubuntu/po/pt.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "Instalar o Lubuntu 24.10" +msgid "Install Lubuntu 25.04" +msgstr "Instalar o Lubuntu 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/pt_BR.po b/lubuntu/po/pt_BR.po index 8fffdde..38e0811 100644 --- a/lubuntu/po/pt_BR.po +++ b/lubuntu/po/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" -msgstr "Instalar Lubuntu 24.10" +msgid "Install Lubuntu 25.04" +msgstr "Instalar Lubuntu 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Lubuntu" diff --git a/lubuntu/po/ru.po b/lubuntu/po/ru.po index f5cc89f..0e70493 100644 --- a/lubuntu/po/ru.po +++ b/lubuntu/po/ru.po @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" +msgid "Install Lubuntu 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/lubuntu/po/zh-hans.po b/lubuntu/po/zh-hans.po index f5cc89f..0e70493 100644 --- a/lubuntu/po/zh-hans.po +++ b/lubuntu/po/zh-hans.po @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Lubuntu 24.10" +msgid "Install Lubuntu 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/ubuntuunity/branding/ubuntuunity/branding.desc b/ubuntuunity/branding/ubuntuunity/branding.desc index 8025740..b3ed435 100644 --- a/ubuntuunity/branding/ubuntuunity/branding.desc +++ b/ubuntuunity/branding/ubuntuunity/branding.desc @@ -6,10 +6,10 @@ windowExpanding: fullscreen strings: productName: Ubuntu Unity shortProductName: Ubuntu Unity - version: 24.10 - shortVersion: oracular + version: 25.04 + shortVersion: plucky versionedName: Ubuntu Unity - shortVersionedName: Ubuntu Unity 24.10 + shortVersionedName: Ubuntu Unity 25.04 bootloaderEntryName: Ubuntu productUrl: https://ubuntuunity.org/ diff --git a/ubuntuunity/oem/calamares-launch-oem.desktop b/ubuntuunity/oem/calamares-launch-oem.desktop index f39d5cc..db5ad71 100644 --- a/ubuntuunity/oem/calamares-launch-oem.desktop +++ b/ubuntuunity/oem/calamares-launch-oem.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Install Ubuntu Unity 24.10 (OEM mode) +Name=Install Ubuntu Unity 25.04 (OEM mode) Exec=sudo -E /usr/bin/calamares-launch-oem Icon=ubuntu-unity-installer Terminal=false diff --git a/ubuntuunity/po/ar.po b/ubuntuunity/po/ar.po index 55ee6e7..55d7d91 100644 --- a/ubuntuunity/po/ar.po +++ b/ubuntuunity/po/ar.po @@ -16,7 +16,7 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/ubuntuunity/po/be.po b/ubuntuunity/po/be.po index 745afc1..ff1c2aa 100644 --- a/ubuntuunity/po/be.po +++ b/ubuntuunity/po/be.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/ubuntuunity/po/ca.po b/ubuntuunity/po/ca.po index f2f324b..8ac23ee 100644 --- a/ubuntuunity/po/ca.po +++ b/ubuntuunity/po/ca.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" -msgstr "Instal·lar Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" +msgstr "Instal·lar Ubuntu Unity 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Ubuntu Unity" diff --git a/ubuntuunity/po/calamares-settings-ubuntuunity.pot b/ubuntuunity/po/calamares-settings-ubuntuunity.pot index 2c55749..9efd1de 100644 --- a/ubuntuunity/po/calamares-settings-ubuntuunity.pot +++ b/ubuntuunity/po/calamares-settings-ubuntuunity.pot @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../ubuntu-unity-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" msgstr "" #: ../ubuntu-unity-calamares.desktop.in.h:2 diff --git a/ubuntuunity/po/da.po b/ubuntuunity/po/da.po index abc80a7..0e20d6f 100644 --- a/ubuntuunity/po/da.po +++ b/ubuntuunity/po/da.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" -msgstr "Installer Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" +msgstr "Installer Ubuntu Unity 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Ubuntu Unity" diff --git a/ubuntuunity/po/de.po b/ubuntuunity/po/de.po index 3e9122b..dfede83 100644 --- a/ubuntuunity/po/de.po +++ b/ubuntuunity/po/de.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" -msgstr "Ubuntu Unity 24.10 installieren" +msgid "Install Ubuntu Unity 25.04" +msgstr "Ubuntu Unity 25.04 installieren" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Ubuntu Unity" diff --git a/ubuntuunity/po/el.po b/ubuntuunity/po/el.po index 953f11d..403e730 100644 --- a/ubuntuunity/po/el.po +++ b/ubuntuunity/po/el.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/ubuntuunity/po/es.po b/ubuntuunity/po/es.po index 9c5738b..b720064 100644 --- a/ubuntuunity/po/es.po +++ b/ubuntuunity/po/es.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" -msgstr "Instalar Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" +msgstr "Instalar Ubuntu Unity 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Ubuntu Unity" diff --git a/ubuntuunity/po/et.po b/ubuntuunity/po/et.po index 8b4c8ed..b3c7dae 100644 --- a/ubuntuunity/po/et.po +++ b/ubuntuunity/po/et.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/ubuntuunity/po/eu.po b/ubuntuunity/po/eu.po index 6de1312..7a744f4 100644 --- a/ubuntuunity/po/eu.po +++ b/ubuntuunity/po/eu.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/ubuntuunity/po/fr.po b/ubuntuunity/po/fr.po index 055d936..1af82d1 100644 --- a/ubuntuunity/po/fr.po +++ b/ubuntuunity/po/fr.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" -msgstr "Installer Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" +msgstr "Installer Ubuntu Unity 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Ubuntu Unity" diff --git a/ubuntuunity/po/gl.po b/ubuntuunity/po/gl.po index f996394..edd705a 100644 --- a/ubuntuunity/po/gl.po +++ b/ubuntuunity/po/gl.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/ubuntuunity/po/it.po b/ubuntuunity/po/it.po index 49fb884..46e7108 100644 --- a/ubuntuunity/po/it.po +++ b/ubuntuunity/po/it.po @@ -20,8 +20,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" -msgstr "Installa Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" +msgstr "Installa Ubuntu Unity 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Ubuntu Unity" diff --git a/ubuntuunity/po/ko.po b/ubuntuunity/po/ko.po index 161913b..d8e8db2 100644 --- a/ubuntuunity/po/ko.po +++ b/ubuntuunity/po/ko.po @@ -13,7 +13,7 @@ msgstr "" "X-Generator: Translate Toolkit 2.3.0\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/ubuntuunity/po/no.po b/ubuntuunity/po/no.po index d37a325..fb36c75 100644 --- a/ubuntuunity/po/no.po +++ b/ubuntuunity/po/no.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" -msgstr "Installer Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" +msgstr "Installer Ubuntu Unity 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Ubuntu Unity" diff --git a/ubuntuunity/po/pl.po b/ubuntuunity/po/pl.po index 4c0fdaa..2c42ffb 100644 --- a/ubuntuunity/po/pl.po +++ b/ubuntuunity/po/pl.po @@ -16,8 +16,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" -msgstr "Zainstaluj Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" +msgstr "Zainstaluj Ubuntu Unity 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Ubuntu Unity" diff --git a/ubuntuunity/po/pt.po b/ubuntuunity/po/pt.po index ddb200e..efdd7d3 100644 --- a/ubuntuunity/po/pt.po +++ b/ubuntuunity/po/pt.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" -msgstr "Instalar o Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" +msgstr "Instalar o Ubuntu Unity 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Ubuntu Unity" diff --git a/ubuntuunity/po/pt_BR.po b/ubuntuunity/po/pt_BR.po index a9a3db3..7f048d5 100644 --- a/ubuntuunity/po/pt_BR.po +++ b/ubuntuunity/po/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "X-Generator: Weblate 3.1-dev\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" -msgstr "Instalar Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" +msgstr "Instalar Ubuntu Unity 25.04" #: ../lubuntu-calamares.desktop.in.h:2 msgid "Install Ubuntu Unity" diff --git a/ubuntuunity/po/ru.po b/ubuntuunity/po/ru.po index 07ffd5f..f331028 100644 --- a/ubuntuunity/po/ru.po +++ b/ubuntuunity/po/ru.po @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/ubuntuunity/po/zh-hans.po b/ubuntuunity/po/zh-hans.po index 07ffd5f..f331028 100644 --- a/ubuntuunity/po/zh-hans.po +++ b/ubuntuunity/po/zh-hans.po @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../lubuntu-calamares.desktop.in.h:1 -msgid "Install Ubuntu Unity 24.10" +msgid "Install Ubuntu Unity 25.04" msgstr "" #: ../lubuntu-calamares.desktop.in.h:2 diff --git a/ubuntuunity/ubuntu-unity-calamares.desktop.in b/ubuntuunity/ubuntu-unity-calamares.desktop.in index 6403dd9..7281a05 100644 --- a/ubuntuunity/ubuntu-unity-calamares.desktop.in +++ b/ubuntuunity/ubuntu-unity-calamares.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Version=1.0 -_Name=Install Ubuntu Unity 24.10 +_Name=Install Ubuntu Unity 25.04 _GenericName=Install Ubuntu Unity Exec=sudo -E /usr/bin/calamares-launch-normal _Comment=Calamares — System Installer