diff options
| author | l10n daemon script <[email protected]> | 2024-06-28 01:27:14 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-28 01:27:14 +0000 |
| commit | 08347a59c0a442c42b6c97c692b6d4aabb2e70df (patch) | |
| tree | 079bd612ebaee083b7d2109bf066e04564ff1d9d /src/settings/kcm/kcmdolphingeneral.json | |
| parent | 3a54a369d9115fa66ed474c4eee3ef51b300db3c (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/kcmdolphingeneral.json')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 975e181b7..1805822e3 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -7,14 +7,10 @@ "Name[az]": "Əsas", "Name[be]": "Асноўныя", "Name[bg]": "Общи", - "Name[ca@valencia]": "General", - "Name[ca]": "General", "Name[cs]": "Obecné", "Name[da]": "Generelt", "Name[de]": "Allgemein", - "Name[en_GB]": "General", "Name[eo]": "Ĝenerala", - "Name[es]": "General", "Name[eu]": "Orokorra", "Name[fi]": "Perusasetukset", "Name[fr]": "Général", @@ -22,9 +18,7 @@ "Name[he]": "כללי", "Name[hi]": "साधारण", "Name[hu]": "Általános", - "Name[ia]": "General", "Name[id]": "Umum", - "Name[ie]": "General", "Name[is]": "Almennt", "Name[it]": "Generale", "Name[ka]": "მთავარი", |