diff options
| author | l10n daemon script <[email protected]> | 2015-11-30 10:26:25 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-30 10:26:25 +0000 |
| commit | d3c9d3c31f4caa685e4ea7f909f88cb3dc21aafb (patch) | |
| tree | deed68addb9d84edd3450a6d34102b222db13b1c /src/dolphinpart.desktop | |
| parent | 090f3e90ea4ce43c6d5e90c7b82c13a52222c72c (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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index f3f4a21f7..e875a53a2 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -4,7 +4,6 @@ Name=Dolphin View Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista del Dolphin Name[cs]=Pohled Dolphin -Name[da]=Dolphin-visning Name[de]=Dolphin-Ansicht Name[el]=Dolphin View Name[en_GB]=Dolphin View @@ -59,7 +58,6 @@ Name[ast]=Iconos Name[ca]=Icones Name[ca@valencia]=Icones Name[cs]=Ikony -Name[da]=Ikoner Name[de]=Symbole Name[el]=Εικονίδια Name[en_GB]=Icons @@ -104,7 +102,6 @@ Name=Compact Name[ca]=Compacta Name[ca@valencia]=Compacta Name[cs]=Kompaktní -Name[da]=Kompakt Name[de]=Kompakt Name[el]=Σύμπτυξη Name[en_GB]=Compact @@ -146,7 +143,6 @@ Name=Details Name[ca]=Detalls Name[ca@valencia]=Detalls Name[cs]=Podrobnosti -Name[da]=Detaljer Name[de]=Details Name[el]=Λεπτομέρειες Name[en_GB]=Details |