diff options
| author | l10n daemon script <[email protected]> | 2016-12-20 12:38:21 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-12-20 12:38:21 +0100 |
| commit | ae935d36b1565dd9a763f022caac5863071711fa (patch) | |
| tree | 95a53f5bce475de12b59761e3ed23ad99b5bfcb2 /src/dolphinpart.desktop | |
| parent | d690b0719f3c48f65763df790e1f5c19dcc327a5 (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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 6b9398da8..9b3089542 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -2,7 +2,6 @@ Type=Service Name=Dolphin View Name[ar]=منظور دولفين -Name[ast]=Vista de Dolphin Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista del Dolphin Name[cs]=Pohled Dolphin @@ -107,7 +106,6 @@ Exec=dolphin [Desktop Action compact] Name=Compact Name[ar]=متراصّ -Name[ast]=Compautu Name[ca]=Compacta Name[ca@valencia]=Compacta Name[cs]=Kompaktní @@ -154,7 +152,6 @@ Exec=dolphin [Desktop Action details] Name=Details Name[ar]=التّفاصيل -Name[ast]=Detalles Name[ca]=Detalls Name[ca@valencia]=Detalls Name[cs]=Podrobnosti |