diff options
| author | l10n daemon script <[email protected]> | 2023-01-22 02:03:57 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-22 02:03:57 +0000 |
| commit | 83964c2071893b65e6fd8dc96bad5388107c8ef3 (patch) | |
| tree | 77e6ceb4958d7729d7ba2b854565063ce05a426a /src/settings/kcm/kcmdolphinnavigation.json | |
| parent | 579eadeb6ddffb03e8043090a330c6dba0717299 (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 d7607fa30..e7e152f27 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -24,6 +24,7 @@ "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება", "Description[ko]": "파일 관리자 탐색 설정", "Description[lt]": "Konfigūruoti failų tvarkytuvės naršymą", + "Description[nb]": "Sett opp navigasjon i filbehandleren", "Description[nl]": "Bestandsbeheerdernavigatie configureren", "Description[nn]": "Set opp navigasjonen i filhandsamaren", "Description[pl]": "Ustawienia poruszania się przy zarządzaniu plikami", |