diff options
| author | l10n daemon script <[email protected]> | 2023-01-02 02:34:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-02 02:34:18 +0000 |
| commit | d11d4781487243dddc3a3899bd65d21542a93383 (patch) | |
| tree | e4221185daeb79c8b8c944576bbc6ce5c6ebdcde /src/settings/kcm/kcmdolphingeneral.json | |
| parent | dccd8c4899e2811960f60c825ddf433ce174b372 (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/kcmdolphingeneral.json')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index e8fc86d07..835310b85 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -19,7 +19,7 @@ "Description[ia]": "Configura preferentias del gerente general de file", "Description[id]": "Konfigurasikan pengaturan pengelola file umum", "Description[ie]": "Configurar li parametres del gerente de files", - "Description[is]": "Sýsla með almennar stillingar skráastjóra", + "Description[is]": "Grunnstilla almennar stillingar skráastjóra", "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ka]": "ფაილების მმართველის ზოგადი მორგება", "Description[ko]": "일반 파일 관리자 설정", |