jeg er i gang med release-notes
har dog en irriterende konflikt jeg ikke kan komme af med
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$
Fra: Kåre Thor Olsen <kaarethor@gmail.com>
Til: debian-l10n-danish@lists.debian.org
Sendt: 1:48 lørdag den 4. maj 2013
Emne: Oversat Debian 7-nyhed til www.debian.org