diff options
| author | l10n daemon script <[email protected]> | 2022-11-19 01:51:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-11-19 01:51:46 +0000 |
| commit | b72f800ac4b299af5546f70deb4b7664f5890d89 (patch) | |
| tree | efe127b08d1b3b418e550aabf38d5e616eb383f1 /src/settings/kcm | |
| parent | c1a5c5076d9f0011e59a781acd70849672b07a47 (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 00890b763..cd62ec23f 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -21,6 +21,7 @@ "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ka]": "ფაილების მმართველის ზოგადი მორგება", "Description[ko]": "일반 파일 관리자 설정", + "Description[lt]": "Konfigūruoti bendras failų tvarkytuvės nuostatas", "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", "Description[nn]": "Set opp generelle innstillingar for filhandsamaren", "Description[pl]": "Ustawienia ogólne zarządzania plikami", @@ -59,6 +60,7 @@ "Name[it]": "Generale", "Name[ka]": "მთავარი", "Name[ko]": "일반", + "Name[lt]": "Bendrosios", "Name[nl]": "Algemeen", "Name[nn]": "Generelt", "Name[pl]": "Ogólne", diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json index 803735a2a..cb6942729 100644 --- a/src/settings/kcm/kcmdolphinnavigation.json +++ b/src/settings/kcm/kcmdolphinnavigation.json @@ -21,6 +21,7 @@ "Description[it]": "Configura la navigazione col gestore dei file", "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება", "Description[ko]": "파일 관리자 탐색 설정", + "Description[lt]": "Konfigūruoti failų tvarkytuvės naršymą", "Description[nl]": "Bestandsbeheerdernavigatie configureren", "Description[nn]": "Set opp navigasjonen i filhandsamaren", "Description[pl]": "Ustawienia poruszania się przy zarządzaniu plikami", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 7f330f398..35e4466cd 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -21,6 +21,7 @@ "Description[it]": "Configura le viste del gestore dei file", "Description[ka]": "ფაილების მმართველის ხედის რეჟიმების მორგება", "Description[ko]": "파일 관리자 보기 모드 설정", + "Description[lt]": "Konfigūruoti failų tvarkytuvės rodinio veiksenas", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", "Description[nn]": "Set opp visingsmodusane i filhandsamaren", "Description[pl]": "Ustawienia trybów widoku zarządzania plikami", |