diff options
| author | l10n daemon script <[email protected]> | 2023-11-08 09:18:27 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-11-08 09:18:27 +0000 |
| commit | 3fde6cbeb0b2df48a91870c74c4ef74462a82058 (patch) | |
| tree | 8ec7df75dfc2fb7725fd8e796e10956b7c104441 /src/settings | |
| parent | 33d8c894f25958d3024bef8d9be3d9f880923056 (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 57fcaa3da..f168aadda 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -3,6 +3,7 @@ "Icon": "system-file-manager", "Name": "General", "Name[ar]": "عامّ", + "Name[ast]": "Xeneral", "Name[az]": "Əsas", "Name[be]": "Асноўныя", "Name[bg]": "Общи", @@ -18,6 +19,7 @@ "Name[fi]": "Perusasetukset", "Name[fr]": "Général", "Name[gl]": "Xeral", + "Name[he]": "כללי", "Name[hi]": "साधारण", "Name[ia]": "General", "Name[id]": "Umum", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 3ba03c5fa..abb2401a7 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -19,6 +19,7 @@ "Name[fi]": "Näkymät", "Name[fr]": "Modes d'affichage", "Name[gl]": "Modos de vista", + "Name[he]": "מצבי תצוגה", "Name[hi]": "दृश्य मोड्स", "Name[hu]": "Nézetmódok", "Name[ia]": "Modos de vista", |