diff options
| author | l10n daemon script <[email protected]> | 2022-09-21 01:48:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-09-21 01:48:38 +0000 |
| commit | 6c65d06bcd4b34ef7a82203b3ba06b6c3604986b (patch) | |
| tree | 8bc1c4ec57ab20e55f92e16f518f42bbe91b34b5 /src/settings/kcm/kcmdolphinnavigation.json | |
| parent | fede2094e3ffb1e4ba738727af1832b6bdd3fe35 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 13ca8e341..bbeba9a2a 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -18,6 +18,7 @@ "Description[id]": "Konfigurasikan navigasi pengelola file", "Description[is]": "Stilla flakkstýringar skráastjóra", "Description[it]": "Configura la navigazione col gestore dei file", + "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება", "Description[ko]": "파일 관리자 탐색 설정", "Description[nl]": "Bestandsbeheerdernavigatie configureren", "Description[nn]": "Set opp navigasjonen i filhandsamaren", @@ -62,6 +63,7 @@ "Name[is]": "Flakk", "Name[it]": "Navigazione", "Name[ja]": "ナビゲーション", + "Name[ka]": "ნავიგაცია", "Name[ko]": "탐색", "Name[lt]": "Naršymas", "Name[lv]": "Navigācija", |