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/dolphinpart.json.in | 1 + src/itemactions/hidefileitemaction.json | 1 + src/itemactions/movetonewfolderitemaction.json | 1 + src/itemactions/setfoldericonitemaction.json | 1 + src/settings/kcm/kcmdolphingeneral.json | 1 + src/settings/kcm/kcmdolphinviewmodes.json | 1 + 6 files changed, 6 insertions(+) diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 2e7b68a75..fa243cd6d 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -30,6 +30,7 @@ "Name[eu]": "Dolphin-en ikuspegia", "Name[fi]": "Dolphin-näkymä", "Name[fr]": "Vue de Dolphin", + "Name[ga]": "Radharc Dolphin", "Name[gl]": "Vista de Dolphin", "Name[he]": "תצוגת Dolphin", "Name[hi]": "डॉल्फ़िन दृश्य", diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index 288e0cb69..fa3d202f6 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -15,6 +15,7 @@ "Name[eu]": "Ezkutatu", "Name[fi]": "Piilota", "Name[fr]": "Masquer", + "Name[ga]": "Folaigh", "Name[he]": "הסתרה", "Name[hu]": "Elrejtés", "Name[ia]": "Cela", diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index a44732b8a..0b1b67551 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -21,6 +21,7 @@ "Name[eu]": "Eraman karpeta berrira", "Name[fi]": "Siirrä uuteen kansioon", "Name[fr]": "Déplacer vers le nouveau dossier", + "Name[ga]": "Bog go Fillteán Nua", "Name[gl]": "Mover a un novo cartafol", "Name[he]": "העברה לתיקייה חדשה", "Name[hu]": "Áthelyezés új mappába", diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index b730aff84..2d888da56 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -15,6 +15,7 @@ "Name[eu]": "Ezarri karpetaren ikonoa", "Name[fi]": "Aseta kansiokuvake", "Name[fr]": "Définir l'icône de dossiers", + "Name[ga]": "Socraigh Deilbhín Fillteáin", "Name[gl]": "Definir a icona do cartafol", "Name[he]": "הגדרת סמל תיקייה", "Name[hu]": "Mappaikon beállítása", diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 8c743d781..a1254bdda 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -19,6 +19,7 @@ "Name[eu]": "Orokorra", "Name[fi]": "Perusasetukset", "Name[fr]": "Général", + "Name[ga]": "Ginearálta", "Name[gl]": "Xeral", "Name[he]": "כללי", "Name[hi]": "साधारण", 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