diff options
| author | l10n daemon script <[email protected]> | 2018-04-30 07:09:04 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-30 07:09:04 +0200 |
| commit | 94ba6a0978fe03bcd51a37cd252b1ff2a9efe090 (patch) | |
| tree | 93e4f79346cd98d66b7cbe05b1c4fed55df0f7ac /src/dolphinpart.desktop | |
| parent | c270f4713691e6918054b4bb294e1016cedfbdbe (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 fb257221c..2344555d5 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -11,6 +11,7 @@ Name[el]=Dolphin View Name[en_GB]=Dolphin View Name[es]=Vista de Dolphin Name[et]=Dolphini vaade +Name[eu]=Dolphin ikuspegia Name[fi]=Dolphin-näkymä Name[fr]=Vue de Dolphin Name[gl]=Vista de Dolphin @@ -68,6 +69,7 @@ Name[el]=Εικονίδια Name[en_GB]=Icons Name[es]=Iconos Name[et]=Ikoonid +Name[eu]=Ikonoak Name[fi]=Kuvakkeet Name[fr]=Icônes Name[gl]=Iconas @@ -116,6 +118,7 @@ Name[el]=Σύμπτυξη Name[en_GB]=Compact Name[es]=Compacto Name[et]=Kompaktne +Name[eu]=Trinkoa Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta @@ -164,6 +167,7 @@ Name[el]=Λεπτομέρειες Name[en_GB]=Details Name[es]=Detalles Name[et]=Üksikasjad +Name[eu]=Xehetasunak Name[fi]=Yksityiskohdat Name[fr]=Détails Name[gl]=Detalles |