diff options
| author | l10n daemon script <[email protected]> | 2016-02-19 09:23:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-02-19 09:23:18 +0000 |
| commit | 20cb1492e7815cf46e231839fe0fd982ce19ceff (patch) | |
| tree | a122c08dd6f63ffc85616760bea979bbd04bccc5 /src | |
| parent | 6bc4f18f60f9acceb2b4a0338da35b1a04340a3f (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')
| -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 816575aef..1f6af812e 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -104,6 +104,7 @@ Exec=dolphin [Desktop Action compact] Name=Compact Name[ar]=متراصّ +Name[ast]=Compautu Name[ca]=Compacta Name[ca@valencia]=Compacta Name[cs]=Kompaktní |