Hi. yast-translation project experienced large conflict caused by https://github.com/nijel/weblate/issues/1266 To solve this conflict, I have merged many files manually and the reset the repository. Please check, whether your edits done in last 3 days are in place now, especially if your work is listed below. If something went wrong, please contact me. Thanks for understanding. Affected files: modified: po/add-on/ar.po modified: po/base/fa.po modified: po/gtk/de.po modified: po/gtk/id.po modified: po/kdump/af.po modified: po/kdump/am.po modified: po/kdump/ar.po modified: po/kdump/ast.po modified: po/kdump/be.po modified: po/kdump/bg.po modified: po/kdump/bn.po modified: po/kdump/bs.po modified: po/kdump/ca.po modified: po/kdump/cs.po modified: po/kdump/cy.po modified: po/kdump/da.po modified: po/kdump/de.po modified: po/kdump/el.po modified: po/kdump/en_GB.po modified: po/kdump/en_US.po modified: po/kdump/eo.po modified: po/kdump/es.po modified: po/kdump/et.po modified: po/kdump/eu.po modified: po/kdump/fa.po modified: po/kdump/fi.po modified: po/kdump/fr.po modified: po/kdump/gl.po modified: po/kdump/gu.po modified: po/kdump/he.po modified: po/kdump/hi.po modified: po/kdump/hr.po modified: po/kdump/hu.po modified: po/kdump/id.po modified: po/kdump/it.po modified: po/kdump/ja.po modified: po/kdump/jv.po modified: po/kdump/ka.po modified: po/kdump/kdump.pot modified: po/kdump/km.po modified: po/kdump/kn.po modified: po/kdump/ko.po modified: po/kdump/ku.po modified: po/kdump/lo.po modified: po/kdump/lt.po modified: po/kdump/lv.po modified: po/kdump/mk.po modified: po/kdump/mr.po modified: po/kdump/ms.po modified: po/kdump/my.po modified: po/kdump/nb.po modified: po/kdump/nds.po modified: po/kdump/ne.po modified: po/kdump/nl.po modified: po/kdump/nn.po modified: po/kdump/pa.po modified: po/kdump/pl.po modified: po/kdump/ps.po modified: po/kdump/pt.po modified: po/kdump/pt_BR.po modified: po/kdump/ro.po modified: po/kdump/ru.po modified: po/kdump/si.po modified: po/kdump/sk.po modified: po/kdump/sl.po modified: po/kdump/sq.po modified: po/kdump/sr.po modified: po/kdump/sr@Latn.po modified: po/kdump/sv.po modified: po/kdump/sw.po modified: po/kdump/ta.po modified: po/kdump/tg.po modified: po/kdump/th.po modified: po/kdump/tk.po modified: po/kdump/tr.po modified: po/kdump/uk.po modified: po/kdump/vi.po modified: po/kdump/wa.po modified: po/kdump/xh.po modified: po/kdump/zh_CN.po modified: po/kdump/zh_TW.po modified: po/kdump/zu.po Auto-merging po/ncurses-pkg/fa.po CONFLICT (content): Merge conflict in po/ncurses-pkg/fa.po Auto-merging po/iplb/id.po CONFLICT (content): Merge conflict in po/iplb/id.po Auto-merging po/installation/fa.po CONFLICT (content): Merge conflict in po/installation/fa.po Auto-merging po/ftp-server/pt_BR.po CONFLICT (content): Merge conflict in po/ftp-server/pt_BR.po Auto-merging po/base/id.po CONFLICT (content): Merge conflict in po/base/id.po Automatic merge failed Unmerged paths: (use "git add <file>..." to mark resolution) both modified: po/base/id.po both modified: po/ftp-server/pt_BR.po both modified: po/installation/fa.po both modified: po/iplb/id.po both modified: po/ncurses-pkg/fa.po -- Best Regards / S pozdravem, Stanislav Brabec software developer --------------------------------------------------------------------- SUSE LINUX, s. r. o. e-mail: sbrabec@suse.com Křižíkova 148/34 (Corso IIa) tel: +49 911 7405384547 186 00 Praha 8-Karlín fax: +420 284 084 001 Czech Republic http://www.suse.cz/ PGP: 830B 40D5 9E05 35D8 5E27 6FA3 717C 209F A04F CD76 -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation+owner@opensuse.org