diff options
| author | l10n daemon script <[email protected]> | 2016-10-10 12:24:39 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-10-10 12:24:39 +0000 |
| commit | 8828e686e94056af17e0c13b7550451c881af060 (patch) | |
| tree | 64c9d66bcfb52483e860aba09ad64c580566e1a6 /src/dolphinpart.desktop | |
| parent | aac88e2b0ffcd8ccd9bd84326002b6786098dfd1 (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/dolphinpart.desktop')
| -rw-r--r-- | src/dolphinpart.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index a4bac816f..6b9398da8 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -124,6 +124,7 @@ Name[hu]=Kompakt Name[ia]=Compacte Name[id]=Sederhana Name[it]=Compatta +Name[ja]=コンパクト Name[ko]=축소됨 Name[lt]=Kompaktiškas Name[nb]=Kompakt |