mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-17 15:31:20 +00:00
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"
This commit is contained in:
parent
7002dc4e8a
commit
2c29c7ed28
|
@ -22,7 +22,7 @@ Name[ja]=Dolphin 全般
|
||||||
Name[ko]=Dolphin 일반
|
Name[ko]=Dolphin 일반
|
||||||
Name[lt]=Dolphin bendrosios
|
Name[lt]=Dolphin bendrosios
|
||||||
Name[lv]=Dolphin vispārējs
|
Name[lv]=Dolphin vispārējs
|
||||||
Name[ml]=പൊതു സജ്ജീകരണങ്ങള്
|
Name[ml]=ഡോൾഫിൻ ജനറൽ
|
||||||
Name[nb]=Dolphin generelt
|
Name[nb]=Dolphin generelt
|
||||||
Name[nl]=Dolphin algemeen
|
Name[nl]=Dolphin algemeen
|
||||||
Name[nn]=Generelt for Dolphin
|
Name[nn]=Generelt for Dolphin
|
||||||
|
|
|
@ -124,7 +124,7 @@ Name[ja]=表示モード
|
||||||
Name[ko]=보기 모드
|
Name[ko]=보기 모드
|
||||||
Name[lt]=Rodinio veiksenos
|
Name[lt]=Rodinio veiksenos
|
||||||
Name[lv]=Skata režīmi
|
Name[lv]=Skata režīmi
|
||||||
Name[ml]=അവതരണ ദശകള്
|
Name[ml]=അവതരണ രീതികള്
|
||||||
Name[nb]=Visningsmåter
|
Name[nb]=Visningsmåter
|
||||||
Name[nl]=Weergavemodi
|
Name[nl]=Weergavemodi
|
||||||
Name[nn]=Visingsmodusar
|
Name[nn]=Visingsmodusar
|
||||||
|
|
|
@ -25,7 +25,7 @@ Comment[ja]=ファイルビューのためのバージョン管理プラグイ
|
||||||
Comment[ko]=파일 보기용 버전 제어 플러그인
|
Comment[ko]=파일 보기용 버전 제어 플러그인
|
||||||
Comment[lt]=Failo rodinių versijų tvarkymo papildinys
|
Comment[lt]=Failo rodinių versijų tvarkymo papildinys
|
||||||
Comment[lv]=Versiju kontroles spraudnis priekš datņu skata
|
Comment[lv]=Versiju kontroles spraudnis priekš datņu skata
|
||||||
Comment[ml]=ഫയല് അവതരണദിശകൾക്കുള്ള പതിപ്പ് നിയന്ത്രണ സംയോജകം
|
Comment[ml]=ഫയൽ കാഴ്ചകൾക്കായുള്ള പതിപ്പ് നിയന്ത്രണ പ്ലഗിൻ
|
||||||
Comment[nb]=Versjonskontrollmodul for filvisninger
|
Comment[nb]=Versjonskontrollmodul for filvisninger
|
||||||
Comment[nl]=Plugin voor versiecontrole op bestandoverzichten
|
Comment[nl]=Plugin voor versiecontrole op bestandoverzichten
|
||||||
Comment[nn]=Versjonskontroll-tillegg for filvisingar
|
Comment[nn]=Versjonskontroll-tillegg for filvisingar
|
||||||
|
|
Loading…
Reference in a new issue