diff options
| author | l10n daemon script <[email protected]> | 2015-12-07 10:14:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-12-07 10:14:12 +0000 |
| commit | 0fc2c24039bc0cf7ff0f4db4697254fea6947eeb (patch) | |
| tree | 9ba487046c78c781cbc9db8aeb84ddbda1b9e5ad /src/dolphinpart.desktop | |
| parent | d3c9d3c31f4caa685e4ea7f909f88cb3dc21aafb (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index e875a53a2..063ab152f 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Type=Service Name=Dolphin View +Name[ast]=Vista de Dolphin Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista del Dolphin Name[cs]=Pohled Dolphin @@ -140,6 +141,7 @@ Exec=dolphin [Desktop Action details] Name=Details +Name[ast]=Detalles Name[ca]=Detalls Name[ca@valencia]=Detalls Name[cs]=Podrobnosti |