summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2013-03-01 18:50:59 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2013-03-01 18:50:59 +0100
commit32fa71a57dcf625c94207dce612175af49c93ce4 (patch)
treefd91c62c29bcab80a749757958166faf3cbab59f
parent3e2efdda0a8f577d571fcae15e9f4c3cebddfe30 (diff)
include two missing patches to really fix bug #696225, thanks to
Guillem Jover
-rw-r--r--apt-pkg/contrib/progress.cc2
-rw-r--r--debian/changelog7
-rw-r--r--po/ca.po10
-rw-r--r--po/cs.po10
-rw-r--r--po/ru.po10
5 files changed, 38 insertions, 1 deletions
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 17a6b70e9..916e1d730 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -192,7 +192,7 @@ void OpTextProgress::Update()
}
// Print the spinner
- snprintf(S,sizeof(S),_("\r%s... %u%%"),Op.c_str(),(unsigned int)Percent);
+ snprintf(S,sizeof(S),_("%c%s... %u%%"),'\r',Op.c_str(),(unsigned int)Percent);
Write(S);
OldOp = Op;
diff --git a/debian/changelog b/debian/changelog
index 97587b6bf..ff4988d63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.9.7.8~exp2) UNRELEASEDexperimental; urgency=low
+
+ * include two missing patches to really fix bug #696225, thanks to
+ Guillem Jover
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 01 Mar 2013 18:50:17 +0100
+
apt (0.9.7.8~exp1) experimental; urgency=low
[ Manpages translation updates ]
diff --git a/po/ca.po b/po/ca.po
index 03d11e1aa..61d231277 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2403,6 +2403,16 @@ msgstr "%c%s… Error!"
msgid "%c%s... Done"
msgstr "%c%s… Fet"
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr "…"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
+
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
diff --git a/po/cs.po b/po/cs.po
index 4ccb2f70b..3d16d6811 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2399,6 +2399,16 @@ msgstr "%c%s… Chyba!"
msgid "%c%s... Done"
msgstr "%c%s… Hotovo"
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr "…"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
+
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
diff --git a/po/ru.po b/po/ru.po
index c60c9a384..9b66cc268 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2457,6 +2457,16 @@ msgstr "%c%s… Ошибка!"
msgid "%c%s... Done"
msgstr "%c%s… Готово"
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr "…"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
+
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."