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"
wilder-portage-prov
l10n daemon script 6 years ago
parent 0b44a16ef4
commit 5575f2e784
  1. 2
      applets/appmenu/package/metadata.desktop

@ -51,6 +51,8 @@ Comment[ca]=Barra de menús global a l'escriptori Plasma
Comment[de]=Globale Menüleiste auf der Plasma-Arbeitsfläche
Comment[es]=Barra de menú global para el escritorio Plasma
Comment[fr]=Barre globale de menu de votre bureau Plasma
Comment[it]=Barra dei menu globale nel tuo desktop Plasma
Comment[ko]=Plasma 데스크톱에 전역 메뉴 표시줄 표시
Comment[nl]=Globale menubalk in uw Plasma-bureaublad
Comment[pt]=Menu global na sua área de trabalho do Plasma
Comment[pt_BR]=Barra de menu global na sua área de trabalho Plasma

Loading…
Cancel
Save