diff options
| author | l10n daemon script <[email protected]> | 2016-08-19 12:04:22 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-08-19 12:04:22 +0000 |
| commit | 438ede27dc86938275d4ea1d8bd57b1e174f6053 (patch) | |
| tree | d870eac6352d0ee940774751e858c414961da660 /src/dolphinpart.desktop | |
| parent | 9c9c9be45db17b236a131f3209327ea79790fd96 (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 e8814f16b..a4bac816f 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -11,6 +11,7 @@ Name[de]=Dolphin-Ansicht Name[el]=Dolphin View Name[en_GB]=Dolphin View Name[es]=Vista de Dolphin +Name[et]=Dolphini vaade Name[fi]=Dolphin-näkymä Name[fr]=Vue de Dolphin Name[gl]=Vista de Dolphin @@ -67,6 +68,7 @@ Name[de]=Symbole Name[el]=Εικονίδια Name[en_GB]=Icons Name[es]=Iconos +Name[et]=Ikoonid Name[fi]=Kuvakkeet Name[fr]=Icônes Name[gl]=Iconas @@ -114,6 +116,7 @@ Name[de]=Kompakt Name[el]=Σύμπτυξη Name[en_GB]=Compact Name[es]=Compacto +Name[et]=Kompaktne Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta @@ -159,6 +162,7 @@ Name[de]=Details Name[el]=Λεπτομέρειες Name[en_GB]=Details Name[es]=Detalles +Name[et]=Üksikasjad Name[fi]=Yksityiskohdat Name[fr]=Détails Name[gl]=Detalles |