diff options
| author | l10n daemon script <[email protected]> | 2016-01-20 12:38:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-01-20 12:38:42 +0000 |
| commit | 3b8623b0403a85751a3b48648a541f9534cd3d78 (patch) | |
| tree | a59737f1cd022c05a18772859c3280a737c2e8af /src/dolphinpart.desktop | |
| parent | 7c343f21dd5c156e1a41823ca8984647d85c4ff8 (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 93d07704b..816575aef 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Type=Service Name=Dolphin View +Name[ar]=منظور دولفين Name[ast]=Vista de Dolphin Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista del Dolphin @@ -55,6 +56,7 @@ Actions=icons;details;compact; [Desktop Action icons] Name=Icons +Name[ar]=الأيقونات Name[ast]=Iconos Name[ca]=Icones Name[ca@valencia]=Icones @@ -101,6 +103,7 @@ Exec=dolphin [Desktop Action compact] Name=Compact +Name[ar]=متراصّ Name[ca]=Compacta Name[ca@valencia]=Compacta Name[cs]=Kompaktní @@ -143,6 +146,7 @@ Exec=dolphin [Desktop Action details] Name=Details +Name[ar]=التّفاصيل Name[ast]=Detalles Name[ca]=Detalls Name[ca@valencia]=Detalls |