diff -Nru bzr-2.6.0+bzr6589.6320~ppa4079~ubuntu12.04.1/debian/bzr-builder.manifest bzr-2.6.0+bzr6589.6321~ppa4079~ubuntu12.04.1/debian/bzr-builder.manifest --- bzr-2.6.0+bzr6589.6320~ppa4079~ubuntu12.04.1/debian/bzr-builder.manifest 2013-12-25 04:52:16.000000000 +0000 +++ bzr-2.6.0+bzr6589.6321~ppa4079~ubuntu12.04.1/debian/bzr-builder.manifest 2014-01-25 06:48:35.000000000 +0000 @@ -1,4 +1,4 @@ -# bzr-builder format 0.3 deb-version {debupstream-base}bzr6589.6320~ppa4079 +# bzr-builder format 0.3 deb-version {debupstream-base}bzr6589.6321~ppa4079 lp:bzr revid:pqm@pqm.ubuntu.com-20131007170434-mb0ahksmrzsnhi1i merge packaging lp:~debian-bazaar/bzr/2.6 revid:a.starr.b@gmail.com-20131008141212-ag9pr3l9qd4eggve -merge translations lp:~bzr-core/bzr/bzr-translations-export revid:launchpad_translations_on_behalf_of_bzr-core-20131225043059-ayap3sijjghoj2rv +merge translations lp:~bzr-core/bzr/bzr-translations-export revid:launchpad_translations_on_behalf_of_bzr-core-20140125043046-ld13n2owk6pws0xl diff -Nru bzr-2.6.0+bzr6589.6320~ppa4079~ubuntu12.04.1/debian/changelog bzr-2.6.0+bzr6589.6321~ppa4079~ubuntu12.04.1/debian/changelog --- bzr-2.6.0+bzr6589.6320~ppa4079~ubuntu12.04.1/debian/changelog 2013-12-25 04:52:16.000000000 +0000 +++ bzr-2.6.0+bzr6589.6321~ppa4079~ubuntu12.04.1/debian/changelog 2014-01-25 06:48:35.000000000 +0000 @@ -1,8 +1,8 @@ -bzr (2.6.0+bzr6589.6320~ppa4079~ubuntu12.04.1) precise; urgency=low +bzr (2.6.0+bzr6589.6321~ppa4079~ubuntu12.04.1) precise; urgency=low * Auto build. - -- Launchpad Package Builder Wed, 25 Dec 2013 04:52:16 +0000 + -- Launchpad Package Builder Sat, 25 Jan 2014 06:48:35 +0000 bzr (2.6.0+bzr6589-1) UNRELEASED; urgency=low diff -Nru bzr-2.6.0+bzr6589.6320~ppa4079~ubuntu12.04.1/po/cs.po bzr-2.6.0+bzr6589.6321~ppa4079~ubuntu12.04.1/po/cs.po --- bzr-2.6.0+bzr6589.6320~ppa4079~ubuntu12.04.1/po/cs.po 2013-12-25 04:52:09.000000000 +0000 +++ bzr-2.6.0+bzr6589.6321~ppa4079~ubuntu12.04.1/po/cs.po 2014-01-25 06:48:08.000000000 +0000 @@ -8,15 +8,15 @@ "Project-Id-Version: bzr\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-07-27 12:45+0200\n" -"PO-Revision-Date: 2013-12-24 14:52+0000\n" +"PO-Revision-Date: 2014-01-24 08:39+0000\n" "Last-Translator: Zbyněk Schwarz \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2013-12-25 04:30+0000\n" -"X-Generator: Launchpad (build 16877)\n" +"X-Launchpad-Export-Date: 2014-01-25 04:30+0000\n" +"X-Generator: Launchpad (build 16914)\n" #: bzrlib/add.py:93 msgid "skipping {0} (larger than {1} of {2} bytes)" @@ -12980,6 +12980,9 @@ "interpolation markers, trying to display the mergetool line results in the\n" "following problem::" msgstr "" +"Protože jak ``mergetool`` tak ``config`` používají složené závorky\n" +"jako značky interpolace, pokus o zobrazení řádku nástroje sloučení\n" +"má za následek následující problém::" #: en/help_topics/configuration.txt:720 msgid "" @@ -14397,7 +14400,7 @@ #: en/help_topics/env-variables.txt:3 msgid "See bzr help configuration for more details." -msgstr "" +msgstr "Viz bzr help configuration pro další informace" #: en/help_topics/env-variables.txt:5 msgid ""