diff options
| author | l10n daemon script <[email protected]> | 2015-12-08 10:05:01 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-12-08 10:05:01 +0000 |
| commit | c0d5537afb10f09aaa6b47a994e8f8024c1006b4 (patch) | |
| tree | 8487c351a74f6c737759ba63b609f1ad30aff821 /src/dolphinpart.desktop | |
| parent | 9c432e6905c41193e0dff759ba5c61ac295e41ac (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 063ab152f..d1549f2d8 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -118,6 +118,7 @@ Name[ko]=축소됨 Name[lt]=Kompaktiškas Name[nb]=Kompakt Name[nl]=Compact +Name[nn]=Kompakt Name[pa]=ਸੰਖਿਪਤ Name[pl]=Kompaktowy Name[pt]=Compacta |