diff options
| author | l10n daemon script <[email protected]> | 2015-06-04 11:19:31 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-04 11:19:31 +0000 |
| commit | 1c1efb983c60ea57422317186047f744e23df114 (patch) | |
| tree | ee5cf5fa6ff7a7094138758ce0138ca1a257ae52 /src/dolphinpart.desktop | |
| parent | 586252341ea69a60b64f404dd23ef93e59c1e16c (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 f62f57eb2..e54adcea5 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -5,6 +5,7 @@ Name[ca]=Vista del Dolphin Name[cs]=Pohled Dolphin Name[de]=Dolphin-Ansicht Name[en_GB]=Dolphin View +Name[es]=Vista de Dolphin Name[fi]=Dolphin-näkymä Name[fr]=Vue de Dolphin Name[gl]=Vista de Dolphin @@ -50,6 +51,7 @@ Name[ca]=Icones Name[cs]=Ikony Name[de]=Symbole Name[en_GB]=Icons +Name[es]=Iconos Name[fi]=Kuvakkeet Name[fr]=Icônes Name[gl]=Iconas @@ -86,6 +88,7 @@ Name[ca]=Compacta Name[cs]=Kompaktní Name[de]=Kompakt Name[en_GB]=Compact +Name[es]=Compacto Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta @@ -119,6 +122,7 @@ Name[ca]=Detalls Name[cs]=Podrobnosti Name[de]=Details Name[en_GB]=Details +Name[es]=Detalles Name[fi]=Yksityiskohdat Name[fr]=Détails Name[gl]=Detalles |