diff options
| author | l10n daemon script <[email protected]> | 2021-09-20 01:28:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-09-20 01:28:18 +0000 |
| commit | f8c292c556b87a19e9099cc98bf0ab88424472b2 (patch) | |
| tree | c0f088c45041b562e517b9c9c173430626d894e3 /src/dolphinpart.desktop.in | |
| parent | 084dbbe2f7b62a50a9c2d44fb5f6ae0aebac97eb (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 2a121dbe6..e891c2485 100644 --- a/src/dolphinpart.desktop.in +++ b/src/dolphinpart.desktop.in @@ -27,6 +27,7 @@ Name[ko]=Dolphin 보기 Name[lt]=Dolphin rodinys Name[lv]=Dolphin skats Name[ml]=ഡോള്ഫിന് അവതരണരീതി +Name[my]=လင်းပိုင် မြင်ကွင်း Name[nb]=Dolphin visning Name[nl]=Dolphin-weergave Name[nn]=Dolphin-vising @@ -98,6 +99,7 @@ Name[ko]=아이콘 Name[lt]=Piktogramos Name[lv]=Ikonas Name[ml]=സൂചനാചിത്രങ്ങള് +Name[my]=အိုင်ကွန်များ Name[nb]=Ikoner Name[nl]=Pictogrammen Name[nn]=Ikon @@ -155,6 +157,7 @@ Name[ko]=축소됨 Name[lt]=Kompaktiškas Name[lv]=Kompakts Name[ml]=തിങ്ങിയത് +Name[my]=ကျစ်လစ် Name[nb]=Kompakt Name[nl]=Compact Name[nn]=Kompakt @@ -211,6 +214,7 @@ Name[ko]=자세히 Name[lt]=Išsamus Name[lv]=Detaļas Name[ml]=വിശദമായി +Name[my]=အသေးစိတ် Name[nb]=Detaljer Name[nl]=Details Name[nn]=Detaljar |