diff options
| author | l10n daemon script <[email protected]> | 2015-11-17 12:50:56 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-17 12:50:56 +0000 |
| commit | e0dfcb9e1dc6a9dc210792231b84bd59e907366b (patch) | |
| tree | f139bc1c181cac2d3e5b8f5634f7434f9b322d38 | |
| parent | c96add9c68b0826b3657729d902bf9dd891f2a16 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 8941e8465..e875a53a2 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -54,6 +54,7 @@ Actions=icons;details;compact; [Desktop Action icons] Name=Icons +Name[ast]=Iconos Name[ca]=Icones Name[ca@valencia]=Icones Name[cs]=Ikony |