From a23d1f5954e3c9ddc5521ef57d32cd817b7d147a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Sz=C3=BCcs?= Date: Mon, 30 Jun 2025 19:30:18 +0200 Subject: [PATCH] Resolve merge conflicts --- CODEOWNERS | 3 ++- src/os/i18n.zig | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 421a60ec7..66e98d833 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -162,6 +162,8 @@ /po/de_DE.UTF-8.po @ghostty-org/de_DE /po/es_BO.UTF-8.po @ghostty-org/es_BO /po/fr_FR.UTF-8.po @ghostty-org/fr_FR +/po/ga_IE.UTF-8.po @ghostty-org/ga_IE +/po/hu_HU.UTF-8.po @ghostty-org/hu_HU /po/id_ID.UTF-8.po @ghostty-org/id_ID /po/ja_JP.UTF-8.po @ghostty-org/ja_JP /po/mk_MK.UTF-8.po @ghostty-org/mk_MK @@ -173,7 +175,6 @@ /po/tr_TR.UTF-8.po @ghostty-org/tr_TR /po/uk_UA.UTF-8.po @ghostty-org/uk_UA /po/zh_CN.UTF-8.po @ghostty-org/zh_CN -/po/hu_HU.UTF-8.po @ghostty-org/hu_HU # Packaging - Snap /snap/ @ghostty-org/snap diff --git a/src/os/i18n.zig b/src/os/i18n.zig index f262de579..7b8a6e6d7 100644 --- a/src/os/i18n.zig +++ b/src/os/i18n.zig @@ -45,6 +45,7 @@ pub const locales = [_][:0]const u8{ "es_BO.UTF-8", "pt_BR.UTF-8", "ca_ES.UTF-8", + "ga_IE.UTF-8", "hu_HU.UTF-8", };