diff options
| author | l10n daemon script <[email protected]> | 2020-02-06 05:34:55 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-02-06 05:34:55 +0100 |
| commit | 2c29c7ed28f7389ec79907760311fce3a26622c2 (patch) | |
| tree | 6a2ff416f91767db8b3d9db03195a2e3a3630a44 /src/settings | |
| parent | 7002dc4e8aacf29826864271c0d11d20d94b4b7b (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index d3f19539a..c8eb36c72 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -22,7 +22,7 @@ Name[ja]=Dolphin 全般 Name[ko]=Dolphin 일반 Name[lt]=Dolphin bendrosios Name[lv]=Dolphin vispārējs -Name[ml]=പൊതു സജ്ജീകരണങ്ങള് +Name[ml]=ഡോൾഫിൻ ജനറൽ Name[nb]=Dolphin generelt Name[nl]=Dolphin algemeen Name[nn]=Generelt for Dolphin diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 76e561d9d..486e63ca5 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -124,7 +124,7 @@ Name[ja]=表示モード Name[ko]=보기 모드 Name[lt]=Rodinio veiksenos Name[lv]=Skata režīmi -Name[ml]=അവതരണ ദശകള് +Name[ml]=അവതരണ രീതികള് Name[nb]=Visningsmåter Name[nl]=Weergavemodi Name[nn]=Visingsmodusar |