mirror of
https://git.launchpad.net/~ubuntu-qt-code/ubuntu/+source/calamares/+git/calamares
synced 2025-03-11 19:21:09 +00:00
Fix two American English entries (LP: #2045741).
This commit is contained in:
parent
e2e0a55b5e
commit
f9073ded1e
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,3 +1,10 @@
|
||||
calamares (3.3.0.0-0ubuntu5) noble; urgency=medium
|
||||
|
||||
* Fix two American English entries (LP: #2045741):
|
||||
- https://github.com/calamares/calamares/issues/2257
|
||||
|
||||
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 01 Jan 2024 13:39:12 -0600
|
||||
|
||||
calamares (3.3.0.0-0ubuntu4) noble; urgency=medium
|
||||
|
||||
* Add d/p/support-appstream-1.0.patch
|
||||
|
27
debian/patches/lp-2045741.patch
vendored
Normal file
27
debian/patches/lp-2045741.patch
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
From 709296940c1a3d320bde317966b073167833fad9 Mon Sep 17 00:00:00 2001
|
||||
From: Adriaan de Groot <groot@kde.org>
|
||||
Date: Sun, 24 Dec 2023 23:01:37 +0100
|
||||
Subject: [PATCH] i18n: suppress duplicated languages
|
||||
|
||||
The list of translations from Transifex contains "en", and we
|
||||
add it explicitly a second time -- instead of fixing those and
|
||||
needing to ensure that the source language is returned, or optionally
|
||||
adding "en" if it isn't in the list already, just de-duplicate.
|
||||
|
||||
FIXES #2257
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8a26ae6c7f..53e9f494e4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -513,6 +513,7 @@ if(NOT CALAMARES_RELEASE_MODE)
|
||||
list(APPEND CALAMARES_TRANSLATION_LANGUAGES ${_tx_incomplete})
|
||||
endif()
|
||||
list(SORT CALAMARES_TRANSLATION_LANGUAGES)
|
||||
+list(REMOVE_DUPLICATES CALAMARES_TRANSLATION_LANGUAGES)
|
||||
|
||||
add_subdirectory(lang) # i18n tools
|
||||
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1,3 +1,4 @@
|
||||
0001-replace-pkexec-by-sudo.patch
|
||||
apport-package-hook.patch
|
||||
support-appstream-1.0.patch
|
||||
lp-2045741.patch
|
||||
|
Loading…
x
Reference in New Issue
Block a user