Re: [opensuse-translation] Re: [openSUSE Weblate] Fout bij samenvoegen in yast-base/master

29 Oct 2016


      Somebody has changed the files during your translation. Save your changes locally, undo it on github (follow the instruction in the sended link), checkout the updated branch and look after the difference between the new file and your translated file (diff). You can commit it again after a update of the file.

Best regards,
Sarah
...
Gesendet: Freitag, 28. Oktober 2016 um 23:56 Uhr
Von: "Freek de Kruijf" 
An: "Mailinglist openSUSE translation" 
Betreff: [opensuse-translation] Re: [openSUSE Weblate] Fout bij samenvoegen in yast-base/master
I get the message below about twice every hour. Is it possible to stop this? 
Apparently the problem is with the country code id.
...
Hallo,
Er is een fout opgetreden bij het samenvoegen in yast-base/master op
openSUSE Weblate.
Foutmelding:
Auto-merging po/base/id.po
CONFLICT (content): Merge conflict in po/base/id.po
Auto-merging po/base/fa.po
Automatic merge failed; fix conflicts and then commit the result. (1)
Repository-status:
On branch master
Your branch and 'origin/master' have diverged,
and have 32 and 4 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
You have unmerged paths.
  (fix conflicts and run "git commit")
Changes to be committed:
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
Unmerged paths:
  (use "git add <file>..." to mark resolution)
both modified:      po/base/id.po
Bekijk onze veelgestelde vragen (FAQ) voor meer informatie om dit op te
lossen.
http://docs.weblate.org/en/weblate-2.6/faq.html#merge
--
    Verstuurd door het Weblate vertaalsysteem
    https://l10n.opensuse.org/
    Abonnementsinstellingen wijzigen:
https://l10n.opensuse.org/accounts/profile/#subscriptions
-- 
fr.gr.
member openSUSE
Freek de Kruijf
-- 
To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-translation+owner@opensuse.org
-- 
To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-translation+owner@opensuse.org

Re: [opensuse-translation] Re: [openSUSE Weblate] Fout bij samenvoegen in yast-base/master

Sarah Julia Kriesch