diff options
| author | l10n daemon script <[email protected]> | 2022-05-15 01:59:30 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-15 01:59:30 +0000 |
| commit | 2ceaa0ba1be1317b52a5a5d4439585b9af3bab2d (patch) | |
| tree | 20e951aa8bab3ab154e47f2da7b8786c3341aba0 /src/settings/kcm/kcmdolphinnavigation.json | |
| parent | 0fc218fd264adf0f67396409cdd1d44265c71f07 (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 b84fb310e..c18d56242 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -7,6 +7,7 @@ "Description[ca]": "Configura la navegació del gestor de fitxers", "Description[es]": "Configurar la navegación del gestor de archivos", "Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers", + "Description[id]": "Konfigurasikan navigasi pengelola file", "Description[it]": "Configura la navigazione col gestore dei file", "Description[ko]": "파일 관리자 탐색 설정", "Description[nl]": "Bestandsbeheerdernavigatie configureren", |