diff options
| author | l10n daemon script <[email protected]> | 2015-09-08 12:47:01 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-09-08 12:47:01 +0000 |
| commit | c9770e60839f60ffa29e56e9785a9a36b3d4a90c (patch) | |
| tree | 6e191d096a8388e677e7dc3556aa77daf7ac1964 /src/dolphinpart.desktop | |
| parent | 2a18f450254e5d58152e747fbc150747cd34e218 (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 64c01f13b..335c87a80 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -9,6 +9,7 @@ Name[es]=Vista de Dolphin Name[fi]=Dolphin-näkymä Name[fr]=Vue de Dolphin Name[gl]=Vista de Dolphin +Name[hu]=Dolphin nézet Name[ia]=Vista de Dolphin Name[id]=Tampilan Dolphin Name[it]=Vista di Dolphin @@ -58,6 +59,7 @@ Name[es]=Iconos Name[fi]=Kuvakkeet Name[fr]=Icônes Name[gl]=Iconas +Name[hu]=Ikonok Name[ia]=Icones Name[id]=Ikon Name[it]=Icone @@ -98,6 +100,7 @@ Name[es]=Compacto Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta +Name[hu]=Kompakt Name[ia]=Compacte Name[id]=Sederhana Name[it]=Compatta @@ -135,6 +138,7 @@ Name[es]=Detalles Name[fi]=Yksityiskohdat Name[fr]=Détails Name[gl]=Detalles +Name[hu]=Részletek Name[ia]=Detalios Name[id]=Detail Name[it]=Dettagli |