I have tried several times, but can't get it to work o:(
i have enclosed the danish update. Hope someone can help.
bye
Joe
Danish
joe@pc:~/overi/ddp/release-notes/da$ msgfmt --statistics -c -v -o /dev/null upgrading.po
upgrading.po: 341 oversatte tekster.
Checked out revision 10031.
Summary of conflicts:
Skipped paths: 1
joe@pc:~/overi/ddp$ cd release-notes
joe@pc:~/overi/ddp/release-notes$ dir
be dblatex.xsl fi ifxetex.sty nb pt-br sk transcount
ca de
find-dummies.sh it nl README statspage txt.xsl
changes-release.pl debian fo.xsl ja pl README.translators stats.txt vi
check-trans.pl debian.css fr lt poabc.txt release-notes.ent sv xmlroff.xsl
cs en
html.xsl Makefile preproc.xsl ro test-build.sh zh-cn
da es hyphenation.xsl ml pt ru test-langs.sh zh-tw
joe@pc:~/overi/ddp/release-notes$ cd da
joe@pc:~/overi/ddp/release-notes/da$ dir
about.dbk issues.dbk moreinfo.po release-notes.all.pdf upgrading.dbk upgrading.po.r9571
about.po issues.po old-stuff.dbk release-notes.all.txt upgrading.po
whats-new.dbk
hyphenation.tex issues.po~ old-stuff.po release-notes.all.xml upgrading.po~ whats-new.po
installing.dbk language.ent poabc.txt release-notes.dbk upgrading.po.mine
installing.po moreinfo.dbk release-notes.all.html release-notes.po upgrading.po.r9522
joe@pc:~/overi/ddp/release-notes/da$ msgfmt --statistics -c -v -o /dev/null upgrading.po
upgrading.po: 341 oversatte tekster.
joe@pc:~/overi/ddp/release-notes/da$ svn ci -m "update Danish translation 341 oversatte tekster" upgrading.po
svn: Commit failed (details follow):
svn: Aborting commit: '/home/joe/overi/ddp/release-notes/da/upgrading.po' remains in
conflict
joe@pc:~/overi/ddp/release-notes/da$ cd ..
joe@pc:~/overi/ddp/release-notes$ dir
be dblatex.xsl fi ifxetex.sty nb pt-br sk transcount
ca de find-dummies.sh it nl README statspage txt.xsl
changes-release.pl debian fo.xsl ja pl README.translators
stats.txt vi
check-trans.pl debian.css fr lt poabc.txt release-notes.ent sv xmlroff.xsl
cs en html.xsl Makefile preproc.xsl ro test-build.sh zh-cn
da es hyphenation.xsl ml pt ru test-langs.sh
zh-tw
joe@pc:~/overi/ddp/release-notes$ make update-po LINGUA=da
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/about.dbk --po da/about.po
.......... afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>'
--previous --format docbook --master en/installing.dbk --po da/installing.po
............ afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/issues.dbk --po da/issues.po
................. afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o
inline='<indexterm> <primary>' --previous --format docbook --master en/moreinfo.dbk --po da/moreinfo.po
........ afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/old-stuff.dbk --po da/old-stuff.po
.......... afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen>
<indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/release-notes.dbk --po da/release-notes.po
............................. afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/upgrading.dbk --po da/upgrading.po
................................................................... afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o
translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/whats-new.dbk --po da/whats-new.po
......................................... afsluttet.
joe@pc:~/overi/ddp/release-notes$ cd ..
joe@pc:~/overi/ddp$ cd release-notes
joe@pc:~/overi/ddp/release-notes$ cd da
joe@pc:~/overi/ddp/release-notes/da$ dir
about.dbk issues.dbk moreinfo.po release-notes.all.pdf upgrading.dbk upgrading.po.r9571
about.po issues.po old-stuff.dbk release-notes.all.txt upgrading.po whats-new.dbk
hyphenation.tex
issues.po~ old-stuff.po release-notes.all.xml upgrading.po~ whats-new.po
installing.dbk language.ent poabc.txt release-notes.dbk upgrading.po.mine
installing.po moreinfo.dbk release-notes.all.html release-notes.po upgrading.po.r9522
joe@pc:~/overi/ddp/release-notes/da$ msgfmt --statistics -c -v -o /dev/null upgrading.po
upgrading.po: 340 oversatte tekster, 1 uafklaret oversættelse.
joe@pc:~/overi/ddp/release-notes/da$ svn ci -m "update Danish translation 340 oversatte tekster" upgrading.po
svn: Commit failed (details follow):
svn: Aborting commit: '/home/joe/overi/ddp/release-notes/da/upgrading.po' remains in
conflict
joe@pc:~/overi/ddp/release-notes/da$ msgfmt --statistics -c -v -o /dev/null upgrading.po
upgrading.po: 341 oversatte tekster.
joe@pc:~/overi/ddp/release-notes/da$ svn ci -m "update Danish translation 341 oversatte tekster" upgrading.po
svn: Commit failed (details follow):
svn: Aborting commit: '/home/joe/overi/ddp/release-notes/da/upgrading.po' remains in conflict
joe@pc:~/overi/ddp/release-notes/da$ cd ..
joe@pc:~/overi/ddp/release-notes$ make update-po LINGUA=da
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/about.dbk --po
da/about.po
.......... afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/installing.dbk --po da/installing.po
............ afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook
--master en/issues.dbk --po da/issues.po
..................... afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/moreinfo.dbk --po da/moreinfo.po
.......... afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm>
<primary>' --previous --format docbook --master en/old-stuff.dbk --po da/old-stuff.po
.......... afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/release-notes.dbk --po da/release-notes.po
............................. afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen>
<indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/upgrading.dbk --po da/upgrading.po
................................................................ afsluttet.
po4a-updatepo -o nodefault='<contrib> <editor> <indexterm> <note> <primary> <pubdate> <programlisting> <orderedlist> <screen>' -o translated='<contrib> <editor> W<programlisting> <note> <orderedlist> <pubdate> W<screen> <indexterm><primary>' -o inline='<indexterm> <primary>' --previous --format docbook --master en/whats-new.dbk --po da/whats-new.po
........................................ afsluttet.
joe@pc:~/overi/ddp/release-notes$ cd ..
joe@pc:~/overi/ddp$ svn co svn+ssh://svn.debian.org/svn/ddp/manuals/trunk/release-notes
Skipped 'release-notes/da/upgrading.po'
Checked out revision
10031.
Summary of conflicts:
Skipped paths: 1
joe@pc:~/overi/ddp$