diff options
| author | l10n daemon script <[email protected]> | 2015-11-04 16:55:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-04 16:55:32 +0000 |
| commit | bc8f3373fd98121fbe230842bbb104889961e6d7 (patch) | |
| tree | c7e72e274512eace488b9fab23293e009bb6d7cf /src/dolphinpart.desktop | |
| parent | 536d6ec8666ed89ed993aabb2a4982f8ebf5861c (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, 4 insertions, 0 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 24f258d2a..8941e8465 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -2,6 +2,7 @@ Type=Service Name=Dolphin View Name[ca]=Vista del Dolphin +Name[ca@valencia]=Vista del Dolphin Name[cs]=Pohled Dolphin Name[de]=Dolphin-Ansicht Name[el]=Dolphin View @@ -54,6 +55,7 @@ Actions=icons;details;compact; [Desktop Action icons] Name=Icons Name[ca]=Icones +Name[ca@valencia]=Icones Name[cs]=Ikony Name[de]=Symbole Name[el]=Εικονίδια @@ -97,6 +99,7 @@ Exec=dolphin [Desktop Action compact] Name=Compact Name[ca]=Compacta +Name[ca@valencia]=Compacta Name[cs]=Kompaktní Name[de]=Kompakt Name[el]=Σύμπτυξη @@ -137,6 +140,7 @@ Exec=dolphin [Desktop Action details] Name=Details Name[ca]=Detalls +Name[ca@valencia]=Detalls Name[cs]=Podrobnosti Name[de]=Details Name[el]=Λεπτομέρειες |