diff options
| author | l10n daemon script <[email protected]> | 2022-08-03 01:49:02 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-08-03 01:49:02 +0000 |
| commit | 86c103e765231f1d4daa0507698548af035d0048 (patch) | |
| tree | 96518c7b37956a3fc5ac3c5d4b9020556c1cb023 /src/settings/kcm/kcmdolphinnavigation.json | |
| parent | 227ccfdd3d745906d9a29144e4423f62073dd0cf (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/kcmdolphinnavigation.json')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 337932850..b747cc8da 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -15,6 +15,7 @@ "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", "Description[ia]": "Configura navigation del gerente de file", "Description[id]": "Konfigurasikan navigasi pengelola file", + "Description[is]": "Stilla flakkstýringar skráastjóra", "Description[it]": "Configura la navigazione col gestore dei file", "Description[ko]": "파일 관리자 탐색 설정", "Description[nl]": "Bestandsbeheerdernavigatie configureren", |