diff options
| author | l10n daemon script <[email protected]> | 2021-10-09 01:19:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-10-09 01:19:17 +0000 |
| commit | 1937681d50d12a8c1a7f21c854aa99d3f4b0277b (patch) | |
| tree | a9c8c03264e9e339c927575e95c020a719d13bcd /src/dolphinpart.desktop.in | |
| parent | ec031d0f7dfecfe0fb1cd7c17e0e60296f308c3d (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.in')
| -rw-r--r-- | src/dolphinpart.desktop.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in index e891c2485..cdd51c832 100644 --- a/src/dolphinpart.desktop.in +++ b/src/dolphinpart.desktop.in @@ -21,6 +21,7 @@ Name[hi]=डॉल्फ़िन दृश्य Name[hu]=Dolphin nézet Name[ia]=Vista de Dolphin Name[id]=Tampilan Dolphin +Name[is]=Dolphin-sýn Name[it]=Vista di Dolphin Name[ja]=Dolphin ビュー Name[ko]=Dolphin 보기 @@ -93,6 +94,7 @@ Name[hi]=प्रतीक Name[hu]=Ikonok Name[ia]=Icones Name[id]=Ikon +Name[is]=Táknmyndir Name[it]=Icone Name[ja]=アイコン Name[ko]=아이콘 @@ -151,6 +153,7 @@ Name[hi]=सघन Name[hu]=Kompakt Name[ia]=Compacte Name[id]=Ringkas +Name[is]=Þjappað Name[it]=Compatta Name[ja]=コンパクト Name[ko]=축소됨 @@ -208,6 +211,7 @@ Name[hi]=विवरण Name[hu]=Részletek Name[ia]=Detalios Name[id]=Perincian +Name[is]=Nánar Name[it]=Dettagli Name[ja]=詳細 Name[ko]=자세히 |