diff options
| author | l10n daemon script <[email protected]> | 2026-02-06 01:41:48 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-06 01:41:48 +0000 |
| commit | 0a18c04e19da3d94e3c885237c9d4d2a9fc822e1 (patch) | |
| tree | a34fad31fa1d73deeba55924ec03c5f93c868d75 /src/settings/kcm | |
| parent | f2cedf6a093983911d4da7488fd3f574a189c1fc (diff) | |
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"
Diffstat (limited to 'src/settings/kcm')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
2 files changed, 2 insertions, 0 deletions
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]": "दृश्य मोड्स", |