diff options
| author | l10n daemon script <[email protected]> | 2017-05-25 04:21:54 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-05-25 04:21:54 +0200 |
| commit | 4d9c396a9877ff459703c6372b5426860a32400b (patch) | |
| tree | 0a89368c08bf4e660c6076b89befa969579f3763 /src/dolphinpart.desktop | |
| parent | 95f9dc9de00e4663ade9506bd1b7b58816d13458 (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 da0a659d3..a0d7a96b2 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -71,6 +71,7 @@ Name[et]=Ikoonid Name[fi]=Kuvakkeet Name[fr]=Icônes Name[gl]=Iconas +Name[he]=סמלים Name[hu]=Ikonok Name[ia]=Icones Name[id]=Ikon @@ -118,6 +119,7 @@ Name[et]=Kompaktne Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta +Name[he]=קומפקטי Name[hu]=Kompakt Name[ia]=Compacte Name[id]=Sederhana @@ -165,6 +167,7 @@ Name[et]=Üksikasjad Name[fi]=Yksityiskohdat Name[fr]=Détails Name[gl]=Detalles +Name[he]=פרטים Name[hu]=Részletek Name[ia]=Detalios Name[id]=Detail |