From 2f8f21c3d494328f0b4a544998fc6118b25b56c3 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 25 Mar 2013 08:56:42 +0100
Subject: merge patches from daniel to fix merge artifact and test failure

---
 po/ca.po | 10 ++++++++++
 po/cs.po | 10 ++++++++++
 po/ru.po | 10 ++++++++++
 3 files changed, 30 insertions(+)

(limited to 'po')

diff --git a/po/ca.po b/po/ca.po
index 41488ba3c..0f3570949 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2438,6 +2438,16 @@ msgstr ""
 msgid "%c%s... %u%%"
 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 cb260c621..6e9543939 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2416,6 +2416,16 @@ msgstr ""
 msgid "%c%s... %u%%"
 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 2a72ee3c1..703a83a7c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2474,6 +2474,16 @@ msgstr ""
 msgid "%c%s... %u%%"
 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."
-- 
cgit v1.2.3