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-5.22
l10n daemon script 6 years ago
parent 26c664506c
commit 0a0e26d316
  1. 2
      menu/desktop/kf5-utilities-xutils.directory
  2. 2
      menu/desktop/kf5-utilities.directory

@ -46,6 +46,7 @@ Name[sr@ijekavian]=Икс‑алатке
Name[sr@ijekavianlatin]=X-alatke
Name[sr@latin]=X-alatke
Name[sv]=X-verktyg
Name[tg]=Барномаҳои муфиди X
Name[tr]=X Yardımcı Araçları
Name[uk]=Утиліти X Window
Name[vi]=Tiện ích X
@ -131,6 +132,7 @@ Comment[sr@latin]=Alatke za X‑prozore
Comment[sv]=X-window-verktyg
Comment[ta]=X-சளர கரிகள
Comment[te]=ఎకిలభ
Comment[tg]=Барномаҳои муфиди X Window
Comment[th]=โปรแกรมอรรถประโยชนาง ๆ ของระบบ X Window
Comment[tr]=X Yardımcı Programları
Comment[ug]=X كۆزنەك قوراللىرى

@ -48,6 +48,7 @@ Name[sr@ijekavian]=Алатке
Name[sr@ijekavianlatin]=Alatke
Name[sr@latin]=Alatke
Name[sv]=Verktyg
Name[tg]=Барномаҳои муфид
Name[tr]=Yardımcı Araçlar
Name[uk]=Утиліти
Name[vi]=Tiện ích
@ -101,6 +102,7 @@ Comment[sr@ijekavian]=Алатке
Comment[sr@ijekavianlatin]=Alatke
Comment[sr@latin]=Alatke
Comment[sv]=Verktyg
Comment[tg]=Барномаҳои муфид
Comment[tr]=Yardımcı Araçlar
Comment[uk]=Утиліти
Comment[vi]=Tiện ích

Loading…
Cancel
Save