diff options
| author | l10n daemon script <[email protected]> | 2016-05-29 09:27:44 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-05-29 09:27:44 +0000 |
| commit | 82af09127d219d0111a38618747d651ef74029a6 (patch) | |
| tree | 472ca205e4b37c4f28f9562bf64465c53204cf2f /src/dolphinpart.desktop | |
| parent | 25cc15a5a2097faad3d647c72bd4c2dadac3f7ef (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, 3 insertions, 0 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 830fab2a2..e8814f16b 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -6,6 +6,7 @@ Name[ast]=Vista de Dolphin 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 @@ -108,6 +109,7 @@ Name[ast]=Compautu Name[ca]=Compacta Name[ca@valencia]=Compacta Name[cs]=Kompaktní +Name[da]=Kompakt Name[de]=Kompakt Name[el]=Σύμπτυξη Name[en_GB]=Compact @@ -152,6 +154,7 @@ Name[ast]=Detalles Name[ca]=Detalls Name[ca@valencia]=Detalls Name[cs]=Podrobnosti +Name[da]=Detaljer Name[de]=Details Name[el]=Λεπτομέρειες Name[en_GB]=Details |