fix progress output for (dist-)upgrade calculation

Previously, we had a start and a done of the calculation printed by
higher-level code, but this got intermixed by progress reporting from an
external solver or the output of autoremove code…

The higherlevel code is now only responsible for instantiating a
progress object of its choosing (if it wants progress after all) and the
rest will be handled by the upgrade code. Either it is used to show the
progress of the external solver or the internal solver will give some
hints about its overall progress. The later isn't really a proper
progress as it will jump forward after each substep, but that is at
least a bit better than before without any progress indication.

Fixes also the 'strange' non-display of this progress line in -q=1, while
all others are shown, which is reflected by all testcase changes.

44 files changed, 87 insertions, 87 deletions

diff --git a/po/ar.po b/po/ar.po
index c4069143e..2ab648323 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1578,8 +1578,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "حساب الترقية..."
+msgid "Calculating upgrade"
+msgstr "حساب الترقية"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/ast.po b/po/ast.po
index 629c8f2da..a2f5a7df6 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -1706,8 +1706,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calculando l'anovamientu... "
+msgid "Calculating upgrade"
+msgstr "Calculando l'anovamientu"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/bg.po b/po/bg.po
index ea7382513..ad174d0a8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1743,8 +1743,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Изчисляване на актуализацията..."
+msgid "Calculating upgrade"
+msgstr "Изчисляване на актуализацията"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/bs.po b/po/bs.po
index 3cf69f0b1..5f03012fc 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -1575,8 +1575,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Računam nadogradnju..."
+msgid "Calculating upgrade"
+msgstr "Računam nadogradnju"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/ca.po b/po/ca.po
index 31961ecac..ee9ee46d4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1731,8 +1731,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "S'està calculant l'actualització… "
+msgid "Calculating upgrade"
+msgstr "S'està calculant l'actualització"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/cs.po b/po/cs.po
index 5bb6a79b7..4e43807b7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1757,8 +1757,8 @@ msgid "All packages are up to date."
 msgstr "Všechny balíky jsou aktuální."
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Propočítává se aktualizace… "
+msgid "Calculating upgrade"
+msgstr "Propočítává se aktualizace"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/cy.po b/po/cy.po
index dbf4bfba9..3175bfa57 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1731,8 +1731,8 @@ msgstr ""
 
 #: apt-private/private-upgrade.cc:25
 #, fuzzy
-msgid "Calculating upgrade... "
-msgstr "Yn Cyfrifo'r Uwchraddiad... "
+msgid "Calculating upgrade"
+msgstr "Yn Cyfrifo'r Uwchraddiad"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/da.po b/po/da.po
index 11ef78a5e..f46a851da 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1771,8 +1771,8 @@ msgid "All packages are up to date."
 msgstr "Alle pakker er opdateret."
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Beregner opgraderingen ... "
+msgid "Calculating upgrade"
+msgstr "Beregner opgraderingen"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/de.po b/po/de.po
index ae3b15d41..aef7c8fc4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1833,8 +1833,8 @@ msgid "All packages are up to date."
 msgstr "Alle Pakete sind aktuell."
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
+msgid "Calculating upgrade"
+msgstr "Paketaktualisierung (Upgrade) wird berechnet"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/dz.po b/po/dz.po
index 3ed665f94..59ed4305e 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1696,8 +1696,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
+msgid "Calculating upgrade"
+msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/el.po b/po/el.po
index 92f178b0d..86ef14179 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1718,8 +1718,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Υπολογισμός της αναβάθμισης... "
+msgid "Calculating upgrade"
+msgstr "Υπολογισμός της αναβάθμισης"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/es.po b/po/es.po
index 471774590..77cee1d5d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1780,8 +1780,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calculando la actualización... "
+msgid "Calculating upgrade"
+msgstr "Calculando la actualización"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/eu.po b/po/eu.po
index 9379abad0..88561d003 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1700,8 +1700,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Berriketak kalkulatzen... "
+msgid "Calculating upgrade"
+msgstr "Berriketak kalkulatzen"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/fi.po b/po/fi.po
index cb23ace35..b18648579 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1692,8 +1692,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Käsitellään päivitystä ... "
+msgid "Calculating upgrade"
+msgstr "Käsitellään päivitystä"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/fr.po b/po/fr.po
index f3b69a800..b2197906e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1788,8 +1788,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calcul de la mise à jour... "
+msgid "Calculating upgrade"
+msgstr "Calcul de la mise à jour"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/gl.po b/po/gl.po
index e7aa78713..53a866bc1 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1729,8 +1729,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calculando a anovación... "
+msgid "Calculating upgrade"
+msgstr "Calculando a anovación"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/he.po b/po/he.po
index adc738bec..4a44bc72d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1006,7 +1006,7 @@ msgid "Recommended packages:"
 msgstr ""
 
 #: cmdline/apt-get.cc:1965
-msgid "Calculating upgrade... "
+msgid "Calculating upgrade"
 msgstr ""
 
 #: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
