Bladeren bron

include two missing patches to really fix bug #696225, thanks to
Guillem Jover

Michael Vogt 13 jaren geleden
bovenliggende
commit
32fa71a57d
5 gewijzigde bestanden met toevoegingen van 38 en 1 verwijderingen
  1. 1 1
      apt-pkg/contrib/progress.cc
  2. 7 0
      debian/changelog
  3. 10 0
      po/ca.po
  4. 10 0
      po/cs.po
  5. 10 0
      po/ru.po

+ 1 - 1
apt-pkg/contrib/progress.cc

@@ -192,7 +192,7 @@ void OpTextProgress::Update()
    }
    }
    
    
    // Print the spinner
    // 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);
    Write(S);
 
 
    OldOp = Op;
    OldOp = Op;

+ 7 - 0
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
 apt (0.9.7.8~exp1) experimental; urgency=low
 
 
   [ Manpages translation updates ]
   [ Manpages translation updates ]

+ 10 - 0
po/ca.po

@@ -2403,6 +2403,16 @@ msgstr "%c%s… Error!"
 msgid "%c%s... Done"
 msgid "%c%s... Done"
 msgstr "%c%s… Fet"
 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
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgid "Command line option '%c' [from %s] is not known."

+ 10 - 0
po/cs.po

@@ -2399,6 +2399,16 @@ msgstr "%c%s… Chyba!"
 msgid "%c%s... Done"
 msgid "%c%s... Done"
 msgstr "%c%s… Hotovo"
 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
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgid "Command line option '%c' [from %s] is not known."

+ 10 - 0
po/ru.po

@@ -2457,6 +2457,16 @@ msgstr "%c%s… Ошибка!"
 msgid "%c%s... Done"
 msgid "%c%s... Done"
 msgstr "%c%s… Готово"
 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
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgid "Command line option '%c' [from %s] is not known."