From 0a18c04e19da3d94e3c885237c9d4d2a9fc822e1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 Feb 2026 01:41:48 +0000 Subject: SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/settings/kcm/kcmdolphinviewmodes.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.json') diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 2c72ff866..e5732781e 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -19,6 +19,7 @@ "Name[eu]": "Ikuspegi moduak", "Name[fi]": "Näkymät", "Name[fr]": "Modes d'affichage", + "Name[ga]": "Módanna Amhairc", "Name[gl]": "Modos de vista", "Name[he]": "מצבי תצוגה", "Name[hi]": "दृश्य मोड्स", -- cgit v1.3