diff --git a/po/hu.po b/po/hu.po
index 9457b384c..26a1bfa5c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1736,8 +1736,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Frissítés kiszámítása... "
+msgid "Calculating upgrade"
+msgstr "Frissítés kiszámítása"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/it.po b/po/it.po
index 5348110c2..c0ad782a7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1796,8 +1796,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calcolo dell'aggiornamento... "
+msgid "Calculating upgrade"
+msgstr "Calcolo dell'aggiornamento"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/ja.po b/po/ja.po
index c79bfbf28..c62ff95f7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1765,8 +1765,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "アップグレードパッケージを検出しています ... "
+msgid "Calculating upgrade"
+msgstr "アップグレードパッケージを検出しています"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/km.po b/po/km.po
index 9202b6072..0e95cd985 100644
--- a/po/km.po
+++ b/po/km.po
@@ -1675,8 +1675,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
+msgid "Calculating upgrade"
+msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/ko.po b/po/ko.po
index c1b756cf7..7ec20a7e7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1688,8 +1688,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "업그레이드를 계산하는 중입니다... "
+msgid "Calculating upgrade"
+msgstr "업그레이드를 계산하는 중입니다"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/ku.po b/po/ku.po
index 5f5512065..95c84ae0d 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -1578,8 +1578,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Bilindkirin tê hesibandin..."
+msgid "Calculating upgrade"
+msgstr "Bilindkirin tê hesibandin"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/lt.po b/po/lt.po
index 2f6d71365..9c1c549a3 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1600,8 +1600,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Skaičiuojami atnaujinimai... "
+msgid "Calculating upgrade"
+msgstr "Skaičiuojami atnaujinimai"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/mr.po b/po/mr.po
index 25134d605..6dd53b8a7 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1679,8 +1679,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
+msgid "Calculating upgrade"
+msgstr "पुढिल आवृत्तीची गणती करीत आहे"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/nb.po b/po/nb.po
index 445f1cca5..bc1e296d7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1706,8 +1706,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Beregner oppgradering... "
+msgid "Calculating upgrade"
+msgstr "Beregner oppgradering"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/ne.po b/po/ne.po
index 08de0f8ef..7c0d06837 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -1675,8 +1675,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "स्तर वृद्धि गणना गरिदैछ..."
+msgid "Calculating upgrade"
+msgstr "स्तर वृद्धि गणना गरिदैछ."
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/nl.po b/po/nl.po
index c410baa46..12e1602b9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1730,8 +1730,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Opwaardering wordt doorgerekend... "
+msgid "Calculating upgrade"
+msgstr "Opwaardering wordt doorgerekend"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/nn.po b/po/nn.po
index 7c5f77759..aeec41940 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1691,8 +1691,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Reknar ut oppgradering ... "
+msgid "Calculating upgrade"
+msgstr "Reknar ut oppgradering"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/pl.po b/po/pl.po
index 95785904a..d3829cb6d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1774,8 +1774,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Obliczanie aktualizacji..."
+msgid "Calculating upgrade"
+msgstr "Obliczanie aktualizacji"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/pt.po b/po/pt.po
index 5dcd74bb5..589af3181 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1741,8 +1741,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "A calcular a actualização... "
+msgid "Calculating upgrade"
+msgstr "A calcular a actualização"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c23a42275..87575301a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1710,8 +1710,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calculando atualização... "
+msgid "Calculating upgrade"
+msgstr "Calculando atualização"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/ro.po b/po/ro.po
index 2e556ef62..43c5bce69 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1717,8 +1717,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Calculez înnoirea... "
+msgid "Calculating upgrade"
+msgstr "Calculez înnoirea"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/ru.po b/po/ru.po
index 93d5163fb..f24e513e6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1764,8 +1764,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Расчёт обновлений…"
+msgid "Calculating upgrade"
+msgstr "Расчёт обновлений"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/sk.po b/po/sk.po
index acfd4cf5b..a9f4d2695 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1738,8 +1738,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Prepočítava sa aktualizácia... "
+msgid "Calculating upgrade"
+msgstr "Prepočítava sa aktualizácia"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/sl.po b/po/sl.po
index 69bf678d0..dcca81d87 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1739,8 +1739,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Preračunavanje nadgradnje ... "
+msgid "Calculating upgrade"
+msgstr "Preračunavanje nadgradnje"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/sv.po b/po/sv.po
index 5d11f06c2..b08ceb29f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1723,8 +1723,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Beräknar uppgradering... "
+msgid "Calculating upgrade"
+msgstr "Beräknar uppgradering"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/th.po b/po/th.po
index 5d04c5cda..b6d436a9a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1718,8 +1718,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "กำลังคำนวณการปรับรุ่น... "
+msgid "Calculating upgrade"
+msgstr "กำลังคำนวณการปรับรุ่น"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/tl.po b/po/tl.po
index 49a96a24e..e240e377a 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -1700,8 +1700,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Sinusuri ang pag-upgrade... "
+msgid "Calculating upgrade"
+msgstr "Sinusuri ang pag-upgrade"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/tr.po b/po/tr.po
index a3cd7077f..3aec2d65f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1779,8 +1779,8 @@ msgid "All packages are up to date."
 msgstr "Tüm paketler güncel."
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Yükseltme hesaplanıyor... "
+msgid "Calculating upgrade"
+msgstr "Yükseltme hesaplanıyor"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/uk.po b/po/uk.po
index 4f7b34a37..a5c7d7cf8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1759,8 +1759,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Обчислення оновлень... "
+msgid "Calculating upgrade"
+msgstr "Обчислення оновлень"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/vi.po b/po/vi.po
index 71dcfa553..87ec3b722 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1774,8 +1774,8 @@ msgid "All packages are up to date."
 msgstr "Mọi gói đã được cập nhật."
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Đang tính toán nâng cấp... "
+msgid "Calculating upgrade"
+msgstr "Đang tính toán nâng cấp"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 67e69f716..c06970a01 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1669,8 +1669,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "正在对升级进行计算... "
+msgid "Calculating upgrade"
+msgstr "正在对升级进行计算"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 59a8dcac7..9d6b7d2ea 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1669,8 +1669,8 @@ msgid "All packages are up to date."
 msgstr ""
 
 #: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "籌備升級中... "
+msgid "Calculating upgrade"
+msgstr "籌備升級中"
 
 #: apt-private/private-upgrade.cc:28
 msgid "Done"