diff options
| author | l10n daemon script <[email protected]> | 2019-06-11 05:13:47 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-06-11 05:13:47 +0200 |
| commit | 9f65f1de47510b92b2d153346f1c414c9fadac9f (patch) | |
| tree | c90606301b9abde5363b246c0c12fd5c35fa15ab | |
| parent | 7df5fc8edb54153f877eed4690e77968a1b804ba (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"
| -rw-r--r-- | src/dolphinpart.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 5f2d09345..19c072a02 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -129,7 +129,7 @@ Name[gl]=Compacta Name[he]=קומפקטי Name[hu]=Kompakt Name[ia]=Compacte -Name[id]=Sederhana +Name[id]=Ringkas Name[it]=Compatta Name[ja]=コンパクト Name[ko]=축소됨 |